From 9a67905e0f190ff7b9be00d64e14bdfbc028bed0 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Mon, 22 Jan 2024 13:08:11 +0800
Subject: [PATCH] * Adjust for required fields.

---
 module/execution/ui/create.field.php | 12 +++++++-----
 module/story/ui/create.field.php     | 15 +++++++--------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/module/execution/ui/create.field.php b/module/execution/ui/create.field.php
index c95890a881..a26f8c2e82 100644
--- a/module/execution/ui/create.field.php
+++ b/module/execution/ui/create.field.php
@@ -7,6 +7,7 @@ $project = data('project');
 $from    = data('from');
 $isStage = data('isStage');
 $showExecutionExec = ($from == 'execution' || $from == 'doc');
+$requiredFields    = ",{$config->execution->create->requiredFields},";
 
 $fields->field('project')
     ->required()
@@ -54,7 +55,7 @@ $fields->field('dateRange')
 
 $fields->field('days')
     ->width('1/4')
-    ->required(strpos(",{$config->execution->create->requiredFields},", ",days,") !== false)
+    ->required(strpos($requiredFields, ",days,") !== false)
     ->label($lang->execution->days . sprintf($lang->execution->unitTemplate, $lang->execution->day))
     ->items(false)
     ->value(!empty($plan->begin) ? (helper::workDays($plan->begin, $plan->end) + 1) : '');
@@ -83,13 +84,14 @@ $fields->field('productsBox')
 
 $fields->field('desc')
     ->width('full')
+    ->required(strpos($requiredFields, ",desc,") !== false)
     ->label($showExecutionExec ? $lang->execution->execDesc : $lang->execution->desc)
     ->control('editor');
 
-$fields->field('PO')->foldable()->items(data('poUsers'))->value(data('copyExecution.PO'));
-$fields->field('QD')->foldable()->items(data('qdUsers'))->value(data('copyExecution.QD'));
-$fields->field('PM')->foldable()->items(data('pmUsers'))->value(data('copyExecution.PM'));
-$fields->field('RD')->foldable()->items(data('rdUsers'))->value(data('copyExecution.RD'));
+$fields->field('PO')->foldable()->required(strpos($requiredFields, ",PO,") !== false)->items(data('poUsers'))->value(data('copyExecution.PO'));
+$fields->field('QD')->foldable()->required(strpos($requiredFields, ",QD,") !== false)->items(data('qdUsers'))->value(data('copyExecution.QD'));
+$fields->field('PM')->foldable()->required(strpos($requiredFields, ",PM,") !== false)->items(data('pmUsers'))->value(data('copyExecution.PM'));
+$fields->field('RD')->foldable()->required(strpos($requiredFields, ",RD,") !== false)->items(data('rdUsers'))->value(data('copyExecution.RD'));
 
 $fields->field('teamName')
     ->foldable()
diff --git a/module/story/ui/create.field.php b/module/story/ui/create.field.php
index 27a2deea30..c1b74c9a9b 100644
--- a/module/story/ui/create.field.php
+++ b/module/story/ui/create.field.php
@@ -67,13 +67,10 @@ $fields->field('reviewer')
     ->itemBegin('reviewer[]')->control('picker')->id('reviewer')->items($createFields['reviewer']['options'])->value($createFields['reviewer']['default'])->multiple()->itemEnd();
 $fields->field('needNotReview')->control('hidden')->value(0);
 
-if($isSR)
-{
-    $fields->field('assignedTo')
-        ->required($createFields['assignedTo']['required'])
-        ->id('assignedToBox')
-        ->items($createFields['assignedTo']['options']);
-}
+$fields->field('assignedTo')
+    ->required($createFields['assignedTo']['required'])
+    ->id('assignedToBox')
+    ->items($createFields['assignedTo']['options']);
 
 $fields->field('category')
     ->className('full:w-1/6')
@@ -84,6 +81,7 @@ $fields->field('category')
 if($isKanban)
 {
     $fields->field('region')
+        ->wrapBefore(true)
         ->label($createFields['region']['title'])
         ->items($createFields['region']['options'])
         ->value($createFields['region']['default']);
@@ -146,6 +144,7 @@ if(!isset($createFields['branch']) && $type == 'story')
 $fields->field('source')
     ->foldable()
     ->label($lang->story->source . '&' . $lang->story->sourceNote)
+    ->required($createFields['source']['required'])
     ->control('inputGroup')
     ->items(false)
     ->itemBegin('source')->control('picker')->items($createFields['source']['options'])->value($createFields['source']['default'])->itemEnd()
@@ -165,7 +164,7 @@ $fields->field('mailto')
     ->foldable()
     ->control('mailto');
 
-$fields->field('keywords')->foldable();
+$fields->field('keywords')->foldable()->required($createFields['keywords']['required']);
 
 $fields->field('type')->control('hidden')->value($type);
 $fields->field('status')->control('hidden')->value('active');