From e78e406a227d9efee3584f50e6c124fb58491e7e Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Tue, 22 May 2018 16:16:48 +0800
Subject: [PATCH 1/3]  * Finish task #4293, #4303, #4311.

---
 module/common/view/datatable.fix.html.php | 5 ++++-
 module/todo/view/view.html.php            | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index f44e49b2b0..7513486490 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -1,4 +1,7 @@
 <?php $datatableId = $this->moduleName . ucfirst($this->methodName);?>
+<style>
+#setShowModule {margin-left: 30px;}
+</style>
 <script>
 $(function()
 {
@@ -13,7 +16,7 @@ $(function()
         <?php $mode = isset($this->config->datatable->$datatableId->mode) ? $this->config->datatable->$datatableId->mode : 'table';?>
         // $btnToolbar.append("<a href=\"javascript:saveDatatableConfig('mode', 'table', true);\" class='btn btn-link <?php echo $mode == 'table' ? 'btn-active-line' : '';?>'><?php echo $lang->datatable->table?></a>");
         // $btnToolbar.append("<a href=\"javascript:saveDatatableConfig('mode', 'datatable', true);\" class='btn btn-link <?php echo $mode == 'datatable' ? 'btn-active-line' : '';?>'><?php echo $lang->datatable->datatable?></a>");
-        $btnToolbar.append("<a id='tableCustomBtn' class='btn btn-link' href='<?php echo $this->createLink('datatable', 'ajaxCustom', 'id=' . $this->moduleName . '&method=' . $this->methodName)?>' data-toggle='modal' data-type='ajax'><i class='icon icon-cog'></i></a>");
+        $btnToolbar.append("<a id='tableCustomBtn' class='btn btn-link' title='<?php echo $lang->datatable->custom?>' href='<?php echo $this->createLink('datatable', 'ajaxCustom', 'id=' . $this->moduleName . '&method=' . $this->methodName)?>' data-toggle='modal' data-type='ajax'><i class='icon icon-cog'></i></a>");
         $('#tableCustomBtn').modalTrigger();
     }
 
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index cf55bf4046..6a8b5d04f1 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -64,7 +64,7 @@
             </tr>
             <tr>
               <th><?php echo $lang->todo->date;?></th>
-              <td><?php echo $todo->date == '20300101' ? $lang->todo->periods['future'] : formatTime($todo->date);?></td>
+              <td><?php echo $todo->date == '20300101' ? $lang->todo->periods['future'] : formatTime($todo->date, DT_DATE1);?></td>
             </tr>
             <tr>
               <th><?php echo $lang->todo->beginAndEnd;?></th>

From 47add48bc5f304e684eefc286e868ee1879e4c81 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 22 May 2018 17:28:54 +0800
Subject: [PATCH 2/3]  * Adjust batchedit page for todo.

---
 module/todo/control.php             |  4 ++--
 module/todo/js/batchcreate.js       | 13 -------------
 module/todo/js/common.js            | 30 +++++++++++++++++++++++------
 module/todo/model.php               |  4 ++--
 module/todo/view/batchedit.html.php | 12 +++++++++---
 5 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/module/todo/control.php b/module/todo/control.php
index 06e2fb4259..52523ee656 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -195,8 +195,8 @@ class todo extends control
                 if($todo->type == 'story') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_STORY)->fetch('title');
                 if($todo->type == 'task')  $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TASK)->fetch('name');
                 if($todo->type == 'bug')   $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_BUG)->fetch('title');
-                $todo->begin = str_replace(':', '', $todo->begin);
-                $todo->end   = str_replace(':', '', $todo->end);
+                $todo->begin = $todo->begin ? str_replace(':', '', $todo->begin) : '2400';
+                $todo->end   = $todo->end ? str_replace(':', '', $todo->end) : '2400';
             }
 
             /* Judge whether the edited todos is too large. */
diff --git a/module/todo/js/batchcreate.js b/module/todo/js/batchcreate.js
index d2b0930af6..1282104221 100644
--- a/module/todo/js/batchcreate.js
+++ b/module/todo/js/batchcreate.js
@@ -13,19 +13,6 @@ function updateAction(date)
   location.href=link;
 }
 
