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

Merge branch 'master' of https://git.zcorp.cc/zentaopms

Browse Source
This commit is contained in:
tianshujie98
2021-01-18 11:34:19 +08:00
parent 418039eecf bfe7766a3d
commit 8f589d655d
11 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/programblock.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
</td>
<?php if($longBlock):?>
<td><?php echo $project->teamCount;?></td>
<td><?php echo $project->consumed;?></td>
<td><?php echo $project->consumed . ' ' . $config->hourUnit;?></td>
<td><?php echo $project->budget . ' ' . zget($lang->program->unitList, $project->budgetUnit);?></td>
<td><?php echo $project->leftStories;?></td>
<td><?php echo $project->leftTasks;?></td>
module/block/view/storyblock.html.php
+1 -1
View File
@@ -54,7 +54,7 @@
<td class="c-pri"><span class="label-pri label-pri-<?php echo $story->pri?>" title="<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>"><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
<td class="c-name" style='color: <?php echo $story->color?>' title='<?php echo $story->title?>'><?php echo $story->title?></td>
<?php if($longBlock):?>
<td class='c-estimate text-center'><?php echo $story->estimate?></td>
<td class='c-estimate text-center'><?php echo $story->estimate . ' ' . $config->hourUnit?></td>
<?php endif;?>
<?php $status = $this->processStatus('story', $story);?>
<td class='c-status' title='<?php echo $status;?>'>
module/block/view/taskblock.html.php
+1 -1
View File
@@ -46,7 +46,7 @@
<td class='c-pri <?php if($longBlock) echo "c-pri-long"?>'><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
<td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->PRJ), $task->name)?></td>
<?php if($longBlock):?>
<td class='c-estimate text-center'><?php echo $task->estimate?></td>
<td class='c-estimate text-center'><?php echo $task->estimate . ' ' . $config->hourUnit;?></td>
<td class='c-deadline'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
<?php endif;?>
<?php $status = $this->processStatus('task', $task);?>
module/my/view/task.html.php
+3 -3
View File
@@ -99,9 +99,9 @@
<?php if($type != 'finishedBy'): ?>
<td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
<?php endif;?>
<td class='c-hours'><?php echo round($task->estimate, 1);?></td>
<td class='c-hours'><?php echo round($task->consumed, 1);?></td>
<td class='c-hours'><?php echo round($task->left, 1);?></td>
<td class='c-hours'><?php echo round($task->estimate, 1) . ' ' . $config->hourUnit;?></td>
<td class='c-hours'><?php echo round($task->consumed, 1) . ' ' . $config->hourUnit;?></td>
<td class='c-hours'><?php echo round($task->left, 1) . ' ' . $config->hourUnit;?></td>
<td class='c-status'>
<?php $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
<?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");?>
module/productplan/view/linkstory.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
</td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo zget($users, $story->assignedTo);?></td>
<td><?php echo $story->estimate . ' ' . $lang->story->hour;?></td>
<td><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td>
<span class='status-story status-<?php echo $story->status?>'>
<?php echo $this->processStatus('story', $story);?>
module/productplan/view/view.html.php
+1 -1
View File
@@ -154,7 +154,7 @@
</td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo zget($users, $story->assignedTo);?></td>
<td><?php echo $story->estimate . ' ' . $lang->story->hour;?></td>
<td><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td>
<span class='status-story status-<?php echo $story->status?>'>
<?php echo $this->processStatus('story', $story);?>
module/program/model.php
+2 -1
View File
@@ -1243,7 +1243,8 @@ class programModel extends model
->beginIF($type == 'list')->andWhere('type')->eq('program')->fi()
->beginIF($type == 'dropmenu')->andWhere('type')->in('program,project')->fi()
->andWhere('status')->ne('closed')
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->programs)->fi()
->beginIF(!$this->app->user->admin and $type == 'list')->andWhere('id')->in($this->app->user->view->programs)->fi()
O->beginIF(!$this->app->user->admin and $type == 'dropmenu')->andWhere('id')->in($this->app->user->view->programs . ',' . $this->app->user->view->projects)->fi()
->beginIF($projectID > 0)->andWhere('path')->like($path . '%')->fi()
->orderBy('grade desc, `order`')
->get();
module/program/view/pgmbrowsebylist.html.php
+2 -2
View File
@@ -87,8 +87,8 @@
</ul>
</div>
<?php common::printIcon('program', 'PRJEdit', "projectID=$program->id&programID=$program->parent&from=pgmbrowse", $program, 'list', 'edit', '', '', '', "data-group='program'");?>
<?php common::printIcon('program', 'PRJManageMembers', "projectID=$program->id", $program, 'list', 'group');?>
<?php common::printIcon('program', 'PRJGroup', "projectID=$program->id", $program, 'list', 'lock');?>
<?php common::printIcon('program', 'PRJManageMembers', "projectID=$program->id", $program, 'list', 'group', '', '', '', 'data-group="program"');?>
<?php common::printIcon('program', 'PRJGroup', "projectID=$program->id", $program, 'list', 'lock', '', '', '', 'data-group="program"');?>
<div class='btn-group'>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"><i class='icon-more-alt'></i></button>
<ul class='dropdown-menu pull-right text-center' role='menu'>
module/project/view/all.html.php
+3 -3
View File
@@ -97,9 +97,9 @@
<td class='c-status' title='<?php echo $projectStatus;?>'>
<span class="status-project status-<?php echo $execution->status?>"><?php echo $projectStatus;?></span>
</td>
<td><?php echo $execution->hours->totalEstimate;?></td>
<td><?php echo $execution->hours->totalConsumed;?></td>
<td><?php echo $execution->hours->totalLeft;?></td>
<td><?php echo $execution->hours->totalEstimate . ' ' . $config->hourUnit;?></td>
<td><?php echo $execution->hours->totalConsumed . ' ' . $config->hourUnit;?></td>
<td><?php echo $execution->hours->totalLeft . ' ' . $config->hourUnit;?></td>
<td class="c-progress">
<div class="progress progress-text-left">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $execution->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $execution->hours->progress;?>%">
module/release/view/linkstory.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
</td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo zget($users, $story->assignedTo);?></td>
<td><?php echo $story->estimate;?></td>
<td><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td><span class='status-story status-<?php echo $story->status?>'><?php echo $this->processStatus('story', $story);?></span></td>
<td><?php echo zget($lang->story->stageList, $story->stage);?></td>
</tr>
module/release/view/view.html.php
+1 -1
View File
@@ -115,7 +115,7 @@
?>
</td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo $story->estimate;?></td>
<td><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td>
<span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
</td>