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

* Merge code.

Browse Source
This commit is contained in:
hufangzhou
2021-03-09 10:01:49 +08:00
parent 50c32a9c25 f6bc489e36
commit e854a1ff4d
11 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/de.php
+1 -1
View File
@@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,';
$lang->todo = new stdclass();
$lang->todo->menu = $lang->my->menu;
$lang->product->dividerMenu = ',plan,project,dynamic,';
$lang->product->dividerMenu = ',requirement,set,';
$lang->story = new stdclass();
module/common/lang/en.php
+1 -1
View File
@@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,';
$lang->todo = new stdclass();
$lang->todo->menu = $lang->my->menu;
$lang->product->dividerMenu = ',plan,project,dynamic,';
$lang->product->dividerMenu = ',requirement,set,';
$lang->story = new stdclass();
module/common/lang/fr.php
+1 -1
View File
@@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,';
$lang->todo = new stdclass();
$lang->todo->menu = $lang->my->menu;
$lang->product->dividerMenu = ',plan,project,dynamic,';
$lang->product->dividerMenu = ',requirement,set,';
$lang->story = new stdclass();
module/common/lang/menuOrder.php
+13 -1
View File
@@ -60,19 +60,31 @@ $lang->my->menuOrder[55] = 'contacts';
$lang->todo->menuOrder = $lang->my->menuOrder;
/* product menu order. */
<<<<<<< HEAD
$lang->product->menuOrder[1] = 'dashboard';
$lang->product->menuOrder[5] = 'requirement';
=======
$lang->product->menuOrder[5] = 'dashboard';
>>>>>>> f6bc489e36d6d6f13c214a30e0fea2f6d3bceeed
$lang->product->menuOrder[10] = 'story';
$lang->product->menuOrder[15] = 'plan';
$lang->product->menuOrder[30] = 'project';
$lang->product->menuOrder[20] = 'release';
$lang->product->menuOrder[25] = 'roadmap';
$lang->product->menuOrder[30] = 'project';
$lang->product->menuOrder[30] = 'requirement';
$lang->product->menuOrder[35] = 'track';
$lang->product->menuOrder[40] = 'doc';
<<<<<<< HEAD
$lang->product->menuOrder[45] = 'dynamic';
$lang->product->menuOrder[50] = 'setting';
$lang->product->menuOrder[55] = 'create';
$lang->product->menuOrder[60] = 'all';
=======
$lang->product->menuOrder[50] = 'dynamic';
$lang->product->menuOrder[55] = 'setting';
$lang->product->menuOrder[60] = 'create';
$lang->product->menuOrder[65] = 'all';
>>>>>>> f6bc489e36d6d6f13c214a30e0fea2f6d3bceeed
$lang->story->menuOrder = $lang->product->menuOrder;
$lang->productplan->menuOrder = $lang->product->menuOrder;
module/common/lang/vi.php
+1 -1
View File
@@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,';
$lang->todo = new stdclass();
$lang->todo->menu = $lang->my->menu;
$lang->product->dividerMenu = ',plan,project,dynamic,';
$lang->product->dividerMenu = ',requirement,set,';
$lang->story = new stdclass();
module/common/lang/zh-cn.php
+1 -1
View File
@@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,';
$lang->todo = new stdclass();
$lang->todo->menu = $lang->my->menu;
$lang->product->dividerMenu = ',plan,project,dynamic,';
$lang->product->dividerMenu = ',requirement,set,';
$lang->story = new stdclass();
module/common/lang/zh-tw.php
+1 -1
View File
@@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,';
$lang->todo = new stdclass();
$lang->todo->menu = $lang->my->menu;
$lang->product->dividerMenu = ',plan,project,dynamic,';
$lang->product->dividerMenu = ',requirement,set,';
$lang->story = new stdclass();
module/datatable/model.php
+1 -1
View File
@@ -153,7 +153,7 @@ class datatableModel extends model
$title = (isset($col->name) and $col->name) ? "title='$col->name'" : $title;
if($id == 'id' and (int)$width < 90) $width = '90px';
$width = "data-width='$width' style='width:$width'";
$align = ($id == 'actions' || $id == 'progress') ? 'text-center' : '';
$align = $id == 'actions' ? 'text-center' : '';
echo "<th data-flex='$fixed' $width class='c-$id $align' $title>";
if($id == 'actions')
module/my/view/execution.html.php
+2 -2
View File
@@ -70,8 +70,8 @@
<td><?php echo $execution->hours;?></td>
<td><?php echo $execution->assignedToMeTasks;?></td>
<td>
<div class='progress-pie' data-doughnut-size='80' data-color='#00da88' data-value='<?php echo $execution->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $execution->progress;?>%</div>
<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $execution->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $execution->progress;?></div>
</div>
</td>
</tr>
module/product/view/project.html.php
+2 -2
View File
@@ -65,8 +65,8 @@
<td class="text-center" title="<?php echo $project->hours->totalEstimate . ' ' . $lang->project->workHour;?>"><?php echo $project->hours->totalEstimate . ' ' . $lang->execution->workHourUnit;?></td>
<td class="text-center" title="<?php echo $project->hours->totalConsumed . ' ' . $lang->project->workHour;?>"><?php echo $project->hours->totalConsumed . ' ' . $lang->execution->workHourUnit;?></td>
<td>
<div class='progress-pie' data-doughnut-size='80' data-color='#00da88' data-value='<?php echo $project->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $project->hours->progress;?>%</div>
<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $project->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $project->hours->progress;?></div>
</div>
</td>
</tr>
module/project/model.php
+1 -1
View File
@@ -1131,7 +1131,7 @@ class projectModel extends model
echo $project->hours->totalLeft . ' ' . $this->lang->execution->workHourUnit;
break;
case 'progress':
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>";
echo "<div class='progress-pie' data-doughnut-size='90' 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>";
break;
case 'actions':
if($project->status == 'wait' || $project->status == 'suspended') common::printIcon('project', 'start', "projectID=$project->id", $project, 'list', 'play', '', 'iframe', true);