* code for task #71659.

2022-10-10 14:13:25 +08:00
parent 8fdde5fa0e
commit c13286de9e
9 changed files with 103 additions and 18 deletions
@@ -202,6 +202,7 @@ $lang->backup->common     = 'Backup';
 $lang->action->trash      = 'Recycle';
 $lang->app->common        = 'APP';
 $lang->app->serverLink    = 'Server Link';
+$lang->review->common     = 'Review';

 $lang->personnel->common     = 'Member';
 $lang->personnel->invest     = 'Investment';
@@ -202,6 +202,7 @@ $lang->backup->common     = 'Backup';
 $lang->action->trash      = 'Recycle';
 $lang->app->common        = 'APP';
 $lang->app->serverLink    = 'Server Link';
+$lang->review->common     = 'Review';

 $lang->personnel->common     = 'Member';
 $lang->personnel->invest     = 'Investment';
@@ -202,6 +202,7 @@ $lang->backup->common     = 'Backup';
 $lang->action->trash      = 'Recycle';
 $lang->app->common        = 'APP';
 $lang->app->serverLink    = 'Server Link';
+$lang->review->common     = 'Review';

 $lang->personnel->common     = 'Member';
 $lang->personnel->invest     = 'Investment';
@@ -96,6 +96,7 @@ $lang->my->menu->work['subMenu']->story       = "$lang->SRCommon|my|work|mode=st
 $lang->my->menu->work['subMenu']->bug         = "{$lang->bug->common}|my|work|mode=bug";
 $lang->my->menu->work['subMenu']->testcase    = array('link' => "{$lang->testcase->common}|my|work|mode=testcase&type=assigntome", 'subModule' => 'testtask');
 $lang->my->menu->work['subMenu']->testtask    = "{$lang->testtask->common}|my|work|mode=testtask&type=wait";
+$lang->my->menu->work['subMenu']->audit       = array('link' => "{$lang->review->common}|my|work|mode=audit", 'subModule' => 'review');

 $lang->my->menu->work['menuOrder'][5]  = 'task';
 $lang->my->menu->work['menuOrder'][10] = 'requirement';
@@ -103,6 +104,7 @@ $lang->my->menu->work['menuOrder'][15] = 'story';
 $lang->my->menu->work['menuOrder'][20] = 'bug';
 $lang->my->menu->work['menuOrder'][25] = 'testcase';
 $lang->my->menu->work['menuOrder'][30] = 'testtask';
+$lang->my->menu->work['menuOrder'][35] = 'audit';
 if(!$config->URAndSR) unset($lang->my->menu->work['subMenu']->requirement, $lang->my->menu->work['menuOrder'][10]);

 $lang->my->menu->contribute['subMenu']              = new stdclass();
@@ -112,6 +114,7 @@ $lang->my->menu->contribute['subMenu']->story       = "$lang->SRCommon|my|contri
 $lang->my->menu->contribute['subMenu']->bug         = "{$lang->bug->common}|my|contribute|mode=bug";
 $lang->my->menu->contribute['subMenu']->testcase    = "{$lang->testcase->shortCommon}|my|contribute|mode=testcase&type=openedbyme";
 $lang->my->menu->contribute['subMenu']->testtask    = "{$lang->testtask->common}|my|contribute|mode=testtask&type=done";
+$lang->my->menu->contribute['subMenu']->audit       = array('link' => "{$lang->review->common}|my|contribute|mode=audit&type=reviewedbyme", 'subModule' => 'review');
 $lang->my->menu->contribute['subMenu']->doc         = "{$lang->doc->common}|my|contribute|mode=doc&type=openedbyme";

 $lang->my->menu->contribute['menuOrder'][5]  = 'task';
@@ -120,7 +123,8 @@ $lang->my->menu->contribute['menuOrder'][15] = 'story';
 $lang->my->menu->contribute['menuOrder'][20] = 'bug';
 $lang->my->menu->contribute['menuOrder'][25] = 'testcase';
 $lang->my->menu->contribute['menuOrder'][30] = 'testtask';
