+ id;?> + name'>" . $program->name . '') : html::a($this->createLink('program', 'view', 'program=' . $program->id), $program->name, '_blank');?> + + arrow . $lang->program->activate;?> + +
++ +
From 99fe956e4b3793d3f53253467a644fdef7d48b36 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 18 Sep 2020 16:48:19 +0800 Subject: [PATCH] * Merge code. --- module/block/control.php | 8 +- .../block/view/programstatisticblock.html.php | 8 +- module/common/lang/zh-cn.php | 5 + module/common/model.php | 2 +- module/common/view/header.html.php | 4 +- module/program/control.php | 173 +++++++++++++--- module/program/css/common.css | 10 +- module/program/js/pgmbrowse.js | 9 + module/program/lang/zh-cn.php | 11 +- module/program/model.php | 184 +++++++++++++++--- .../program/view/ajaxgetpgmdropmenu.html.php | 71 +++++++ module/program/view/pgmactivate.html.php | 77 ++++++++ module/program/view/pgmbrowsebylist.html.php | 7 +- module/program/view/pgmview.html.php | 2 + module/program/view/prjbrowse.html.php | 2 +- 15 files changed, 503 insertions(+), 70 deletions(-) create mode 100644 module/program/js/pgmbrowse.js create mode 100644 module/program/view/ajaxgetpgmdropmenu.html.php create mode 100644 module/program/view/pgmactivate.html.php create mode 100644 module/program/view/pgmview.html.php diff --git a/module/block/control.php b/module/block/control.php index f074c3ae92..bd6344b39e 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -833,15 +833,15 @@ class block extends control $today = helper::today(); $monday = $this->loadModel('weekly')->getThisMonday($today); - $tasks = $this->dao->select("program, + $tasks = $this->dao->select("PRJ, sum(consumed) as totalConsumed, sum(if(status != 'cancel' and status != 'closed', `left`, 0)) as totalLeft") ->from(TABLE_TASK) - ->where('program')->in(array_keys($programs)) + ->where('PRJ')->in(array_keys($programs)) ->andWhere('deleted')->eq(0) ->andWhere('parent')->lt(1) - ->groupBy('program') - ->fetchAll('program'); + ->groupBy('PRJ') + ->fetchAll('PRJ'); foreach($programs as $programID => $program) { diff --git a/module/block/view/programstatisticblock.html.php b/module/block/view/programstatisticblock.html.php index fec3835c2e..b472d222cc 100644 --- a/module/block/view/programstatisticblock.html.php +++ b/module/block/view/programstatisticblock.html.php @@ -118,7 +118,7 @@ $(function()