Commitdcd1373

authored

Merge pull requestlowcoder-org#1162 from MenamAfzal/add/timezone-name

Added TimeZoneName in JSON return Object in TimeZone

2 parents4ae6762 +68be43e commitdcd1373Copy full SHA for dcd1373

File tree

+20

-14

lines changed

+20

-14

lines changed

Lines changed: 10 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -462,13 +462,16 @@ export const dateRangeControl = (function () {`
`462`	`462`	`.build();`
`463`	`463`	`})();`
`464`	`464`
`465`		`-constgetTimeZoneInfo=(timeZone:any,othereTimeZone:any)=>{`
`466`		`-consttz=timeZone==='UserChoice' ?othereTimeZone :timeZone;`
`467`		`-return{`
`468`		`-TimeZone:tz,`
`469`		`-Offset:dayjs().tz(tz).format('Z')// Get the UTC offset for the selected timezone`
`470`		`-};`
`471`		`-};`
	`465`	`+constgetTimeZoneInfo=(timeZone:any,otherTimeZone:any)=>{`
	`466`	`+consttz=timeZone==='UserChoice' ?otherTimeZone :timeZone;`
	`467`	`+`
	`468`	`+constdateInTz=dayjs().tz(tz);`
	`469`	`+constoffset=dateInTz.format('Z');`
	`470`	`+consttimeZoneName=newIntl.DateTimeFormat('en-US',{timeZone:tz,timeZoneName:'short'})`
	`471`	`+.formatToParts().find(part=>part.type==='timeZoneName')?.value;`
	`472`	`+`
	`473`	`+return{TimeZone:tz,Offset:offset,Name:timeZoneName};`
	`474`	`+};`
`472`	`475`
`473`	`476`	`exportconstDatePickerComp=withExposingConfigs(datePickerControl,[`
`474`	`477`	`depsConfig({`

Lines changed: 10 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -414,13 +414,16 @@ export const timeRangeControl = (function () {`
`414`	`414`	`.build();`
`415`	`415`	`})();`
`416`	`416`
`417`		`-constgetTimeZoneInfo=(timeZone:any,othereTimeZone:any)=>{`
`418`		`-consttz=timeZone==='UserChoice' ?othereTimeZone :timeZone;`
`419`		`-return{`
`420`		`-TimeZone:tz,`
`421`		`-Offset:dayjs().tz(tz).format('Z')// Get the UTC offset for the selected timezone`
`422`		`-};`
`423`		`-};`
	`417`	`+constgetTimeZoneInfo=(timeZone:any,otherTimeZone:any)=>{`
	`418`	`+consttz=timeZone==='UserChoice' ?otherTimeZone :timeZone;`
	`419`	`+`
	`420`	`+constdateInTz=dayjs().tz(tz);`
	`421`	`+constoffset=dateInTz.format('Z');`
	`422`	`+consttimeZoneName=newIntl.DateTimeFormat('en-US',{timeZone:tz,timeZoneName:'short'})`
	`423`	`+.formatToParts().find(part=>part.type==='timeZoneName')?.value;`
	`424`	`+`
	`425`	`+return{TimeZone:tz,Offset:offset,Name:timeZoneName};`
	`426`	`+};`
`424`	`427`
`425`	`428`	`exportconstTimePickerComp=withExposingConfigs(timePickerControl,[`
`426`	`429`	`newNameConfig("value",trans("export.timePickerValueDesc")),`

Comments

(0)