-$lang->my->menu->contribute['menuOrder'][35] = 'doc';
+$lang->my->menu->contribute['menuOrder'][35] = 'audit';
+$lang->my->menu->contribute['menuOrder'][40] = 'doc';

 if(!$config->URAndSR) unset($lang->my->menu->contribute['subMenu']->requirement, $lang->my->menu->contribute['menuOrder'][10]);

@@ -202,6 +202,7 @@ $lang->backup->common     = '备份';
 $lang->action->trash      = '回收站';
 $lang->app->common        = '应用';
 $lang->app->serverLink    = '服务器链接';
+$lang->review->common     = '评审';

 $lang->personnel->common     = '人员';
 $lang->personnel->invest     = '投入人员';
@@ -207,6 +207,7 @@ var storyCount    = $storyCount;
 var bugCount      = $bugCount;
 var caseCount     = $caseCount;
 var testTaskCount = $testTaskCount;
+var reviewCount   = $reviewCount;

 var isOpenedURAndSR = $isOpenedURAndSR;
 if(isOpenedURAndSR !== 0) var requirementCount = $requirementCount;
@@ -220,8 +221,6 @@ if(isMax !== 0)
 {
    var issueCount   = $issueCount;
    var riskCount    = $riskCount;
-    var reviewCount  = $reviewCount;
-    var qaCount      = $qaCount;
    var meetingCount = $meetingCount;
 }
 </script>
