* Merger code.

2020-08-20 11:13:07 +08:00
parent de3c53ec94
commit a39e00876e
12 changed files with 182 additions and 1 deletions
@@ -97,7 +97,7 @@ CREATE TABLE `zt_designspec` (

 -- DROP TABLE IF EXISTS `zt_issue`;
 CREATE TABLE `zt_issue` (
-  `id` mediumint(8) UNSIGNED NOT NULL,
+  `id` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT,
  `resolvedBy` varchar(30) NOT NULL,
  `program` varchar(255) NOT NULL,
  `title` varchar(255) NOT NULL,
@@ -1398,4 +1398,97 @@ class block extends control
            $this->loadModel('setting')->setItem("{$this->app->user->account}.$module.block.initVersion", $this->config->block->version);
        }
    }
+
+    /**
+     * Print srcum project block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumoverallBlock()
+    {
+        $this->view->program = $this->loadModel('project')->getByID($this->session->program);
+    }
+
+    /**
+     * Print srcum progress block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumprogressBlock()
+    {
+        $this->view->program = $this->loadModel('project')->getByID($this->session->program);
+    }
+
+    /**
+     * Print srcum road map block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumroadmapBlock()
+    {
+        $this->view->program = $this->loadModel('project')->getByID($this->session->program);
+    }
+
+    /**
+     * Print srcum road map block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumtestBlock()
+    {
+        $this->view->program = $this->loadModel('project')->getByID($this->session->program);
+
+        $this->session->set('testtaskList', $this->app->getURI(true));
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        $this->app->loadLang('testtask');
+        $this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
+            ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id')
+            ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.project=t4.id')
+            ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.project=t5.project')
+            ->where('t1.deleted')->eq('0')
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
+            ->andWhere('t1.product = t5.product')
+            ->beginIF($this->params->type != 'all')->andWhere('t1.status')->eq($this->params->type)->fi()
+            ->orderBy('t1.id desc')
+            ->beginIF($this->viewType != 'json')->limit((int)$this->params->num)->fi()
+            ->fetchAll();
+    }
+
+    /**
+     * Print srcum product block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumproductBlock()
+    {
+        $this->view->program = $this->loadModel('project')->getByID($this->session->program);
+    }
+
+    /**
+     * Print srcum project block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumprojectBlock()
+    {
+        $this->view->program = $this->loadModel('project')->getByID($this->session->program);
+    }
+
+    /**
+     * Print srcum dynamic block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumdynamicBlock()
+    {
+        $this->view->program = $this->loadModel('project')->getByID($this->session->program);
+    }
 }
@@ -101,6 +101,35 @@ $lang->block->default['cmmi']['program']['7']['params']['type']    = 'all';
 $lang->block->default['cmmi']['program']['7']['params']['num']     = '15';
 $lang->block->default['cmmi']['program']['7']['params']['orderBy'] = 'id_desc';

+$lang->block->default['scrum']['program']['1']['title'] = '项目整体情况';
+$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverall';
+$lang->block->default['scrum']['program']['1']['grid']  = 8;
+
+$lang->block->default['scrum']['program']['2']['title'] = '进行中的迭代';
+$lang->block->default['scrum']['program']['2']['block'] = 'scrumprogress';
+$lang->block->default['scrum']['program']['2']['grid']  = 8;
+
+$lang->block->default['scrum']['program']['3']['title'] = '产品路线图';
+$lang->block->default['scrum']['program']['3']['block'] = 'scrumroadmap';
+$lang->block->default['scrum']['program']['3']['grid']  = 8;
+
+$lang->block->default['scrum']['program']['4']['title'] = '待测版本';
+$lang->block->default['scrum']['program']['4']['block'] = 'scrumtest';
+$lang->block->default['scrum']['program']['4']['grid']  = 8;
+
+$lang->block->default['scrum']['program']['5']['title'] = '产品总览';
+$lang->block->default['scrum']['program']['5']['block'] = 'scrumproduct';
+$lang->block->default['scrum']['program']['5']['grid']  = 4;
+
+$lang->block->default['scrum']['program']['6']['title'] = '迭代总览';
+$lang->block->default['scrum']['program']['6']['block'] = 'scrumproject';
+$lang->block->default['scrum']['program']['6']['grid']  = 4;
+
+$lang->block->default['scrum']['program']['7']['title'] = '最新动态';
+$lang->block->default['scrum']['program']['7']['block'] = 'scrumoverview';
+$lang->block->default['scrum']['program']['7']['grid']  = 4;
+>>>>>>> Stashed changes
+
 $lang->block->default['product']['1']['title'] = $lang->productCommon . '统计';
 $lang->block->default['product']['1']['block'] = 'statistic';
 $lang->block->default['product']['1']['grid']  = 8;
@@ -0,0 +1,54 @@
+<?php
+/**
+ * The testtask block view file of block module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     block
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php if(empty($testtasks)): ?>
+<div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
+<?php else:?>
+<div class='panel-body has-table scrollbar-hover'>
+  <table class='table table-borderless table-hover table-fixed-head tablesorter block-testtask table-fixed'>
+    <thead>
+      <tr class='text-center'>
+        <?php if($longBlock):?>
+        <th class='w-id'><?php echo $lang->idAB?></th>
+        <th class='text-left'><?php echo $lang->testtask->product;?></th>
+        <?php endif;?>
+        <th class='text-left'><?php echo $lang->testtask->name;?></th>
+        <?php if($longBlock):?>
+        <th class='text-left'><?php echo $lang->testtask->project . '/' . $lang->testtask->build;?></th>
+        <?php endif;?>
+        <th class='w-date'><?php echo $lang->testtask->begin;?></th>
+        <th class='w-date'><?php echo $lang->testtask->end;?></th>
+      </tr>
+    </thead>
+    <tbody>
+      <?php foreach($testtasks as $testtask):?>
+      <?php
+      $appid    = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
+      $viewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}");
+      ?>
+      <tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
+        <?php if($longBlock):?>
+        <td><?php echo sprintf('%03d', $testtask->id);?></td>
+        <td class='text-left' title='<?php echo $testtask->productName?>'><?php echo $testtask->productName?></td>
+        <?php endif;?>
+        <td class='text-left' title='<?php echo $testtask->name?>'><?php echo $testtask->name?></td>
+        <?php if($longBlock):?>
+        <td class='text-left' title='<?php echo $testtask->projectName . '/' . $testtask->buildName?>'><?php echo $testtask->projectName . '/' . $testtask->buildName?></td>
+        <?php endif;?>
+        <td><?php echo $testtask->begin?></td>
+        <td><?php echo $testtask->end?></td>
+      </tr>
+      <?php endforeach;?>
+    </tbody>
+  </table>
+</div>
+<?php endif;?>
@@ -1118,6 +1118,10 @@ $lang->menu->cmmi->issue          = '问题|issue|browse|';
 $lang->menu->cmmi->risk           = '风险|risk|browse|';
 $lang->menu->cmmi->list           = array('link' => '更多|workestimation|index|program={PROGRAM}', 'class' => 'dropdown dropdown-hover cmmi-list', 'subModule' => 'stakeholder,workestimation,durationestimation,budget,pssp,stakeholder');

+/* Srcum menu. */
+$lang->menu->srcum = new stdclass();
+$lang->menu->srcum->programindex   = array('link' => '仪表盘|program|index|program={PROGRAM}');
+
 $lang->cmmi = new stdclass();
 $lang->cmmi->subMenu = new stdclass();
 $lang->cmmi->subMenu->list = new stdclass();
@@ -25,6 +25,7 @@ class program extends control
        $this->view->title      = $this->lang->program->common . $this->lang->colon . $this->lang->program->index;
        $this->view->position[] = $this->lang->program->index;
        $this->view->program    = $this->project->getByID($programID);
+
        $this->display();
    }