diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 115a569e74..bcf1320d34 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -11211,7 +11211,7 @@ class upgradeModel extends model */ public function getUpgradeProjectReports(): array { - $reports = $this->dao->select('t1.id,t1.project,t1.weekStart,t2.status as projectStatus,t2.realBegan,t2.realEnd,t2.suspendedDate')->from(TABLE_WEEKLYREPORT)->alias('t1') + $reports = $this->dao->select('t1.id,t1.project,t1.weekStart,t2.model AS projectModel,t2.status AS projectStatus,t2.realBegan,t2.realEnd,t2.suspendedDate')->from(TABLE_WEEKLYREPORT)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') ->where('t2.status')->ne('wait') ->orderBy('t1.project asc, t1.weekStart asc') @@ -11223,6 +11223,7 @@ class upgradeModel extends model $thisSunday = date('Y-m-d', strtotime('this Sunday')); foreach($reports as $key => $report) { + if(in_array($report->projectModel, array('scrum', 'agileplus', 'kanban'))) continue; if($report->projectStatus == 'doing') $report->realBegan = !helper::isZeroDate($report->realBegan) ? $report->realBegan : $report->weekStart; if(helper::isZeroDate($report->realBegan)) continue;