Merge branch 'sprint/241_tianshujie_task' into 'master'
* Finish task #70096. See merge request easycorp/zentaopms!5497
This commit is contained in:
王怡栋
@@ -1,5 +1,13 @@
|
||||
$(function()
|
||||
{
|
||||
/* Hide creation logs when displaying team logs. */
|
||||
$('#linearefforts .tabs ul > li').click(function()
|
||||
{
|
||||
var tab = $(this).find('a').attr('href');
|
||||
$('#recordForm').toggleClass('hidden', tab == '#legendAllEffort');
|
||||
});
|
||||
|
||||
|
||||
$('.form-date').datetimepicker('setEndDate', today);
|
||||
|
||||
$("#recordForm #submit").click(function(e, confirmed)
|
||||
|
||||
@@ -255,6 +255,7 @@ $lang->task->error->recordMinus = 'Work hours should not be negative numbe
|
||||
$lang->task->error->leftNumber = '"Left" must be numbers.';
|
||||
$lang->task->error->recordMinus = 'Work hours should not be negative number.';
|
||||
$lang->task->error->consumedSmall = '"Genutzt" muss larger than before.';
|
||||
$lang->task->error->dateEmpty = 'Please enter "Date"';
|
||||
$lang->task->error->consumedThisTime = 'Bitte geben Sie die Stunden an';
|
||||
$lang->task->error->left = 'Bitte geben Sie die verbleibenden Stunden an"';
|
||||
$lang->task->error->work = '"Bemerkung" muss kleiner als %d Zeichen sein.';
|
||||
|
||||
@@ -255,6 +255,7 @@ $lang->task->error->recordMinus = 'Work hours should not be negative numbe
|
||||
$lang->task->error->leftNumber = '"Left" must be numbers.';
|
||||
$lang->task->error->recordMinus = 'Work hours should not be negative number.';
|
||||
$lang->task->error->consumedSmall = '"Total Cost" must be > the last number.';
|
||||
$lang->task->error->dateEmpty = 'Please enter "Date"';
|
||||
$lang->task->error->consumedThisTime = 'Please enter "Hours Cost"';
|
||||
$lang->task->error->left = 'Please enter "Hours Left"';
|
||||
$lang->task->error->work = '"Comment" must be < %d characters.';
|
||||
|
||||
@@ -255,6 +255,7 @@ $lang->task->error->recordMinus = 'Work hours should not be negative numbe
|
||||
$lang->task->error->leftNumber = '"Entrez" doit être numérique.';
|
||||
$lang->task->error->recordMinus = 'Work hours should not be negative number.';
|
||||
$lang->task->error->consumedSmall = '"Coût Total" doit être > au dernier chiffre.';
|
||||
$lang->task->error->dateEmpty = 'Please enter "Date"';
|
||||
$lang->task->error->consumedThisTime = 'Entrez le "Coût en Heures"';
|
||||
$lang->task->error->left = 'Entrez les "Heures Restantes"';
|
||||
$lang->task->error->work = '"Commentaire" doit être < %d caractères.';
|
||||
|
||||
@@ -255,6 +255,7 @@ $lang->task->error->recordMinus = '工时不能为负数';
|
||||
$lang->task->error->leftNumber = '"预计剩余"必须为数字';
|
||||
$lang->task->error->recordMinus = '工时不能为负数';
|
||||
$lang->task->error->consumedSmall = '"总计消耗"必须大于之前消耗';
|
||||
$lang->task->error->dateEmpty = '请填写"日期"';
|
||||
$lang->task->error->consumedThisTime = '请填写"消耗"';
|
||||
$lang->task->error->left = '请填写"剩余"';
|
||||
$lang->task->error->work = '"备注"必须小于%d个字符';
|
||||
|
||||
@@ -1828,8 +1828,9 @@ class taskModel extends model
|
||||
|
||||
if(!empty($record->work[$id]) or !empty($record->consumed[$id]))
|
||||
{
|
||||
if(!$record->consumed[$id]) helper::end(js::alert($this->lang->task->error->consumedThisTime));
|
||||
if($record->left[$id] === '') helper::end(js::alert($this->lang->task->error->left));
|
||||
if(helper::isZeroDate($record->dates[$id])) helper::end(js::alert($this->lang->task->error->dateEmpty));
|
||||
if(!$record->consumed[$id]) helper::end(js::alert($this->lang->task->error->consumedThisTime));
|
||||
if($record->left[$id] === '') helper::end(js::alert($this->lang->task->error->left));
|
||||
|
||||
$estimates[$id] = new stdclass();
|
||||
$estimates[$id]->date = $record->dates[$id];
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
<?php if(!empty($task) and !empty($task->team) and $task->mode == 'linear'):?>
|
||||
<style>
|
||||
#linearefforts .nav-tabs{margin-bottom:20px;}
|
||||
#linearefforts div.caption {height:25px; margin:10px 0px;}
|
||||
#mainContent {min-height: 500px;}
|
||||
#mainContent .main-header {padding-bottom: 5px;}
|
||||
#linearefforts {margin-top: -18px;}
|
||||
#linearefforts .nav-tabs{margin-bottom: 10px;}
|
||||
#linearefforts div.caption {height:25px; margin: 10px 0px;}
|
||||
#linearefforts div.caption .account{font-weight: bolder;}
|
||||
#linearefforts .tabs ul > li > a { padding-top: 6px; padding-bottom: 4px;}
|
||||
</style>
|
||||
<?php
|
||||
$this->app->loadLang('execution');
|
||||
@@ -11,7 +15,7 @@ foreach($task->team as $team) $teamOrders[$team->order] = $team->account;
|
||||
|
||||
$myOrders = array();
|
||||
$allEfforts = array();
|
||||
$recorders = array();
|
||||
$recorders = array();
|
||||
foreach($efforts as $effort)
|
||||
{
|
||||
$order = $effort->order;
|
||||
@@ -26,7 +30,6 @@ foreach($efforts as $effort)
|
||||
}
|
||||
?>
|
||||
<div id='linearefforts'>
|
||||
<?php if($myOrders):?>
|
||||
<div class='tabs'>
|
||||
<ul class='nav nav-tabs'>
|
||||
<li class='active'><a href='#legendMyEffort' data-toggle='tab'><?php echo $lang->task->myEffort;?></a></li>
|
||||
@@ -34,6 +37,7 @@ foreach($efforts as $effort)
|
||||
</ul>
|
||||
<div class='tab-content'>
|
||||
<div class='tab-pane active' id='legendMyEffort'>
|
||||
<?php if(!empty($myOrders)):?>
|
||||
<table class='table table-bordered table-fixed table-recorded'>
|
||||
<thead>
|
||||
<tr class='text-center'>
|
||||
@@ -41,7 +45,7 @@ foreach($efforts as $effort)
|
||||
<th class="w-120px"><?php echo $lang->task->date;?></th>
|
||||
<th class="w-120px"><?php echo $lang->task->recordedBy;?></th>
|
||||
<th><?php echo $lang->task->work;?></th>
|
||||
<th class="thWidth"><?php echo $lang->task->consumed;?></th>
|
||||
<th class="thWidth"><?php echo $lang->task->consumedAB;?></th>
|
||||
<th class="thWidth"><?php echo $lang->task->left;?></th>
|
||||
<th class='c-actions-2'><?php echo $lang->actions;?></th>
|
||||
</tr>
|
||||
@@ -77,9 +81,9 @@ foreach($efforts as $effort)
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<div class='tab-pane' id='legendAllEffort'>
|
||||
<?php endif;?>
|
||||
<table class='table table-bordered table-fixed table-recorded'>
|
||||
<thead>
|
||||
<tr class='text-center'>
|
||||
@@ -87,7 +91,7 @@ foreach($efforts as $effort)
|
||||
<th class="w-120px"><?php echo $lang->task->date;?></th>
|
||||
<th class="w-120px"><?php echo $lang->task->recordedBy;?></th>
|
||||
<th><?php echo $lang->task->work;?></th>
|
||||
<th class="thWidth"><?php echo $lang->task->consumed;?></th>
|
||||
<th class="thWidth"><?php echo $lang->task->consumedAB;?></th>
|
||||
<th class="thWidth"><?php echo $lang->task->left;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -113,10 +117,10 @@ foreach($efforts as $effort)
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($myOrders):?>
|
||||
<?php if(!empty($myOrders)):?>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
|
||||
@@ -115,13 +115,13 @@ if(!empty($members) && $task->mode == 'linear')
|
||||
<table class='table table-form table-fixed table-record'>
|
||||
<thead>
|
||||
<tr class='text-center'>
|
||||
<th class="w-150px"><?php echo $lang->task->date;?></th>
|
||||
<th class="w-150px required"><?php echo $lang->task->date;?></th>
|
||||
<?php if($readonly):?>
|
||||
<th class="w-60px <?php if(count($reverseOrders) == 1) echo "hidden"?>"><?php echo $lang->task->teamOrder;?></th>
|
||||
<?php endif;?>
|
||||
<th><?php echo $lang->task->work;?></th>
|
||||
<th class="w-100px"><?php echo $lang->task->consumedAB;?></th>
|
||||
<th class="w-100px"><?php echo $lang->task->leftAB;?></th>
|
||||
<th class="w-100px required"><?php echo $lang->task->consumedAB;?></th>
|
||||
<th class="w-100px <?php if(empty($readonly)) echo 'required'?>"><?php echo $lang->task->leftAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
Reference in New Issue
Block a user