Merge branch 'master' of https://github.com/easysoft/zentaopms
This commit is contained in:
daitingting
@@ -37,7 +37,7 @@ $lang->cron->confirmDelete = '是否删除该计划任务？';
|
||||
$lang->cron->confirmTurnon = '是否关闭计划任务？';
|
||||
$lang->cron->introduction = <<<EOD
|
||||
<p>计划任务功能可以定时执行诸如更新燃尽图、备份等操作，免除自己布置计划任务。</p>
|
||||
<p>该功能还有待完善，所以默认关闭该功能</p>
|
||||
<p>该功能还有待完善，所以默认关闭该功能。</p>
|
||||
EOD;
|
||||
$lang->cron->confirmOpen = <<<EOD
|
||||
<p>是否开启该功能？<a href="%s" target='hiddenwin'><strong>打开计划任务</strong></a></p>
|
||||
|
||||
@@ -21,9 +21,9 @@ $itemRow = <<<EOT
|
||||
<td>
|
||||
<input type='text' class="form-control" autocomplete='off' value="" name="values[]">
|
||||
</td>
|
||||
<td class='text-left'>
|
||||
<a href="javascript:void(0)" class='btn-icon' onclick="addItem(this)"><i class='icon-plus'></i></a>
|
||||
<a href="javascript:void(0)" class='btn-icon' onclick="delItem(this)"><i class='icon-remove'></i></a>
|
||||
<td class='c-actions'>
|
||||
<a href="javascript:void(0)" class='btn btn-link' onclick="addItem(this)"><i class='icon-plus'></i></a>
|
||||
<a href="javascript:void(0)" class='btn btn-link' onclick="delItem(this)"><i class='icon-trash'></i></a>
|
||||
</td>
|
||||
</tr>
|
||||
EOT;
|
||||
@@ -54,9 +54,9 @@ EOT;
|
||||
<?php if(($module == 'story' or $module == 'testcase') and $field == 'review'):?>
|
||||
<table class='table table-form mw-800px'>
|
||||
<tr>
|
||||
<th class='w-120px'><?php echo $lang->custom->storyReview;?></th>
|
||||
<th class='w-80px'><?php echo $lang->custom->storyReview;?></th>
|
||||
<td><?php echo html::radio('needReview', $lang->custom->reviewList, $needReview);?></td>
|
||||
<td class='w-100px'></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr <?php if($needReview and $module == 'testcase') echo "class='hidden'"?>>
|
||||
<th><?php echo $lang->custom->forceReview;?></th>
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
#product_chosen .chosen-single{width:150px;}
|
||||
#project_chosen .chosen-single{width:150px;}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<nav class="panel-actions btn-toolbar"></nav>
|
||||
</div>
|
||||
<div data-ride='table'>
|
||||
<table class='table table-condensed table-striped table-bordered table-fixed' id='bugAssign'>
|
||||
<table class='table table-condensed table-striped table-bordered table-fixed no-margin' id='bugAssign'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th><?php echo $lang->report->user;?></th>
|
||||
|
||||
@@ -11,23 +11,25 @@
|
||||
</div>
|
||||
<div class='main-col'>
|
||||
<div class='cell'>
|
||||
<div class='with-padding'>
|
||||
<div class="table-row" id='conditions'>
|
||||
<div class='col-sm-5'>
|
||||
<div class='input-group input-group-sm'>
|
||||
<span class='input-group-addon'><?php echo $lang->report->bugOpenedDate;?></span>
|
||||
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='form-control form-date' onchange='changeParams(this)'");?></div>
|
||||
<span class='input-group-addon fix-border'><?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 class="row" id='conditions'>
|
||||
<div class='col-sm-4'>
|
||||
<div class='input-group'>
|
||||
<span class='input-group-addon'><?php echo $lang->report->bugOpenedDate;?></span>
|
||||
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='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 class='col-sm-4'>
|
||||
<div class='input-group w-200px input-group-sm'>
|
||||
<span class='input-group-addon'><?php echo $lang->report->product;?></span>
|
||||
<?php echo html::select('product', $products, $product, "class='form-control chosen' onchange='changeParams(this)'");?>
|
||||
<span class='input-group-addon fix-border'><?php echo $lang->report->project;?></span>
|
||||
<?php echo html::select('project', $projects, $project, "class='form-control chosen' onchange='changeParams(this)'");?>
|
||||
</div>
|
||||
</div>
|
||||
<div class='col-sm-4'>
|
||||
<div class='input-group'>
|
||||
<span class='input-group-addon'><?php echo $lang->report->product;?></span>
|
||||
<?php echo html::select('product', $products, $product, "class='form-control chosen' onchange='changeParams(this)'");?>
|
||||
</div>
|
||||
</div>
|
||||
<div class='col-sm-4'>
|
||||
<div class='input-group'>
|
||||
<span class='input-group-addon'><?php echo $lang->report->project;?></span>
|
||||
<?php echo html::select('project', $projects, $project, "class='form-control chosen' onchange='changeParams(this)'");?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -39,7 +41,7 @@
|
||||
<nav class="panel-actions btn-toolbar"></nav>
|
||||
</div>
|
||||
<div data-ride='table'>
|
||||
<table class='table table-condensed table-striped table-bordered table-fixed' id="bug">
|
||||
<table class='table table-condensed table-striped table-bordered table-fixed no-margin' id="bug">
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th><?php echo $lang->bug->openedBy;?></th>
|
||||
|
||||
@@ -10,18 +10,16 @@
|
||||
</div>
|
||||
<div class='main-col'>
|
||||
<div class='cell'>
|
||||
<div class='with-padding'>
|
||||
<div class="table-row" id='conditions'>
|
||||
<div class="col-xs text-right side-col text-gray"><?php echo $lang->report->conditions?></div>
|
||||
<div class='col'>
|
||||
<div class="checkbox-primary inline-block">
|
||||
<input type="checkbox" name="closedProduct" value="closedProduct" id="closedProduct" <?php if(strpos($conditions, 'closedProduct') !== false) echo "checked='checked'"?> />
|
||||
<label for="closedProduct"><?php echo $lang->report->closedProduct?></label>
|
||||
</div>
|
||||
<div class="checkbox-primary inline-block">
|
||||
<input type="checkbox" name="overduePlan" value="overduePlan" id="overduePlan" <?php if(strpos($conditions, 'overduePlan') !== false) echo "checked='checked'"?> />
|
||||
<label for="overduePlan"><?php echo $lang->report->overduePlan?></label>
|
||||
</div>
|
||||
<div class="table-row" id='conditions'>
|
||||
<div class="col-xs text-right text-gray text-middle"><?php echo $lang->report->conditions?></div>
|
||||
<div class='col'>
|
||||
<div class="checkbox-primary inline-block">
|
||||
<input type="checkbox" name="closedProduct" value="closedProduct" id="closedProduct" <?php if(strpos($conditions, 'closedProduct') !== false) echo "checked='checked'"?> />
|
||||
<label for="closedProduct"><?php echo $lang->report->closedProduct?></label>
|
||||
</div>
|
||||
<div class="checkbox-primary inline-block">
|
||||
<input type="checkbox" name="overduePlan" value="overduePlan" id="overduePlan" <?php if(strpos($conditions, 'overduePlan') !== false) echo "checked='checked'"?> />
|
||||
<label for="overduePlan"><?php echo $lang->report->overduePlan?></label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -33,7 +31,7 @@
|
||||
<nav class="panel-actions btn-toolbar"></nav>
|
||||
</div>
|
||||
<div data-ride='table'>
|
||||
<table class='table table-condensed table-striped table-bordered table-fixed' id='productList'>
|
||||
<table class='table table-condensed table-striped table-bordered table-fixed no-margin' id='productList'>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class='w-200px'><?php echo $lang->product->name;?></th>
|
||||
|
||||
@@ -12,14 +12,12 @@
|
||||
</div>
|
||||
<div class='main-col'>
|
||||
<div class='cell'>
|
||||
<div class='with-padding'>
|
||||
<div class="table-row" id='conditions'>
|
||||
<div class='input-group w-400px input-group-sm'>
|
||||
<span class='input-group-addon'><?php echo $lang->projectCommon . $lang->report->beginAndEnd;?></span>
|
||||
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $begin, "class='form-control form-date' onchange='changeDate(this.value, \"$end\")'");?></div>
|
||||
<span class='input-group-addon'><?php echo $lang->report->to;?></span>
|
||||
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $end, "class='form-control form-date' onchange='changeDate(\"$begin\", this.value)'");?></div>
|
||||
</div>
|
||||
<div class="table-row" id='conditions'>
|
||||
<div class='input-group w-400px input-group-sm'>
|
||||
<span class='input-group-addon'><?php echo $lang->projectCommon . $lang->report->beginAndEnd;?></span>
|
||||
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $begin, "class='form-control form-date' onchange='changeDate(this.value, \"$end\")'");?></div>
|
||||
<span class='input-group-addon'><?php echo $lang->report->to;?></span>
|
||||
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $end, "class='form-control form-date' onchange='changeDate(\"$begin\", this.value)'");?></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -30,7 +28,7 @@
|
||||
<nav class="panel-actions btn-toolbar"></nav>
|
||||
</div>
|
||||
<div data-ride='table'>
|
||||
<table class='table table-condensed table-striped table-bordered table-fixed' id='projectList'>
|
||||
<table class='table table-condensed table-striped table-bordered table-fixed no-margin' id='projectList'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->report->id;?></th>
|
||||
|
||||
@@ -11,42 +11,46 @@
|
||||
</div>
|
||||
<div class='main-col'>
|
||||
<div class='cell'>
|
||||
<div class='with-padding'>
|
||||
<form method='post'>
|
||||
<div class="table-row" id='conditions'>
|
||||
<div class='col-2'>
|
||||
<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>
|
||||
<form method='post'>
|
||||
<div class="row" id='conditions'>
|
||||
<div class='col-sm-2'>
|
||||
<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 class='col-4'>
|
||||
<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='form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
|
||||
<span class='input-group-addon fix-border'><?php echo $lang->report->to;?></span>
|
||||
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('end', $end, "class='form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class='col-2'>
|
||||
<div class='input-group'>
|
||||
<span class='input-group-addon'><?php echo $lang->report->diffDays;?></span>
|
||||
<?php echo html::input('days', $days, "class='form-control' autocomplete='off' style='text-align:center'");?>
|
||||
</div>
|
||||
</div>
|
||||
<div class='col-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' autocomplete='off' style='width:50px'");?>
|
||||
</div>
|
||||
</div>
|
||||
<div class='col-1'>
|
||||
<?php echo html::select('assign', $lang->report->assign, $assign, "class='form-control' onchange='changeParams(this)' style='width:90px'");?>
|
||||
</div>
|
||||
<div class='col-1 text-right'><?php echo html::submitButton($lang->report->query);?></div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class='col-sm-4'>
|
||||
<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='form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
|
||||
<span class='input-group-addon fix-border'><?php echo $lang->report->to;?></span>
|
||||
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('end', $end, "class='form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class='col-sm-2'>
|
||||
<div class='input-group'>
|
||||
<span class='input-group-addon'><?php echo $lang->report->diffDays;?></span>
|
||||
<?php echo html::input('days', $days, "class='form-control' autocomplete='off' style='text-align:center'");?>
|
||||
</div>
|
||||
</div>
|
||||
<div class='col-sm-4'>
|
||||
<div class="row">
|
||||
<div class="col-sm-5">
|
||||
<div class='input-group'>
|
||||
<span class='input-group-addon'><?php echo $lang->report->workday;?></span>
|
||||
<?php echo html::input('workday', $workday, "class='form-control' autocomplete='off'");?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<?php echo html::select('assign', $lang->report->assign, $assign, "class='form-control chosen-simple' onchange='changeParams(this)'");?>
|
||||
</div>
|
||||
<div class="col-sm-3">
|
||||
<?php echo html::submitButton($lang->report->query, '', 'btn btn-primary btn-block');?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class='cell'>
|
||||
<div class='panel'>
|
||||
@@ -55,7 +59,7 @@
|
||||
<nav class="panel-actions btn-toolbar"></nav>
|
||||
</div>
|
||||
<div data-ride='table'>
|
||||
<table class='table table-condensed table-striped table-bordered table-fixed' id="workload">
|
||||
<table class='table table-condensed table-striped table-bordered table-fixed no-margin' id="workload">
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class="w-200px"><?php echo $lang->report->user;?></th>
|
||||
|
||||
@@ -221,7 +221,7 @@ class scoreModel extends model
|
||||
$data->time = empty($time) ? helper::now() : $time;
|
||||
$this->dao->insert(TABLE_SCORE)->data($data)->exec();
|
||||
|
||||
$this->dao->update(TABLE_USER)->set("`score`=`score` + " . $rule['score'])->set("`scoreLevel`=`scoreLevel` + " . $rule['score'])->where('account')->eq($account)->exec();
|
||||
$this->dao->update(TABLE_USER)->set("`score`=`score` + " . (int)$rule['score'])->set("`scoreLevel`=`scoreLevel` + " . $rule['score'])->where('account')->eq($account)->exec();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user