From 4d0ff8f8c8527ccf24be302be5f89aba2dcdbf59 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 4 Aug 2015 14:44:13 +0800
Subject: [PATCH]  * adjust for workload.

---
 module/report/control.php            |  9 +++++++
 module/report/lang/en.php            |  2 ++
 module/report/lang/zh-cn.php         |  2 ++
 module/report/view/workload.html.php | 40 +++++++++++++++++-----------
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/module/report/control.php b/module/report/control.php
index 3fe2f4ee60..031ad77632 100644
--- a/module/report/control.php
+++ b/module/report/control.php
@@ -115,6 +115,15 @@ class report extends control
      */
     public function workload($begin = '', $end = '', $workday = 7, $dept = 0)
     {
+        if($_POST)
+        {
+            $data     = fixer::input('post')->get();
+            $begin    = $data->begin;
+            $end      = $data->end;
+            $dept     = $data->dept;
+            $workday  = $data->workday;
+        }
+
         $begin = $begin ? date('Y-m-d', strtotime($begin)) : date('Y-m-d', strtotime('now'));
         $end   = $end   ? date('Y-m-d', strtotime($end))   : date('Y-m-d', strtotime('+1 week'));
 
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index db7ef9313f..452f4dab6c 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -40,6 +40,8 @@ $lang->report->bugAssign        = 'Bug assign';
 $lang->report->workload         = 'Workload';
 $lang->report->workloadAB       = 'Workload';
 $lang->report->bugOpenedDate    = 'Bug opened date';
+$lang->report->taskAssignedDate = 'Task assign date';
+$lang->report->dept             = 'Dept';
 
 $lang->reportList->project->lists[10] = $lang->projectCommon . ' deviation|report|projectdeviation';
 $lang->reportList->product->lists[10] = $lang->productCommon . ' summary|report|productsummary';
diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php
index 6a0a05071c..e579e80e82 100644
--- a/module/report/lang/zh-cn.php
+++ b/module/report/lang/zh-cn.php
@@ -40,6 +40,8 @@ $lang->report->bugAssign        = 'Bug指派表';
 $lang->report->workload         = '员工负载表';
 $lang->report->workloadAB       = '工作负载';
 $lang->report->bugOpenedDate    = 'Bug创建时间';
+$lang->report->taskAssignedDate = '任务指派时间';
+$lang->report->dept             = '部门';
 
 $lang->reportList->project->lists[10] = $lang->projectCommon . '偏差报表|report|projectdeviation';
 $lang->reportList->product->lists[10] = $lang->productCommon . '汇总表|report|productsummary';
diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php
index 06e72ee893..d51b66e244 100644
--- a/module/report/view/workload.html.php
+++ b/module/report/view/workload.html.php
@@ -15,23 +15,33 @@
   </div>
 </div>
 <div class='main'>
-  <div class='row'>
-    <div class='col-sm-4'>
-      <div class='input-group w-300px input-group-sm'>
-        <div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='w-100px form-control form-date' onchange='changeParams(this)'");?></div>
-        <span class='input-group-addon'><?php echo $lang->report->to;?></span>
-        <div class='datepicker-wrapper datepicker-date'><?php echo html::input('end', $end, "class='form-control form-date' onchange='changeParams(this)'");?></div>
+  <form method='post'>
+    <div class='row' style='margin-bottom:5px;'>
+      <div class='col-sm-3'>
+        <div class='input-group'>
+          <span class='input-group-addon'><?php echo $lang->report->dept;?></span>
+          <?php echo html::select('dept', $depts, $dept, "class='form-control chosen' onchange='changeParams(this)'");?>
+        </div>
+      </div>
+      <div class='col-sm-5'>
+        <div class='input-group input-group-sm'>
+          <span class='input-group-addon'><?php echo $lang->report->taskAssignedDate;?></span>
+          <div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='w-100px form-control form-date' onchange='changeParams(this)'");?></div>
+          <span class='input-group-addon'><?php echo $lang->report->to;?></span>
+          <div class='datepicker-wrapper datepicker-date'><?php echo html::input('end', $end, "class='form-control form-date' onchange='changeParams(this)'");?></div>
+        </div>
+      </div>
+      <div class='col-sm-2'>
+        <div class='input-group'>
+          <span class='input-group-addon'><?php echo $lang->report->workday;?></span>
+          <?php echo html::input('workday', $workday, "class='form-control' style='width:50px'");?>
+        </div>
+      </div>
+      <div class='col-sm-1'>
+        <div class='input-group'><?php echo html::submitButton();?></div>
       </div>
     </div>
-    <div class='col-sm-4'>
-      <div class='input-group'>
-        <span class='input-group-addon'><?php echo $lang->report->workday;?></span>
-        <?php echo html::input('workday', $workday, "class='form-control' style='width:50px' onchange='changeParams(this)'");?>
-        <span class='input-group-addon'><?php echo $lang->dept->common;?></span>
-        <?php echo html::select('dept', $depts, $dept, "class='form-control chosen' onchange='changeParams(this)'");?>
-      </div>
-    </div>
-  </div>
+  </form>
   <table class='table table-condensed table-striped table-bordered tablesorter table-fixed active-disabled' id="workload">
     <thead>
     <tr class='colhead'>