- {translate('::SchedulerOptions.BasicSettings')}
+ {translate('::ListForms.SchedulerOptions.BasicSettings')}
option.value === values.schedulerOptionDto?.textExpr,
+ (option) => option.value === values.schedulerOptionDto.textExpr,
)}
+ onChange={(option) => form.setFieldValue(field.name, option?.value)}
/>
)}
option.value === values.schedulerOptionDto?.startDateExpr,
)}
+ onChange={(option) => form.setFieldValue(field.name, option?.value)}
/>
)}
option.value === values.schedulerOptionDto?.endDateExpr,
)}
+ onChange={(option) => form.setFieldValue(field.name, option?.value)}
/>
)}
option.value === values.schedulerOptionDto?.allDayExpr,
)}
+ onChange={(option) => form.setFieldValue(field.name, option?.value)}
/>
)}
@@ -198,10 +182,12 @@ function FormTabScheduler(props: FormEditProps) {
- {translate('::SchedulerOptions.RecurrenceSettings')}
+
+ {translate('::ListForms.SchedulerOptions.RecurrenceSettings')}
+
option.value === values.schedulerOptionDto?.recurrenceRuleExpr,
)}
+ onChange={(option) => form.setFieldValue(field.name, option?.value)}
/>
)}
option.value === values.schedulerOptionDto?.recurrenceExceptionExpr,
)}
+ onChange={(option) => form.setFieldValue(field.name, option?.value)}
/>
)}
@@ -250,9 +238,9 @@ function FormTabScheduler(props: FormEditProps) {
- {translate('::SchedulerOptions.ViewSettings')}
+ {translate('::ListForms.SchedulerOptions.ViewSettings')}
-
+
{({ field, form }: FieldProps) => (
-
+
{({ field, form }: FieldProps) => (
-
-
-
- {({ field, form }: FieldProps) => (
-
- )}
-
+
+
+
-
-
- {({ field, form }: FieldProps) => (
-
- )}
-
+
+
-
-
- {({ field, form }: FieldProps) => (
-
- )}
-
+
+
- {translate('::SchedulerOptions.InteractionSettings')}
+
+ {translate('::ListForms.SchedulerOptions.InteractionSettings')}
+
+
-
-
- {({ field, form }: FieldProps) => (
-
- {translate('::SchedulerOptions.ShowAllDayPanel')}
-
- )}
-
+
+
-
-
- {({ field, form }: FieldProps) => (
-
- {translate('::SchedulerOptions.CrossScrollingEnabled')}
-
- )}
-
+
+
-
-
- {({ field, form }: FieldProps) => (
-
- {translate('::SchedulerOptions.AllowResizing')}
-
- )}
-
+
+
-
-
- {({ field, form }: FieldProps) => (
-
- {translate('::SchedulerOptions.AllowDragging')}
-
- )}
-
+
+
diff --git a/ui/src/views/admin/listForm/edit/options.ts b/ui/src/views/admin/listForm/edit/options.ts
index 3568f489..4dffda45 100644
--- a/ui/src/views/admin/listForm/edit/options.ts
+++ b/ui/src/views/admin/listForm/edit/options.ts
@@ -405,6 +405,33 @@ export const chartBreakStyleLineListOptions = [
{ value: 'waved', label: 'Waved' },
]
+export const colSpanOptions = colSpan.map((span) => ({
+ value: span,
+ label: span,
+}))
+export const gantScaleOptions = enumToList(GanttScaleTypeEnum)
+
+export const schedulerViewOptions = [
+ { value: 'day', label: 'Day' },
+ { value: 'week', label: 'Week' },
+ { value: 'workWeek', label: 'Work Week' },
+ { value: 'month', label: 'Month' },
+ { value: 'timelineDay', label: 'Timeline Day' },
+ { value: 'timelineWeek', label: 'Timeline Week' },
+ { value: 'timelineMonth', label: 'Timeline Month' },
+ { value: 'agenda', label: 'Agenda' },
+]
+
+export const firstDayOfWeekOptions = [
+ { value: 0, label: 'Sunday' },
+ { value: 1, label: 'Monday' },
+ { value: 2, label: 'Tuesday' },
+ { value: 3, label: 'Wednesday' },
+ { value: 4, label: 'Thursday' },
+ { value: 5, label: 'Friday' },
+ { value: 6, label: 'Saturday' },
+]
+
export const dbSourceTypeOptions = enumToList(DbTypeEnum)
export const dataSourceTypeOptions = enumToList(DataSourceTypeEnum)
export const selectCommandTypeOptions = enumToList(SelectCommandTypeEnum)
@@ -433,9 +460,3 @@ export const widgetIconOptions = iconList.map((icon) => ({
value: icon,
label: icon,
}))
-
-export const colSpanOptions = colSpan.map((span) => ({
- value: span,
- label: span,
-}))
-export const gantScaleOptions = enumToList(GanttScaleTypeEnum)
diff --git a/ui/src/views/list/GanttView.tsx b/ui/src/views/list/GanttView.tsx
index 6c205fb4..0c70e325 100644
--- a/ui/src/views/list/GanttView.tsx
+++ b/ui/src/views/list/GanttView.tsx
@@ -279,7 +279,17 @@ const GanttView = (props: GanttViewProps) => {
-
+
+
diff --git a/ui/src/views/list/SchedulerView.tsx b/ui/src/views/list/SchedulerView.tsx
index 9a8f1417..6b5bf988 100644
--- a/ui/src/views/list/SchedulerView.tsx
+++ b/ui/src/views/list/SchedulerView.tsx
@@ -155,8 +155,6 @@ const SchedulerView = (props: SchedulerViewProps) => {
title={translate('::' + gridDto?.gridOptions.title)}
defaultTitle="Erp Platform"
>
-
-
)}
{!gridDto && (
@@ -222,26 +220,26 @@ const SchedulerView = (props: SchedulerViewProps) => {
allowDragging={gridDto.gridOptions.schedulerOptionDto?.allowDragging ?? false}
/>
-
-
-
-
+
+
+
+
-
+
{gridDto.gridOptions.schedulerOptionDto?.resources?.map((resource, index) => (