From c3d53daa5aa074f597b67fee412254850e18f78e Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Mon, 12 Dec 2022 16:36:32 +0800
Subject: [PATCH] * Finish Task #79665

---
 module/task/lang/de.php          | 4 ++--
 module/task/lang/en.php          | 4 ++--
 module/task/lang/fr.php          | 4 ++--
 module/task/lang/zh-cn.php       | 4 ++--
 module/task/view/create.html.php | 9 +++------
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index f3dbd8518d..2aa3ae522e 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -212,8 +212,8 @@ $lang->task->reasonList['']       = '';
 $lang->task->reasonList['done']   = 'Erledigt';
 $lang->task->reasonList['cancel'] = 'Abgebrochen';
 
-$lang->task->modeList['linear'] = 'Serial';
-$lang->task->modeList['multi']  = 'Parallel';
+$lang->task->modeList['linear'] = 'Multiple Person Serial';
+$lang->task->modeList['multi']  = 'Multiple Person Parallel';
 
 $lang->task->afterChoices['continueAdding'] = ' Weitere Aufgaben erfassen';
 $lang->task->afterChoices['toTaskList']     = 'Zurück zur Aufgabenliste';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 374e09c778..9abac62024 100755
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -212,8 +212,8 @@ $lang->task->reasonList['']       = '';
 $lang->task->reasonList['done']   = 'Done';
 $lang->task->reasonList['cancel'] = 'Cancelled';
 
-$lang->task->modeList['linear'] = 'Serial';
-$lang->task->modeList['multi']  = 'Parallel';
+$lang->task->modeList['linear'] = 'Multiple Person Serial';
+$lang->task->modeList['multi']  = 'Multiple Person Parallel';
 
 $lang->task->afterChoices['continueAdding'] = ' Continue Adding Tasks';
 $lang->task->afterChoices['toTaskList']     = 'Go to Task List';
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index 0501411684..8bf9f99c54 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -212,8 +212,8 @@ $lang->task->reasonList['']       = '';
 $lang->task->reasonList['done']   = 'Fait';
 $lang->task->reasonList['cancel'] = 'Annulé';
 
-$lang->task->modeList['linear'] = 'Serial';
-$lang->task->modeList['multi']  = 'Parallel';
+$lang->task->modeList['linear'] = 'Multiple Person Serial';
+$lang->task->modeList['multi']  = 'Multiple Person Parallel';
 
 $lang->task->afterChoices['continueAdding'] = ' Continuer Ajouter Tâches';
 $lang->task->afterChoices['toTaskList']     = 'Aller à la liste des Tâches';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 25d58abdbd..9e7904633c 100755
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -212,8 +212,8 @@ $lang->task->reasonList['']       = '';
 $lang->task->reasonList['done']   = '已完成';
 $lang->task->reasonList['cancel'] = '已取消';
 
-$lang->task->modeList['linear'] = '串行';
-$lang->task->modeList['multi']  = '并行';
+$lang->task->modeList['linear'] = '多人串行';
+$lang->task->modeList['multi']  = '多人并行';
 
 $lang->task->afterChoices['continueAdding'] = "继续为该{$lang->SRCommon}添加任务";
 $lang->task->afterChoices['toTaskList']     = '返回任务列表';
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 91b0a6d413..a3fb8a3d31 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -79,16 +79,13 @@ foreach(explode(',', $config->task->create->requiredFields) as $field)
             </div>
           </td>
           <td>
-            <div class="checkbox-primary c-multipleTask affair">
+            <div class="checkbox-primary c-multipleTask affair" style='display: inline-block'>
               <input type="checkbox" name="multiple" value="1" id="multipleBox" /><label for="multipleBox" class="no-margin"><?php echo $lang->task->multiple;?></label>
             </div>
-            <button id='selectAllUser' type="button" class="btn btn-link<?php if($task->type !== 'affair') echo ' hidden';?>"><?php echo $lang->task->selectAllUser;?></button>
+            <div class='hidden modeBox' style='display: inline-block'><?php echo html::radio('mode', $lang->task->modeList, !empty($task->mode) ? $task->mode: 'linear');?></div>
+          <button id='selectAllUser' type="button" class="btn btn-link<?php if($task->type !== 'affair') echo ' hidden';?>"><?php echo $lang->task->selectAllUser;?></button>
           </td>
         </tr>
-        <tr class='hidden modeBox'>
-          <th><?php echo $lang->task->mode;?></th>
-          <td><?php echo html::select('mode', $lang->task->modeList, $task->mode, "class='form-control chosen'");?></td>
-        </tr>
         <?php if($execution->type == 'kanban'):?>
         <tr>
           <th><?php echo $lang->kanbancard->region;?></th>