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

Merge branch 'sprint/master_zhiuxudong_55626' into 'sprint/196'

Browse Source 
Sprint/master zhiuxudong 55626

See merge request easycorp/zentaopms!3664
This commit is contained in:
孙广明
2022-05-31 07:01:18 +00:00
parent 375444f16e 93e753b39e
commit 4e913acb10
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/view/team.html.php
+5 -2
View File
@@ -15,7 +15,10 @@
<?php js::set('noAccess', $lang->user->error->noAccess)?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->execution->team;?></span></span>
<span class='btn btn-link btn-active-text'>
<span class='text'><?php echo $lang->execution->team;?></span>
<span class="label label-light label-badge"><?php echo count($teamMembers);?></span>
</span>
</div>
<div class='btn-toolbar pull-right'>
<?php
@@ -102,7 +105,7 @@
</tbody>
</table>
<div class='table-footer'>
<div class='table-statistic'><?php echo $lang->team->totalHours . '：' . "<strong>$totalHours{$lang->execution->workHour}</strong>";?></div>
<div class='table-statistic'><?php echo $lang->team->totalHours . '：' . "<strong>$totalHours{$lang->execution->workHour}" . sprintf($lang->project->teamMembersCount, count($teamMembers)) . "</strong>";?></div>
</div>
</form>
<?php endif;?>
module/project/lang/en.php
+1
View File
@@ -59,6 +59,7 @@ $lang->project->copyTeamTitle = 'Select a project team to copy';
$lang->project->daysGreaterProject = 'Days cannot be greater than days of project『%s』';
$lang->project->errorHours = 'Hours/Day cannot be greater than『24』';
$lang->project->workdaysExceed = 'No more than『%s』working days';
$lang->project->teamMembersCount = ', there are %s team members.';
/* Fields. */
$lang->project->common = 'Project';
module/project/lang/zh-cn.php
+1
View File
@@ -59,6 +59,7 @@ $lang->project->copyTeamTitle = '选择一个项目团队来复制';
$lang->project->daysGreaterProject = '可用工日不能大于项目的可用工日『%s』';
$lang->project->errorHours = '可用工时/天不能大于『24』';
$lang->project->workdaysExceed = '可用工作日不能超过『%s』天';
$lang->project->teamMembersCount = '，团队成员共%s人。';
/* Fields. */
$lang->project->common = '项目';
module/project/view/team.html.php
+5 -2
View File
@@ -15,7 +15,10 @@
<?php js::set('noAccess', $lang->user->error->noAccess)?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->project->teamMember;?></span></span>
<span class='btn btn-link btn-active-text'>
<span class='text'><?php echo $lang->project->teamMember;?></span>
<span class="label label-light label-badge"><?php echo count($teamMembers);?></span>
</span>
</div>
<div class='btn-toolbar pull-right'>
<?php
@@ -101,7 +104,7 @@
</tbody>
</table>
<div class='table-footer'>
<div class='table-statistic'><?php echo $lang->team->totalHours . '：' . "<strong>$totalHours{$lang->execution->workHour}</strong>";?></div>
<div class='table-statistic'><?php echo $lang->team->totalHours . '：' . "<strong>$totalHours{$lang->execution->workHour}" . sprintf($lang->project->teamMembersCount, count($teamMembers)) . "</strong>";?></div>
</div>
</form>
<?php endif;?>