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:
hufangzhou
2021-01-27 11:24:39 +08:00
parent 2f9bc2f43a e9d2711275
commit 925cc23b81
22 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/programblock.html.php
+2 -2
View File
@@ -35,8 +35,8 @@
</td>
<?php if($longBlock):?>
<td><?php echo $project->teamCount;?></td>
<td><?php echo $project->consumed;?></td>
<td><?php echo $project->budget . ' ' . zget($lang->program->unitList, $project->budgetUnit);?></td>
<td title="<?php echo $project->consumed . ' ' . $lang->project->workHour;?>"><?php echo $project->consumed . ' ' . $lang->project->workHourUnit;?></td>
<td><?php echo $project->budget != 0 ? zget($lang->program->currencySymbol, $project->budgetUnit) . number_format($project->budget, 2) : $lang->program->future;?></td>
<td><?php echo $project->leftStories;?></td>
<td><?php echo $project->leftTasks;?></td>
<td><?php echo $project->leftBugs;?></td>
module/block/view/programteamblock.html.php
+1 -1
View File
@@ -37,7 +37,7 @@ $maxConsumed = 0;
<div class='chart-col-item'>
<div class='progress'>
<div class='progress-bar' style='width: <?php echo $maxConsumed ? (100 * $project->consumed / $maxConsumed) : 0; ?>%'>
<div class='progress-text'><?php echo $project->consumed;?></div>
<div class='progress-text' title="<?php echo $project->consumed . $lang->project->workHour;?>"><?php echo $project->consumed . $lang->project->workHourUnit;?></div>
</div>
</div>
</div>
module/block/view/projectblock.html.php
+3 -3
View File
@@ -51,9 +51,9 @@
<span class="status-project status-<?php echo $execution->status?>" title='<?php echo $statusName;?>'><?php echo $statusName;?></span>
<?php endif;?>
</td>
<td class="c-hours"><?php echo $execution->hours->totalEstimate;?></td>
<td class="c-hours"><?php echo $execution->hours->totalConsumed;?></td>
<td class="c-hours"><?php echo $execution->hours->totalLeft;?></td>
<td class="c-hours" title="<?php echo $execution->hours->totalEstimate . ' ' . $lang->project->workHour;?>"><?php echo $execution->hours->totalEstimate . ' ' . $lang->project->workHourUnit;?></td>
<td class="c-hours" title="<?php echo $execution->hours->totalConsumed . ' ' . $lang->project->workHour;?>"><?php echo $execution->hours->totalConsumed . ' ' . $lang->project->workHourUnit;?></td>
<td class="c-hours" title="<?php echo $execution->hours->totalLeft . ' ' . $lang->project->workHour;?>"><?php echo $execution->hours->totalLeft . ' ' . $lang->project->workHourUnit;?></td>
<?php endif;?>
<td class="c-progress">
<div class="progress progress-text-left">
module/block/view/scrumlistblock.html.php
+3 -3
View File
@@ -51,9 +51,9 @@
<span class="status-project status-<?php echo $execution->status?>" title='<?php echo $statusName;?>'><?php echo $statusName;?></span>
<?php endif;?>
</td>
<td class="c-hours"><?php echo $execution->hours->totalEstimate;?></td>
<td class="c-hours"><?php echo $execution->hours->totalConsumed;?></td>
<td class="c-hours"><?php echo $execution->hours->totalLeft;?></td>
<td class="c-hours" title="<?php echo $execution->hours->totalEstimate . ' ' . $lang->project->workHour;?>"><?php echo $execution->hours->totalEstimate . ' ' . $lang->project->workHourUnit;?></td>
<td class="c-hours" title="<?php echo $execution->hours->totalConsumed . ' ' . $lang->project->workHour;?>"><?php echo $execution->hours->totalConsumed . ' ' . $lang->project->workHourUnit;?></td>
<td class="c-hours" title="<?php echo $execution->hours->totalLeft . ' ' . $lang->project->workHour;?>"><?php echo $execution->hours->totalLeft . ' ' . $lang->project->workHourUnit;?></td>
<?php endif;?>
<td class="c-progress">
<div class="progress progress-text-left">
module/block/view/scrumoverviewblock.html.php
+6 -5
View File
@@ -37,18 +37,19 @@
</div>
<div class="col-4 tile">
<div class="overview-title"><i class="icon icon-clock"></i> <?php echo $lang->block->consumedHours;?></div>
<div class="tile-amount">
<?php echo $totalData[$projectID]->consumed ? html::a($this->createLink('project', 'index', 'locate=no'), $totalData[$projectID]->consumed) : 0;?>
<div class="tile-amount" title="<?php echo $totalData[$projectID]->consumed . $lang->project->workHour;?>">
<?php echo $totalData[$projectID]->consumed ? html::a($this->createLink('project', 'index', 'locate=no'), $totalData[$projectID]->consumed . $lang->project->workHourUnit) : 0;?>
</div>
<div class="tile-info">
<span class="extra-tips"><?php echo $lang->block->estimatedHours;?> <?php echo $totalData[$projectID]->estimate;?></span>
<span class="extra-tips"><?php echo $lang->block->estimatedHours . ' ' . $totalData[$projectID]->estimate . $lang->project->workHour;?></span>
</div>
</div>
<div class="col-4 tile">
<div class="overview-title"><i class="icon icon-cost"></i> <?php echo $lang->block->spent;?></div>
<div class="tile-amount">￥0</div>
<?php $budget = $totalData[$projectID]->budget != 0 ? zget($lang->program->currencySymbol, $totalData[$projectID]->budgetUnit) . number_format($totalData[$projectID]->budget, 2) : $lang->program->future;?>
<div class="tile-amount"><?php echo $budget;?></div>
<div class="tile-info">
<span class="extra-tips"><?php echo $lang->block->budget;?> ￥<?php echo $totalData[$projectID]->budget . ' ' . zget($lang->program->unitList, $totalData[$projectID]->budgetUnit);?></span>
<span class="extra-tips"><?php echo $lang->block->budget . ' ' . $budget;?></span>
</div>
</div>
</div>
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' title="<?php echo $task->estimate . ' ' . $lang->project->workHour;?>"><?php echo $task->estimate . ' ' . $lang->project->workHourUnit;?></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/index/view/index.html.php
+1 -1
View File
@@ -19,7 +19,7 @@ js::set('tabsLang', $lang->index->tab);
js::set('menuItems', commonModel::getMainNavList($app->rawModule));
js::set('defaultOpen', $open);
?>
<?php if($this->config->bizVersion):?>
<?php if(isset($this->config->bizVersion)):?>
<style>#searchbox .dropdown-menu.show-quick-go.with-active {top: -465px; max-height: 462px;}</style>
<?php endif;?>
<div id='menu'>
module/program/model.php
+7 -3
View File
@@ -1743,6 +1743,10 @@ class programModel extends model
$title = "title='{$PRJProgram}'";
}
if($id == 'PRJEstimate') $title = "title='{$project->hours->totalEstimate} {$this->lang->project->workHour}'";
if($id == 'PRJConsume') $title = "title='{$project->hours->totalConsumed} {$this->lang->project->workHour}'";
if($id == 'PRJSurplus') $title = "title='{$project->hours->totalLeft} {$this->lang->project->workHour}'";
echo "<td class='c-name " . $class . "' $title>";
switch($id)
{
@@ -1780,13 +1784,13 @@ class programModel extends model
echo $project->teamCount;
break;
case 'PRJEstimate':
echo $project->hours->totalEstimate;
echo $project->hours->totalEstimate . ' ' . $this->lang->project->workHourUnit;
break;
case 'PRJConsume':
echo $project->hours->totalConsumed;
echo $project->hours->totalConsumed . ' ' . $this->lang->project->workHourUnit;
break;
case 'PRJSurplus':
echo $project->hours->totalLeft;
echo $project->hours->totalLeft . ' ' . $this->lang->project->workHourUnit;
break;
case 'PRJProgress':
echo "<div class='progress-pie' data-doughnut-size='80' data-color='#00da88' data-value='{$project->hours->progress}' data-width='24' data-height='24' data-back-color='#e8edf3'><div class='progress-info'>{$project->hours->progress}%</div></div>";
module/project/css/grouptask.css
+1
View File
@@ -24,3 +24,4 @@
.is-firefox .group-header:before {content: ' '; position: absolute; top: 0; right: 0; left: 0; bottom: 0; background: #fff; z-index: 0;}
.is-firefox .group-header > a,
.is-firefox .group-header > .groupSummary {position: relative; z-index: 1;}
.c-hours {white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
module/project/view/grouptask.html.php
+4 -4
View File
@@ -184,7 +184,7 @@
<div class='groupSummary small'>
<?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->project->memberHoursAB, zget($users, $task->assignedTo), $members[$task->assignedTo]->totalHours);?>
<?php printf($lang->project->groupSummaryAB, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?>
<?php printf($lang->project->groupSummaryAB, $groupSum, $groupWait, $groupDoing, $groupEstimate . $lang->project->workHourUnit, $groupConsumed . $lang->project->workHourUnit, $groupLeft . $lang->project->workHourUnit);?>
</div>
</div>
</td>
@@ -202,9 +202,9 @@
<td class="c-status"><span class='status-task status-<?php echo $task->status;?>'> <?php echo $this->processStatus('task', $task);?></span></td>
<td class="c-assign"><?php echo "<span class='$assignedToClass'>" . $task->assignedToRealName . "</span>";?></td>
<td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
<td class="c-hours em"><?php echo $task->estimate;?></td>
<td class="c-hours em"><?php echo $task->consumed;?></td>
<td class="c-hours em"><?php echo $task->left;?></td>
<td class="c-hours em" title="<?php echo $task->estimate . ' ' . $lang->project->workHour;?>"><?php echo $task->estimate . ' ' . $lang->project->workHourUnit;?></td>
<td class="c-hours em" title="<?php echo $task->consumed . ' ' . $lang->project->workHour;?>"><?php echo $task->consumed . ' ' . $lang->project->workHourUnit;?></td>
<td class="c-hours em" title="<?php echo $task->left . ' ' . $lang->project->workHour;?>"><?php echo $task->left . ' ' . $lang->project->workHourUnit;?></td>
<td class="c-num em"><?php echo $task->progress . '%';?></td>
<td class="c-type"><?php echo zget($lang->task->typeList, $task->type);?></td>
<td class='c-date <?php if(isset($task->delay)) echo 'delayed';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
module/project/view/preview.html.php
+1 -1
View File
@@ -128,7 +128,7 @@ $dataType = '';
</tr>
<tr>
<td align='center'><?php echo $lang->task->leftThisTime?></td>
<td align='center'><?php if($content->left) echo $content->left?></td>
<td align='center'><?php if($content->left) echo $content->left . $lang->project->workHourUnit;?></td>
<td></td>
<td></td>
<td></td>
module/search/lang/de.php
+1
View File
@@ -96,3 +96,4 @@ $lang->search->objecttypelist['story'] = $lang->srcommon;
$lang->search->objecttypelist['requirement'] = $lang->urcommon;
$lang->search->objecttypelist['stage'] = $lang->execution->stage;
$lang->search->objecttypelist['sprint'] = $lang->execution->sprint;
$lang->search->objectTypeList['sprint'] = $lang->executionCommon;
module/search/lang/en.php
+1 -1
View File
@@ -95,4 +95,4 @@ $lang->search->modules['risk'] = 'Risk';
$lang->search->objecttypelist['story'] = $lang->srcommon;
$lang->search->objecttypelist['requirement'] = $lang->urcommon;
$lang->search->objecttypelist['stage'] = $lang->execution->stage;
$lang->search->objecttypelist['sprint'] = $lang->execution->sprint;
$lang->search->objectTypeList['sprint'] = $lang->executionCommon;
module/search/lang/fr.php
+1 -1
View File
@@ -95,4 +95,4 @@ $lang->search->modules['risk'] = 'Risk';
$lang->search->objecttypelist['story'] = $lang->srcommon;
$lang->search->objecttypelist['requirement'] = $lang->urcommon;
$lang->search->objecttypelist['stage'] = $lang->execution->stage;
$lang->search->objecttypelist['sprint'] = $lang->execution->sprint;
$lang->search->objectTypeList['sprint'] = $lang->executionCommon;
module/search/lang/vi.php
+1 -1
View File
@@ -95,4 +95,4 @@ $lang->search->modules['risk'] = 'Risk';
$lang->search->objectTypeList['story'] = $lang->SRCommon;
$lang->search->objectTypeList['requirement'] = $lang->URCommon;
$lang->search->objectTypeList['stage'] = $lang->execution->stage;
$lang->search->objectTypeList['sprint'] = $lang->execution->sprint;
$lang->search->objectTypeList['sprint'] = $lang->executionCommon;
module/search/lang/zh-cn.php
+1 -1
View File
@@ -95,4 +95,4 @@ $lang->search->modules['risk'] = '风险';
$lang->search->objectTypeList['story'] = $lang->SRCommon;
$lang->search->objectTypeList['requirement'] = $lang->URCommon;
$lang->search->objectTypeList['stage'] = $lang->execution->stage;
$lang->search->objectTypeList['sprint'] = $lang->execution->sprint;
$lang->search->objectTypeList['sprint'] = $lang->executionCommon;
module/search/lang/zh-tw.php
+1 -1
View File
@@ -95,4 +95,4 @@ $lang->search->modules['risk'] = '風險';
$lang->search->objecttypelist['story'] = $lang->srcommon;
$lang->search->objecttypelist['requirement'] = $lang->urcommon;
$lang->search->objecttypelist['stage'] = $lang->execution->stage;
$lang->search->objecttypelist['sprint'] = $lang->execution->sprint;
$lang->search->objectTypeList['sprint'] = $lang->executionCommon;
module/search/model.php
+8 -3
View File
@@ -541,9 +541,11 @@ class searchModel extends model
$module = $objectType;
if($module == 'case') $module = 'testcase';
if(common::hasPriv($module, 'view')) $allowedObject[] = $objectType;
if($module == 'caselib' and common::hasPriv('caselib', 'view')) $allowedObject[] = $objectType;
if($module == 'execution' and common::haspriv('project', 'view')) $allowedobject[] = $objectType;
if($module == 'project' and common::haspriv('program', 'index')) $allowedobject[] = $objectType;
if($module == 'caselib' and common::hasPriv('caselib', 'view')) $allowedObject[] = $objectType;
if($module == 'execution' and common::haspriv('project', 'view')) $allowedobject[] = $objectType;
if($module == 'project' and common::haspriv('program', 'index')) $allowedobject[] = $objectType;
if($module == 'deploystep' and common::haspriv('deploy', 'viewstep')) $allowedobject[] = $objectType;
}
}
@@ -972,6 +974,9 @@ class searchModel extends model
$query = $this->dao->select('t1.*')->from($table)->alias('t1')
->where('1')
->beginIF($type == 'program')->andWhere('type')->eq('program')->fi()
->beginIF($type == 'project')->andWhere('type')->eq('project')->fi()
->beginIF($type == 'execution')->andWhere('type')->in('stage,sprint')->fi()
->beginIF(isset($data->deleted))->andWhere('t1.deleted')->eq(0)->fi();
}
return $query;
module/task/view/recordestimate.html.php
+2 -2
View File
@@ -53,8 +53,8 @@
<tr class="text-center">
<td><?php echo $estimate->id;?></td>
<td><?php echo $estimate->date;?></td>
<td><?php echo $estimate->consumed;?></td>
<td><?php echo $estimate->left;?></td>
<td title="<?php echo $estimate->consumed . ' ' . $lang->project->workHour;?>"><?php echo $estimate->consumed . ' ' . $lang->project->workHourUnit;?></td>
<td title="<?php echo $estimate->left . ' ' . $lang->project->workHour;?>"><?php echo $estimate->left . ' ' . $lang->project->workHourUnit;?></td>
<td class="text-left" title="<?php echo $estimate->work;?>"><?php echo $estimate->work;?></td>
<?php if(empty($task->team) or $task->assignedTo == $this->app->user->account):?>
<td align='center' class='c-actions'>
module/user/control.php
+1
View File
@@ -25,6 +25,7 @@ class user extends control
$this->loadModel('company')->setMenu();
$this->loadModel('dept');
$this->loadModel('todo');
$this->app->loadLang('project');
$this->app->loadModuleConfig($this->moduleName);//Finish task #5118.(Fix bug #2271)
}
module/user/css/task.css
+1
View File
@@ -1 +1,2 @@
td.delayed{color:#fff; background: #e84e0f!important;}
.hours {white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
module/user/view/task.html.php
+3 -3
View File
@@ -62,9 +62,9 @@
<?php if($task->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
<?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', false, $task->PRJ), $task->name, null, "style='color: $task->color'");?>
</td>
<td><?php echo $task->estimate;?></td>
<td><?php echo $task->consumed;?></td>
<td><?php echo $task->left;?></td>
<td class='hours' title="<?php echo $task->estimate . ' ' . $lang->project->workHour;?>"><?php echo $task->estimate . ' ' . $lang->project->workHourUnit;?></td>
<td class='hours' title="<?php echo $task->consumed . ' ' . $lang->project->workHour;?>"><?php echo $task->consumed . ' ' . $lang->project->workHourUnit;?></td>
<td class='hours' title="<?php echo $task->left . ' ' . $lang->project->workHour;?>"><?php echo $task->left . ' ' . $lang->project->workHourUnit;?></td>
<td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
<td class='<?php echo $task->status;?>'><?php echo $this->processStatus('task', $task);?></td>
</tr>