From 540425a31fce5b40367016f2e4b0c440dd33e915 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 24 Jan 2024 09:25:07 +0800
Subject: [PATCH] * Adjust create story page.

---
 module/story/ui/create.field.php |  2 +-
 module/story/ui/create.html.php  | 41 ++++++++++++++++++++++----------
 module/story/zen.php             |  1 +
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/module/story/ui/create.field.php b/module/story/ui/create.field.php
index 5346051b11..9201cf455d 100644
--- a/module/story/ui/create.field.php
+++ b/module/story/ui/create.field.php
@@ -126,7 +126,7 @@ $fields->field('verify')
 
 $fields->field('files')->width('full')->control('files');
 
-if(!isset($createFields['branch']) && $type == 'story')
+if(!isset($createFields['branch']) && $type == 'story' and isset($createFields['plan']))
 {
     $fields->field('plan')
         ->foldable()
diff --git a/module/story/ui/create.html.php b/module/story/ui/create.html.php
index f3b6bf8071..99cb3680ae 100644
--- a/module/story/ui/create.html.php
+++ b/module/story/ui/create.html.php
@@ -30,25 +30,40 @@ if(!empty($objectID))
     $createFields->remove('parent');
     $createFields->field('source')->className('full:w-1/2');
     $createFields->field('sourceNote')->className('full:w-1/2');
-    if(isset($fields['URS']))
+
+    $orders         = 'product,module,twinsStory,URS,assignedTo,reviewer,region,lane,title,category,pri,estimate,spec,verify,files';
+    $fullModeOrders = 'product,module,twinsStory,plan,URS,reviewer,region,lane,assignedTo,category,title,pri,estimate,spec,verify,files';
+    if(!isset($fields['plan']))
+    {
+        $createFields->field('category')->width('1/6');
+        $createFields->field('pri')->width('1/6');
+        $createFields->field('estimate')->width('1/6');
+        $createFields->field('source')->width('1/2');
+        $createFields->field('sourceNote')->width('1/2');
+        $fullModeOrders = 'product,module,twinsStory,URS,assignedTo,reviewer,region,lane,title,category,pri,estimate,spec,verify,files';
+
+        if(!isset($fields['URS']))
+        {
+            $createFields->field('category')->width('1/2');
+            $createFields->field('pri')->width('1/4');
+            $createFields->field('estimate')->width('1/4');
+            $orders         = 'product,module,twinsStory,assignedTo,category,reviewer,region,lane,title,pri,estimate,spec,verify,files';
+            $fullModeOrders = 'product,module,twinsStory,assignedTo,category,reviewer,region,lane,title,pri,estimate,spec,verify,files';
+        }
+    }
+    elseif(isset($fields['URS']))
     {
         $createFields->field('category')->width('1/6')->className('full:w-1/2');
         $createFields->field('pri')->width('1/6')->className('full:w-1/4');
         $createFields->field('estimate')->width('1/6')->className('full:w-1/4');
     }
-    else
-    {
-        $createFields->field('category')->width('1/2');
-        $createFields->field('pri')->width('1/4');
-        $createFields->field('estimate')->width('1/4');
-    }
-
-    $orders         = 'product,module,twinsStory,URS,assignedTo,reviewer,region,lane,title,category,pri,estimate,spec,verify,files';
-    $fullModeOrders = 'product,module,twinsStory,plan,URS,reviewer,region,lane,assignedTo,category,title,pri,estimate,spec,verify,files';
-    if(!isset($fields['URS']))
+    elseif(!isset($fields['URS']))
     {
+        $createFields->field('category')->className('full:w-1/6');
+        $createFields->field('pri')->className('full:w-1/6');
+        $createFields->field('estimate')->className('full:w-1/6');
         $orders         = 'product,module,twinsStory,reviewer,region,lane,assignedTo,category,title,pri,estimate,spec,verify,files';
-        $fullModeOrders = 'product,module,twinsStory,reviewer,region,lane,assignedTo,category,title,pri,estimate,spec,verify,files';
+        $fullModeOrders = 'product,module,twinsStory,reviewer,region,lane,plan,assignedTo,title,category,pri,estimate,spec,verify,files';
     }
 
     $createFields->orders($orders);
@@ -57,6 +72,8 @@ if(!empty($objectID))
 /* Set layout in product tab. */
 else
 {
+    $createFields->field('source')->className('full:w-1/2');
+    $createFields->field('sourceNote')->className('full:w-1/2');
     if($type == 'story')
     {
         if(!isset($fields['branch']) || !isset($fields['URS']))
diff --git a/module/story/zen.php b/module/story/zen.php
index 62e95945cf..a2bb1418c5 100644
--- a/module/story/zen.php
+++ b/module/story/zen.php
@@ -1012,6 +1012,7 @@ class storyZen extends story
         }
         if($storyType != 'story') unset($fields['region'], $fields['lane'], $fields['branches'], $fields['modules'], $fields['plans']);
         if($storyType != 'story' || !$this->config->URAndSR || $hiddenURS) unset($fields['URS']);
+        if($hiddenPlan) unset($fields['plan']);
         if($hiddenProduct)
         {
             $fields['product']['control']    = 'hidden';