Sfoglia il codice sorgente

date format day of year (#1436)

* Support day of yer in date format 'D'

* Support day of yer in date format 'D'

---------

Co-authored-by: Fred Lefévère-Laoide <Fred.Lefevere-Laoide@Taipy.io>
Fred Lefévère-Laoide 11 mesi fa
parent
commit
7e43f3a59a

+ 2 - 2
frontend/taipy-gui/src/utils/index.spec.ts

@@ -93,11 +93,11 @@ describe("getDateTimeString", () => {
         expect(myWarn).toHaveBeenCalledWith("Invalid date format:", "Invalid time value")
         expect(myWarn).toHaveBeenCalledWith("Invalid date format:", "Invalid time value")
     });
     });
     it("returns for bad format", async () => {
     it("returns for bad format", async () => {
-        expect(getDateTimeString("2024-10-05", "D", getDateFormatConfig())).toContain("05 2024");
+        expect(getDateTimeString("2024-10-05", "ABCDEF", getDateFormatConfig())).toContain("05 2024");
         expect(myWarn).toHaveBeenCalled()
         expect(myWarn).toHaveBeenCalled()
         expect(myWarn.mock.lastCall).toHaveLength(2)
         expect(myWarn.mock.lastCall).toHaveLength(2)
         expect(myWarn.mock.lastCall[0]).toBe("Invalid date format:")
         expect(myWarn.mock.lastCall[0]).toBe("Invalid date format:")
-        expect(myWarn.mock.lastCall[1]).toContain("Use `d` instead of `D`")
+        expect(myWarn.mock.lastCall[1]).toContain("Format string contains an unescaped latin alphabet character `A`")
     });
     });
     it("returns for null", async () => {
     it("returns for null", async () => {
         expect(getDateTimeString(null as unknown as string, "dd-MM-yy", getDateFormatConfig())).toBe("null");
         expect(getDateTimeString(null as unknown as string, "dd-MM-yy", getDateFormatConfig())).toBe("null");

+ 3 - 2
frontend/taipy-gui/src/utils/index.ts

@@ -111,10 +111,11 @@ export const getDateTimeString = (
             return formatInTimeZone(
             return formatInTimeZone(
                 dateVal || "",
                 dateVal || "",
                 formatConf.forceTZ || !tz ? formatConf.timeZone : tz,
                 formatConf.forceTZ || !tz ? formatConf.timeZone : tz,
-                datetimeformat || formatConf.dateTime
+                datetimeformat || formatConf.dateTime,
+                { useAdditionalDayOfYearTokens: true }
             );
             );
         }
         }
-        return format(dateVal || 0, datetimeformat || formatConf.date);
+        return format(dateVal || 0, datetimeformat || formatConf.date, { useAdditionalDayOfYearTokens: true });
     } catch (e) {
     } catch (e) {
         console.warn("Invalid date format:", (e as Error).message || e);
         console.warn("Invalid date format:", (e as Error).message || e);
         return `${dateVal}`;
         return `${dateVal}`;