-function switchDateList(number)
-{
-    if($('#switchDate' + number).attr('checked') == 'checked')
-    {
-        $('#begins' + number).attr('disabled', 'disabled').trigger('chosen:updated');
-        $('#ends' + number).attr('disabled', 'disabled').trigger('chosen:updated');
-    }
-    else
-    {
-        $('#begins' + number).removeAttr('disabled').trigger('chosen:updated');
-        $('#ends' + number).removeAttr('disabled').trigger('chosen:updated');
-    }
-}
 $(function()
 {
     setBeginsAndEnds();
diff --git a/module/todo/js/common.js b/module/todo/js/common.js
index a257b67cb8..8a93301c81 100644
--- a/module/todo/js/common.js
+++ b/module/todo/js/common.js
@@ -82,18 +82,36 @@ function setBeginsAndEnds(i, beginOrEnd)
         if(beginOrEnd == 'begin')
         {
             $("#ends" + i)[0].selectedIndex = $("#begins" + i)[0].selectedIndex + 3;
-            $("#ends" + j).trigger('chosen:updated');
+            $("#ends" + i).trigger('chosen:updated');
         }
-        for(j = i+1; j < batchCreateNum; j++)
+
+        if(typeof batchCreateNum != 'undefined')
         {
-            $("#begins" + j)[0].selectedIndex = $("#ends" + (j - 1))[0].selectedIndex;
-            $("#ends" + j)[0].selectedIndex = $("#begins" + j)[0].selectedIndex + 3;
-            $("#begins" + j).trigger('chosen:updated');
-            $("#ends" + j).trigger('chosen:updated');
+            for(j = i+1; j < batchCreateNum; j++)
+            {
+                $("#begins" + j)[0].selectedIndex = $("#ends" + (j - 1))[0].selectedIndex;
+                $("#ends" + j)[0].selectedIndex = $("#begins" + j)[0].selectedIndex + 3;
+                $("#begins" + j).trigger('chosen:updated');
+                $("#ends" + j).trigger('chosen:updated');
+            }
         }
     }
 }
 
