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

Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade

Browse Source
This commit is contained in:
mayue
2022-08-04 09:09:53 +08:00
parent 0ab5b2956d 451bffdc26
commit 37c49204e1
6 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/lang/de.php
+2
View File
@@ -12,6 +12,7 @@
$lang->programplan->common = 'Program Plan';
$lang->programplan->browse = 'Program Plan';
$lang->programplan->gantt = 'Gantt Chart';
$lang->programplan->ganttEdit = 'Gantt Edit';
$lang->programplan->list = 'Stage List';
$lang->programplan->create = 'Create';
$lang->programplan->edit = 'Edit';
@@ -84,3 +85,4 @@ $lang->programplan->error->createdTask = 'The task has been decomposed. Sub
$lang->programplan->error->parentWorkload = 'The sum of the workload of the child phase cannot be greater than that of the parent phase: %s.';
$lang->programplan->error->parentDuration = 'The planned start and planned completion of the child phase cannot exceed the parent phase.';
$lang->programplan->error->sameName = 'Stage name cannot be the same!';
$lang->programplan->error->taskDrag = 'The %s task cannot be dragged';
module/programplan/lang/en.php
+2
View File
@@ -12,6 +12,7 @@
$lang->programplan->common = 'Program Plan';
$lang->programplan->browse = 'Gantt Chart';
$lang->programplan->gantt = 'Gantt Chart';
$lang->programplan->ganttEdit = 'Gantt Edit';
$lang->programplan->list = 'Stage List';
$lang->programplan->create = 'Create';
$lang->programplan->edit = 'Edit';
@@ -84,3 +85,4 @@ $lang->programplan->error->createdTask = 'The task is decomposed. Sub stages
$lang->programplan->error->parentWorkload = 'The sum of the workload in the sub stage cannot be > that in the parent stage: %s.';
$lang->programplan->error->parentDuration = 'The planned start and planned completion of the child phase cannot exceed the parent phase.';
$lang->programplan->error->sameName = 'Stage name cannot be the same!';
$lang->programplan->error->taskDrag = 'The %s task cannot be dragged';
module/programplan/lang/fr.php
+2
View File
@@ -12,6 +12,7 @@
$lang->programplan->common = 'Program Plan';
$lang->programplan->browse = 'Program Plan';
$lang->programplan->gantt = 'Gantt Chart';
$lang->programplan->ganttEdit = 'Gantt Edit';
$lang->programplan->list = 'Stage List';
$lang->programplan->create = 'Create';
$lang->programplan->edit = 'Edit';
@@ -84,3 +85,4 @@ $lang->programplan->error->createdTask = 'The task has been decomposed. Sub
$lang->programplan->error->parentWorkload = 'The sum of the workload of the child phase cannot be greater than that of the parent phase: %s.';
$lang->programplan->error->parentDuration = 'The planned start and planned completion of the child phase cannot exceed the parent phase.';
$lang->programplan->error->sameName = 'Stage name cannot be the same!';
$lang->programplan->error->taskDrag = 'The %s task cannot be dragged';
module/programplan/lang/zh-cn.php
+2
View File
@@ -12,6 +12,7 @@
$lang->programplan->common = '项目阶段';
$lang->programplan->browse = '浏览甘特图';
$lang->programplan->gantt = '甘特图';
$lang->programplan->ganttEdit = '甘特图编辑';
$lang->programplan->list = '阶段列表';
$lang->programplan->create = '设置阶段';
$lang->programplan->edit = '编辑';
@@ -84,3 +85,4 @@ $lang->programplan->error->createdTask = '已分解任务，不可添加子
$lang->programplan->error->parentWorkload = '子阶段的工作量之和不能大于父阶段的工作量:%s';
$lang->programplan->error->parentDuration = '子阶段计划开始、计划完成不能超过父阶段';
$lang->programplan->error->sameName = '阶段名称不能相同！';
$lang->programplan->error->taskDrag = '%s的任务不可以拖动';
module/programplan/view/gantt.html.php
+4 -3
View File
@@ -69,6 +69,7 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
<?php js::set('dateDetails', $dateDetails);?>
<?php js::set('module', $app->rawModule);?>
<?php js::set('method', $app->rawMethod);?>
<?php js::set('canGanttEdit', common::hasPriv('programplan', 'ganttEdit'));?>
<div id='mainContent' class='main-content load-indicator' data-loading='<?php echo $lang->programplan->exporting;?>'>
<form class="main-form form-ajax not-watch">
<div class="example">
@@ -390,9 +391,9 @@ function validateResources(id)
flag = true;
/* Check status. */
if(status !== statusLang)
if(status !== statusLang && type === 'task')
{
new $.zui.Messager(status + '的任务不可以拖动', {
new $.zui.Messager("<?php echo $lang->programplan->error->taskDrag;?>".replace('%s', status), {
type: 'danger',
icon: 'exclamation-sign'
}).show();
@@ -456,7 +457,7 @@ $(function()
?>
gantt.serverList("userList", <?php echo json_encode($userList);?>);
gantt.config.readonly = false;
gantt.config.readonly = canGanttEdit ? true : false;
gantt.config.details_on_dblclick = false;
gantt.config.order_branch = 'marker';
gantt.config.drag_progress = false;