* Rename estimateStartDate and actualStartDate insead of estStart and realStart.

module/task/lang/en.php

@@ -45,8 +45,8 @@ $lang->task->leftAB            = 'Left';
 $lang->task->consumed          = 'Consumed';
 $lang->task->consumedAB        = 'Use';
 $lang->task->hour              = 'Hour';
-$lang->task->estimateStartDate = 'Start date';
-$lang->task->actualStartDate   = 'Actual start';
+$lang->task->estStarted        = 'Estimate start';
+$lang->task->realStarted       = 'Real start';
 $lang->task->deadline          = 'Deadline';
 $lang->task->deadlineAB        = 'Deadline';
 $lang->task->status            = 'Status';

module/task/lang/zh-cn.php

@@ -45,8 +45,8 @@ $lang->task->leftAB            = '剩';
 $lang->task->consumed          = '已经消耗';
 $lang->task->consumedAB        = '耗';
 $lang->task->hour              = '小时';
-$lang->task->estimateStartDate = '开始日期';
-$lang->task->actualStartDate   = '实际开始';
+$lang->task->estStarted        = '预计开始';
+$lang->task->realStarted       = '实际开始';
 $lang->task->deadline          = '截止日期';
 $lang->task->deadlineAB        = '截止';
 $lang->task->status            = '任务状态';
@@ -181,5 +181,5 @@ $lang->task->report->finishedTasksPerDay->graph->xAxisName   = '日期';
 $lang->task->report->finishedTasksPerDay->graph->rotateNames = '1';
 
 $lang->task->placeholder->estimate = '对该任务最初的预计';
-$lang->task->placeholder->deadline = '任务的截至日期，如果逾期有警告显示。';
+$lang->task->placeholder->deadline = '任务的截止日期，如果逾期有警告显示。';
 $lang->task->placeholder->mailto   = '当前task所有的操作都会抄送给该列表(不会指派给当前操作人)，抄送给可以是多个人，输入用户名(非真实姓名)进行选择。'; 

module/task/model.php

@@ -32,6 +32,7 @@ class taskModel extends model
                 ->striptags('name')
                 ->add('project', (int)$projectID)
                 ->setDefault('estimate, left, story', 0)
+                ->setDefault('estStarted', '0000-00-00')
                 ->setDefault('deadline', '0000-00-00')
                 ->setDefault('status', 'wait')
                 ->setIF($this->post->estimate != false, 'left', $this->post->estimate)
@@ -50,6 +51,7 @@ class taskModel extends model
                 ->autoCheck()
                 ->batchCheck($this->config->task->create->requiredFields, 'notempty')
                 ->checkIF($task->estimate != '', 'estimate', 'float')
+                ->checkIF($task->deadline != '', 'deadline', 'ge', $task->estStarted)
                 ->exec();
 
             if(!dao::isError())

module/task/view/create.html.php

@@ -63,8 +63,8 @@ $(function()
       <td><?php echo html::input('estimate', '', "class='text-3'") . $lang->task->hour;?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->task->estimateStartDate;?></th>
-      <td><?php echo html::input('estimateStartDate', '', "class='text-3 date'");?></td>
+      <th class='rowhead'><?php echo $lang->task->estStarted;?></th>
+      <td><?php echo html::input('estStarted', '', "class='text-3 date'");?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->task->deadline;?></th>

module/task/view/edit.html.php

@@ -84,8 +84,12 @@
         <legend><?php echo $lang->task->legendEffort;?></legend>
         <table class='table-1'> 
           <tr>
-            <th class='rowhead'><?php echo $lang->task->estimateStartDate;?></th>
-            <td><?php echo html::input('estimateStartDate', $task->actualStartDate, "class='text-1 date'");?></td>
+            <th class='rowhead'><?php echo $lang->task->estStarted;?></th>
+            <td><?php echo html::input('estStarted', $task->estStarted, "class='text-1 date'");?></td>
+          </tr>  
+          <tr>
+            <th class='rowhead'><?php echo $lang->task->realStarted;?></th>
+            <td><?php echo html::input('realStarted', $task->realStarted, "class='text-1 date'");?></td>
           </tr>  
           <tr>
             <th class='rowhead'><?php echo $lang->task->deadline;?></th>

module/task/view/start.html.php

@@ -11,20 +11,21 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>
     <caption><?php echo $task->name;?></caption>
     <tr>
-      <th class='rowhead'><?php echo $lang->task->estimateStartDate;?></th>
-      <td><?php echo html::input('actualStartDate', helper::now(), "class='text-3'");?></td>
+      <th class='rowhead'><?php echo $lang->task->realStarted;?></th>
+      <td><?php echo html::input('realStarted', helper::today(), "class='text-2 date'");?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->task->consumed;?></th>
-      <td><?php echo html::input('consumed', $task->consumed, "class='text-3'") . $lang->task->hour;?></td>
+      <td><?php echo html::input('consumed', $task->consumed, "class='text-2'") . $lang->task->hour;?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->task->left;?></th>
-      <td><?php echo html::input('left', $task->left, "class='text-3'") . $lang->task->hour;?></td>
+      <td><?php echo html::input('left', $task->left, "class='text-2'") . $lang->task->hour;?></td>
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>

module/task/view/view.html.php

@@ -137,8 +137,12 @@
         <legend><?php echo $lang->task->legendEffort;?></legend>
         <table class='table-1'> 
           <tr>
-            <th class='rowhead'><?php echo $lang->task->estimateStartDate;?></th>
-            <td> <?php echo strtotime($task->actualStartDate) ? substr($task->actualStartDate, 0, 10) : substr($task->estimateStartDate, 0, 10); ?> </td>
+            <th class='rowhead'><?php echo $lang->task->estStarted;?></th>
+            <td><?php echo $task->estStarted;?></td>
+          </tr>  
+          <tr>
+            <th class='rowhead'><?php echo $lang->task->realStarted;?></th>
+            <td><?php echo $task->realStarted; ?> </td>
           </tr>  
           <tr>
             <th class='rowhead'><?php echo $lang->task->deadline;?></th>