From 5885a75c2e2de188ca2708ee506124149f080075 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 25 Aug 2020 13:15:56 +0800
Subject: [PATCH] * Code for program mothod.

---
 module/block/control.php                      | 2 +-
 module/block/view/recentprogramblock.html.php | 5 +++--
 module/program/model.php                      | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index 5df76e81ed..10d0aca623 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1498,7 +1498,7 @@ class block extends control
     {
         $this->loadModel('project');
 
-        $num    = isset($this->params->num)  ? (int)$this->params->num : 15;
+        $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/recentprogramblock.html.php b/module/block/view/recentprogramblock.html.php
index 8ff4831f67..d8ab8169df 100644
--- a/module/block/view/recentprogramblock.html.php
+++ b/module/block/view/recentprogramblock.html.php
@@ -19,13 +19,14 @@
 #cards .program-detail > p {margin-bottom: 8px;}
 #cards .program-detail .progress {height: 4px;}
 #cards .program-detail .progress-text-left .progress-text {width: 50px; left: -50px;}
+#cards .panel-heading {cursor: pointer;}
 </style>
 <div class='row' id='cards'>
   <?php foreach ($programs as $programID => $program):?>
   <div class='col' data-id='<?php echo $programID?>'>
     <div class='panel' data-url='<?php echo $this->createLink('program', 'index', "programID=$program->id");?>'>
       <div class='panel-heading'>
-        <strong class='program-name' title='<?php echo $program->name;?>'><?php echo $program->name;?></strong>
+        <strong class='program-name' title='<?php echo $program->name;?>'> <?php echo html::a($this->createLink('program', 'index', "programID=$program->id", '', '', $program->id), $program->name);?> </strong>
         <?php if($program->template === 'cmmi'): ?>
         <span class='program-type-label label label-warning label-outline'><?php echo $lang->program->cmmi; ?></span>
         <?php else: ?>
@@ -64,7 +65,7 @@
           <p class='text-muted'><?php echo $lang->program->lastIteration; ?></p>
           <?php if($project):?>
           <div class='row'>
-            <div class='col-xs-5'><?php echo $project->name; ?></div>
+            <div class='col-xs-5'><?php echo $project->name;?></div>
             <div class='col-xs-7'>
             <div class="progress progress-text-left">
               <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->hours->progress;?>%">
diff --git a/module/program/model.php b/module/program/model.php
index 0542042367..77b32ce669 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -189,7 +189,8 @@ class programModel extends model
 
         foreach($programs as $programID => $program)
         {
-            $program->projects  = $this->project->getProjectStats($status, 0, 0, $itemCounts, 'id_desc', $pager, $programID);
+            $orderBy = $program->template == 'cmmi' ? 'id_asc' : 'id_desc';
+            $program->projects  = $this->project->getProjectStats($status, 0, 0, $itemCounts, $orderBy, $pager, $programID);
             $program->teamCount = isset($teams[$programID]) ? $teams[$programID]->count : 0;
             $program->estimate  = isset($estimates[$programID]) ? $estimates[$programID]->estimate : 0;
         }