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

* finish task #2567.

Browse Source
This commit is contained in:
chenfeiCF
2016-03-29 10:34:34 +08:00
parent 79096a6fdd
commit 8cd6978375
11 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/projectblock.html.php
+4
View File
@@ -29,7 +29,11 @@
<tr data-url='<?php echo $sso . $sign . 'referer=' . base64_encode($this->createLink('project', 'task', 'project=' . $project->id)); ?>' <?php echo $appid?>>
<td class='text-left' title='<?php echo $project->name;?>'><?php echo $project->name;?></td>
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td><?php echo $lang->project->delayed;?></td>
<?php else:?>
<td><?php echo $lang->project->statusList[$project->status];?></td>
<?php endif;?>
<td><?php echo $project->hours->totalEstimate;?></td>
<td><?php echo $project->hours->totalConsumed;?></td>
<td><?php echo $project->hours->totalLeft;?></td>
module/my/view/project.html.php
+4
View File
@@ -41,7 +41,11 @@
<td class='text-left'><?php echo html::a($projectLink, $project->name);?></td>
<td><?php echo $project->begin;?></td>
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td class='project-delay'><?php echo $lang->project->delayed;?></td>
<?php else:?>
<td class='project-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
<?php endif;?>
<td><?php echo $project->role;?></td>
<td><?php echo $project->join;?></td>
<td><?php echo $project->hours;?></td>
module/product/view/project.html.php
+4
View File
@@ -33,7 +33,11 @@
<td class='text-left'><?php echo html::a($this->createLink('project', 'task', 'project=' . $project->id), $project->name, '_parent');?></td>
<td><?php echo $project->code;?></td>
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td class='status-delay'><?php echo $lang->project->delayed;?></td>
<?php else:?>
<td class='status-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
<?php endif;?>
<td><?php echo $project->hours->totalEstimate;?></td>
<td><?php echo $project->hours->totalConsumed;?></td>
<td><?php echo $project->hours->totalLeft;?></td>
module/project/lang/en.php
+1
View File
@@ -48,6 +48,7 @@ $lang->project->typeDesc = 'No burndown and story in OPS';
$lang->project->mine = 'I charge : ';
$lang->project->other = 'Other : ';
$lang->project->deleted = 'Deleted';
$lang->project->delayed = 'Delayed';
$lang->project->start = 'Start';
$lang->project->activate = 'Activate';
module/project/lang/zh-cn.php
+1
View File
@@ -48,6 +48,7 @@ $lang->project->typeDesc = "运维{$lang->projectCommon}禁用燃尽图和
$lang->project->mine = '我负责：';
$lang->project->other = '其他：';
$lang->project->deleted = '已删除';
$lang->project->delayed = '已延期';
$lang->project->start = '开始';
$lang->project->activate = '激活';
module/project/model.php
+14
View File
@@ -713,6 +713,13 @@ class projectModel extends model
// Process the end time.
$project->end = date("Y-m-d", strtotime($project->end));
/* Judge whether the project is delayed. */
if($project->status != 'done')
{
$delay = helper::diffDate(helper::today(), $project->end);
if($delay > 0) $project->delay = $delay;
}
/* Process the burns. */
$project->burns = array();
$burnData = isset($burns[$project->id]) ? $burns[$project->id] : array();
@@ -818,6 +825,13 @@ class projectModel extends model
$project = $this->dao->findById((int)$projectID)->from(TABLE_PROJECT)->fetch();
if(!$project) return false;
/* Judge whether the project is delayed. */
if($project->status != 'done')
{
$delay = helper::diffDate(helper::today(), $project->end);
if($delay > 0) $project->delay = $delay;
}
$total = $this->dao->select('
SUM(estimate) AS totalEstimate,
SUM(consumed) AS totalConsumed,
module/project/view/index.html.php
+4
View File
@@ -62,7 +62,11 @@
<td class='text-left'><?php echo $project->code;?></td>
<td><?php echo $users[$project->PM];?></td>
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td class='status-delay'><?php echo $lang->project->delayed;?></td>
<?php else:?>
<td class='status-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
<?php endif;?>
<td><?php echo $project->hours->totalEstimate;?></td>
<td><?php echo $project->hours->totalConsumed;?></td>
<td><?php echo $project->hours->totalLeft;?></td>
module/project/view/view.html.php
+4
View File
@@ -89,7 +89,11 @@
</tr>
<tr>
<th><?php echo $lang->project->status;?></th>
<?php if(isset($project->delay)):?>
<td class='delay'><?php echo $lang->project->delayed;?></td>
<?php else:?>
<td class='<?php echo $project->status;?>'><?php $lang->show($lang->project->statusList, $project->status);?></td>
<?php endif;?>
</tr>
<tr>
<th><?php echo $lang->project->PM;?></th>
module/user/model.php
+13 -1
View File
@@ -746,11 +746,23 @@ class userModel extends model
*/
public function getProjects($account)
{
return $this->dao->select('t1.*,t2.*')->from(TABLE_TEAM)->alias('t1')
$projects = $this->dao->select('t1.*,t2.*')->from(TABLE_TEAM)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->where('t1.account')->eq($account)
->andWhere('t2.deleted')->eq(0)
->fetchAll();
/* Judge whether the project is delayed. */
foreach($projects as $project)
{
if($project->status != 'done')
{
$delay = helper::diffDate(helper::today(), $project->end);
if($delay > 0) $project->delay = $delay;
}
}
return $projects;
}
/**
module/user/view/project.html.php
+4
View File
@@ -36,7 +36,11 @@
<td><?php echo html::a($projectLink, $project->name);?></td>
<td><?php echo $project->begin;?></td>
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td class='project-delay'><?php echo $lang->project->delayed;?></td>
<?php else:?>
<td class='project-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
<?php endif;?>
<td><?php echo $project->role;?></td>
<td><?php echo $project->join;?></td>
<td><?php echo $project->hours;?></td>
www/theme/default/style.css
+1
View File
@@ -211,6 +211,7 @@ td.status-active, td[class$="-active"] {color:#229f24;}
td.wait, td[class$="-wait"] {color:#808080;}
td.pause, td[class$="-pause"],
td.suspended, td[class$="-suspended"] {color:#E48600;}
td.delay, td[class$="-delay"] {color:#e84e0f;}
td.closed, td[class$="-closed"],
td.cancel, td[class$="-cancel"] {color:#888;}
td.doing, td[class$="-doing"],