@@ -949,28 +948,32 @@ EOF;
     */
    public function audit($browseType = 'needreview', $orderBy = 't1.id_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
    {
-        $this->loadModel('datatable');
-        $this->loadModel('baseline');
-        $this->session->set('reviewList', $this->app->getURI(true));
-        $this->app->loadLang('review');
        $this->app->loadClass('pager', true);
        $pager = pager::init($recTotal, $recPerPage, $pageID);

-        $pendingList = $this->loadModel('approval')->getPendingReviews('review');
-        if($browseType == 'needreview')
+        $reviewList = array();
+        if($this->config->edition == 'max')
        {
-            $reviewList  = $this->loadModel('review')->getByList($pendingList, $orderBy, $pager);
-        }
-        else
-        {
-            $reviewList = $this->loadModel('review')->getUserReviews($browseType, $orderBy, $pager);
+            $this->loadModel('datatable');
+            $this->loadModel('baseline');
+            $this->app->loadLang('review');
+            $this->session->set('reviewList', $this->app->getURI(true));
+            $pendingList = $this->loadModel('approval')->getPendingReviews('review');
+            if($browseType == 'needreview')
+            {
+                $reviewList  = $this->loadModel('review')->getByList($pendingList, $orderBy, $pager);
+            }
+            else
+            {
+                $reviewList = $this->loadModel('review')->getUserReviews($browseType, $orderBy, $pager);
+            }
+            $this->view->products    = $this->my->getProductPairs();
+            $this->view->pendingList = $pendingList;
        }

        $this->view->title       = $this->lang->my->myReview;
        $this->view->users       = $this->loadModel('user')->getPairs('noclosed|noletter');
        $this->view->reviewList  = $reviewList;
-        $this->view->pendingList = $pendingList;
-        $this->view->products    = $this->my->getProductPairs();
        $this->view->recTotal    = $recTotal;
        $this->view->recPerPage  = $recPerPage;
        $this->view->pageID      = $pageID;
@@ -10,6 +10,7 @@ $(function()
            $("#subNavbar li[data-id='bug'] a").append('<span class="label label-light label-badge">' + bugCount + '</span>');
            $("#subNavbar li[data-id='testcase'] a").append('<span class="label label-light label-badge">' + caseCount + '</span>');
            $("#subNavbar li[data-id='testtask'] a").append('<span class="label label-light label-badge">' + testTaskCount + '</span>');
+            $("#subNavbar li[data-id='audit'] a").append('<span class="label label-light label-badge">' + reviewCount + '</span>');

            if(isOpenedURAndSR !== 0) $("#subNavbar li[data-id='requirement'] a").append('<span class="label label-light label-badge">' + requirementCount + '</span>');

@@ -18,7 +19,6 @@ $(function()
            {
                $("#subNavbar li[data-id='issue'] a").append('<span class="label label-light label-badge">' + issueCount + '</span>');
                $("#subNavbar li[data-id='risk'] a").append('<span class="label label-light label-badge">' + riskCount + '</span>');
-                $("#subNavbar li[data-id='audit'] a").append('<span class="label label-light label-badge">' + reviewCount + '</span>');
                $("#subNavbar li[data-id='nc'] a").append('<span class="label label-light label-badge">' + qaCount + '</span>');
                $("#subNavbar li[data-id='myMeeting'] a").append('<span class="label label-light label-badge">' + meetingCount + '</span>');
            }
@@ -0,0 +1,72 @@
+<?php include $app->getModuleRoot() . 'common/view/header.html.php'?>
+<?php js::set('mode', $mode);?>
+<?php js::set('total', $pager->recTotal);?>
+<?php js::set('rawMethod', $app->rawMethod);?>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-left">
+    <?php foreach($lang->review->browseTypeList as $key => $type):?>
+    <?php if(in_array($key, array('all', 'done', 'reviewing'))) continue;?>
+    <?php if($app->rawMethod == 'work' && in_array($key, array('reviewedbyme', 'createdbyme', 'wait'))) continue;?>
+    <?php if($app->rawMethod == 'contribute' && $key == 'wait') continue;?>
+    <?php $active = $key == $browseType ? 'btn-active-text' : '';?>
+    <?php $recTotalLabel = $key == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>": '';?>
+    <?php echo html::a($this->createLink('my', $app->rawMethod, "mode=$mode&browseType=$key"), '<span class="text">' . $type . '</span>' . $recTotalLabel, '', 'class="btn btn-link ' . $active .'"');?>
+    <?php endforeach;?>
+  </div>
+</div>
+<div id="mainContent" class="main-row fade">
+  <div class='main-col'>
+    <?php if(empty($reviewList)):?>
+    <div class="table-empty-tip">
+      <p>
+        <span class="text-muted"><?php echo $lang->noData;?></span>
+      </p>
+    </div>
+    <?php else:?>
+    <form class='main-table' method='post' id='myReviewForm'>
+      <div class="table-header fixed-right">
+        <nav class="btn-toolbar pull-right"></nav>
+      </div>
+      <?php
+      $vars = "mode=$mode&browseType=$browseType&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
+      include $app->getModuleRoot() . 'common/view/datatable.html.php';
+
+      $setting = $this->datatable->getSetting('review');
+      foreach($setting as $key => $value)
+      {
+          if($value->id == 'actions') $setting[$key]->width = 80;
+      }
+
+      $widths  = $this->datatable->setFixedFieldWidth($setting);
+      ?>
+        <table class='table has-sort-head datatable' id='reviewList' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>'>
+          <thead>
+            <tr>
+              <?php
+              foreach($setting as $value)
+              {
+                  if($value->show)
+                  {
+                      $this->datatable->printHead($value, $orderBy, $vars, false);
+                  }
+              }
+              ?>
+            </tr>
+          </thead>
+          <tbody>
+          <?php foreach($reviewList as $review):?>
+          <tr data-id='<?php echo $review->id?>'>
+            <?php foreach($setting as $value) $this->my->reviewPrintCell($value, $review, $users, $products, $pendingList);?>
+          </tr>
+          <?php endforeach;?>
+          </tbody>
+        </table>
+      <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
+    </form>
+    <?php endif;?>
+  </div>
+</div>
+<script>
+$(function(){$('#myReviewForm').table();})
+</script>
+<?php include $app->getModuleRoot() . 'common/view/footer.html.php'?>
@@ -347,7 +347,6 @@ $config->delete['17_0_beta1'][] = 'extension/max/group/ext/lang/zh-cn/zflow.php'
 $config->delete['17_0_beta1'][] = 'extension/max/group/ext/model/flow.php';
 $config->delete['17_0_beta1'][] = 'extension/max/user/ext/model/bizext.php';
 $config->delete['17_0_beta1'][] = 'extension/max/sso/ext/model/bizext.php';
-$config->delete['18_0'][]       = 'extension/max/custom/ext/view/mode.zentaomax.html.hook.php';

 $config->delete['17_2'][] = 'extension/biz/my/ext/view/todo.calendar.html.hook.php';
 $config->delete['17_2'][] = 'extension/max/my/ext/view/todo.calendar.html.hook.php';
@@ -375,6 +374,9 @@ $config->delete['17_2'][] = 'extension/lite/workflowrelation/ext/view/admin.flow
 $config->delete['17_2'][] = 'extension/lite/extension/lite/workflowrule/ext/view/browse.flow.html.hook.php';
 $config->delete['17_2'][] = 'extension/lite/extension/lite/workflowrule/ext/view/view.flow.html.hook.php';

+$config->delete['18_0'][] = 'extension/max/custom/ext/view/mode.zentaomax.html.hook.php';
+$config->delete['18_0'][] = 'extension/max/my/ext/view/audit.html.php';
+
 $config->upgrade->openModules = array('action', 'admin', 'api', 'automation', 'backup', 'block', 'branch', 'budget', 'bug', 'build', 'caselib', 'ci', 'client', 'common', 'company', 'compile', 'convert', 'cron', 'custom', 'datatable', 'dept', 'design', 'dev', 'doc', 'durationestimation', 'entry', 'execution', 'extension', 'file', 'git', 'gitlab', 'group', 'holiday', 'im', 'index', 'index.html', 'install', 'issue', 'jenkins', 'job', 'kanban', 'license', 'mail', 'message', 'misc', 'mr', 'my', 'personnel', 'pipeline', 'product', 'productplan', 'productset', 'program', 'programplan', 'project', 'projectbuild', 'projectplan', 'projectrelease', 'projectstory', 'qa', 'release', 'repo', 'report', 'risk', 'score', 'search', 'setting', 'sonarqube', 'sso', 'stage', 'stakeholder', 'story', 'subject', 'svn', 'task', 'testcase', 'testreport', 'testsuite', 'testtask', 'todo', 'tree', 'tutorial', 'upgrade', 'user', 'webhook', 'weekly', 'workestimation', 'gitea', 'gogs', 'port');

 $config->upgrade->unsetModules = array('design', 'program', 'programplan', 'projectbuild', 'projectrelease', 'stage', 'stakeholder', 'product', 'branch', 'productplan', 'release', 'build', 'qa', 'bug', 'testcase', 'testtask', 'testreport', 'testsuite', 'caselib', 'automation', 'repo', 'ci', 'compile', 'jenkins', 'job', 'svn', 'gitlab', 'sonarqube', 'mr', 'git', 'report', 'sqlbuilder', 'feedback', 'faq', 'attend', 'holiday', 'leave', 'makeup', 'overtime', 'lieu', 'ops', 'host', 'serverroom', 'account', 'domain', 'service', 'deploy', 'conference', 'traincourse', 'pssp', 'baseline', 'classify', 'cm', 'cmcl', 'auditcl', 'reviewcl', 'process', 'activity', 'zoutput', 'auditplan', 'nc', 'subject', 'weekly', 'workestimation', 'issue', 'durationestimation', 'risk', 'opportunity', 'trainplan', 'gapanalysis', 'researchplan', 'researchreport', 'meeting', 'meetingroom', 'budget', 'reviewissue', 'reviewsetting', 'review', 'milestone', 'measurement', 'measrecord', 'assetlib', 'setting', 'im', 'client', 'ldap', 'dev', 'api', 'gitea', 'gogs');