Merge branch 'sprint/tsj_task' into 'master'

Sprint/tsj task

See merge request easycorp/zentaopms!7026

module/execution/css/batchedit.css

@@ -2,3 +2,5 @@
 .c-team-name {width: 120px;}
 .c-project, .c-user, .c-code, .c-desc, .c-days {width: 150px;}
 .c-method {width: 45px;}
+.c-type > .icon-help {vertical-align: text-top;}
+.c-type > .popover .popover-content {font-weight: 400;}

module/execution/css/batchedit.en.css

@@ -1,3 +1,4 @@
 .c-user {width: 150px !important;}
 .c-date {width: 125px;}
 .c-method {width: 60px;}
+.c-type {width: 130px;}

module/execution/css/create.css

@@ -39,3 +39,4 @@
 .productsBox .required + .text-danger.help-text {position: relative; left: 10px;}
 .productsBox > #productNameLabel {padding-top: 8px;}
 .productsBox div[id^='branch'].chosen-disabled {pointer-events: none;}
+.methodTip icon:before {margin-bottom: 5px;}

module/execution/js/batchedit.js

@@ -27,3 +27,8 @@ $('#executionForm').on('change input mousedown', '.has-error', function()
     $(this).parent().find('.text-danger').remove();
     $(this).removeClass('has-error');
 })
+
+$(function()
+{
+    $('[data-toggle="popover"]').popover();
+})

module/execution/js/create.js

@@ -153,6 +153,8 @@ $(function()
     {
         $('.disabledBranch div[id^="branch"]').addClass('chosen-disabled');
     }
+
+    $('[data-toggle="popover"]').popover();
 });
 
 function showLifeTimeTips()

module/execution/js/edit.js

@@ -112,6 +112,8 @@ $(function()
     {
         $('.disabledBranch div[id^="branch"]').addClass('chosen-disabled');
     }
+
+    $('[data-toggle="popover"]').popover();
 })
 var lastProjectID = $("#project").val();
 

module/execution/lang/de.php

@@ -151,6 +151,8 @@ $lang->execution->left     = 'Left';
 $lang->execution->copyTeamTip        = "copy Project/project team members";
 $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』';
 $lang->execution->errorHours         = 'Hours/Day cannot be greater than『24』';
+$lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.';
+$lang->execution->typeTip            = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent.";
 
 $lang->execution->start    = 'Start';
 $lang->execution->activate = 'Aktivieren';

module/execution/lang/en.php

@@ -151,6 +151,8 @@ $lang->execution->left     = 'Left';
 $lang->execution->copyTeamTip        = "copy Project/project team members";
 $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』';
 $lang->execution->errorHours         = 'Hours/Day cannot be greater than『24』';
+$lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.';
+$lang->execution->typeTip            = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent.";
 
 $lang->execution->start    = 'Start';
 $lang->execution->activate = 'Activate';

module/execution/lang/fr.php

@@ -151,6 +151,8 @@ $lang->execution->left     = 'Left';
 $lang->execution->copyTeamTip        = "copy Project/project team members";
 $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』';
 $lang->execution->errorHours         = 'Hours/Day cannot be greater than『24』';
+$lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.';
+$lang->execution->typeTip            = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent.";
 
 $lang->execution->start    = 'Démarrer';
 $lang->execution->activate = 'Activer';

module/execution/lang/zh-cn.php

@@ -151,6 +151,8 @@ $lang->execution->left     = '剩余';
 $lang->execution->copyTeamTip         = "可以选择复制项目或{$lang->execution->common}团队的成员";
 $lang->execution->daysGreaterProject  = '可用工日不能大于执行的可用工日『%s』';
 $lang->execution->errorHours          = '可用工时/天不能大于『24』';
+$lang->execution->agileplusMethodTip  = '融合敏捷项目创建执行时，支持迭代和看板两种管理方法。';
+$lang->execution->typeTip             = '“综合”类型的父阶段可以创建其它类型的子级，其它父子层级的类型均一致。';
 
 $lang->execution->start    = "开始";
 $lang->execution->activate = "激活";

module/execution/view/batchedit.html.php

