From 64d1969639b890fa725fb969bb04bf3e1ebdcba7 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Mon, 14 May 2012 01:21:08 +0000
Subject: [PATCH]  * finish task#791.

---
 module/todo/control.php               | 3 +--
 module/todo/css/batchcreate.css       | 2 +-
 module/todo/model.php                 | 2 +-
 module/todo/view/batchcreate.html.php | 6 +++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/module/todo/control.php b/module/todo/control.php
index ae2ae7a3ab..9fc7ad8b46 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -67,7 +67,6 @@ class todo extends control
     public function batchCreate($date = 'today', $account = '')
     {
         if($date == 'today') $this->view->date = helper::today();
-        $todoLink = $this->createLink('my', 'todo', "date=today");
 
         if(!empty($_POST))
         {
@@ -75,7 +74,7 @@ class todo extends control
             if(dao::isError()) die(js::error(dao::getError()));
 
             /* Locate the browser. */
-            die(js::locate($todoLink, 'parent'));
+            die(js::locate($this->createLink('my', 'todo', "date={$this->post->date}"), 'parent'));
         }
 
         $header['title'] = $this->lang->my->common . $this->lang->colon . $this->lang->todo->create;
diff --git a/module/todo/css/batchcreate.css b/module/todo/css/batchcreate.css
index a5255f7774..d701cb83b2 100755
--- a/module/todo/css/batchcreate.css
+++ b/module/todo/css/batchcreate.css
@@ -1,3 +1,3 @@
 .half-left{text-align:right}
 .half-right{text-align:left}
-.f-left {margin-left:20px}
+.nameBox .f-left {margin-left:20px}
diff --git a/module/todo/model.php b/module/todo/model.php
index f03c0e038f..cd9d536e60 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -63,7 +63,7 @@ class todoModel extends model
             if((isset($todos->names[$i]) && $todos->names[$i] != '') || (!isset($todos->names[$i]) && (isset($todos->bugs[$i+1]) || isset($todos->tasks[$i+1]))))
             {
                 $data->account = $this->app->user->account;
-                $data->date    = helper::today();
+                $data->date    = $this->post->date;
                 $data->type    = $todos->types[$i];
                 $data->pri     = $todos->pris[$i];
                 $data->name    = isset($todos->names[$i]) ? $todos->names[$i] : '';
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index 1cf6071003..bd5cb0b7b0 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -11,9 +11,13 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <form method='post'>
   <table class='table-1 fixed'> 
-    <caption><?php echo $lang->todo->batchCreate . $lang->colon . $date;?></caption>
+    <caption>
+      <div class='f-left'><?php echo $lang->todo->batchCreate . $lang->colon;?></div>
+      <?php echo html::input('date', $date, "class='select-2 date'");?>
+    </caption>
     <tr>
       <th class='w-20px'><?php echo $lang->idAB;?></th> 
       <th class='w-100px'><?php echo $lang->todo->type;?></th>