+function switchDateList(number)
+{
+    if($('#switchDate' + number).prop('checked'))
+    {
+        $('#begins' + number).attr('disabled', 'disabled').trigger('chosen:updated');
+        $('#ends' + number).attr('disabled', 'disabled').trigger('chosen:updated');
+    }
+    else
+    {
+        $('#begins' + number).removeAttr('disabled').trigger('chosen:updated');
+        $('#ends' + number).removeAttr('disabled').trigger('chosen:updated');
+    }
+}
+
 function switchDateFeature(switcher)
 {
     if(switcher.checked) 
diff --git a/module/todo/model.php b/module/todo/model.php
index 081eabbea2..a4fc1c2c95 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -220,8 +220,8 @@ class todoModel extends model
                 $todo->pri    = $data->pris[$todoID];
                 $todo->status = $data->status[$todoID];
                 $todo->name   = ($todo->type == 'custom' or $todo->type == 'cycle') ? $data->names[$todoID] : '';
-                $todo->begin  = $data->begins[$todoID];
-                $todo->end    = $data->ends[$todoID];
+                $todo->begin  = isset($data->begins[$todoID]) ? $data->begins[$todoID] : 2400;
+                $todo->end    = isset($data->ends[$todoID]) ? $data->ends[$todoID] : 2400;
                 if($todo->type == 'task') $todo->idvalue = isset($data->tasks[$todoID]) ? $data->tasks[$todoID] : 0;
                 if($todo->type == 'bug')  $todo->idvalue = isset($data->bugs[$todoID]) ? $data->bugs[$todoID] : 0;
 
diff --git a/module/todo/view/batchedit.html.php b/module/todo/view/batchedit.html.php
index 6d608d8c63..68e1922402 100644
--- a/module/todo/view/batchedit.html.php
+++ b/module/todo/view/batchedit.html.php
@@ -40,7 +40,7 @@
           <th class='w-100px<?php echo zget($visibleFields, 'pri', ' hidden')?>'>   <?php echo $lang->todo->pri;?></th>
           <th><?php echo $lang->todo->name;?></th>
           <th <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo $lang->todo->desc;?></th>
-          <th class='w-180px<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
+          <th class='w-300px<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
           <th class='w-120px<?php echo zget($visibleFields, 'status', ' hidden')?>'>   <?php echo $lang->todo->status;?></th>
         </tr>
       </thead>
@@ -77,10 +77,16 @@
         <td <?php echo zget($visibleFields, 'beginAndEnd', "class='hidden'")?> style='overflow:visible'>
           <div class='input-group'>
             <?php
-            echo html::select("begins[$todo->id]", $times, $todo->begin, "onchange=\"setBeginsAndEnds($todo->id, 'begin');\" class='form-control chosen control-time-begin'" . (isset($visibleFields['beginAndEnd']) ? '' : " disabled"));
+            echo html::select("begins[$todo->id]", $times, $todo->begin, "onchange=\"setBeginsAndEnds($todo->id, 'begin');\" class='form-control chosen control-time-begin'" . ((isset($visibleFields['beginAndEnd']) && $todo->begin != '2400') ? '' : " disabled"));
             echo '<span class="input-group-addon fix-border fix-padding"></span>';
-            echo html::select("ends[$todo->id]", $times, $todo->end, "onchange=\"setBeginsAndEnds($todo->id, 'end');\" class='form-control chosen control-time-end'" . (isset($visibleFields['beginAndEnd']) ? '' : " disabled"));
+            echo html::select("ends[$todo->id]", $times, $todo->end, "onchange=\"setBeginsAndEnds($todo->id, 'end');\" class='form-control chosen control-time-end'" . ((isset($visibleFields['beginAndEnd']) && $todo->begin != '2400') ? '' : " disabled"));
             ?>
+            <span class="input-group-addon">
+              <div class='checkbox-primary dateSwitcher'>
+                <input type='checkbox' name="switchDate[<?php echo $todo->id;?>]" id="switchDate<?php echo $todo->id;?>" data-key="<?php echo $todo->id;?>" onclick='switchDateList(<?php echo $todo->id?>);' <?php if($todo->begin == '2400') echo "checked='checked'";?>>
+                <label for='switchDate'><?php echo $lang->todo->periods['future'];?></label>
+              </div>
+            </span>
           </div>
         </td>
         <td <?php echo zget($visibleFields, 'status', "class='hidden'")?> style='overflow:visible'><?php echo html::select("status[$todo->id]", $lang->todo->statusList, $todo->status, "class='form-control chosen'");?></td>

From b352241f2f2e945ce2391ab9540672904bae9650 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 22 May 2018 17:33:56 +0800
Subject: [PATCH 3/3]  * Adjust style for batchedit page of todo.

---
 module/todo/view/batchedit.html.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/module/todo/view/batchedit.html.php b/module/todo/view/batchedit.html.php
index 68e1922402..2445748254 100644
--- a/module/todo/view/batchedit.html.php
+++ b/module/todo/view/batchedit.html.php
@@ -31,9 +31,9 @@
   $columns = count($visibleFields) + 4;
   ?>
   <form method='post' target='hiddenwin' action='<?php echo $this->inlink('batchEdit', "from=todoBatchEdit");?>'>
-    <table class='table table-form table-fixed with-border'>
+    <table class='table table-form'>
       <thead>
-        <tr>
+        <tr class='text-center'>
           <th class='w-40px'>   <?php echo $lang->idAB;?></th>
           <th class='w-100px'>  <?php echo $lang->todo->date;?></th>
           <th class='w-80px'>  <?php echo $lang->todo->type;?></th>
@@ -94,7 +94,12 @@
       <?php endforeach;?>
       </tbody>
       <tfoot>
-        <tr><td colspan='<?php echo $columns?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td></tr>
+        <tr>
+          <td colspan='<?php echo $columns?>' class='text-center'>
+            <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
+          </td>
+        </tr>
       </tfoot>
     </table>
   </form>