@@ -62,7 +62,10 @@
             <th class='c-user<?php echo zget($visibleFields, 'PO',       ' hidden') . zget($requiredFields, 'PO',     '', ' required');?>'><?php echo $lang->execution->PO;?></th>
             <th class='c-user<?php echo zget($visibleFields, 'QD',       ' hidden') . zget($requiredFields, 'QD',     '', ' required');?>'><?php echo $lang->execution->QD;?></th>
             <th class='c-user<?php echo zget($visibleFields, 'RD',       ' hidden') . zget($requiredFields, 'RD',     '', ' required');?>'><?php echo $lang->execution->RD;?></th>
-            <th class='c-type<?php echo zget($visibleFields, 'type',     ' hidden') . zget($requiredFields, 'type',   '', ' required');?>'><?php echo $lang->execution->$type;?></th>
+            <th class='c-type<?php echo zget($visibleFields, 'type',     ' hidden') . zget($requiredFields, 'type',   '', ' required');?>'>
+              <?php echo $lang->execution->$type;?>
+              <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->execution->typeTip;?>"></icon>
+            </th>
             <th class='c-date required'><?php echo $lang->execution->begin;?></th>
             <th class='c-date required'><?php echo $lang->execution->end;?></th>
             <th class='c-desc <?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', '', ' required');?>'><?php echo $lang->execution->$desc;?></th>

module/execution/view/create.html.php

@@ -66,7 +66,10 @@
         <tr>
           <th><?php echo $lang->execution->method;?></th>
           <td class="col-main"><?php echo html::select("type", $lang->execution->typeList, $type, "class='form-control chosen' required onchange='setType(this.value)'");?></td>
-          <td colspan='2'></td>
+          <td class='methodTip'>
+            <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->execution->agileplusMethodTip;?>"></icon>
+          </td>
+          <td></td>
         </tr>
         <?php endif;?>
         <tr>

module/execution/view/edit.html.php

@@ -98,6 +98,9 @@
           }
           ?>
           </td>
+          <td>
+            <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->execution->typeTip;?>"></icon>
+          </td>
         </tr>
         <?php endif;?>
         <tr>

module/programplan/css/create.css

@@ -1 +1,2 @@
 #planForm tr td {vertical-align: top;}
+#mainContent .methodTitle, #mainContent .methodTip {display: inline-block; vertical-align: middle;}

module/programplan/js/create.js

@@ -5,6 +5,8 @@ $(function()
         $(this).removeClass('has-error');
         $(this).closest('td').find('.text-danger.help-text').remove();
     });
