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

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

@ -464,29 +464,33 @@ export class SystemKeywords {
case 'date': case 'date':
const resultDate = SystemKeywords.getDateFromLocaleString(result, contentLocale); const resultDate = SystemKeywords.getDateFromLocaleString(result, contentLocale);
switch (filter.operator) { if (resultDate) {
case '=': switch (filter.operator) {
if (resultDate.getTime() == filter.value.getTime()) case '=':
filterAcceptCount++; if (resultDate.getTime() == filter.value.getTime())
break; filterAcceptCount++;
case '<': break;
if (resultDate.getTime() < filter.value.getTime()) case '<':
filterAcceptCount++; if (resultDate.getTime() < filter.value.getTime())
break; filterAcceptCount++;
case '>': break;
if (resultDate.getTime() > filter.value.getTime()) case '>':
filterAcceptCount++; if (resultDate.getTime() > filter.value.getTime())
break; filterAcceptCount++;
case '<=': break;
if (resultDate.getTime() <= filter.value.getTime()) case '<=':
filterAcceptCount++; if (resultDate.getTime() <= filter.value.getTime())
break; filterAcceptCount++;
case '>=': break;
if (resultDate.getTime() >= filter.value.getTime()) case '>=':
filterAcceptCount++; if (resultDate.getTime() >= filter.value.getTime())
break; filterAcceptCount++;
break;
}
break;
} else {
GBLog.info(`BASIC: FIND with NULL date in filter.`);
} }
break;
} }
}); });
@ -517,15 +521,20 @@ 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);
switch (contentLocale) { if (parts[3]) {
case 'pt': switch (contentLocale) {
date = new Date(Number.parseInt(parts[2]), Number.parseInt(parts[1]), Number.parseInt(parts[3]), 0, 0, 0, 0); case 'pt':
break; date = new Date(Number.parseInt(parts[2]), Number.parseInt(parts[1]), Number.parseInt(parts[3]), 0, 0, 0, 0);
case 'en': break;
date = new Date(Number.parseInt(parts[1]), Number.parseInt(parts[2]), Number.parseInt(parts[3]), 0, 0, 0, 0); case 'en':
break; date = new Date(Number.parseInt(parts[1]), Number.parseInt(parts[2]), Number.parseInt(parts[3]), 0, 0, 0, 0);
break;
}
return date;
}
else {
return null;
} }
return date;
} }
/** /**