From d62d93baa73ed6d0fc0e75f16f0690525edc496a Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Tue, 25 Aug 2020 08:57:39 +0800
Subject: [PATCH]  * Finish task #7628.

---
 module/block/control.php                    |  7 +++++-
 module/block/view/programteamblock.html.php | 24 +++++++++++++++++++++
 module/design/control.php                   |  7 ++++--
 module/design/js/commit.js                  |  5 +++--
 module/design/view/commit.html.php          | 16 ++++++++++----
 module/repo/view/revision.html.php          |  2 +-
 6 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index b14d058819..13ad92372a 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1450,7 +1450,12 @@ class block extends control
 
     public function printProgramteamBlock()
     {
-    
+        $this->loadModel('project');
+
+        $num    = isset($this->params->num)  ? (int)$this->params->num : 15;
+
+        /* Get projects. */
+        $this->view->programs = $this->loadModel('program')->getUserPrograms('all', 'id_desc', $num);
     }
 
     /**
diff --git a/module/block/view/programteamblock.html.php b/module/block/view/programteamblock.html.php
index e69de29bb2..3d863a5698 100644
--- a/module/block/view/programteamblock.html.php
+++ b/module/block/view/programteamblock.html.php
@@ -0,0 +1,24 @@
+<?php if(empty($programs)): ?>
+<div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
+<?php else:?>
+<div class='panel-body has-table scrollbar-hover'>
+  <table>
+    <thead>
+      <tr>
+        <th class='w-200px'></th>
+        <th><?php echo $lang->program->teamCount;?></th>
+        <th><?php echo $lang->task->consumed;?></th>
+      </tr>
+    </thead>
+    <tbody>
+      <?php foreach($programs as $program):?>
+      <tr>
+        <td title='<?php echo $program->name?>'><?php echo $program->name;?></td>
+        <td><?php echo $program->teamCount;?></td>
+        <td><?php echo $program->consumed;?></td>
+      </tr>
+      <?php endforeach;?>
+    </tbody>
+  </table>
+</div>
+<?php endif;?>
diff --git a/module/design/control.php b/module/design/control.php
index 8b95ae0bd8..2dc9931925 100644
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -220,7 +220,7 @@ class design extends control
      * @access public
      * @return void
      */
-    public function commit($designID, $begin = '', $end = '', $recTotal = 0, $recPerPage = 50, $pageID = 1)
+    public function commit($designID, $repoID = 0, $begin = '', $end = '', $recTotal = 0, $recPerPage = 50, $pageID = 1)
     {
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
@@ -229,8 +229,10 @@ class design extends control
         $begin   = $begin ? date('Y-m-d', strtotime($begin)) : $program->begin;
         $end     = $end ? date('Y-m-d', strtotime($end)) : helper::today();
 
-        $repoID    = $this->session->repoID;
+        $repos     = $this->loadModel('repo')->getRepoPairs();
+        $repoID    = $repoID ? $repoID : key($repos);
         $repo      = $this->loadModel('repo')->getRepoByID($repoID);
+
         $revisions = $this->repo->getCommits($repo, '', 'HEAD', '', $pager, $begin, $end);
 
         if($_POST)
@@ -250,6 +252,7 @@ class design extends control
         $this->view->title           = $this->lang->design->commit;
         $this->view->position[]      = $this->lang->design->commit;
 
+        $this->view->repos           = $repos;
         $this->view->repoID          = $repoID;
         $this->view->repo            = $repo;
         $this->view->revisions       = $revisions;
diff --git a/module/design/js/commit.js b/module/design/js/commit.js
index 3d87736b51..53a1c9eb66 100644
--- a/module/design/js/commit.js
+++ b/module/design/js/commit.js
@@ -1,7 +1,8 @@
-$('#begin, #end').change(function()
+$('#begin, #end, #repo').change(function()
 {
     var begin   = $('#begin').val();
     var end     = $('#end').val();
+    var repo    = $('#repo').val();
 
     if(begin.indexOf('-') != -1) 
     {   
@@ -16,5 +17,5 @@ $('#begin, #end').change(function()
         for(i = 0 ; i < endarray.length ; i++) end = end + endarray[i];
     }
 
-    location.href = createLink('design', 'commit', "designID=" + designID + '&begin=' + begin + '&end=' + end);
+    location.href = createLink('design', 'commit', "designID=" + designID + '&repoID=' + repo + '&begin=' + begin + '&end=' + end);
 })
diff --git a/module/design/view/commit.html.php b/module/design/view/commit.html.php
index 1ee3f9c087..c194f9c363 100644
--- a/module/design/view/commit.html.php
+++ b/module/design/view/commit.html.php
@@ -20,10 +20,18 @@
     </h2>
   </div>
   <div class='searchBox'>
-    <h4><?php echo $lang->design->commitDate . '：';?></h4>
-    <?php echo html::input('begin', $begin, "class='form-control form-date srearch-date'");?>
-    <span>~</span>
-  <?php echo html::input('end', $end, "class='form-control form-date srearch-date'");?>
+    <table class="table">
+      <tr>
+        <td class="w-100px"><h4><?php echo $lang->repo->maintain . ': ';?></h4></td>
+        <td><?php echo html::select('repo', $repos, $repoID, "class='form-control chosen'");?></td>
+        <td>
+          <h4><?php echo $lang->design->commitDate . '：';?></h4>
+          <?php echo html::input('begin', $begin, "class='form-control form-date srearch-date'");?>
+          <span>~</span>
+          <?php echo html::input('end', $end, "class='form-control form-date srearch-date'");?>
+        </td>
+      </tr>
+    </table>
   </div>
   <form id='logForm' class='main-table form-ajax' data-ride='table' action=<?php echo inlink('commit', "designID=$designID");?> method='post'>
     <table class='table'>
diff --git a/module/repo/view/revision.html.php b/module/repo/view/revision.html.php
index f0080d1c7a..2482d0e98b 100644
--- a/module/repo/view/revision.html.php
+++ b/module/repo/view/revision.html.php
@@ -19,7 +19,7 @@ $typeInfo = $type == 'file' ? '&type=file' : '';
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php echo html::a($this->repo->createLink('browse', "repoID=$repoID", $preDir), "<i class='icon icon-back'></i>" . $lang->goback, '', "class='btn btn-link'");?>
+    <?php echo html::a($this->repo->createLink('browse', "repoID=$repoID", $preDir), "<i class='icon icon-back'></i>" . $lang->goback, '', "class='btn btn-secondary'");?>
     <div class="divider"></div>
     <div class="page-title">
       <?php echo $lang->repo->revisionA . ' ' . ($repo->SCM == 'Git' ? $this->repo->getGitRevisionName($revision, $log->commit) : $revision);?>