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

Finish task #45800.

Browse Source
This commit is contained in:
zhouxin
2021-12-13 07:53:23 +00:00
parent c9e940be61
commit 9567620ff4
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update16.0.beta1.sql
+1
View File
@@ -106,3 +106,4 @@ ALTER TABLE `zt_kanbanlane` ADD COLUMN `region` mediumint(8) unsigned NOT NULL A
ALTER TABLE `zt_kanbanlane` ADD COLUMN `group` mediumint(8) unsigned NOT NULL AFTER `region`;
ALTER TABLE `zt_kanbancolumn` ADD COLUMN `region` mediumint(8) unsigned NOT NULL AFTER `type`;
ALTER TABLE `zt_kanbancolumn` ADD COLUMN `group` mediumint(8) unsigned NOT NULL AFTER `region`;
ALTER TABLE `zt_project` ADD COLUMN `suspendedDate` date NOT NULL AFTER `canceledDate`;
db/zentao.sql
+1
View File
@@ -996,6 +996,7 @@ CREATE TABLE IF NOT EXISTS `zt_project` (
`closedDate` datetime NOT NULL,
`canceledBy` varchar(30) NOT NULL DEFAULT '',
`canceledDate` datetime NOT NULL,
`suspendedDate` date NOT NULL,
`PO` varchar(30) NOT NULL DEFAULT '',
`PM` varchar(30) NOT NULL DEFAULT '',
`QD` varchar(30) NOT NULL DEFAULT '',
module/project/model.php
+3
View File
@@ -1245,6 +1245,7 @@ class projectModel extends model
->setDefault('status', 'suspended')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setDefault('suspendedDate', $now)
->remove('comment')->get();
$this->dao->update(TABLE_PROJECT)->data($project)
@@ -1275,6 +1276,8 @@ class projectModel extends model
->remove('comment,readjustTime,readjustTask')
->get();
if($oldProject->realBegan == '0000-00-00') $project->realBegan = helper::today();
if(!$this->post->readjustTime)
{
unset($project->begin);
module/weekly/model.php
+24 -5
View File
@@ -22,9 +22,28 @@ class weeklyModel extends model
public function getPageNav($project, $date)
{
$date = date('Ymd', strtotime($this->getThisMonday($date)));
$begin = $project->begin;
$weeks = $this->getWeekPairs($begin);
$current = zget($weeks, $date, '');
if($project->status == 'wait')
{
$begin = helper::now();
$end = $begin;
}
if($project->status == 'doing')
{
$begin = $project->realBegan != '0000-00-00' ? $project->realBegan : $date;
$end = $date;
}
if($project->status == 'suspended')
{
$begin = $project->realBegan != '0000-00-00' ? $project->realBegan : $project->suspendedDate;
$end = $project->suspendedDate;
}
if($project->status == 'closed')
{
$begin = $project->realBegan != '0000-00-00' ? $project->realBegan : $project->realEnd;
$end = $project->realEnd;
}
$weeks = $this->getWeekPairs($begin, $end);
$current = zget($weeks, $date, current($weeks));
$selectHtml = "<div class='btn-group angle-btn'>";
$selectHtml .= html::a('###', $this->lang->weekly->common . $this->lang->colon . $project->name, '', "class='btn'");
$selectHtml .= '</div>';
@@ -49,9 +68,9 @@ class weeklyModel extends model
* @access public
* @return array
*/
public function getWeekPairs($begin)
public function getWeekPairs($begin, $end = '')
{
$sn = $this->getWeekSN($begin, date('Y-m-d'));
$sn = $end != '' ? $this->getWeekSN($begin, $end) : $this->getWeekSN($begin, date('Y-m-d'));
$weeks = array();
for($i = 0; $i <= $sn; $i++)
{