* Delete unused file and fix menu.

2020-09-16 14:05:13 +08:00
parent c890125ee8
commit d624251ab6
7 changed files with 33 additions and 117 deletions
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -121,8 +121,8 @@ $lang->common->common = '公有模块';
 /* 主导航菜单。*/
 $lang->mainNav = new stdclass();
 $lang->mainNav->my         = '<i class="icon icon-menu-my"></i> 地盘|my|index|';
-$lang->mainNav->programset = '<i class="icon icon-menu-project"></i> 项目集|programset|index|';
-$lang->mainNav->program    = '<i class="icon icon-menu-project"></i> 项目|program|browse|';
+$lang->mainNav->program    = '<i class="icon icon-menu-project"></i> 项目集|program|pgmindex|';
+$lang->mainNav->project    = '<i class="icon icon-menu-project"></i> 项目|program|prjbrowse|';
 $lang->mainNav->system     = '<i class="icon icon-menu-users"></i> 组织|custom|estimate|';
 $lang->mainNav->admin      = '<i class="icon icon-menu-backend"></i> 后台|admin|index|';

@@ -130,10 +130,10 @@ $lang->reporting = new stdclass();
 $lang->dividerMenu = ',admin,';

 /* Program set menu. */
-$lang->programset = new stdclass();
-$lang->programset->menu = new stdclass();
-$lang->programset->menu->index   = '主页|programset|index|';
-$lang->programset->menu->browse  = '项目集|programset|browse|';
+$lang->program = new stdclass();
+$lang->program->menu = new stdclass();
+$lang->program->menu->index   = '主页|program|pgmindex|';
+$lang->program->menu->browse  = '项目集|program|pgmbrowse|';

 /* Scrum menu. */
 $lang->menu = new stdclass();
@@ -896,6 +896,6 @@ if($config->URAndSR)
 }

 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule   = array('my', 'todo', 'effort', 'program', 'programset', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'holiday', 'custom', 'auditcl', 'subject', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+$lang->noMenuModule   = array('my', 'todo', 'effort', 'program', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'holiday', 'custom', 'auditcl', 'subject', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');

 include (dirname(__FILE__) . '/menuOrder.php');
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -525,7 +525,7 @@ class commonModel extends model
        {
            $active = '';
            list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav);
-            if($moduleName == $group) $active = 'active';
+            if($moduleName != 'program' && $moduleName == $group) $active = 'active';
            if(zget($lang->navGroup, $moduleName, '') == $group) $active = 'active';
            if(common::hasPriv($currentModule, $currentMethod)) echo "<li class=$active>" . html::a(helper::createLink($currentModule, $currentMethod, $vars), $title) . '</li>';
            if(($lastMenu != $nav) && strpos($lang->dividerMenu, ",{$group},") !== false) echo "<li class='divider'></li>";
@@ -548,7 +548,7 @@ class commonModel extends model
        global $app, $lang, $config;

        /* If program, return.*/
-        if($moduleName == 'program' and $methodName != 'index') return;
+        if($moduleName == 'program' and strpos($methodName, 'prj') !== false) return;

        /* Set the main main menu. */
        $mainMenu      = $moduleName;
@@ -2157,11 +2157,17 @@ EOD;
            $lang->menu      = $lang->admin->menu;
            $lang->menuOrder = $lang->admin->menuOrder;
        }
-        if($group == 'programset')     
+        if($group == 'program') 
        {
-            $lang->menu = $lang->programset->menu;
+            if($moduleName == 'program')
+            {
+                $lang->menu = $lang->program->menu;
+            }
+            else
+            {
+                $lang->menu = self::getProgramMainMenu($moduleName);
+            }
        }
-        if($group == 'program') $lang->menu = self::getProgramMainMenu($moduleName);
    }

    /**
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -9,6 +9,18 @@ class program extends control
        $this->programs = $this->program->getPairs();
    }

+    /**
+     * Program home page.
+     *
+     * @access public
+     * @return void
+     */
+    public function PGMIndex()
+    {
+        $this->lang->navGroup->program = 'program';
+        $this->display();
+    }
+
    /**
     * Program index view.
     *
@@ -30,7 +42,7 @@ class program extends control
    }

    /**
-     * Program list.
+     * Project list.
     *
     * @param  varchar $status
     * @param  varchar $orderBy
@@ -40,8 +52,9 @@ class program extends control
     * @access public
     * @return void
     */