+
+    $('[data-toggle="popover"]').popover();
 });
 /**
  * Add item to create view of programplan.

module/programplan/js/edit.js

@@ -57,4 +57,6 @@ $(function()
             if(!result) return false;
         }
     })
+
+    $('[data-toggle="popover"]').popover();
 })

module/programplan/lang/de.php

@@ -20,6 +20,7 @@ $lang->programplan->delete        = 'Delete Stage';
 $lang->programplan->close         = 'Close Stage';
 $lang->programplan->activate      = 'Activate Stage';
 $lang->programplan->createSubPlan = 'Create Sub Plan';
+$lang->programplan->subPlanManage = 'Sub-stages management';
 
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';
@@ -72,6 +73,7 @@ $lang->programplan->emptyBegin       = '『Begin』should not be blank';
 $lang->programplan->emptyEnd         = '『End』should not be blank';
 $lang->programplan->checkBegin       = '『Begin』should be valid date';
 $lang->programplan->checkEnd         = '『End』should be valid date';
+$lang->programplan->methodTip        = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as Iterations/Kanban. If the sub-stage is created as an Iteration/Kanban, it does not support creating sub-levels further down.';
 
 $lang->programplan->milestoneList[1] = 'Yes';
 $lang->programplan->milestoneList[0] = 'No';

module/programplan/lang/en.php

@@ -20,6 +20,7 @@ $lang->programplan->delete        = 'Delete Stage';
 $lang->programplan->close         = 'Close Stage';
 $lang->programplan->activate      = 'Activate Stage';
 $lang->programplan->createSubPlan = 'Create Sub Stage';
+$lang->programplan->subPlanManage = 'Sub-stages management';
 
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';
@@ -72,6 +73,7 @@ $lang->programplan->emptyBegin       = '『Begin』should not be blank';
 $lang->programplan->emptyEnd         = '『End』should not be blank';
 $lang->programplan->checkBegin       = '『Begin』should be valid date';
 $lang->programplan->checkEnd         = '『End』should be valid date';
+$lang->programplan->methodTip        = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as Iterations/Kanban. If the sub-stage is created as an Iteration/Kanban, it does not support creating sub-levels further down.';
 
 $lang->programplan->milestoneList[1] = 'Yes';
 $lang->programplan->milestoneList[0] = 'No';

module/programplan/lang/fr.php

@@ -20,6 +20,7 @@ $lang->programplan->delete        = 'Delete Stage';
 $lang->programplan->close         = 'Close Stage';
 $lang->programplan->activate      = 'Activate Stage';
 $lang->programplan->createSubPlan = 'Create Sub Plan';
+$lang->programplan->subPlanManage = 'Sub-stages management';
 
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';
@@ -72,6 +73,7 @@ $lang->programplan->emptyBegin       = '『Begin』should not be blank';
 $lang->programplan->emptyEnd         = '『End』should not be blank';
 $lang->programplan->checkBegin       = '『Begin』should be valid date';
 $lang->programplan->checkEnd         = '『End』should be valid date';
+$lang->programplan->methodTip        = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as Iterations/Kanban. If the sub-stage is created as an Iteration/Kanban, it does not support creating sub-levels further down.';
 
 $lang->programplan->milestoneList[1] = 'Yes';
 $lang->programplan->milestoneList[0] = 'No';

module/programplan/lang/zh-cn.php

@@ -20,6 +20,7 @@ $lang->programplan->delete        = '删除阶段';
 $lang->programplan->close         = '关闭阶段';
 $lang->programplan->activate      = '激活阶段';
 $lang->programplan->createSubPlan = '创建子阶段';
+$lang->programplan->subPlanManage = '子阶段的管理方法';
 
 $lang->programplan->parent           = '父阶段';
 $lang->programplan->emptyParent      = '无';
@@ -72,6 +73,7 @@ $lang->programplan->emptyBegin       = '『计划开始』日期不能为空';
 $lang->programplan->emptyEnd         = '『计划完成』日期不能为空';
 $lang->programplan->checkBegin       = '『计划开始』应当为合法的日期';
 $lang->programplan->checkEnd         = '『计划完成』应当为合法的日期';
+$lang->programplan->methodTip        = '融合瀑布项目阶段子阶段创建时，可以选择创建为阶段或创建为迭代/看板。子阶段为迭代/看板，不支持继续向下创建子级。';
 
 $lang->programplan->milestoneList[1] = '是';
 $lang->programplan->milestoneList[0] = '否';

module/programplan/view/create.html.php

@@ -45,6 +45,7 @@
   <div class='main-header'>
     <?php if(!empty($planID) and $project->model == 'waterfallplus'):?>
     <div class="pull-left">
+      <div class='methodTitle'><strong><?php echo $lang->programplan->subPlanManage . ':'?></strong></div>
       <div class='btn-group'>
         <a href='javascript:;' class='btn btn-link btn-limit' data-toggle='dropdown'><span class='text' title='<?php echo zget($lang->programplan->typeList, $executionType);?>'><?php echo zget($lang->programplan->typeList, $executionType);?></span> <span class='caret'></span></a>
         <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
@@ -57,6 +58,7 @@
           ?>
         </ul>
       </div>
+      <div class='methodTip'><icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->programplan->methodTip;?>"></icon></div>
     </div>
     <?php endif;?>
     <div class="btn-toolbar pull-right">

module/programplan/view/edit.html.php

@@ -60,6 +60,9 @@
             <td colspan='2'>
               <?php echo $enableOptionalAttr ? html::select('attribute', $lang->stage->typeList, $plan->attribute, "class='form-control'") : zget($lang->stage->typeList, $plan->attribute);?>
             </td>
+            <td>
+              <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->execution->typeTip;?>"></icon>
+            </td>
           </tr>
           <?php if($plan->setMilestone):?>
           <tr>