Browse Source

tbel: tbDate timeZone add weekday

_tbel_fix_bug_tb_date_timezone_pattern
nick 3 years ago
parent
commit
bba7bfbaf5
  1. 10
      common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDateTimeFormatOptions.java

10
common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDateTimeFormatOptions.java

@ -41,12 +41,16 @@ public class TbDateTimeFormatOptions {
String patternTime = "";
delimiterValidation();
if ("short".equals(weekday)) {
patternDate = "E, ";
} else if ("long".equals(weekday)) {
patternDate = "EEEE, ";
}
if ("numeric".equals(day)) {
patternDate = "d";
patternDate += "d";
} else if ("2-digit".equals(day)) {
patternDate = "dd";
patternDate += "dd";
}
if ("numeric".equals(month)) {
patternDate = patternDate.isEmpty() ? "M" : patternDate + delimiter + "M";
} else if ("2-digit".equals(month)) {

Loading…
Cancel
Save