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

* finish task #6161.

Browse Source
This commit is contained in:
wangyidong
2019-07-30 15:38:49 +08:00
parent cd2162d54a
commit 17b53acaa9
73 changed files with 178 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/css/activate.css
+2
View File
@@ -0,0 +1,2 @@
.thWidth{width:90px !important;}
html[lang^='zh-'] .thWidth{width:70px !important;}
module/task/css/edit.css
+4
View File
@@ -0,0 +1,4 @@
.thWidth{width:85px !important;}
.lifeThWidth{width:120px !important;}
html[lang^='zh-'] .thWidth{width:70px !important;}
html[lang^='zh-'] .lifeThWidth{width:70px !important;}
module/task/css/finish.css
+2
View File
@@ -0,0 +1,2 @@
.thWidth{width:120px !important;}
html[lang^='zh-'] .thWidth{width:100px !important;}
module/task/css/recordestimate.css
+3
View File
@@ -1 +1,4 @@
.form-condensed .table-form {margin-bottom: 20px;}
.thWidth{width:90px !important;}
html[lang^='zh-'] .thWidth{width:70px !important;}
module/task/css/view.css
+5
View File
@@ -1,3 +1,8 @@
.side-col .cell{padding:0px;}
.side-col #legendProjectAndTask .list-unstyled{padding:10px; border:1px solid #ddd; border-top:0px; margin:0px;}
.tab-pane table {border: 1px solid #ddd; border-top: none;}
#legendLife .thWidth{width:100px !important;}
.effortThWidth{width:90px !important;}
html[lang^='zh-'] #legendLife .thWidth{width:70px !important;}
html[lang^='zh-'] .effortThWidth{width:70px !important;}
module/task/view/activate.html.php
+1 -2
View File
@@ -27,8 +27,7 @@
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<?php $colWidth = common::checkNotCN() ? 'w-90px' : 'w-70px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->task->assignedTo;?></th>
<th class='thWidth'><?php echo $lang->task->assignedTo;?></th>
<td class='w-p25-f'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control chosen'");?></td>
<td></td>
</tr>
module/task/view/edit.html.php
+4 -6
View File
@@ -20,7 +20,6 @@
<?php js::set('confirmChangeProject', $lang->task->confirmChangeProject);?>
<?php js::set('changeProjectConfirmed', false);?>
<?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>
<?php $thWidth = common::checkNotCN() ? 'w-85px' : 'w-70px';?>
<div class='main-content' id='mainContent'>
<form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
<div class='main-header'>
@@ -91,12 +90,12 @@
<table class='table table-form'>
<?php if($task->parent <= 0):?>
<tr>
<th class=<?php echo $thWidth;?>><?php echo $lang->task->project;?></th>
<th class='thWidth'><?php echo $lang->task->project;?></th>
<td><?php echo html::select('project', $projects, $task->project, 'class="form-control chosen" onchange="loadAll(this.value)"');?></td>
</tr>
<?php endif;?>
<tr>
<th class=<?php echo $thWidth;?>><?php echo $lang->task->module;?></th>
<th class='thWidth'><?php echo $lang->task->module;?></th>
<td id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="form-control chosen" onchange="loadModuleRelated()"');?></td>
</tr>
<?php if($config->global->flow != 'onlyTask' and $project->type != 'ops'):?>
@@ -148,7 +147,7 @@
<div class='detail-title'><?php echo $lang->task->legendEffort;?></div>
<table class='table table-form'>
<tr>
<th class=<?php echo $thWidth;?>><?php echo $lang->task->estStarted;?></th>
<th class='thWidth'><?php echo $lang->task->estStarted;?></th>
<td><?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date'");?></td>
</tr>
<tr>
@@ -177,10 +176,9 @@
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->task->legendLife;?></div>
<?php $thWidth = common::checkNotCN() ? 'w-120px' : 'w-70px';?>
<table class='table table-form'>
<tr>
<th class=<?php echo $thWidth;?>><?php echo $lang->task->openedBy;?></th>
<th class='lifeThWidth'><?php echo $lang->task->openedBy;?></th>
<td><?php echo $users[$task->openedBy];?></td>
</tr>
<tr>
module/task/view/finish.html.php
+2 -3
View File
@@ -35,14 +35,13 @@
<form method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table table-form'>
<tr>
<?php $colWidth = common::checkNotCN() ? 'w-120px' : 'w-100px';?>
<th class='<?php echo $colWidth;?>'><?php echo !empty($task->team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?></th>
<th class='thWidth'><?php echo !empty($task->team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?></th>
<td class='w-p25-f'><?php echo $task->consumed;?> <?php echo $lang->workingHour;?></td>
<td></td>
</tr>
<?php if(!empty($task->team)):?>
<tr>
<th class='<?php echo $colWidth;?>'><?php echo $lang->task->hasConsumed;?></th>
<th class='thWidth'><?php echo $lang->task->hasConsumed;?></th>
<td class='w-p25-f'><?php echo (float)$task->myConsumed;?> <?php echo $lang->workingHour;?></td><td></td>
</tr>
<?php endif;?>
module/task/view/recordestimate.html.php
+2 -3
View File
@@ -24,7 +24,6 @@
<?php $team = array_keys($task->team);?>
<?php js::set('confirmRecord', (!empty($team) && $task->assignedTo != end($team)) ? $lang->task->confirmTransfer : $lang->task->confirmRecord);?>
<?php js::set('noticeSaveRecord', $lang->task->noticeSaveRecord);?>
<?php $colWidth = common::checkNotCN() ? 'w-90px' : 'w-70px';?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
@@ -42,8 +41,8 @@
<tr class='text-center'>
<th class="w-id"><?php echo $lang->idAB;?></th>
<th class="w-120px"><?php echo $lang->task->date;?></th>
<th class="<?php echo $colWidth;?>"><?php echo $lang->task->consumed;?></th>
<th class="<?php echo $colWidth;?>"><?php echo $lang->task->left;?></th>
<th class="thWidth"><?php echo $lang->task->consumed;?></th>
<th class="thWidth"><?php echo $lang->task->left;?></th>
<th><?php echo $lang->comment;?></th>
<th class='c-actions-2'><?php if(empty($task->team) or $task->assignedTo == $this->app->user->account) echo $lang->actions;?></th>
</tr>
module/task/view/view.html.php
+2 -4
View File
@@ -288,10 +288,9 @@
</table>
</div>
<div class='tab-pane' id='legendLife'>
<?php $widthClass = common::checkNotCN() ? 'w-100px' : 'w-70px';?>
<table class='table table-data'>
<tr>
<th class='<?php echo $widthClass;?>'><?php echo $lang->task->openedBy;?></th>
<th class='thWidth'><?php echo $lang->task->openedBy;?></th>
<td><?php echo $task->openedBy ? zget($users, $task->openedBy, $task->openedBy) . $lang->at . $task->openedDate : $lang->noData;?></td>
</tr>
<tr>
@@ -344,9 +343,8 @@
<summary class="detail-title"><?php echo $lang->task->legendEffort;?></summary>
<div class="detail-content">
<table class='table table-data'>
<?php $widthClass = common::checkNotCN() ? 'w-90px' : 'w-70px';?>
<tr>
<th class='<?php echo $widthClass;?>'><?php echo $lang->task->estimate;?></th>
<th class='effortThWidth'><?php echo $lang->task->estimate;?></th>
<td><?php echo $task->estimate . $lang->workingHour;?></td>
</tr>
<tr>