GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(basic.gblib): NOW keyword is now formatting values with two zeros.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2021-08-15 12:00:36 -03:00
parent b99c917754
commit 296b999ec3
1 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/basic.gblib/services/SystemKeywords.ts
View file

@ -464,6 +464,7 @@ export class SystemKeywords {
case 'date': case 'date':
const resultDate = SystemKeywords.getDateFromLocaleString(result, contentLocale); const resultDate = SystemKeywords.getDateFromLocaleString(result, contentLocale);
if (resultDate) {
switch (filter.operator) { switch (filter.operator) {
case '=': case '=':
if (resultDate.getTime() == filter.value.getTime()) if (resultDate.getTime() == filter.value.getTime())
@ -487,6 +488,9 @@ export class SystemKeywords {
break; break;
} }
break; break;
} else {
GBLog.info(`BASIC: FIND with NULL date in filter.`);
}
} }
}); });
@ -517,6 +521,7 @@ export class SystemKeywords {
private static getDateFromLocaleString(date: any, contentLocale: any) { private static getDateFromLocaleString(date: any, contentLocale: any) {
const parts = /^([0-3]?[0-9]).([0-3]?[0-9]).((?:[0-9]{2})?[0-9]{2})$/gi.exec(date); const parts = /^([0-3]?[0-9]).([0-3]?[0-9]).((?:[0-9]{2})?[0-9]{2})$/gi.exec(date);
if (parts[3]) {
switch (contentLocale) { switch (contentLocale) {
case 'pt': case 'pt':
date = new Date(Number.parseInt(parts[2]), Number.parseInt(parts[1]), Number.parseInt(parts[3]), 0, 0, 0, 0); date = new Date(Number.parseInt(parts[2]), Number.parseInt(parts[1]), Number.parseInt(parts[3]), 0, 0, 0, 0);
@ -527,6 +532,10 @@ export class SystemKeywords {
} }
return date; return date;
} }
else {
return null;
}
}
/** /**
* Creates a folder in the bot instance drive. * Creates a folder in the bot instance drive.