From bba7bfbaf5f849d07b8692850c5a2fd0d8ea49a9 Mon Sep 17 00:00:00 2001
From: nick <nick@avalr.com.ua>
Date: Thu, 7 Sep 2023 13:41:17 +0300
Subject: [PATCH] tbel:  tbDate timeZone add weekday

---
 .../script/api/tbel/TbDateTimeFormatOptions.java       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDateTimeFormatOptions.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDateTimeFormatOptions.java
index a9c545cc01..5aafbd178b 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDateTimeFormatOptions.java
+++ b/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)) {