From f6e413be0935c85d017b81807dbe1be41a82dd15 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 4 Jul 2023 09:03:01 +0800
Subject: [PATCH] * Adjust style of the activate task page.

---
 module/task/css/activate.ui.css  |  8 ++++++--
 module/task/js/activate.ui.js    | 18 +++++++++---------
 module/task/ui/activate.html.php |  4 +++-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/module/task/css/activate.ui.css b/module/task/css/activate.ui.css
index a498161ae7..40ceb51dd8 100644
--- a/module/task/css/activate.ui.css
+++ b/module/task/css/activate.ui.css
@@ -1,4 +1,8 @@
 #modalTeam .table tr {border: none;}
 .team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
-#teamTable td.required {position: relative;}
-#teamTable td.required:after {content: '*'; color: rgba(var(--color-danger-500-rgb),var(--tw-text-opacity)); position: absolute; top: 1rem; right: 0.125rem;}
+#teamForm td.required {position: relative;}
+#teamForm td.required:after {content: '*'; color: rgba(var(--color-danger-500-rgb),var(--tw-text-opacity)); position: absolute; top: 1rem; right: 0.125rem;}
+#teamForm tr td:first-child {width: 40px; position: relative;}
+#teamForm tr td:first-child .icon{position:absolute; top: 40px; right: 19px;display: block; font-size: 8px; color: #9ea3bd;}
+#teamForm tr:nth-last-child(1) td:first-child .icon {display: none;}
+div.input-control-suffix {height: 2rem;}
diff --git a/module/task/js/activate.ui.js b/module/task/js/activate.ui.js
index 3625bf4e46..88d939ac18 100644
--- a/module/task/js/activate.ui.js
+++ b/module/task/js/activate.ui.js
@@ -193,7 +193,7 @@ function setTeamUser()
 
 
 /* Mange team. */
-$('#teamTable').on('click.team', '.btn-add', function()
+$('#teamForm').on('click.team', '.btn-add', function()
 {
     let $newRow = $(this).closest('tr').clone();
     $newRow.find('td.required').removeClass('required');
@@ -205,7 +205,7 @@ $('#teamTable').on('click.team', '.btn-add', function()
     disableMembers();
 })
 
-$('#teamTable').on('click.team', '.btn-delete', function()
+$('#teamForm').on('click.team', '.btn-delete', function()
 {
     let $row = $(this).closest('tr');
     if(isMultiple && !checkRemove($row.index())) return;
@@ -241,7 +241,7 @@ function setLineIndex()
  */
 function toggleBtn()
 {
-    let $deleteBtn = $('#teamTable').find('.btn-delete');
+    let $deleteBtn = $('#teamForm').find('.btn-delete');
     if($deleteBtn.length == 1)
     {
         $deleteBtn.addClass('hidden');
@@ -264,7 +264,7 @@ function disableMembers()
     if(mode == 'multi')
     {
         let members = [];
-        let $teams  = $('#teamTable').find('select[name^=team]');
+        let $teams  = $('#teamForm').find('select[name^=team]');
         for(i = 0; i < $teams.length; i++)
         {
             let value = $teams.eq(i).val();
@@ -287,7 +287,7 @@ function disableMembers()
                 $this.find('option[value=' + account + ']').attr('disabled', 'disabled');
             })
         });
-        $('#teamTable').find('tr.hidden').remove();
+        $('#teamForm').find('tr.hidden').remove();
     }
 }
 
@@ -300,7 +300,7 @@ function disableMembers()
  */
 function checkRemove(removeIndex)
 {
-    let $teams      = $('#teamTable').find('select#team');
+    let $teams      = $('#teamForm').find('select#team');
     let totalLeft   = 0;
     let memberCount = 0;
     for(i = 0; i < $teams.length; i++)
@@ -328,12 +328,12 @@ function checkRemove(removeIndex)
         return false;
     }
 
-    if($('#teamTable').find('td > .btn-delete:enabled').length == 1) return false;
+    if($('#teamForm').find('td > .btn-delete:enabled').length == 1) return false;
 
     return true;
 }
 
-$('#teamTable').on('change', 'select[name^=team]', function()
+$('#teamForm').on('change', 'select[name^=team]', function()
 {
     $(this).closest('tr').find('input[name^=teamLeft]').closest('td').toggleClass('required', $(this).val() != '')
 
@@ -354,7 +354,7 @@ $('#teamTable').on('change', 'select[name^=team]', function()
     $tr.find('[name^=teamEstimate]').val(estimate);
 });
 
-$('#teamTable').find('select#team:enabled').each(function()
+$('#teamForm').find('select#team:enabled').each(function()
 {
     $(this).closest('tr').find('input[name^=teamLeft]').closest('td').toggleClass('required', $(this).val() != '')
 });
diff --git a/module/task/ui/activate.html.php b/module/task/ui/activate.html.php
index 378e469638..0bfdb6cfca 100644
--- a/module/task/ui/activate.html.php
+++ b/module/task/ui/activate.html.php
@@ -132,6 +132,7 @@ foreach($task->team as $member)
                 setClass('team-number'),
                 $i
             ),
+            $task->mode == 'linear' ? icon("angle-down") : null
         ),
         h::td
         (
@@ -230,6 +231,7 @@ for($i; $i <= $rowCount; $i ++)
                 setClass("team-number"),
                 $i
             ),
+            $task->mode == 'linear' ? icon("angle-down") : null
         ),
         h::td
         (
@@ -355,7 +357,7 @@ formPanel
             h::table
             (
                 setClass('table table-form'),
-                set::id('teamTable'),
+                set::id('teamForm'),
                 $teamForm
             ),
         )