Merge branch 'sprint/168'

module/program/lang/en.php

@@ -24,7 +24,7 @@ $lang->program->canceledBy   = 'CanceledBy';
 $lang->program->canceledDate = 'CanceledDate';
 $lang->program->team         = 'Team';
 $lang->program->order        = 'Rank';
-$lang->program->days         = 'Available Days';
+$lang->program->days         = 'Days';
 $lang->program->acl          = 'Access Control';
 $lang->program->whitelist    = 'WhiteList';
 $lang->program->deleted      = 'Deleted';
@@ -76,7 +76,7 @@ $lang->program->stakeholderTypeList['inside']  = 'Inside';
 $lang->program->stakeholderTypeList['outside'] = 'Outside';
 
 $lang->program->noProgram          = 'No program.';
-$lang->program->showClosed         = 'Closed programs.';
+$lang->program->showClosed         = 'Closed';
 $lang->program->tips               = 'If a parent item set is selected, products under that parent item set can be associated. If no item set is selected, a product with the same name as the item is created by default and associated with that item.';
 $lang->program->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?";
 $lang->program->beginLetterParent  = "Parent begin date: %s, begin date should be >                  = parent begin date.";

module/program/model.php

@@ -166,10 +166,14 @@ class programModel extends model
             ->andWhere('program')->in(array_keys($programs))
             ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
             ->andWhere('status')->ne('closed')
-            ->fetchGroup('program', 'id');
+            ->orderBy('order_asc')
+            ->fetchGroup('program');
 
         $productPairs = array();
-        foreach($productGroup as $programID => $products) $productPairs = array_merge($productPairs, array_keys($products));
+        foreach($productGroup as $programID => $products) 
+        {
+            foreach($products as $product) $productPairs[$product->id] = $product->id;
+        }
 
         /* Get all plans under products. */
         $plans = $this->dao->select('id, product, title')->from(TABLE_PRODUCTPLAN)
@@ -184,7 +188,6 @@ class programModel extends model
             ->on('t1.project = t2.id')
             ->where('t2.deleted')->eq(0)
             ->andWhere('t1.product')->in($productPairs)
-            ->andWhere('t2.status')->eq('doing')
             ->andWhere('t2.type')->eq('project')
             ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
             ->fetchGroup('product');
@@ -226,11 +229,11 @@ class programModel extends model
         /* Group data by product. */
         foreach($productGroup as $programID => $products)
         {
-            foreach($products as $productID => $product)
+            foreach($products as $product)
             {
-                $product->plans    = zget($plans, $productID, array());
-                $product->releases = zget($releases, $productID, array());
-                $projects          = zget($projectGroup, $productID, array());
+                $product->plans    = zget($plans, $product->id, array());
+                $product->releases = zget($releases, $product->id, array());
+                $projects          = zget($projectGroup, $product->id, array());
                 foreach($projects as $project)
                 {
                     if(helper::diffDate(helper::today(), $project->end) > 0) $project->delay = 1;
@@ -260,11 +263,11 @@ class programModel extends model
 
             if(in_array($programID, $involvedPrograms))
             {
-                $kanbanGroup['my'][$programID] = $programGroup;
+                $kanbanGroup['my'][] = $programGroup;
             }
             else
             {
-                $kanbanGroup['others'][$programID] = $programGroup;
+                $kanbanGroup['others'][] = $programGroup;
             }
         }
 
@@ -909,7 +912,7 @@ class programModel extends model
             ->beginIF(!$isQueryAll)->andWhere('id')->in($this->app->user->view->programs)->fi()
             ->andWhere('deleted')->eq(0)
             ->beginIF($model)->andWhere('model')->eq($model)->fi()
-            ->orderBy('`order`')
+            ->orderBy('`order` asc')
             ->fetchPairs();
     }
 

module/program/view/browse.html.php

@@ -29,11 +29,7 @@
     <?php if(common::hasPriv('project', 'batchEdit') and $programType != 'bygrid') echo html::checkbox('editProject', array('1' => $lang->project->edit), '', $this->cookie->editProject ? 'checked=checked' : '');?>
   </div>
   <div class='pull-right'>
-    <?php if(isset($this->config->maxVersion)):?>
     <?php common::printLink('project', 'createGuide', "programID=0&from=PGM", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-secondary" data-toggle="modal" data-target="#guideDialog"');?>
-    <?php elseif($this->config->systemMode == 'new'):?>
-    <?php common::printLink('project', 'create', "mode=scrum&programID=0", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-secondary"');?>
-    <?php endif;?>
     <?php if(isset($lang->pageActions)) echo $lang->pageActions;?>
   </div>
 </div>

module/program/view/edit.html.php

@@ -85,7 +85,7 @@
         </tr>
         <tr>
           <th><?php echo $lang->project->realBegan;?></th>
-          <td><?php echo html::input('realBegan', helper::isZeroDate($program->realBegan) ? '' : $program->realBegan, "class='form-control form-date'");?></td>
+          <td><?php echo html::input('realBegan', $program->realBegan, "class='form-control form-date'");?></td><td></td><td></td>
         </tr>
         <tr>
           <th><?php echo $lang->program->desc;?></th>

module/program/view/project.html.php

@@ -30,11 +30,7 @@ js::set('browseType', $browseType);
     <?php echo html::checkbox('involved ', array('1' => $lang->project->mine), '', $this->cookie->involved ? 'checked=checked' : '');?>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php if(isset($this->config->maxVersion)):?>
     <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
-    <?php elseif($this->config->systemMode == 'new'):?>
-    <?php common::printLink('project', 'create', "mode=scrum&programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary"');?>
-    <?php endif;?>
   </div>
 </div>
 <div id='mainContent' class="main-row fade">
@@ -43,11 +39,7 @@ js::set('browseType', $browseType);
     <div class="table-empty-tip">
       <p>
         <span class="text-muted"><?php echo $lang->project->empty;?></span>
-        <?php if(isset($this->config->maxVersion)):?>
         <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info btn-wide " data-toggle="modal" data-target="#guideDialog"');?>
-        <?php elseif($this->config->systemMode == 'new'):?>
-        <?php common::printLink('project', 'create', "mode=scrum&programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info btn-wide"');?>
-        <?php endif;?>
       </p>
     </div>
     <?php else:?>