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

Merge branch 'zentaopms_wangyuting' into 'master'

Browse Source 
* Fix the bug of not updating the weekly report.

See merge request easycorp/zentaopms!6860
This commit is contained in:
王怡栋
2023-02-06 09:20:09 +00:00
parent 91b5f22ed9 775c16402c
commit 6d105678b0
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/weekly/model.php
+8 -6
View File
@@ -117,11 +117,11 @@ class weeklyModel extends model
{
$weekStart = $this->getThisMonday($date);
$report = new stdclass();
$PVEV = $this->getPVEV($project, $date);
$PVEV = $this->getPVEV($project, $date, $mode = 'new');
$report->pv = $PVEV['PV'];
$report->ev = $PVEV['EV'];
$report->ac = $this->getAC($project, $date);
$report->ac = $this->getAC($project, $date, $mode = 'new');
$report->sv = $this->getSV($report->ev, $report->pv);
$report->cv = $this->getCV($report->ev, $report->ac);
$report->project = $project;
@@ -372,13 +372,14 @@ class weeklyModel extends model
*
* @param int $project
* @param string $date
* @param string $mode
* @access public
* @return array
*/
public function getPVEV($projectID, $date = '')
public function getPVEV($projectID, $date = '', $mode = 'old')
{
$report = $this->getFromDB($projectID, $date);
if(!empty($report)) return array('PV' => $report->pv, 'EV' => $report->ev);
if(!empty($report) && $mode == 'old') return array('PV' => $report->pv, 'EV' => $report->ev);
if(!$date) $date = date('Y-m-d');
$lastDay = $this->getLastDay($date);
@@ -434,13 +435,14 @@ class weeklyModel extends model
*
* @param int $project
* @param string $date
* @param string $mode
* @access public
* @return int
*/
public function getAC($project, $date = '')
public function getAC($project, $date = '', $mode = 'old')
{
$report = $this->getFromDB($project, $date);
if(!empty($report)) return $report->ac;
if(!empty($report) && $mode == 'old') return $report->ac;
if(!$date) $date = date('Y-m-d');
$lastDay = $this->getLastDay($date);
module/weekly/view/index.html.php
+1 -1
View File
@@ -72,7 +72,7 @@ $(function(){$('#exportreport').modalTrigger();});
<td><?php echo $cv ? $cv . '%' : '';?></td>
<td><?php echo $lang->weekly->cost;?></td>
<?php $projectCost = zget($this->config->custom, 'cost', 1);?>
<td><?php echo empty($projectCost) ? 0 : $ac * $projectCost;?></td>
<td class='projectCost'><?php echo empty($projectCost) ? 0 : $ac * $projectCost;?></td>
</tr>
</table>
<div class='page-title'><h4><?php echo $lang->weekly->finished;?></h4></div>