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

Merge branch '18.x' into ipd1.1

Browse Source
This commit is contained in:
tanghucheng
2023-09-13 03:23:50 -04:00
parent 8b5f957851 4c30e47fea
commit 86b8aaa455
1091 changed files with 130798 additions and 4093 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/model.php
+4 -4
View File
@@ -976,7 +976,7 @@ class programplanModel extends model
if($this->config->edition == 'max' or $this->config->edition == 'ipd')
{
$data->planDuration = $this->getDuration($data->begin, $data->end);
$data->realDuration = $this->getDuration($data->realBegan, $data->realEnd);
if(isset($data->realBegan) && isset($data->realEnd)) $data->realDuration = $this->getDuration($data->realBegan, $data->realEnd);
}
$projectChanged = false;
@@ -997,7 +997,7 @@ class programplanModel extends model
$this->dao->update(TABLE_PROJECT)->data($data)
->autoCheck()
->batchCheck($this->config->programplan->edit->requiredFields, 'notempty')
->checkIF($plan->percent != '' and $setPercent, 'percent', 'float')
->checkIF(!empty($data->percent) and $setPercent, 'percent', 'float')
->where('id')->eq($stageID)
->exec();
@@ -1054,7 +1054,7 @@ class programplanModel extends model
$this->dao->insert(TABLE_PROJECT)->data($data)
->autoCheck()
->batchCheck($this->config->programplan->create->requiredFields, 'notempty')
->checkIF($plan->percent != '' and $setPercent, 'percent', 'float')
->checkIF(!empty($data->percent) and $setPercent, 'percent', 'float')
->exec();
if(!dao::isError())
@@ -1259,7 +1259,7 @@ class programplanModel extends model
if($this->config->edition == 'max' or $this->config->edition == 'ipd')
{
$plan->planDuration = $this->getDuration($plan->begin, $plan->end);
$plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd);
if(isset($plan->realBegan) && isset($plan->realEnd)) $plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd);
}
if($planChanged) $plan->version = $oldPlan->version + 1;
module/programplan/view/create.html.php
+4 -1
View File
@@ -238,7 +238,9 @@
<tfoot>
<tr>
<?php $colspan = $planID == 0 ? $colspan : $colspan - 1;?>
<td colspan='<?php echo $colspan?>' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::backButton(); ?></td>
<td colspan='<?php echo $colspan?>' class='text-center form-actions'>
<?php echo html::submitButton() . ' ' . html::backButton(); ?>
</td>
</tr>
</tfoot>
</table>
@@ -299,4 +301,5 @@ var options = {
}
$('#planForm tbody.sortable').sortable(options);
</script>
<?php include '../../ai/view/inputinject.html.php';?>
<?php include '../../common/view/footer.html.php';?>