-    public function browse($status = 'doing', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 50, $pageID = 1)
+    public function PGMBrowse($status = 'doing', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 50, $pageID = 1)
    {
+        $this->lang->navGroup->program = 'program';
        if(common::hasPriv('program', 'createGuide')) $this->lang->pageActions = html::a($this->createLink('program', 'createGuide'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->program->create, '', "class='btn btn-primary' data-toggle=modal");

        $this->app->session->set('programList', $this->app->getURI(true));
--- a/module/program/view/pgmbrowse.html.php
+++ b/module/program/view/pgmbrowse.html.php
--- a/module/program/view/pgmindex.html.php
+++ b/module/program/view/pgmindex.html.php
--- a/module/programset/control.php
+++ b/module/programset/control.php
@@ -1,13 +0,0 @@
-<?php
-class programset extends control
-{
-    public function index()
-    {
-        $this->display(); 
-    }
-
-    public function browse()
-    {
-        $this->display(); 
-    }
-}
--- a/module/programset/view/browse.html.php
+++ b/module/programset/view/browse.html.php
@@ -1,90 +0,0 @@
-<?php include '../../common/view/header.html.php';?>
-<div id='mainContent' class='main-row'>
-  <?php if(empty($programsets)):?>
-  <div class="table-empty-tip">
-    <p><span class="text-muted"><?php echo $lang->programset->noProgramset;?></span> <?php common::printLink('programset', 'createguide', '', "<i class='icon icon-plus'></i> " . $lang->programset->create, '', "class='btn btn-info' data-toggle=modal");?></p>
-  </div>
-  <?php else:?>
-  <div class='main-col'>
-    <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>
-            <th class='c-id w-80px'>
-              <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
-            </th>
-            <th class='w-100px'><?php common::printOrderLink('code', $orderBy, $vars, $lang->program->code);?></th>
-            <th class='table-nest-title'><?php common::printOrderLink('name', $orderBy, $vars, $lang->program->name);?></th>
-            <th class='w-80px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->program->status);?></th>
-            <th class='w-100px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->program->begin);?></th>
-            <th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->program->end);?></th>
-            <th class='w-100px'><?php common::printOrderLink('budget', $orderBy, $vars, $lang->program->budget);?></th>
-            <th class='w-100px'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->program->PM);?></th>
-            <th class='text-center w-240px'><?php echo $lang->actions;?></th>
-          </tr>
-        </thead>
-        <tbody id='programTableList'>
-          <?php foreach($programs as $program):?>
-          <?php
-          $trClass = '';
-          $trAttrs = "data-id='$program->id' data-order='$program->order' data-parent='$program->parent'";
-          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>
-            <td class='text-center'><?php echo $program->begin;?></td>
-            <td class='text-center'><?php echo $program->end == '0000-00-00' ? '' : $program->end;?></td>
-            <td class='text-left'><?php echo $program->budget . ' ' . zget($lang->program->unitList, $program->budgetUnit);?></td>
-            <td><?php echo zget($users, $program->PM);?></td>
-            <td class='text-center c-actions'>
-              <?php common::printIcon('program', 'group', "programID=$program->id", $program, 'list', 'group');?>
-              <?php common::printIcon('program', 'manageMembers', "programID=$program->id", $program, 'list', 'persons');?>
-              <?php common::printIcon('program', 'start', "programID=$program->id", $program, 'list', '', '', 'iframe', true);?>
-              <?php common::printIcon('program', 'activate', "programID=$program->id", $program, 'list', '', '', 'iframe', true);?>
-              <?php common::printIcon('program', 'suspend', "programID=$program->id", $program, 'list', '', '', 'iframe', true);?>
-              <?php common::printIcon('program', 'close', "programID=$program->id", $program, 'list', '', '', 'iframe', true);?>
-              <?php if(common::hasPriv('program', 'edit')) echo html::a($this->createLink("program", "edit", "programID=$program->id"), "<i class='icon-edit'></i>", '', "class='btn' title='{$lang->edit}'");?>
-              <?php common::printIcon('program', 'create', "template=&programID=$program->id", '', 'list', 'treemap-alt', '', '', '', '', $this->lang->program->children);?>
-              <?php if(common::hasPriv('program', 'delete')) echo html::a($this->createLink("program", "delete", "programID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$lang->delete}'");?>
-            </td>
-          </tr>
-          <?php endforeach;?>
-        </tbody>
-      </table>
-      <div class='table-footer'>
-        <?php $pager->show('right', 'pagerjs');?>
-      </div>
-    </form>
-  </div>
-  <?php endif;?>
-</div>
-<style>
-.w-240px {width:240px;}
-#programsetTableList.sortable-sorting > tr {opacity: 0.7}
-#programsetTableList.sortable-sorting > tr.drag-row {opacity: 1;}
-#programsetTableList > tr.drop-not-allowed {opacity: 0.1!important}
-</style>
-<?php include '../../common/view/footer.html.php';?>