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

* Finish task #70094.

Browse Source
This commit is contained in:
tianshujie
2022-09-22 18:13:50 +08:00
parent 4908ead6e8
commit a6cd4e549c
6 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/lang/de.php
+1
View File
@@ -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.';
module/task/lang/en.php
+1
View File
@@ -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.';
module/task/lang/fr.php
+1
View File
@@ -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.';
module/task/lang/zh-cn.php
+1
View File
@@ -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个字符';
module/task/model.php
+3 -2
View File
@@ -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];
module/task/view/recordestimate.html.php
+3 -3
View File
@@ -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>