Skip to content

Add/time zone #1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 10, 2024
Merged

Add/time zone #1151

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
79dca8b
function calculation reverted
MenamAfzal Sep 6, 2024
56ebeae
missing timeZones added
MenamAfzal Sep 6, 2024
fd6ad1d
default values added
MenamAfzal Sep 6, 2024
056337c
pull from origin
MenamAfzal Sep 9, 2024
6de6379
formatted values with respect to selective timeZone
MenamAfzal Sep 10, 2024
286c500
Merge branch 'dev' into add/time-zone
FalkWolsky Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
default values added
  • Loading branch information
@MenamAfzal
MenamAfzal committed Sep 6, 2024
commit fd6ad1d6039c6a18ee474e1c41db6b79ed13b29e
2 changes: 1 addition & 1 deletion client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export const DateRangeUIView = (props: DateRangeUIViewProps) => {
<StyledAntdSelect
options={timeZoneOptions.filter(option => option.value !== 'UserChoice')}
placeholder="Select Time Zone"
defaultValue={'Etc/UTC'}
defaultValue={'(UTC 00:00) UTC'}
onChange={props?.onClickDateRangeTimeZone}
/>
</StyledDiv>
Expand Down
2 changes: 1 addition & 1 deletion client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const DateUIView = (props: DataUIViewProps) => {
<StyledAntdSelect
options={timeZoneOptions.filter(option => option.value !== 'UserChoice')}
placeholder="Select Time Zone"
defaultValue={'Etc/UTC'}
defaultValue={'(UTC 00:00) UTC'}
onChange={props.onClickDateTimeZone}
/>
</StyledDiv>
Expand Down
4 changes: 2 additions & 2 deletions client/packages/lowcoder/src/comps/comps/dateComp/timeRangeUIView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const RangePickerStyled = styled((props: any) => <RangePicker {...props} />)<{ $
`;

const StyledAntdSelect = styled(AntdSelect)`
width: 100%;
width: 300px;
margin: 10px 0px;
.ant-select-selector {
font-size: 14px;
Expand Down Expand Up @@ -71,7 +71,7 @@ export const TimeRangeUIView = (props: TimeRangeUIViewProps) => {
<StyledAntdSelect
placeholder="Select Time Zone"
options={timeZoneOptions.filter(option => option.value !== 'UserChoice')} // Filter out 'userChoice'
defaultValue={'Etc/UTC'}
defaultValue={'(UTC 00:00) UTC'}
onChange={props.handleTimeRangeZoneChange}
/>
)
Expand Down
4 changes: 2 additions & 2 deletions client/packages/lowcoder/src/comps/comps/dateComp/timeUIView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const TimeMobileUIView = React.lazy(() =>
);

const StyledAntdSelect = styled(AntdSelect)`
width: 350px;
width: 300px;
margin: 10px 0;
.ant-select-selector {
font-size: 14px;
Expand Down Expand Up @@ -54,7 +54,7 @@ export const TimeUIView = (props: TimeUIViewProps) => {
placeholder="Select Time Zone"
options={timeZoneOptions.filter(option => option.value !== 'UserChoice')} // Filter out 'userChoice'
onChange={props?.handleTimeZoneChange}
defaultValue={'Etc/UTC'}
defaultValue={'(UTC 00:00) UTC'}
/>
)
)}
Expand Down
62 changes: 31 additions & 31 deletions client/packages/lowcoder/src/comps/comps/dateComp/timeZone.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
import { trans } from "i18n";

export const timeZoneOptions = [
{ label: trans("timeZone.UTC-12:00"), value: "Etc/GMT+12" },
{ label: trans("timeZone.UTC-11:00"), value: "Etc/GMT+11" },
{ label: trans("timeZone.UTC-10:00"), value: "Pacific/Honolulu" },
{ label: trans("timeZone.UTC-09:00"), value: "America/Anchorage" },
{ label: trans("timeZone.UTC-08:00"), value: "America/Tijuana" },
{ label: trans("timeZone.UTC-07:00"), value: "America/Los_Angeles" },
{ label: trans("timeZone.UTC-06:00"), value: "America/Chicago" },
{ label: trans("timeZone.UTC-05:00"), value: "America/New_York" },
{ label: trans("timeZone.UTC-04:00"), value: "America/Halifax" },
{ label: trans("timeZone.UTC-03:00"), value: "America/Argentina/Buenos_Aires" },
{ label: trans("timeZone.UTC-02:00"), value: "Etc/GMT+2" },
{ label: trans("timeZone.UTC-01:00"), value: "Atlantic/Cape_Verde" },
{ label: trans("timeZone.UTC+00:00"), value: "Etc/UTC" },
{ label: trans("timeZone.UTC+01:00"), value: "Europe/Berlin" },
{ label: trans("timeZone.UTC+02:00"), value: "Europe/Bucharest" },
{ label: trans("timeZone.UTC+03:00"), value: "Europe/Moscow" },
{ label: trans("timeZone.UTC+04:00"), value: "Asia/Dubai" },
{ label: trans("timeZone.UTC+05:00"), value: "Asia/Karachi" },
{ label: trans("timeZone.UTC+05:30"), value: "Asia/Kolkata" },
{ label: trans("timeZone.UTC+05:45"), value: "Asia/Kathmandu" },
{ label: trans("timeZone.UTC+06:00"), value: "Asia/Dhaka" },
{ label: trans("timeZone.UTC+06:30"), value: "Asia/Rangoon" },
{ label: trans("timeZone.UTC+07:00"), value: "Asia/Bangkok" },
{ label: trans("timeZone.UTC+08:00"), value: "Asia/Shanghai" },
{ label: trans("timeZone.UTC+09:00"), value: "Asia/Tokyo" },
{ label: trans("timeZone.UTC+09:30"), value: "Australia/Darwin" },
{ label: trans("timeZone.UTC+10:00"), value: "Australia/Sydney" },
{ label: trans("timeZone.UTC+11:00"), value: "Pacific/Guadalcanal" },
{ label: trans("timeZone.UTC+12:00"), value: "Pacific/Auckland" },
{ label: trans("timeZone.UTC+13:00"), value: "Pacific/Tongatapu" },
{ label: trans("timeZone.UserChoice"), value: "UserChoice" }
{ label: trans("timeZone.UTC-12:00"), value: trans("timeZone.UTC-12:00") },
{ label: trans("timeZone.UTC-11:00"), value: trans("timeZone.UTC-11:00") },
{ label: trans("timeZone.UTC-10:00"), value: trans("timeZone.UTC-10:00") },
{ label: trans("timeZone.UTC-09:00"), value: trans("timeZone.UTC-09:00") },
{ label: trans("timeZone.UTC-08:00"), value: trans("timeZone.UTC-08:00") },
{ label: trans("timeZone.UTC-07:00"), value: trans("timeZone.UTC-07:00") },
{ label: trans("timeZone.UTC-06:00"), value: trans("timeZone.UTC-06:00") },
{ label: trans("timeZone.UTC-05:00"), value: trans("timeZone.UTC-05:00") },
{ label: trans("timeZone.UTC-04:00"), value: trans("timeZone.UTC-04:00") },
{ label: trans("timeZone.UTC-03:00"), value: trans("timeZone.UTC-03:00") },
{ label: trans("timeZone.UTC-02:00"), value: trans("timeZone.UTC-02:00") },
{ label: trans("timeZone.UTC-01:00"), value: trans("timeZone.UTC-01:00") },
{ label: trans("timeZone.UTC+00:00"), value: trans("timeZone.UTC+00:00") },
{ label: trans("timeZone.UTC+01:00"), value: trans("timeZone.UTC+01:00") },
{ label: trans("timeZone.UTC+02:00"), value: trans("timeZone.UTC+02:00") },
{ label: trans("timeZone.UTC+03:00"), value: trans("timeZone.UTC+03:00") },
{ label: trans("timeZone.UTC+04:00"), value: trans("timeZone.UTC+04:00") },
{ label: trans("timeZone.UTC+05:00"), value: trans("timeZone.UTC+05:00") },
{ label: trans("timeZone.UTC+05:30"), value: trans("timeZone.UTC+05:30") },
{ label: trans("timeZone.UTC+05:45"), value: trans("timeZone.UTC+05:45") },
{ label: trans("timeZone.UTC+06:00"), value: trans("timeZone.UTC+06:00") },
{ label: trans("timeZone.UTC+06:30"), value: trans("timeZone.UTC+06:30") },
{ label: trans("timeZone.UTC+07:00"), value: trans("timeZone.UTC+07:00") },
{ label: trans("timeZone.UTC+08:00"), value: trans("timeZone.UTC+08:00") },
{ label: trans("timeZone.UTC+09:00"), value: trans("timeZone.UTC+09:00") },
{ label: trans("timeZone.UTC+09:30"), value: trans("timeZone.UTC+09:30") },
{ label: trans("timeZone.UTC+10:00"), value: trans("timeZone.UTC+10:00") },
{ label: trans("timeZone.UTC+11:00"), value: trans("timeZone.UTC+11:00") },
{ label: trans("timeZone.UTC+12:00"), value: trans("timeZone.UTC+12:00") },
{ label: trans("timeZone.UTC+13:00"), value: trans("timeZone.UTC+13:00") },
{ label: trans("timeZone.UserChoice"), value: trans("timeZone.UserChoice") }
];
2 changes: 1 addition & 1 deletion client/packages/lowcoder/src/i18n/locales/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3644,7 +3644,7 @@ export const en = {
"UTC+11:00": "(UTC+11:00) Solomon Islands, New Caledonia",
"UTC+12:00": "(UTC+12:00) Auckland, Fiji",
"UTC+13:00": "(UTC+13:00) Nuku'alofa, Samoa",
"UserChoice": "User Choice"
"UserChoice": "UserChoice"
},
tour: {
section1Title: "Steps",
Expand Down