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

* zin: fix work days calculation.

Browse Source
This commit is contained in:
sunhao
2024-01-30 08:47:45 +08:00
parent 63ac63c389
commit f5539f04c3
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/ui/create.html.php
+18 -18
View File
@@ -52,25 +52,25 @@ $showExecutionExec = !empty($from) and ($from == 'execution' || $from == 'doc');
$handleBeginEndChange = jsCallback()
->const('weekend', $config->execution->weekend)
->do(<<<'JS'
const $picker = $this.closest('.date-range-picker');
const begin = $picker.find('[name=begin]').val();
const end = $picker.find('[name=end]').val();
if(!zui.isValidDate(begin) || !zui.isValidDate(end)) return;
const $days = $element.find('[name=days]');
const beginDate = zui.createDate(begin);
const endDate = zui.createDate(end);
const totalDays = Math.floor((endDate.getTime() - beginDate.getTime()) / zui.TIME_DAY);
if(totalDays <= 0) return $days.val(0);
let workDays = 0;
for(i = 0; i < totalDays; i++)
{
const date = new Date(beginDate.getTime());
date.setDate(date.getDate() + i);
const $picker = $this.closest('.date-range-picker');
const begin = $picker.find('[name=begin]').val();
const end = $picker.find('[name=end]').val();
if(!zui.isValidDate(begin) || !zui.isValidDate(end)) return;
const $days = $element.find('[name=days]');
const beginDate = zui.createDate(begin);
const endDate = zui.createDate(end);
const totalDays = 1 + Math.ceil((endDate.getTime() - beginDate.getTime()) / zui.TIME_DAY);
if(totalDays <= 0) return $days.val(0);
let workDays = 0;
for(i = 0; i < totalDays; i++)
{
const date = new Date(beginDate.getTime());
date.setDate(date.getDate() + i);
if((weekend == 2 && date.getDay() == 6) || date.getDay() == 0) continue;
workDays++;
}
$days.val(workDays);
if((weekend == 2 && date.getDay() == 6) || date.getDay() == 0) continue;
workDays++;
}
$days.val(workDays);
JS);
formGridPanel