Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

2021-07-08 13:11:47 +08:00
parent 834d42610c ccc8c97aaa
commit 7be1de8381
13 changed files with 32 additions and 8 deletions
@@ -2,3 +2,4 @@ UPDATE `zt_block` SET `source`='execution' WHERE `source`='project' and `block`=

 ALTER TABLE `zt_story` MODIFY COLUMN `reviewedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
 REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'story', '', 'reviewRules', 'allpass');
+ALTER TABLE `zt_storyestimate` MODIFY COLUMN `average` float NOT NULL;
@@ -943,7 +943,7 @@ CREATE TABLE IF NOT EXISTS `zt_storyestimate` (
  `story` mediumint(9) NOT NULL,
  `round` smallint(6) NOT NULL,
  `estimate` text NOT NULL,
-  `average` float(10,2) NOT NULL,
+  `average` float NOT NULL,
  `openedBy` varchar(30) NOT NULL,
  `openedDate` datetime NOT NULL,
  UNIQUE KEY `story` (`story`,`round`)
@@ -225,8 +225,9 @@ $lang->scrum->menu->settings['subMenu']->group       = array('link' => "{$lang->

 /* Execution menu. */
 $lang->execution->homeMenu = new stdclass();
-if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|";
-$lang->execution->homeMenu->list  = array('link' => "{$lang->execution->list}|execution|all|", 'alias' => 'create,batchedit');
+//if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|";
+//$lang->execution->homeMenu->list = array('link' => "{$lang->execution->list}|execution|all|", 'alias' => 'create,batchedit');
+$lang->execution->homeMenu->executionkanban = array('link' => "{$lang->execution->executionKanban}|execution|executionkanban|");

 $lang->execution->menu = new stdclass();
 $lang->execution->menu->task     = array('link' => "{$lang->task->common}|execution|task|executionID=%s", 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
@@ -209,7 +209,7 @@ $lang->my->work = '待处理';

 $lang->project->list = '项目列表';

-$lang->execution->list = "{$lang->executionCommon}列表";
+$lang->execution->executionKanban = "{$lang->execution->common}看板";

 $lang->doc->recent    = '最近文档';
 $lang->doc->my        = '我的文档';
@@ -543,7 +543,7 @@ class commonModel extends model
        {
            $nav = $lang->mainNav->$openApp;
            list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav);
-            if($openApp == 'execution') $currentMethod = 'all';
+            if($openApp == 'execution') $currentMethod = 'executionKanban';
        }
        else
        {
@@ -553,7 +553,7 @@ class commonModel extends model
        }

        if($config->systemMode == 'classic' and $openApp == 'execution') $icon = zget($lang->navIcons, 'project', '');
-        $link = ($openApp != 'execution' or ($config->systemMode == 'classic')) ? helper::createLink($currentModule, $currentMethod) : '';
+        $link = helper::createLink($currentModule, $currentMethod);
        $html = $link ? html::a($link, "$icon {$lang->$openApp->common}", '', "class='btn'") : "$icon {$lang->$openApp->common}";

        echo "<div class='btn-group header-btn'>" . $html . '</div>';
@@ -1861,6 +1861,17 @@ class execution extends control
        $this->display();
    }

+    /**
+     * Execution kanban.
+     *
+     * @access public
+     * @return void
+     */
+    public function executionKanban()
+    {
+        $this->display();
+    }
+
    /**
     * Tree view.
     * Product
@@ -54,7 +54,7 @@
          <td><?php echo zget($users, $user->account);?></td>
          <?php echo html::hidden('account[]', $user->account, "class='form-control'");?>
          <?php if(!empty($estimateInfo->estimate)):?>
-          <td><?php echo isset($estimateInfo->estimate->{$user->account}) ? $estimateInfo->estimate->{$user->account}->estimate : '';?></td>
+          <td class='c-name' title="<?php echo isset($estimateInfo->estimate->{$user->account}) ? $estimateInfo->estimate->{$user->account}->estimate : '';?>" style='text-align: center !important;'><?php echo isset($estimateInfo->estimate->{$user->account}) ? $estimateInfo->estimate->{$user->account}->estimate : '';?></td>
          <td class='new-estimate hide'><?php echo html::input('estimate[]', '', "class='form-control'");?></td>
          <?php else:?>
          <td class='new-estimate'><?php echo html::input('estimate[]', '', "class='form-control'");?></td>
@@ -273,6 +273,7 @@ $lang->story->cannotDeleteParent   = "Can not delete parent {$lang->SRCommon}";
 $lang->story->moveChildrenTips     = "Its Child {$lang->SRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->SRCommon}.";
 $lang->story->changeTips           = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
 $lang->story->estimateMustBeNumber = 'Estimate value must be number.';
+$lang->story->estimateMustBePlus   = 'Estimated value cannot be negative';

 $lang->story->form = new stdclass();
 $lang->story->form->area     = 'Story Bereich';
@@ -274,6 +274,7 @@ $lang->story->cannotDeleteParent   = "Can not delete parent {$lang->SRCommon}";
 $lang->story->moveChildrenTips     = "Its Child {$lang->SRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->SRCommon}.";
 $lang->story->changeTips           = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
 $lang->story->estimateMustBeNumber = 'Estimate value must be number.';
+$lang->story->estimateMustBePlus   = 'Estimated value cannot be negative';

 $lang->story->form = new stdclass();
 $lang->story->form->area     = 'Scope';
@@ -273,6 +273,7 @@ $lang->story->cannotDeleteParent   = "Impossible de supprimer {$lang->SRCommon}
 $lang->story->moveChildrenTips     = "Its Child {$lang->SRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->SRCommon}.";
 $lang->story->changeTips           = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
 $lang->story->estimateMustBeNumber = 'Estimate value must be number.';
+$lang->story->estimateMustBePlus   = 'Estimated value cannot be negative';

 $lang->story->form = new stdclass();
 $lang->story->form->area     = 'Périmètre';
@@ -273,6 +273,7 @@ $lang->story->cannotDeleteParent   = "Không thể xóa {$lang->SRCommon} mẹ";
 $lang->story->moveChildrenTips     = "Its Child {$lang->SRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->SRCommon}.";
 $lang->story->changeTips           = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
 $lang->story->estimateMustBeNumber = 'Estimate value must be number.';
+$lang->story->estimateMustBePlus   = 'Estimated value cannot be negative';

 $lang->story->form = new stdclass();
 $lang->story->form->area     = 'Phạm vi';
@@ -274,6 +274,7 @@ $lang->story->cannotDeleteParent    = "不能删除父{$lang->SRCommon}";
 $lang->story->moveChildrenTips      = "修改父{$lang->SRCommon}的所属产品会将其下的子{$lang->SRCommon}也移动到所选产品下。";
 $lang->story->changeTips            = '该软件需求关联的用户需求有变更，点击“不变更”忽略此条变更，点击“变更”来进行该软件需求的变更。';
 $lang->story->estimateMustBeNumber  = '估算值必须是数字';
+$lang->story->estimateMustBePlus    = '估算值不能是负数';

 $lang->story->form = new stdclass();
 $lang->story->form->area      = "该{$lang->SRCommon}所属范围";
@@ -4159,7 +4159,13 @@ class storyModel extends model
                dao::$errors[] = $this->lang->story->estimateMustBeNumber;
                return false;
            }
-            $estimates[$account]['estimate'] = $data->estimate[$key];
+
+            if(!empty($data->estimate[$key]) and $data->estimate[$key] < 0)
+            {
+                dao::$errors[] = $this->lang->story->estimateMustBePlus;
+                return false;
+            }
+            $estimates[$account]['estimate'] = strpos($data->estimate[$key], '-') !== false ? (int)$data->estimate[$key] : (float)$data->estimate[$key];
        }