LisformWorkflow çalışması

api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsDto.cs

@@ -366,19 +366,6 @@ public class GridOptionsDto : AuditedEntityDto<Guid>
         set { SubFormsJson = JsonSerializer.Serialize(value); }
     }
 
-    [JsonIgnore]
-    public string WorkflowJson { get; set; }
-    public WorkflowDto WorkflowDto
-    {
-        get
-        {
-            if (!string.IsNullOrEmpty(WorkflowJson))
-                return JsonSerializer.Deserialize<WorkflowDto>(WorkflowJson);
-            return new WorkflowDto();
-        }
-        set { WorkflowJson = JsonSerializer.Serialize(value); }
-    }
-
     [JsonIgnore]
     public string ExtraFilterJson { get; set; } // Cagrilacak Extra Filters
     public ExtraFilterDto[] ExtraFilterDto

api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsEditDto.cs

@@ -123,5 +123,18 @@ public class GridOptionsEditDto : GridOptionsDto
         }
         set { ExtraFilterJson = JsonSerializer.Serialize(value); }
     }
+
+    [JsonIgnore]
+    public string WorkflowJson { get; set; }
+    public WorkflowDto WorkflowDto
+    {
+        get
+        {
+            if (!string.IsNullOrEmpty(WorkflowJson))
+                return JsonSerializer.Deserialize<WorkflowDto>(WorkflowJson);
+            return new WorkflowDto();
+        }
+        set { WorkflowJson = JsonSerializer.Serialize(value); }
+    }
 }
 

api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/WorkflowDto.cs

@@ -2,7 +2,7 @@
 
 public class WorkflowDto
 {
-    public string ApprovalFieldName { get; set; }
+    public string ApprovalUserFieldName { get; set; }
     public string ApprovalDateFieldName { get; set; }
     public string ApprovalStatusFieldName { get; set; }
 }

api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json

@@ -18730,9 +18730,9 @@
         },
         {
             "resourceName": "Platform",
-            "key": "ListForms.ListFormEdit.Workflow.ApprovalFieldName",
+            "key": "ListForms.ListFormEdit.Workflow.ApprovalUserFieldName",
-            "en": "Approval Field Name",
+            "en": "Approval User Field Name",
-            "tr": "Onay Alanı Adı"
+            "tr": "Onaylayan Kişi Alanı Adı"
         },
         {
             "resourceName": "Platform",

ui/src/proxy/form/models.ts

@@ -907,7 +907,7 @@ export interface WidgetEditDto {
 }
 
 export interface WorkflowDto {
-  approvalFieldName: string
+  approvalUserFieldName: string
   approvalDateFieldName: string
   approvalStatusFieldName: string
 }

ui/src/views/admin/listForm/edit/FormTabWorkflow.tsx

@@ -296,8 +296,9 @@ export function FormTabWorkflow(
   }
 
   const schema = object().shape({
-    approvalFieldName: string(),
+    approvalUserFieldName: string(),
     approvalDateFieldName: string(),
+    approvalStatusFieldName: string(),
   })
 
   const initialValues = useStoreState((s) => s.admin.lists.values)
@@ -320,14 +321,14 @@ export function FormTabWorkflow(
               <Card className="my-2">
                 <div className="grid grid-cols-1 md:grid-cols-3 gap-3">
                   <FormItem
-                    label={translate('::ListForms.ListFormEdit.Workflow.ApprovalFieldName')}
+                    label={translate('::ListForms.ListFormEdit.Workflow.ApprovalUserFieldName')}
                     invalid={
-                      errors.workflowDto?.approvalFieldName &&
+                      errors.workflowDto?.approvalUserFieldName &&
-                      touched.workflowDto?.approvalFieldName
+                      touched.workflowDto?.approvalUserFieldName
                     }
-                    errorMessage={errors.workflowDto?.approvalFieldName}
+                    errorMessage={errors.workflowDto?.approvalUserFieldName}
                   >
-                    <Field type="text" name="workflowDto.approvalFieldName">
+                    <Field type="text" name="workflowDto.approvalUserFieldName">
                       {({ field, form }: FieldProps<SelectBoxOption>) => (
                         <Select
                           field={field}
@@ -335,7 +336,7 @@ export function FormTabWorkflow(
                           options={columnOptions}
                           isClearable={true}
                           value={columnOptions.filter(
-                            (option) => option.value === values.workflowDto.approvalFieldName,
+                            (option) => option.value === values.workflowDto.approvalUserFieldName,
                           )}
                           onChange={(option) => form.setFieldValue(field.name, option?.value)}
                         />