Merge branch 'master' of github.com:easysoft/zentaopms

2020-08-27 13:03:02 +08:00
parent 04508fa14c 17ba1e95e4
commit d51ab5893b
55 changed files with 558 additions and 1692 deletions
@@ -105,10 +105,8 @@ $lang->program->lastIteration      = 'Latest iterations';
 $lang->program->ongoingStage       = 'Ongoing stage';
 $lang->program->scrum              = 'Scrum';
 $lang->program->scrumTitle         = 'Scrum development full process project management';
-$lang->program->scrumDesc          = '<strong>Introduction: </strong>Iterate in small steps, release quickly<br><strong>Contains function points: </strong>Project overview, iterations, plans, stories, etc.';
 $lang->program->cmmi               = 'CMMI';
 $lang->program->cmmiTitle          = 'CMMI management';
-$lang->program->cmmiDesc           = '<strong>Introduction: </strong>Standardized management by stages<br><strong>Contains function points: </strong>Estimate, plan, stage, report, etc.';
 $lang->program->cannotCreateChild  = 'The project already has actual content and can not add subprojects directly. You can create a parent project for the current project and then add a child project under the new parent project.';
 $lang->program->hasChildren        = 'This project has a subproject and can not be deleted.';
 $lang->program->confirmDelete      = 'Do you want to delete this project?';
@@ -105,10 +105,8 @@ $lang->program->lastIteration      = '近期迭代';
 $lang->program->ongoingStage       = '进行中的阶段';
 $lang->program->scrum              = 'Scrum';
 $lang->program->scrumTitle         = '敏捷开发全流程项目管理';
-$lang->program->scrumDesc          = '<strong>简介：</strong>小步迭代，快速发布<br><strong>包含功能点：</strong>项目概览、迭代、计划、需求等';
 $lang->program->cmmi               = '瀑布';
 $lang->program->cmmiTitle          = '瀑布式项目管理';
-$lang->program->cmmiDesc           = '<strong>简介：</strong>按阶段规范化管理<br><strong>包含功能点：</strong>估算、计划、阶段、报告';
 $lang->program->cannotCreateChild  = '该项目已经有实际的内容，无法直接添加子项目。您可以为当前项目创建一个父项目，然后在新的父项目下面添加子项目。';
 $lang->program->hasChildren        = '该项目有子项目存在，不能删除。';
 $lang->program->confirmDelete      = "您确定删除项目[%s]吗？";
@@ -184,6 +184,7 @@ class programModel extends model
        /* Init vars. */
        $this->loadModel('project');
        $programs = $this->getList($status, $orderBy, $pager);
+
        if(empty($programs)) return array();

        $programIdList = array_keys($programs);
@@ -208,9 +209,10 @@ class programModel extends model
        foreach($programs as $programID => $program)
        {
            $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;
+            $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;
+            $program->parentName = $this->project->getProjectParentName($program->parent);
        }

        return $programs;
@@ -49,9 +49,10 @@ foreach($programs as $program)
    ?>
    </div>
    <div class="col-footer">
-      <?php echo html::a(helper::createLink('program', 'createGuide'), '<i class="icon icon-plus"></i>' . $lang->program->create, '', 'class="not-list-item text-primary" data-toggle=modal'); ?>
-      <div class='pull-right'>
+      <div class='pull-left'>
        <?php echo html::a(helper::createLink('program', 'browse', 'status=all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->project->all, '', 'class="not-list-item"'); ?>
+      </div>
+      <div class='pull-right'>
        <span class='text-muted muted'> &nbsp; | &nbsp; </span>
        <a class='toggle-right-col not-list-item'><?php echo $lang->project->doneProjects?><i class='icon icon-angle-right'></i></a>
      </div>
@@ -1,6 +1,6 @@
 <?php $canOrder = (common::hasPriv('program', 'updateOrder') and strpos($orderBy, 'order') !== false)?>
-<form class='main-table auto-fade-in fade' id='programForm' method='post' data-ride='table' data-nested='true' data-expand-nest-child='false' data-checkable='false'>
-  <table class='table has-sort-head table-fixed' id='programList'>
+<form class='main-table' id='programForm' method='post' data-ride='table' data-nested='true' data-expand-nest-child='false' data-checkable='false'>
+  <table class='table has-sort-head table-fixed table-nested' id='programList'>
    <?php $vars = "status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
    <thead>
      <tr>
@@ -22,12 +22,32 @@
    </thead>
    <tbody class='sortable' id='programTableList'>
      <?php foreach($programs as $program):?>
-      <tr data-id='<?php echo $program->id ?>' data-order='<?php echo $program->order ?>'<?php if($program->isCat) echo " data-nested='true'";?><?php if($program->parent) echo " data-nest-parent='$program->parent' data-nest-path='$program->path'";?>>
+      <?php
+      $trClass = '';
+      $trAttrs = "data-id='$program->id' data-order=$program->order";
+      if($program->isCat)
+      {
+          $trAttrs .= " data-nested='true'";
+          if($program->parent == '0') $trClass .= ' is-top-level table-nest-child-hide';
+          else $trClass .= ' is-top-level table-nest-hide';
+      }
+
+      if($program->parent)
+      {
+          if(!$program->isCat) $trClass .= ' is-nest-child';
+          $trClass .= ' table-nest-hide';
+          $trAttrs .= " data-nest-parent='$program->parent' data-nest-path='$program->path'";
+      }
+      else if(!$program->isCat) $trClass .= ' no-nest';
+      $trAttrs .= " class='$trClass'";
+      ?>
+      <tr <?php echo $trAttrs;?>>
        <td class='c-id'>
          <?php printf('%03d', $program->id);?>
        </td>
        <td class='text-left'><?php echo $program->code;?></td>
        <td class='text-left pgm-title table-nest-title' title='<?php echo $program->name?>'>
+          <span class="table-nest-icon icon<?php if($program->isCat) echo ' table-nest-toggle' ?>"></span>
          <?php echo $program->isCat ? $program->name : html::a($this->createLink('program', 'index', "programID=$program->id", '', '', $program->id), $program->name);?>
        </td>
        <td class='c-status'><span class="status-program status-<?php echo $program->status?>"><?php echo zget($lang->project->statusList, $program->status, '');?></span></td>
@@ -19,7 +19,6 @@
          <img class='program-type-img' data-type='scrum' src='<?php echo $config->webRoot . 'theme/default/images/main/scrum.png'?>'>
          <h3><?php echo $lang->program->scrum; ?></h3>
          <p><?php echo $lang->program->scrumTitle; ?></p>
-          <p class='text-left'><?php echo $lang->program->scrumDesc; ?></p>
        </div>
      </div>
      <div class='col-xs-6'>
@@ -27,7 +26,6 @@
          <img class='program-type-img' data-type='cmmi' src='<?php echo $config->webRoot . 'theme/default/images/main/cmmi.png'?>'>
          <h3><?php echo $lang->program->cmmi; ?></h3>
          <p><?php echo $lang->program->cmmiTitle; ?></p>
-          <p class='text-left'><?php echo $lang->program->cmmiDesc; ?></p>
        </div>
      </div>
      </div>