Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for workload.

Browse Source
This commit is contained in:
wangyidong
2015-08-04 14:44:13 +08:00
parent 60d6d5a63c
commit 4d0ff8f8c8
4 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/report/control.php
View File

@@ -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'));

2
module/report/lang/en.php
View File

@@ -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';

2
module/report/lang/zh-cn.php
View File

@@ -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';

40
module/report/view/workload.html.php
View File

@@ -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'>