diff --git a/config/zentaopms.php b/config/zentaopms.php
index 59ea1c162a..63fb73f861 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -189,7 +189,6 @@ if(!defined('TABLE_LANG')) define('TABLE_LANG', '`' . $config->db-
if(!defined('TABLE_DESIGN')) define('TABLE_DESIGN', '`' . $config->db->prefix . 'design`');
if(!defined('TABLE_DESIGNSPEC')) define('TABLE_DESIGNSPEC', '`' . $config->db->prefix . 'designspec`');
if(!defined('TABLE_PROJECTSPEC')) define('TABLE_PROJECTSPEC', '`' . $config->db->prefix . 'projectspec`');
-if(!defined('TABLE_BUDGET')) define('TABLE_BUDGET', '`' . $config->db->prefix . 'budget`');
if(!defined('TABLE_SEARCHINDEX')) define('TABLE_SEARCHINDEX', $config->db->prefix . 'searchindex');
if(!defined('TABLE_SEARCHDICT')) define('TABLE_SEARCHDICT', $config->db->prefix . 'searchdict');
@@ -221,7 +220,6 @@ $config->objectTables['entry'] = TABLE_ENTRY;
$config->objectTables['webhook'] = TABLE_WEBHOOK;
$config->objectTables['design'] = TABLE_DESIGN;
$config->objectTables['stakeholder'] = TABLE_STAKEHOLDER;
-$config->objectTables['budget'] = TABLE_BUDGET;
$config->objectTables['job'] = TABLE_JOB;
/* Program privs.*/
diff --git a/db/update15.0.sql b/db/update15.0.sql
index cfabe33029..124204cbbb 100644
--- a/db/update15.0.sql
+++ b/db/update15.0.sql
@@ -129,23 +129,6 @@ CREATE TABLE IF NOT EXISTS `zt_projectspec` (
UNIQUE KEY `project` (`project`,`version`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_budget`;
-CREATE TABLE IF NOT EXISTS `zt_budget` (
- `id` int(8) NOT NULL AUTO_INCREMENT,
- `PRJ` mediumint(8) NOT NULL,
- `stage` char(30) NOT NULL,
- `subject` mediumint(8) NOT NULL,
- `amount` char(30) NOT NULL,
- `name` varchar(255) NOT NULL,
- `desc` text NOT NULL,
- `createdBy` char(30) NOT NULL,
- `createdDate` date NOT NULL,
- `lastEditedBy` char(30) NOT NULL,
- `lastEditedDate` date NOT NULL,
- `deleted` enum('0','1') NOT NULL DEFAULT '0',
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
ALTER TABLE `zt_task` ADD `design` mediumint(8) unsigned NOT NULL AFTER `module`;
ALTER TABLE `zt_task` ADD `version` smallint(6) NOT NULL AFTER `desc`;
ALTER TABLE `zt_task` ADD `activatedDate` date NOT NULL AFTER `lastEditedDate`;
diff --git a/db/zentao.sql b/db/zentao.sql
index c90b2cb1d2..4bdc98a4b4 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -148,22 +148,6 @@ CREATE TABLE IF NOT EXISTS `zt_bug` (
KEY `result` (`result`),
KEY `assignedTo` (`assignedTo`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_budget`;
-CREATE TABLE IF NOT EXISTS `zt_budget` (
- `id` int(8) NOT NULL AUTO_INCREMENT,
- `PRJ` mediumint(8) NOT NULL,
- `stage` char(30) NOT NULL,
- `subject` mediumint(8) NOT NULL,
- `amount` char(30) NOT NULL,
- `name` varchar(255) NOT NULL,
- `desc` text NOT NULL,
- `createdBy` char(30) NOT NULL,
- `createdDate` date NOT NULL,
- `lastEditedBy` char(30) NOT NULL,
- `lastEditedDate` date NOT NULL,
- `deleted` enum('0','1') NOT NULL DEFAULT '0',
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `zt_build`;
CREATE TABLE IF NOT EXISTS `zt_build` (
`id` mediumint(8) unsigned NOT NULL auto_increment,
diff --git a/module/budget/config.php b/module/budget/config.php
deleted file mode 100644
index 0364a0fd80..0000000000
--- a/module/budget/config.php
+++ /dev/null
@@ -1,9 +0,0 @@
-budget = new stdclass();
-$config->budget->editor = new stdclass();
-$config->budget->create = new stdclass();
-
-$config->budget->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
-$config->budget->editor->edit = array('id' => 'desc', 'tools' => 'simpleTools');
-
-$config->budget->create->requiredFields = 'stage,subject,name';
diff --git a/module/budget/control.php b/module/budget/control.php
deleted file mode 100644
index e0b690534c..0000000000
--- a/module/budget/control.php
+++ /dev/null
@@ -1,221 +0,0 @@
-
- * @package budget
- * @version $Id: control.php 5107 2013-07-12 01:46:12Z chencongzhi520@gmail.com $
- * @link http://www.zentao.net
- */
-class budget extends control
-{
- /**
- * __construct
- *
- * @param string $module
- * @param string $method
- * @access public
- * @return void
- */
- public function __construct($module = '', $method = '')
- {
- parent::__construct($module, $method);
- $this->view->project = $this->loadModel('program')->getPRJByID($this->session->PRJ);
- }
-
- /**
- * The budget browse page.
- *
- * @param string $orderBy
- * @param int $recTotal
- * @param int $recPerPage
- * @param int $pageID
- * @access public
- * @return void
- */
- public function browse($orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
- {
- $this->app->loadClass('pager', $static = true);
- $pager = pager::init($recTotal, $recPerPage, $pageID);
-
- $this->view->title = $this->lang->budget->list . $this->lang->colon . $this->lang->budget->common;
- $this->view->position[] = $this->lang->budget->common;
- $this->view->position[] = $this->lang->budget->list;
-
- $this->view->budgets = $this->budget->getList($this->session->PRJ, $orderBy, $pager);
- $this->view->orderBy = $orderBy;
- $this->view->pager = $pager;
- $this->view->modules = $this->loadModel('tree')->getOptionMenu(0, 'subject');
- $this->view->stages = $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
- $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
- $this->display();
- }
-
- /**
- * The budget summary page.
- *
- * @access public
- * @return void
- */
- public function summary()
- {
- $subjects = $this->budget->getSubjectStructure();
-
- $this->view->title = $this->lang->budget->summary . $this->lang->colon . $this->lang->budget->common;
- $this->view->position[] = $this->lang->budget->common;
- $this->view->position[] = $this->lang->budget->summary;
-
- $this->view->subjects = $subjects;
- $this->view->hasSubSubject = $this->budget->checkSubSubject($subjects);
- $this->view->plans = $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
- $this->view->summary = $this->budget->getSummary($this->session->PRJ, $subjects);
- $this->view->modules = $this->loadModel('tree')->getOptionMenu(0, $viewType = 'subject', $startModuleID = 0);
-
- $this->display();
- }
-
- /**
- * Create a budget.
- *
- * @access public
- * @return void
- */
- public function create()
- {
- if($_POST)
- {
- $budgetID = $this->budget->create();
- if(dao::isError())
- {
- $response = array('result' => 'fail', 'message' => dao::getError());
- $this->send($response);
- }
-
- $this->loadModel('action')->create('budget', $budgetID, 'created');
- $response = array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'));
- $this->send($response);
- }
-
- $this->view->title = $this->lang->budget->create . $this->lang->colon . $this->lang->budget->common;
- $this->view->position[] = $this->lang->budget->common;
- $this->view->position[] = $this->lang->budget->create;
-
- $this->view->subjects = array(0 => '') + $this->budget->getSubjectOption();
- $this->view->plans = $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
- $this->display();
- }
-
- /**
- * Edit a budget.
- *
- * @param int $budgetID
- * @access public
- * @return void
- */
- public function edit($budgetID)
- {
- if($_POST)
- {
- $changes = $this->budget->update($budgetID);
- if(dao::isError())
- {
- $response = array('result' => 'fail', 'message' => dao::getError());
- $this->send($response);
- }
-
- if($changes)
- {
- $actionID = $this->loadModel('action')->create('budget', $budgetID, 'edited');
- $this->action->logHistory($actionID, $changes);
- }
-
- $response = array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'));
- $this->send($response);
- }
-
- $this->view->title = $this->lang->budget->edit . $this->lang->colon . $this->lang->budget->common;
- $this->view->position[] = $this->lang->budget->common;
- $this->view->position[] = $this->lang->budget->edit;
-
- $this->view->subjects = array('' => '') + $this->budget->getSubjectOption();
- $this->view->plans = $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
- $this->view->budget = $this->budget->getByID($budgetID);
- $this->display();
- }
-
- /**
- * Budget details.
- *
- * @param int $budgetID
- * @access public
- * @return void
- */
- public function view($budgetID)
- {
- $this->view->title = $this->lang->budget->common . $this->lang->colon . $this->lang->budget->view;
- $this->view->position[] = $this->lang->budget->common;
- $this->view->position[] = $this->lang->budget->view;
-
- $this->view->subjects = $this->budget->getSubjectOption();
- $this->view->plans = $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
- $this->view->budget = $this->budget->getByID($budgetID);
- $this->view->actions = $this->loadModel('action')->getList('budget', $budgetID);
- $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
-
- $this->display();
- }
-
- /**
- * Delete a budget.
- *
- * @param int $budgetID
- * @param varchar $confirm
- * @access public
- * @return void
- */
- public function delete($budgetID = 0, $confirm = 'no')
- {
- if($confirm == 'no')
- {
- echo js::confirm($this->lang->budget->confirmDelete, inLink('delete', "budgetID=$budgetID&confirm=yes"));
- die();
- }
- else
- {
- $this->budget->delete(TABLE_BUDGET, $budgetID);
- die(js::locate(inlink('browse'), 'parent'));
- }
- }
-
- /**
- * Batch create budgets.
- *
- * @access public
- * @return void
- */
- public function batchCreate()
- {
- if($_POST)
- {
- $this->budget->batchCreate();
- if(dao::isError())
- {
- $response = array('result' => 'fail', 'message' => dao::getError());
- $this->send($response);
- }
-
- $response = array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'));
- $this->send($response);
- }
-
- $this->view->title = $this->lang->budget->batchCreate . $this->lang->colon . $this->lang->budget->common;
- $this->view->position[] = $this->lang->budget->common;
- $this->view->position[] = $this->lang->budget->batchCreate;
-
- $this->view->subjects = array('' => '') + $this->budget->getSubjectOption();
- $this->view->plans = $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
- $this->display();
- }
-}
diff --git a/module/budget/css/common.css b/module/budget/css/common.css
deleted file mode 100644
index b42452795d..0000000000
--- a/module/budget/css/common.css
+++ /dev/null
@@ -1 +0,0 @@
-#pageNav{display: none}
diff --git a/module/budget/lang/de.php b/module/budget/lang/de.php
deleted file mode 100644
index 56050830ba..0000000000
--- a/module/budget/lang/de.php
+++ /dev/null
@@ -1,42 +0,0 @@
-budget->create = 'Create Budget';
-$lang->budget->edit = 'Edit';
-$lang->budget->total = 'Total Budget';
-$lang->budget->summary = 'Summary';
-$lang->budget->browse = 'Budget';
-$lang->budget->list = 'Budget List';
-$lang->budget->view = 'Budget Detail';
-$lang->budget->delete = 'Delete';
-$lang->budget->batchCreate = 'Batch Create';
-$lang->budget->common = 'Estimate Cost';
-$lang->budget->id = 'ID';
-$lang->budget->stage = 'Stage';
-$lang->budget->subject = 'Category';
-$lang->budget->name = 'Item';
-$lang->budget->amount = 'Estimated';
-$lang->budget->desc = 'Description';
-$lang->budget->CNY = 'RMB';
-$lang->budget->USD = 'USD';
-$lang->budget->HKD = 'HKD';
-$lang->budget->NTD = 'New Taiwan';
-$lang->budget->EUR = 'Euro';
-$lang->budget->DEM = 'Deutsche Mark';
-$lang->budget->CHF = 'Swiss Franc';
-$lang->budget->FRF = 'French Franc';
-$lang->budget->GBP = 'Pound';
-$lang->budget->NLG = 'Florin';
-$lang->budget->CAD = 'Canadian';
-$lang->budget->RUR = 'Russian Ruble';
-$lang->budget->INR = 'Indian';
-$lang->budget->AUD = 'Australian';
-$lang->budget->NZD = 'New Zealand';
-$lang->budget->THB = 'Thai Baht';
-$lang->budget->SGD = 'Singapore';
-$lang->budget->createdBy = 'CreatedBy';
-$lang->budget->createdDate = 'CreatedDate';
-$lang->budget->lastEditedBy = 'LastEditBy';
-$lang->budget->lastEditedDate = 'LastEditedDate';
-$lang->budget->basicInfo = 'Basic Info.';
-
-$lang->budget->summaryReport = 'Summary';
-$lang->budget->confirmDelete = 'Do you want to delete it?';
diff --git a/module/budget/lang/en.php b/module/budget/lang/en.php
deleted file mode 100644
index 56050830ba..0000000000
--- a/module/budget/lang/en.php
+++ /dev/null
@@ -1,42 +0,0 @@
-budget->create = 'Create Budget';
-$lang->budget->edit = 'Edit';
-$lang->budget->total = 'Total Budget';
-$lang->budget->summary = 'Summary';
-$lang->budget->browse = 'Budget';
-$lang->budget->list = 'Budget List';
-$lang->budget->view = 'Budget Detail';
-$lang->budget->delete = 'Delete';
-$lang->budget->batchCreate = 'Batch Create';
-$lang->budget->common = 'Estimate Cost';
-$lang->budget->id = 'ID';
-$lang->budget->stage = 'Stage';
-$lang->budget->subject = 'Category';
-$lang->budget->name = 'Item';
-$lang->budget->amount = 'Estimated';
-$lang->budget->desc = 'Description';
-$lang->budget->CNY = 'RMB';
-$lang->budget->USD = 'USD';
-$lang->budget->HKD = 'HKD';
-$lang->budget->NTD = 'New Taiwan';
-$lang->budget->EUR = 'Euro';
-$lang->budget->DEM = 'Deutsche Mark';
-$lang->budget->CHF = 'Swiss Franc';
-$lang->budget->FRF = 'French Franc';
-$lang->budget->GBP = 'Pound';
-$lang->budget->NLG = 'Florin';
-$lang->budget->CAD = 'Canadian';
-$lang->budget->RUR = 'Russian Ruble';
-$lang->budget->INR = 'Indian';
-$lang->budget->AUD = 'Australian';
-$lang->budget->NZD = 'New Zealand';
-$lang->budget->THB = 'Thai Baht';
-$lang->budget->SGD = 'Singapore';
-$lang->budget->createdBy = 'CreatedBy';
-$lang->budget->createdDate = 'CreatedDate';
-$lang->budget->lastEditedBy = 'LastEditBy';
-$lang->budget->lastEditedDate = 'LastEditedDate';
-$lang->budget->basicInfo = 'Basic Info.';
-
-$lang->budget->summaryReport = 'Summary';
-$lang->budget->confirmDelete = 'Do you want to delete it?';
diff --git a/module/budget/lang/fr.php b/module/budget/lang/fr.php
deleted file mode 100644
index 56050830ba..0000000000
--- a/module/budget/lang/fr.php
+++ /dev/null
@@ -1,42 +0,0 @@
-budget->create = 'Create Budget';
-$lang->budget->edit = 'Edit';
-$lang->budget->total = 'Total Budget';
-$lang->budget->summary = 'Summary';
-$lang->budget->browse = 'Budget';
-$lang->budget->list = 'Budget List';
-$lang->budget->view = 'Budget Detail';
-$lang->budget->delete = 'Delete';
-$lang->budget->batchCreate = 'Batch Create';
-$lang->budget->common = 'Estimate Cost';
-$lang->budget->id = 'ID';
-$lang->budget->stage = 'Stage';
-$lang->budget->subject = 'Category';
-$lang->budget->name = 'Item';
-$lang->budget->amount = 'Estimated';
-$lang->budget->desc = 'Description';
-$lang->budget->CNY = 'RMB';
-$lang->budget->USD = 'USD';
-$lang->budget->HKD = 'HKD';
-$lang->budget->NTD = 'New Taiwan';
-$lang->budget->EUR = 'Euro';
-$lang->budget->DEM = 'Deutsche Mark';
-$lang->budget->CHF = 'Swiss Franc';
-$lang->budget->FRF = 'French Franc';
-$lang->budget->GBP = 'Pound';
-$lang->budget->NLG = 'Florin';
-$lang->budget->CAD = 'Canadian';
-$lang->budget->RUR = 'Russian Ruble';
-$lang->budget->INR = 'Indian';
-$lang->budget->AUD = 'Australian';
-$lang->budget->NZD = 'New Zealand';
-$lang->budget->THB = 'Thai Baht';
-$lang->budget->SGD = 'Singapore';
-$lang->budget->createdBy = 'CreatedBy';
-$lang->budget->createdDate = 'CreatedDate';
-$lang->budget->lastEditedBy = 'LastEditBy';
-$lang->budget->lastEditedDate = 'LastEditedDate';
-$lang->budget->basicInfo = 'Basic Info.';
-
-$lang->budget->summaryReport = 'Summary';
-$lang->budget->confirmDelete = 'Do you want to delete it?';
diff --git a/module/budget/lang/vi.php b/module/budget/lang/vi.php
deleted file mode 100644
index 56050830ba..0000000000
--- a/module/budget/lang/vi.php
+++ /dev/null
@@ -1,42 +0,0 @@
-budget->create = 'Create Budget';
-$lang->budget->edit = 'Edit';
-$lang->budget->total = 'Total Budget';
-$lang->budget->summary = 'Summary';
-$lang->budget->browse = 'Budget';
-$lang->budget->list = 'Budget List';
-$lang->budget->view = 'Budget Detail';
-$lang->budget->delete = 'Delete';
-$lang->budget->batchCreate = 'Batch Create';
-$lang->budget->common = 'Estimate Cost';
-$lang->budget->id = 'ID';
-$lang->budget->stage = 'Stage';
-$lang->budget->subject = 'Category';
-$lang->budget->name = 'Item';
-$lang->budget->amount = 'Estimated';
-$lang->budget->desc = 'Description';
-$lang->budget->CNY = 'RMB';
-$lang->budget->USD = 'USD';
-$lang->budget->HKD = 'HKD';
-$lang->budget->NTD = 'New Taiwan';
-$lang->budget->EUR = 'Euro';
-$lang->budget->DEM = 'Deutsche Mark';
-$lang->budget->CHF = 'Swiss Franc';
-$lang->budget->FRF = 'French Franc';
-$lang->budget->GBP = 'Pound';
-$lang->budget->NLG = 'Florin';
-$lang->budget->CAD = 'Canadian';
-$lang->budget->RUR = 'Russian Ruble';
-$lang->budget->INR = 'Indian';
-$lang->budget->AUD = 'Australian';
-$lang->budget->NZD = 'New Zealand';
-$lang->budget->THB = 'Thai Baht';
-$lang->budget->SGD = 'Singapore';
-$lang->budget->createdBy = 'CreatedBy';
-$lang->budget->createdDate = 'CreatedDate';
-$lang->budget->lastEditedBy = 'LastEditBy';
-$lang->budget->lastEditedDate = 'LastEditedDate';
-$lang->budget->basicInfo = 'Basic Info.';
-
-$lang->budget->summaryReport = 'Summary';
-$lang->budget->confirmDelete = 'Do you want to delete it?';
diff --git a/module/budget/lang/zh-cn.php b/module/budget/lang/zh-cn.php
deleted file mode 100644
index 6945013bc7..0000000000
--- a/module/budget/lang/zh-cn.php
+++ /dev/null
@@ -1,42 +0,0 @@
-budget->create = '新建';
-$lang->budget->edit = '编辑';
-$lang->budget->total = '总预算';
-$lang->budget->summary = '汇总';
-$lang->budget->browse = '列表';
-$lang->budget->list = '列表';
-$lang->budget->view = '详情';
-$lang->budget->delete = '删除';
-$lang->budget->batchCreate = '批量新建';
-$lang->budget->common = '费用估算';
-$lang->budget->id = '编号';
-$lang->budget->stage = '阶段';
-$lang->budget->subject = '科目';
-$lang->budget->name = '费用名称';
-$lang->budget->amount = '预计金额';
-$lang->budget->desc = '说明';
-$lang->budget->CNY = '人民币';
-$lang->budget->USD = '美元';
-$lang->budget->HKD = '港元';
-$lang->budget->NTD = '台元';
-$lang->budget->EUR = '欧元';
-$lang->budget->DEM = '马克';
-$lang->budget->CHF = '瑞士法郎';
-$lang->budget->FRF = '法国法郎';
-$lang->budget->GBP = '英镑';
-$lang->budget->NLG = '荷兰盾';
-$lang->budget->CAD = '加拿大元';
-$lang->budget->RUR = '卢布';
-$lang->budget->INR = '卢比';
-$lang->budget->AUD = '澳大利亚元';
-$lang->budget->NZD = '新西兰元';
-$lang->budget->THB = '泰国铢';
-$lang->budget->SGD = '新加坡元';
-$lang->budget->createdBy = '由谁创建';
-$lang->budget->createdDate = '创建时间';
-$lang->budget->lastEditedBy = '由谁编辑';
-$lang->budget->lastEditedDate = '编辑时间';
-$lang->budget->basicInfo = '基本信息';
-
-$lang->budget->summaryReport = '汇总表';
-$lang->budget->confirmDelete = '您确定要删除吗？';
diff --git a/module/budget/lang/zh-tw.php b/module/budget/lang/zh-tw.php
deleted file mode 100644
index 9b77549e1f..0000000000
--- a/module/budget/lang/zh-tw.php
+++ /dev/null
@@ -1,42 +0,0 @@
-budget->create = '新建';
-$lang->budget->edit = '編輯';
-$lang->budget->total = '總預算';
-$lang->budget->summary = '彙總';
-$lang->budget->browse = '列表';
-$lang->budget->list = '列表';
-$lang->budget->view = '詳情';
-$lang->budget->delete = '刪除';
-$lang->budget->batchCreate = '批量新建';
-$lang->budget->common = '費用估算';
-$lang->budget->id = '編號';
-$lang->budget->stage = '階段';
-$lang->budget->subject = '科目';
-$lang->budget->name = '費用名稱';
-$lang->budget->amount = '預計金額';
-$lang->budget->desc = '說明';
-$lang->budget->CNY = '人民幣';
-$lang->budget->USD = '美元';
-$lang->budget->HKD = '港元';
-$lang->budget->NTD = '台元';
-$lang->budget->EUR = '歐元';
-$lang->budget->DEM = '馬克';
-$lang->budget->CHF = '瑞士法郎';
-$lang->budget->FRF = '法國法郎';
-$lang->budget->GBP = '英鎊';
-$lang->budget->NLG = '荷蘭盾';
-$lang->budget->CAD = '加拿大元';
-$lang->budget->RUR = '盧布';
-$lang->budget->INR = '盧比';
-$lang->budget->AUD = '澳大利亞元';
-$lang->budget->NZD = '新西蘭元';
-$lang->budget->THB = '泰國銖';
-$lang->budget->SGD = '新加坡元';
-$lang->budget->createdBy = '由誰創建';
-$lang->budget->createdDate = '創建時間';
-$lang->budget->lastEditedBy = '由誰編輯';
-$lang->budget->lastEditedDate = '編輯時間';
-$lang->budget->basicInfo = '基本信息';
-
-$lang->budget->summaryReport = '彙總表';
-$lang->budget->confirmDelete = '您確定要刪除嗎？';
diff --git a/module/budget/model.php b/module/budget/model.php
deleted file mode 100644
index 527bf63ac6..0000000000
--- a/module/budget/model.php
+++ /dev/null
@@ -1,268 +0,0 @@
-
- * @package budget
- * @version $Id: model.php 5079 2013-07-10 00:44:34Z chencongzhi520@gmail.com $
- * @link http://www.zentao.net
- */
-?>
-loadModel('tree')->getOptionMenu(0, $viewType = 'subject', $startModuleID = 0);
- $subjectList = $this->dao->select('*')->from(TABLE_MODULE)->where('id')->in(array_keys($subjects))->fetchAll();
-
- foreach($subjectList as $subject)
- {
- if(isset($subjects[$subject->parent])) unset($subjects[$subject->parent]);
- if($subject->grade > 2) unset($subjects[$subject->id]);
- }
-
- return $subjects;
- }
-
- /**
- * Get budget by id.
- *
- * @param int $budgetID
- * @access public
- * @return array
- */
- public function getByID($budgetID)
- {
- $budget = $this->dao->select('*')->from(TABLE_BUDGET)->where('id')->eq($budgetID)->fetch();
- $budget = $this->loadModel('file')->replaceImgURL($budget, 'desc');
-
- return $budget;
- }
-
- /**
- * Get budget list.
- *
- * @param int $projectID
- * @param string $orderBy
- * @param object $pager
- * @access public
- * @return object
- */
- public function getList($projectID, $orderBy = 'id_desc', $pager = null)
- {
- return $this->dao->select('*')->from(TABLE_BUDGET)->where('PRJ')->eq($projectID)->andWhere('deleted')->eq(0)->orderBy($orderBy)->page($pager)->fetchAll();
- }
-
- /**
- * Get stages.
- *
- * @param int $projectID
- * @access public
- * @return array
- */
- public function getStages($projectID)
- {
- return $this->dao->select('stage')->from(TABLE_BUDGET)->where('PRJ')->eq($projectID)->andWhere('deleted')->eq(0)->orderBy('stage_asc')->fetchPairs();
- }
-
- /**
- * Get subjects.
- *
- * @param int $projectID
- * @access public
- * @return array
- */
- public function getSubjectPairs($projectID)
- {
- return $this->dao->select('subject')->from(TABLE_BUDGET)->where('PRJ')->eq($projectID)->andWhere('deleted')->eq(0)->orderBy('subject_asc')->fetchPairs();
- }
-
- /**
- * Get subject structure.
- *
- * @access public
- * @return array
- */
- public function getSubjectStructure()
- {
- $this->loadModel('tree');
-
- $structure = array();
- $subjectPairs = $this->getSubjectPairs($this->session->PRJ);
- $subjects = $this->dao->select('*')->from(TABLE_MODULE)->where('id')->in($subjectPairs)->fetchAll('id');
-
- foreach($subjects as $subject)
- {
- if($subject->grade == 1)
- {
- $structure[$subject->id][] = $subject->id;
- continue;
- }
-
- $structure[$subject->parent][] = $subject->id;
- }
-
- return $structure;
- }
-
- /**
- * Check if has sub-subjects.
- *
- * @param array $subjects
- * @access public
- * @return bool
- */
- public function checkSubSubject($subjects)
- {
- foreach($subjects as $id => $subject)
- {
- if(count($subject) > 1 || $id != $subject[0]) return true;
- }
-
- return false;
- }
-
- /**
- * Get summary.
- *
- * @param int $projectID
- * @param array $subjects
- * @access public
- * @return array
- */
- public function getSummary($projectID, $subjects)
- {
- $budgets = $this->dao->select('*')->from(TABLE_BUDGET)->where('PRJ')->eq($projectID)->andWhere('deleted')->eq(0)->fetchAll();
- $stages = $this->getStages($this->session->PRJ);
-
- /* Assign each subject to a stage. */
- $summary['stages'] = array();
- $summary['subjects'] = array();
- foreach($stages as $stageID)
- {
- foreach($subjects as $subject)
- {
- foreach($subject as $children)
- {
- $summary['stages'][$stageID][$children] = 0;
- $summary['subjects'][$children] = 0;
- }
- }
- }
-
- /* Count the costs incurred by a stage corresponding to a subject. */
- foreach($budgets as $budget)
- {
- $summary['stages'][$budget->stage][$budget->subject] += $budget->amount;
- $summary['subjects'][$budget->subject] += $budget->amount;
- }
-
- return $summary;
- }
-
- /**
- * Create a budget.
- *
- * @access public
- * @return int
- */
- public function create()
- {
- $budget = fixer::input('post')
- ->setDefault('createdBy', $this->app->user->account)
- ->setDefault('createdDate', helper::today())
- ->setDefault('PRJ', $this->session->PRJ)
- ->cleanFloat('amount')
- ->stripTags($this->config->budget->editor->create['id'], $this->config->allowedTags)
- ->remove('uid')
- ->get();
-
- $this->dao->insert(TABLE_BUDGET)->data($budget)
- ->autoCheck()
- ->batchCheck($this->config->budget->create->requiredFields, 'notempty')
- ->exec();
-
- $budgetID = $this->dao->lastInsertID();
- return $budgetID;
- }
-
- /**
- * Batch create budgets.
- *
- * @access public
- * @return bool
- */
- public function batchCreate()
- {
- $today = helper::today();
- $budgets = fixer::input('post')->get();
-
- foreach($budgets->name as $i => $name)
- {
- if(!$name) continue;
- $data = new stdclass();
- $data->name = $name;
- $data->PRJ = $this->session->PRJ;
- $data->stage = $budgets->stage[$i];
- $data->subject = $budgets->subject[$i];
- $data->amount = (float)$budgets->amount[$i];
- $data->desc = nl2br($budgets->desc[$i]);
- $data->createdBy = $this->app->user->account;
- $data->createdDate = $today;
-
- foreach(explode(',', $this->config->budget->create->requiredFields) as $field)
- {
- $field = trim($field);
- if($field and empty($data->$field))
- {
- dao::$errors['message'][] = sprintf($this->lang->error->notempty, $this->lang->budget->$field);
- return false;
- }
- }
-
-
- $this->dao->insert(TABLE_BUDGET)->data($data)->autoCheck()->exec();
-
- $budgetID = $this->dao->lastInsertID();
- $this->loadModel('action')->create('budget', $budgetID, 'Opened');
- }
-
- return !dao::isError();
- }
-
- /**
- * Update a budget.
- *
- * @param int $budgetID
- * @access public
- * @return array
- */
- public function update($budgetID)
- {
- $oldBudget = $this->getByID($budgetID);
- $budget = fixer::input('post')
- ->setDefault('lastEditedBy', $this->app->user->account)
- ->setDefault('lastEditedDate', helper::today())
- ->cleanFloat('amount')
- ->stripTags($this->config->budget->editor->edit['id'], $this->config->allowedTags)
- ->remove('uid')
- ->get();
-
- $this->dao->update(TABLE_BUDGET)->data($budget)
- ->where('id')->eq($budgetID)
- ->autoCheck()
- ->batchCheck($this->config->budget->create->requiredFields, 'notempty')
- ->exec();
-
- if(!dao::isError()) return common::createChanges($oldBudget, $budget);
- }
-}
diff --git a/module/budget/view/batchcreate.html.php b/module/budget/view/batchcreate.html.php
deleted file mode 100644
index 9f9ab8230c..0000000000
--- a/module/budget/view/batchcreate.html.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
- * @package budget
- * @version $Id: batchCreate.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $
- * @link http://www.zentao.net
- */
-?>
-
-
-
-
-
-
budget->batchCreate;?>
-
-
-
-
-
- " . $lang->budget->summary, '', "class='btn btn-link'");?>
- " . $lang->budget->list, '', "class='btn btn-link browse-active'");?>
-
-
- " . $lang->budget->batchCreate, '', "class='btn btn-secondary'");?>
- " . $lang->budget->create, '', "class='btn btn-primary'");?>
-
-
-
-
-
-
- noData;?>
-
- createLink('budget', 'create', ''), " " . $lang->budget->create, '', "class='btn btn-info'");?>
-
-
-
-
-
-
-
-
-
-
-
budget->create . $lang->budget->common;?>
-
-
-
-
-
-
-
budget->edit . $lang->budget->common;?>
-
-
-
-
-
- " . $lang->budget->summary, '', "class='btn btn-link summary-active'");?>
- " . $lang->budget->list, '', "class='btn btn-link'");?>
-
-
- " . $lang->budget->batchCreate, '', "class='btn btn-secondary'");?>
- " . $lang->budget->create, '', "class='btn btn-primary'");?>
-
-
-
-
-
-
- | budget->subject . '/' . $lang->budget->stage;?> |
- $subject):?>
- |
-
- budget->summary;?> |
-
-
- $subject):?>
-
-
- |
-
-
-
- $subject):?>
-
- |
-
- |
-
- |
-
-
-
- | budget->summary;?> |
-
- |
-
- |
-
-
-
budget->total . '：' . array_sum($summary['subjects']) . $lang->budget->{$project->budgetUnit};?>
-
-
-
-
-
-
-
-
-
budget->desc;?>
-
- desc;?>
-
-
-
-
-
-
-
-
-
budget->basicInfo;?>
-
-
-
- | budget->stage;?> |
- stage);?> |
-
-
- | budget->subject;?> |
- subject);?> |
-
-
- | budget->amount;?> |
- amount;?> |
-
-
- | budget->createdBy;?> |
- createdBy);?> |
-
-
- | budget->createdDate;?> |
- createdDate;?> |
-
-
- | budget->lastEditedBy;?> |
- lastEditedBy);?> |
-
-
- | budget->lastEditedDate;?> |
- lastEditedDate;?> |
-
-
-
-
-
-
-
' + item + '
');
- var newItem = $('#names' + i).closest('tr');
- newItem.find('.form-date').datepicker();
- $("#output" + i).chosen();
- $("#output_i__chosen").remove();
- i ++;
-}
-
-function deleteItem(obj)
-{
- if($('#planForm .table tbody').children().length < 2) return false;
- $(obj).closest('tr').remove();
-}
diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php
deleted file mode 100644
index 7b79967dd4..0000000000
--- a/module/programplan/lang/de.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- * @package programplan
- * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
- * @link http://www.zentao.net
- */
-$lang->programplan->common = 'Program Plan';
-$lang->programplan->browse = 'Program Plan';
-$lang->programplan->gantt = 'Gantt Chart';
-$lang->programplan->list = 'Stage List';
-$lang->programplan->create = 'Create';
-$lang->programplan->edit = 'Edit';
-$lang->programplan->delete = 'Delete';
-$lang->programplan->createSubPlan = 'Create Sub Plan';
-
-$lang->programplan->parent = 'Parent Stage';
-$lang->programplan->emptyParent = 'N/A';
-$lang->programplan->name = 'Stage Name';
-$lang->programplan->subStageName = 'Sub Stage Name';
-$lang->programplan->percent = 'Workload Ratio';
-$lang->programplan->percentAB = 'Workload Ratio';
-$lang->programplan->planPercent = 'Workload';
-$lang->programplan->attribute = 'Stage Type';
-$lang->programplan->milestone = 'Milestone';
-$lang->programplan->taskProgress = 'Task Progress';
-$lang->programplan->task = 'Task';
-$lang->programplan->begin = 'Begin';
-$lang->programplan->end = 'End';
-$lang->programplan->realBegan = 'Actual Started';
-$lang->programplan->realEnd = 'Actual End';
-$lang->programplan->planDateRange = 'Planned Start';
-$lang->programplan->realDateRange = 'Actual Start';
-$lang->programplan->output = 'Output';
-$lang->programplan->openedBy = 'Created By';
-$lang->programplan->openedDate = 'Created Date';
-$lang->programplan->editedBy = 'Edited By';
-$lang->programplan->editedDate = 'Edited Date';
-$lang->programplan->duration = 'Duration';
-$lang->programplan->version = 'Version';
-$lang->programplan->full = 'Full Screen';
-$lang->programplan->today = 'Today';
-$lang->programplan->exporting = 'Exporting';
-$lang->programplan->exportFail = 'Export failed';
-$lang->programplan->hideCriticalPath = 'Hide Critical Path';
-$lang->programplan->showCriticalPath = 'Show Critical Path';
-
-$lang->programplan->milestoneList[1] = 'Yes';
-$lang->programplan->milestoneList[0] = 'No';
-
-$lang->programplan->noData = 'No Data';
-$lang->programplan->children = 'Sub Plan';
-$lang->programplan->childrenAB = 'Child';
-$lang->programplan->confirmDelete = 'Do you want to delete the current plan?';
-$lang->programplan->workloadTips = 'The proportion of the sub stage workload is divided by 100%.';
-
-$lang->programplan->stageCustom = new stdClass();
-$lang->programplan->stageCustom->date = 'Show Date';
-$lang->programplan->stageCustom->task = 'Show Task';
-
-$lang->programplan->error = new stdclass();
-$lang->programplan->error->percentNumber = '"Workload %" must be digits.';
-$lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.';
-$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100%.';
-$lang->programplan->error->createdTask = 'The task has been decomposed. Sub phases cannot be added.';
-$lang->programplan->error->parentWorkload = 'The sum of the workload of the child phase cannot be greater than that of the parent phase: %s.';
diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php
deleted file mode 100644
index 7b79967dd4..0000000000
--- a/module/programplan/lang/en.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- * @package programplan
- * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
- * @link http://www.zentao.net
- */
-$lang->programplan->common = 'Program Plan';
-$lang->programplan->browse = 'Program Plan';
-$lang->programplan->gantt = 'Gantt Chart';
-$lang->programplan->list = 'Stage List';
-$lang->programplan->create = 'Create';
-$lang->programplan->edit = 'Edit';
-$lang->programplan->delete = 'Delete';
-$lang->programplan->createSubPlan = 'Create Sub Plan';
-
-$lang->programplan->parent = 'Parent Stage';
-$lang->programplan->emptyParent = 'N/A';
-$lang->programplan->name = 'Stage Name';
-$lang->programplan->subStageName = 'Sub Stage Name';
-$lang->programplan->percent = 'Workload Ratio';
-$lang->programplan->percentAB = 'Workload Ratio';
-$lang->programplan->planPercent = 'Workload';
-$lang->programplan->attribute = 'Stage Type';
-$lang->programplan->milestone = 'Milestone';
-$lang->programplan->taskProgress = 'Task Progress';
-$lang->programplan->task = 'Task';
-$lang->programplan->begin = 'Begin';
-$lang->programplan->end = 'End';
-$lang->programplan->realBegan = 'Actual Started';
-$lang->programplan->realEnd = 'Actual End';
-$lang->programplan->planDateRange = 'Planned Start';
-$lang->programplan->realDateRange = 'Actual Start';
-$lang->programplan->output = 'Output';
-$lang->programplan->openedBy = 'Created By';
-$lang->programplan->openedDate = 'Created Date';
-$lang->programplan->editedBy = 'Edited By';
-$lang->programplan->editedDate = 'Edited Date';
-$lang->programplan->duration = 'Duration';
-$lang->programplan->version = 'Version';
-$lang->programplan->full = 'Full Screen';
-$lang->programplan->today = 'Today';
-$lang->programplan->exporting = 'Exporting';
-$lang->programplan->exportFail = 'Export failed';
-$lang->programplan->hideCriticalPath = 'Hide Critical Path';
-$lang->programplan->showCriticalPath = 'Show Critical Path';
-
-$lang->programplan->milestoneList[1] = 'Yes';
-$lang->programplan->milestoneList[0] = 'No';
-
-$lang->programplan->noData = 'No Data';
-$lang->programplan->children = 'Sub Plan';
-$lang->programplan->childrenAB = 'Child';
-$lang->programplan->confirmDelete = 'Do you want to delete the current plan?';
-$lang->programplan->workloadTips = 'The proportion of the sub stage workload is divided by 100%.';
-
-$lang->programplan->stageCustom = new stdClass();
-$lang->programplan->stageCustom->date = 'Show Date';
-$lang->programplan->stageCustom->task = 'Show Task';
-
-$lang->programplan->error = new stdclass();
-$lang->programplan->error->percentNumber = '"Workload %" must be digits.';
-$lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.';
-$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100%.';
-$lang->programplan->error->createdTask = 'The task has been decomposed. Sub phases cannot be added.';
-$lang->programplan->error->parentWorkload = 'The sum of the workload of the child phase cannot be greater than that of the parent phase: %s.';
diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php
deleted file mode 100644
index 7b79967dd4..0000000000
--- a/module/programplan/lang/fr.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- * @package programplan
- * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
- * @link http://www.zentao.net
- */
-$lang->programplan->common = 'Program Plan';
-$lang->programplan->browse = 'Program Plan';
-$lang->programplan->gantt = 'Gantt Chart';
-$lang->programplan->list = 'Stage List';
-$lang->programplan->create = 'Create';
-$lang->programplan->edit = 'Edit';
-$lang->programplan->delete = 'Delete';
-$lang->programplan->createSubPlan = 'Create Sub Plan';
-
-$lang->programplan->parent = 'Parent Stage';
-$lang->programplan->emptyParent = 'N/A';
-$lang->programplan->name = 'Stage Name';
-$lang->programplan->subStageName = 'Sub Stage Name';
-$lang->programplan->percent = 'Workload Ratio';
-$lang->programplan->percentAB = 'Workload Ratio';
-$lang->programplan->planPercent = 'Workload';
-$lang->programplan->attribute = 'Stage Type';
-$lang->programplan->milestone = 'Milestone';
-$lang->programplan->taskProgress = 'Task Progress';
-$lang->programplan->task = 'Task';
-$lang->programplan->begin = 'Begin';
-$lang->programplan->end = 'End';
-$lang->programplan->realBegan = 'Actual Started';
-$lang->programplan->realEnd = 'Actual End';
-$lang->programplan->planDateRange = 'Planned Start';
-$lang->programplan->realDateRange = 'Actual Start';
-$lang->programplan->output = 'Output';
-$lang->programplan->openedBy = 'Created By';
-$lang->programplan->openedDate = 'Created Date';
-$lang->programplan->editedBy = 'Edited By';
-$lang->programplan->editedDate = 'Edited Date';
-$lang->programplan->duration = 'Duration';
-$lang->programplan->version = 'Version';
-$lang->programplan->full = 'Full Screen';
-$lang->programplan->today = 'Today';
-$lang->programplan->exporting = 'Exporting';
-$lang->programplan->exportFail = 'Export failed';
-$lang->programplan->hideCriticalPath = 'Hide Critical Path';
-$lang->programplan->showCriticalPath = 'Show Critical Path';
-
-$lang->programplan->milestoneList[1] = 'Yes';
-$lang->programplan->milestoneList[0] = 'No';
-
-$lang->programplan->noData = 'No Data';
-$lang->programplan->children = 'Sub Plan';
-$lang->programplan->childrenAB = 'Child';
-$lang->programplan->confirmDelete = 'Do you want to delete the current plan?';
-$lang->programplan->workloadTips = 'The proportion of the sub stage workload is divided by 100%.';
-
-$lang->programplan->stageCustom = new stdClass();
-$lang->programplan->stageCustom->date = 'Show Date';
-$lang->programplan->stageCustom->task = 'Show Task';
-
-$lang->programplan->error = new stdclass();
-$lang->programplan->error->percentNumber = '"Workload %" must be digits.';
-$lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.';
-$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100%.';
-$lang->programplan->error->createdTask = 'The task has been decomposed. Sub phases cannot be added.';
-$lang->programplan->error->parentWorkload = 'The sum of the workload of the child phase cannot be greater than that of the parent phase: %s.';
diff --git a/module/programplan/lang/vi.php b/module/programplan/lang/vi.php
deleted file mode 100644
index 7b79967dd4..0000000000
--- a/module/programplan/lang/vi.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- * @package programplan
- * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
- * @link http://www.zentao.net
- */
-$lang->programplan->common = 'Program Plan';
-$lang->programplan->browse = 'Program Plan';
-$lang->programplan->gantt = 'Gantt Chart';
-$lang->programplan->list = 'Stage List';
-$lang->programplan->create = 'Create';
-$lang->programplan->edit = 'Edit';
-$lang->programplan->delete = 'Delete';
-$lang->programplan->createSubPlan = 'Create Sub Plan';
-
-$lang->programplan->parent = 'Parent Stage';
-$lang->programplan->emptyParent = 'N/A';
-$lang->programplan->name = 'Stage Name';
-$lang->programplan->subStageName = 'Sub Stage Name';
-$lang->programplan->percent = 'Workload Ratio';
-$lang->programplan->percentAB = 'Workload Ratio';
-$lang->programplan->planPercent = 'Workload';
-$lang->programplan->attribute = 'Stage Type';
-$lang->programplan->milestone = 'Milestone';
-$lang->programplan->taskProgress = 'Task Progress';
-$lang->programplan->task = 'Task';
-$lang->programplan->begin = 'Begin';
-$lang->programplan->end = 'End';
-$lang->programplan->realBegan = 'Actual Started';
-$lang->programplan->realEnd = 'Actual End';
-$lang->programplan->planDateRange = 'Planned Start';
-$lang->programplan->realDateRange = 'Actual Start';
-$lang->programplan->output = 'Output';
-$lang->programplan->openedBy = 'Created By';
-$lang->programplan->openedDate = 'Created Date';
-$lang->programplan->editedBy = 'Edited By';
-$lang->programplan->editedDate = 'Edited Date';
-$lang->programplan->duration = 'Duration';
-$lang->programplan->version = 'Version';
-$lang->programplan->full = 'Full Screen';
-$lang->programplan->today = 'Today';
-$lang->programplan->exporting = 'Exporting';
-$lang->programplan->exportFail = 'Export failed';
-$lang->programplan->hideCriticalPath = 'Hide Critical Path';
-$lang->programplan->showCriticalPath = 'Show Critical Path';
-
-$lang->programplan->milestoneList[1] = 'Yes';
-$lang->programplan->milestoneList[0] = 'No';
-
-$lang->programplan->noData = 'No Data';
-$lang->programplan->children = 'Sub Plan';
-$lang->programplan->childrenAB = 'Child';
-$lang->programplan->confirmDelete = 'Do you want to delete the current plan?';
-$lang->programplan->workloadTips = 'The proportion of the sub stage workload is divided by 100%.';
-
-$lang->programplan->stageCustom = new stdClass();
-$lang->programplan->stageCustom->date = 'Show Date';
-$lang->programplan->stageCustom->task = 'Show Task';
-
-$lang->programplan->error = new stdclass();
-$lang->programplan->error->percentNumber = '"Workload %" must be digits.';
-$lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.';
-$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100%.';
-$lang->programplan->error->createdTask = 'The task has been decomposed. Sub phases cannot be added.';
-$lang->programplan->error->parentWorkload = 'The sum of the workload of the child phase cannot be greater than that of the parent phase: %s.';
diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php
deleted file mode 100644
index 7d6fa7f818..0000000000
--- a/module/programplan/lang/zh-cn.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- * @package programplan
- * @version $Id: zh-cn.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
- * @link http://www.zentao.net
- */
-$lang->programplan->common = '项目计划';
-$lang->programplan->browse = '浏览阶段计划';
-$lang->programplan->gantt = '甘特图';
-$lang->programplan->list = '阶段列表';
-$lang->programplan->create = '设置阶段';
-$lang->programplan->edit = '编辑';
-$lang->programplan->delete = '删除';
-$lang->programplan->createSubPlan = '创建二级阶段';
-
-$lang->programplan->parent = '父阶段';
-$lang->programplan->emptyParent = '无';
-$lang->programplan->name = '阶段名称';
-$lang->programplan->subStageName = '子阶段名称';
-$lang->programplan->percent = '工作量占比';
-$lang->programplan->percentAB = '工作量占比';
-$lang->programplan->planPercent = '工作量';
-$lang->programplan->attribute = '阶段类型';
-$lang->programplan->milestone = '里程碑';
-$lang->programplan->taskProgress = '任务进度';
-$lang->programplan->task = '任务';
-$lang->programplan->begin = '计划开始';
-$lang->programplan->end = '计划完成';
-$lang->programplan->realBegan = '实际开始';
-$lang->programplan->realEnd = '实际完成';
-$lang->programplan->planDateRange = '计划起始日期';
-$lang->programplan->realDateRange = '实际起始日期';
-$lang->programplan->output = '输出';
-$lang->programplan->openedBy = '由谁创建';
-$lang->programplan->openedDate = '创建日期';
-$lang->programplan->editedBy = '由谁编辑';
-$lang->programplan->editedDate = '编辑日期';
-$lang->programplan->duration = '计划工期';
-$lang->programplan->version = '版本号';
-$lang->programplan->full = '全屏';
-$lang->programplan->today = '今天';
-$lang->programplan->exporting = '导出';
-$lang->programplan->exportFail = '导出失败';
-$lang->programplan->hideCriticalPath = '隐藏关键路径';
-$lang->programplan->showCriticalPath = '显示关键路径';
-
-$lang->programplan->milestoneList[1] = '是';
-$lang->programplan->milestoneList[0] = '否';
-
-$lang->programplan->noData = '暂无数据。';
-$lang->programplan->children = '二级计划';
-$lang->programplan->childrenAB = '子';
-$lang->programplan->confirmDelete = '确定要删除当前计划吗？';
-$lang->programplan->workloadTips = '子阶段工作量占比按百分百的比例进行拆分';
-
-$lang->programplan->stageCustom = new stdClass();
-$lang->programplan->stageCustom->date = '显示日期';
-$lang->programplan->stageCustom->task = '显示任务';
-
-$lang->programplan->error = new stdclass();
-$lang->programplan->error->percentNumber = '"工作量比例"必须为数字';
-$lang->programplan->error->planFinishSmall = '"计划完成时间"必须大于"计划开始时间"';
-$lang->programplan->error->percentOver = '工作量占比累计不应当超过100%';
-$lang->programplan->error->createdTask = '已分解任务,不可添加子阶段';
-$lang->programplan->error->parentWorkload = '子阶段的工作量之和不能大于父阶段的工作量:%s';
diff --git a/module/programplan/lang/zh-tw.php b/module/programplan/lang/zh-tw.php
deleted file mode 100644
index fb61f5ea6f..0000000000
--- a/module/programplan/lang/zh-tw.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- * @package programplan
- * @version $Id: zh-tw.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
- * @link http://www.zentao.net
- */
-$lang->programplan->common = '項目計劃';
-$lang->programplan->browse = '瀏覽階段計劃';
-$lang->programplan->gantt = '甘特圖';
-$lang->programplan->list = '階段列表';
-$lang->programplan->create = '設置階段';
-$lang->programplan->edit = '編輯';
-$lang->programplan->delete = '刪除';
-$lang->programplan->createSubPlan = '創建二級階段';
-
-$lang->programplan->parent = '父階段';
-$lang->programplan->emptyParent = '無';
-$lang->programplan->name = '階段名稱';
-$lang->programplan->subStageName = '子階段名稱';
-$lang->programplan->percent = '工作量占比';
-$lang->programplan->percentAB = '工作量占比';
-$lang->programplan->planPercent = '工作量';
-$lang->programplan->attribute = '階段類型';
-$lang->programplan->milestone = '里程碑';
-$lang->programplan->taskProgress = '任務進度';
-$lang->programplan->task = '任務';
-$lang->programplan->begin = '計劃開始';
-$lang->programplan->end = '計劃完成';
-$lang->programplan->realBegan = '實際開始';
-$lang->programplan->realEnd = '實際完成';
-$lang->programplan->planDateRange = '計划起始日期';
-$lang->programplan->realDateRange = '實際起始日期';
-$lang->programplan->output = '輸出';
-$lang->programplan->openedBy = '由誰創建';
-$lang->programplan->openedDate = '創建日期';
-$lang->programplan->editedBy = '由誰編輯';
-$lang->programplan->editedDate = '編輯日期';
-$lang->programplan->duration = '計劃工期';
-$lang->programplan->version = '版本號';
-$lang->programplan->full = '全屏';
-$lang->programplan->today = '今天';
-$lang->programplan->exporting = '導出';
-$lang->programplan->exportFail = '導出失敗';
-$lang->programplan->hideCriticalPath = '隱藏關鍵路徑';
-$lang->programplan->showCriticalPath = '顯示關鍵路徑';
-
-$lang->programplan->milestoneList[1] = '是';
-$lang->programplan->milestoneList[0] = '否';
-
-$lang->programplan->noData = '暫無數據。';
-$lang->programplan->children = '二級計劃';
-$lang->programplan->childrenAB = '子';
-$lang->programplan->confirmDelete = '確定要刪除當前計劃嗎？';
-$lang->programplan->workloadTips = '子階段工作量占比按百分百的比例進行拆分';
-
-$lang->programplan->stageCustom = new stdClass();
-$lang->programplan->stageCustom->date = '顯示日期';
-$lang->programplan->stageCustom->task = '顯示任務';
-
-$lang->programplan->error = new stdclass();
-$lang->programplan->error->percentNumber = '"工作量比例"必須為數字';
-$lang->programplan->error->planFinishSmall = '"計劃完成時間"必須大於"計劃開始時間"';
-$lang->programplan->error->percentOver = '工作量占比累計不應當超過100%';
-$lang->programplan->error->createdTask = '已分解任務,不可添加子階段';
-$lang->programplan->error->parentWorkload = '子階段的工作量之和不能大於父階段的工作量:%s';
diff --git a/module/programplan/model.php b/module/programplan/model.php
deleted file mode 100644
index 3c00650367..0000000000
--- a/module/programplan/model.php
+++ /dev/null
@@ -1,910 +0,0 @@
-
- * @package programplan
- * @version $Id: model.php 5079 2013-07-10 00:44:34Z chencongzhi520@gmail.com $
- * @link http://www.zentao.net
- */
-?>
-dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($planID)->fetch();
-
- return $this->processPlan($plan);
- }
-
- /**
- * Get plans list.
- *
- * @param int $projectID
- * @param int $productID
- * @param string $browseType all|parent
- * @param string $orderBy
- * @access public
- * @return array
- */
- public function getStage($projectID = 0, $productID = 0, $browseType = 'all', $orderBy = 'id_asc')
- {
- if(empty($projectID) || empty($productID)) return array();
-
- $plans = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
- ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
- ->where('t1.product')->eq($productID)
- ->andWhere('t2.type')->eq('stage')
- ->beginIF($browseType == 'all')->andWhere('t2.project')->eq($projectID)->fi()
- ->beginIF($browseType == 'parent')->andWhere('t2.parent')->eq($projectID)->fi()
- ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()
- ->andWhere('t2.deleted')->eq('0')
- ->orderBy($orderBy)
- ->fetchAll('id');
-
- return $this->processPlans($plans);
- }
-
- /**
- * Get plans by idList.
- *
- * @param array $idList
- * @access public
- * @return array
- */
- public function getByList($idList = array())
- {
- $plans = $this->dao->select('*')->from(TABLE_PROJECT)
- ->where('id')->in($idList)
- ->andWhere('type')->eq('project')
- ->fetchAll('id');
-
- return $this->processPlans($plans);
- }
-
- /**
- * Get plans.
- *
- * @param int $projectID
- * @param int $productID
- * @param string $orderBy
- * @access public
- * @return array
- */
- public function getPlans($projectID = 0, $productID = 0, $orderBy = 'id_asc')
- {
- $plans = $this->getStage($projectID, $productID, 'all', $orderBy);
-
- $parents = array();
- $children = array();
- foreach($plans as $planID => $plan)
- {
- $plan->grade == 1 ? $parents[$planID] = $plan : $children[$plan->parent][] = $plan;
- }
-
- foreach($parents as $planID => $plan) $parents[$planID]->children = isset($children[$planID]) ? $children[$planID] : array();
-
- return $parents;
- }
-
- /**
- * Get pairs.
- *
- * @param int $projectID
- * @param int $productID
- * @param string $type
- * @access public
- * @return array
- */
- public function getPairs($projectID, $productID = 0, $type = 'all')
- {
- $plans = $this->getPlans($projectID, $productID);
-
- $pairs = array(0 => '');
- foreach($plans as $plan)
- {
- $pairs[$plan->id] = $plan->name;
- if(!empty($plan->children))
- {
- foreach($plan->children as $child) $pairs[$child->id] = $plan->name . '/' . $child->name;
- }
- }
-
- return $pairs;
- }
-
- /**
- * Get gantt data.
- *
- * @param int $projectID
- * @param int $productID
- * @param int $baselineID
- * @param string $selectCustom
- * @param bool $returnJson
- * @access public
- * @return string
- */
- public function getDataForGantt($projectID, $productID, $baselineID = 0, $selectCustom = '', $returnJson = true)
- {
- $this->loadModel('stage');
-
- $plans = $this->getStage($projectID, $productID);
- if($baselineID)
- {
- $baseline = $this->loadModel('cm')->getByID($baselineID);
- $oldData = json_decode($baseline->data);
- $oldPlans = $oldData->stage;
- foreach($oldPlans as $id => $oldPlan)
- {
- if(!isset($plans[$id])) continue;
- $plans[$id]->version = $oldPlan->version;
- $plans[$id]->name = $oldPlan->name;
- $plans[$id]->milestone = $oldPlan->milestone;
- $plans[$id]->begin = $oldPlan->begin;
- $plans[$id]->end = $oldPlan->end;
- }
- }
-
- $datas = array();
- $planIDList = array();
- $isMilestone = " ";
- $stageIndex = array();
- foreach($plans as $plan)
- {
- $planIDList[$plan->id] = $plan->id;
-
- $start = $plan->begin == '0000-00-00' ? '' : date('d-m-Y', strtotime($plan->begin));
- $end = $plan->end == '0000-00-00' ? '' : $plan->end;
-
- $data = new stdclass();
- $data->id = $plan->id;
- $data->type = 'plan';
- $data->text = empty($plan->milestone) ? $plan->name : $plan->name . $isMilestone ;
- $data->percent = $plan->percent;
- $data->attribute = zget($this->lang->stage->typeList, $plan->attribute);
- $data->milestone = zget($this->lang->programplan->milestoneList, $plan->milestone);
- $data->start_date = $start;
- $data->deadline = $end;
- $data->realBegan = $plan->realBegan == '0000-00-00' ? '' : $plan->realBegan;
- $data->realEnd = $plan->realEnd == '0000-00-00' ? '' : $plan->realEnd;
- $data->duration = helper::diffDate($plan->end, $plan->begin) + 1;;
- $data->parent = $plan->grade == 1 ? 0 :$plan->parent;
- $data->open = true;
-
- if($data->start_date == '' or $data->deadline == '') $data->duration = 0;
-
- $datas['data'][] = $data;
- $stageIndex[] = array('planID' => $plan->id, 'progress' => array('totalConsumed' => 0, 'totalReal' => 0));
- }
-
- $taskSign = "[ T ] ";
- $taskPri = "%s ";
-
- /* Judge whether to display tasks under the stage. */
- $owner = $this->app->user->account;
- $module = 'programplan';
- $section = 'browse';
- $object = 'stageCustom';
-
- if(empty($selectCustom)) $selectCustom = $this->loadModel('setting')->getItem("owner={$owner}&module={$module}§ion={$section}&key={$object}");
-
- $tasks = array();
- if(strpos($selectCustom, 'task') !== false)
- {
- $tasks = $this->dao->select('*')->from(TABLE_TASK)->where('deleted')->eq(0)->andWhere('project')->in($planIDList)->fetchAll('id');
- }
-
- if($baselineID)
- {
- $oldTasks = $oldData->task;
- foreach($oldTasks as $id => $oldTask)
- {
- if(!isset($tasks->$id)) continue;
- $tasks->$id->version = $oldTask->version;
- $tasks->$id->name = $oldTask->name;
- $tasks->$id->estStarted = $oldTask->estStarted;
- $tasks->$id->deadline = $oldTask->deadline;
- }
- }
-
- foreach($tasks as $task)
- {
- $start = $task->estStarted == '0000-00-00' ? '' : date('d-m-Y', strtotime($task->estStarted));
- $end = $task->deadline == '0000-00-00' ? '' : $task->deadline;
-
- $realBegan = $task->realStarted == '0000-00-00' ? '' : $task->realStarted;
- $realEnd = $task->finishedDate == '0000-00-00 00:00:00' ? '' : substr($task->finishedDate, 5, 11);
- $priIcon = sprintf($taskPri, $task->pri, $task->pri, $task->pri);
-
- $data = new stdclass();
- $data->id = $task->project . '-' . $task->id;
- $data->type = 'task';
- $data->text = $taskSign . $priIcon . $task->name;
- $data->percent = '';
- $data->attribute = '';
- $data->milestone = '';
- $data->start_date = $start;
- $data->deadline = $end;
- $data->realBegan = $realBegan;
- $data->realEnd = $realEnd;
- $data->duration = helper::diffDate($task->deadline, $task->estStarted) + 1;
- $data->parent = $task->parent > 0 ? $task->project . '-' . $task->parent : $task->project;
- $data->open = true;
- $progress = $task->consumed ? round($task->consumed / ($task->left + $task->consumed), 3) * 100 : 0;
- $data->taskProgress = $progress . '%';
-
- if($data->start_date == '' or $data->deadline == '') $data->duration = 0;
-
- $datas['data'][] = $data;
- foreach($stageIndex as $index => $stage)
- {
- if($stage['planID'] == $task->project)
- {
- $stageIndex[$index]['progress']['totalConsumed'] += $task->consumed;
- $stageIndex[$index]['progress']['totalReal'] += ($task->left + $task->consumed);
- }
- }
- }
-
- /* Calculate the progress of the phase. */
- foreach($stageIndex as $index => $stage)
- {
- $progress = empty($stage['progress']['totalConsumed']) ? 0 : round($stage['progress']['totalConsumed'] / $stage['progress']['totalReal'], 3) * 100;
- $progress .= '%';
- $datas['data'][$index]->taskProgress = $progress;
- }
-
- return $returnJson ? json_encode($datas) : $datas;
- }
-
- /**
- * Get total percent.
- *
- * @param object $stage
- * @param object $parent
- * @access public
- * @return int
- */
- public function getTotalPercent($stage, $parent = false)
- {
- /* When parent is equal to true, query the total workload of the subphase. */
- $projectID = $parent ? $stage->id : $stage->project;
- $plans = $this->getStage($projectID, $stage->product, 'parent');
-
- $totalPercent = 0;
- $stageID = $stage->id;
- foreach($plans as $id => $stage)
- {
- if($id == $stageID) continue;
- $totalPercent += $stage->percent;
- }
-
- return $totalPercent;
- }
-
- /**
- * Process plans.
- *
- * @param int $plans
- * @access public
- * @return object
- */
- public function processPlans($plans)
- {
- foreach($plans as $planID => $plan) $plans[$planID] = $this->processPlan($plan);
- return $plans;
- }
-
- /**
- * Process plan.
- *
- * @param int $plan
- * @access public
- * @return object
- */
- public function processPlan($plan)
- {
- $plan->setMilestone = true;
-
- if($plan->parent)
- {
- $attribute = $this->dao->select('attribute')->from(TABLE_PROJECT)->where('id')->eq($plan->parent)->fetch('attribute');
- $plan->attribute = $attribute == 'develop' ? $attribute : $plan->attribute;
- }
- else
- {
- $milestones = $this->dao->select('count(*) AS count')->from(TABLE_PROJECT)
- ->where('parent')->eq($plan->id)
- ->andWhere('milestone')->eq(1)
- ->andWhere('deleted')->eq(0)
- ->fetch('count');
- if($milestones > 0)
- {
- $plan->milestone = 0;
- $plan->setMilestone = false;
- }
- }
-
- $plan->begin = $plan->begin == '0000-00-00' ? '' : $plan->begin;
- $plan->end = $plan->end == '0000-00-00' ? '' : $plan->end;
- $plan->realBegan = $plan->realBegan == '0000-00-00' ? '' : $plan->realBegan;
- $plan->realEnd = $plan->realEnd == '0000-00-00' ? '' : $plan->realEnd;
-
- $plan->product = $this->loadModel('product')->getProductIDByProject($plan->id);
- $plan->productName = $this->dao->findByID($plan->product)->from(TABLE_PRODUCT)->fetch('name');
-
- return $plan;
- }
-
- /**
- * Get duration.
- *
- * @param int $begin
- * @param int $end
- * @access public
- * @return int
- */
- public function getDuration($begin, $end)
- {
- $duration = $this->loadModel('holiday')->getActualWorkingDays($begin, $end);
- return count($duration);
- }
-
- /**
- * Create a plan.
- *
- * @param int $projectID
- * @param int $productID
- * @param int $parentID
- * @access public
- * @return bool
- */
- public function create($projectID = 0, $productID = 0, $parentID = 0)
- {
- $data = (array)fixer::input('post')->get();
- extract($data);
-
- /* Determine if a task has been created under the parent phase. */
- if(!$this->isCreateTask($parentID)) return dao::$errors['message'][] = $this->lang->programplan->error->createdTask;
-
- /* The child phase type setting is the same as the parent phase. */
- $parentAttribute = '';
- $parentPercent = 0;
- if($parentID)
- {
- $parentStage = $this->getByID($parentID);
- $parentAttribute = $parentStage->attribute;
- $parentPercent = $parentStage->percent;
- $parentACL = $parentStage->acl;
- }
-
- $attributes = array_values($attributes);
- $milestone = array_values($milestone);
- $datas = array();
- foreach($names as $key => $name)
- {
- if(empty($name)) continue;
-
- $plan = new stdclass();
- $plan->id = isset($planIDList[$key]) ? $planIDList[$key] : '';
- $plan->type = 'stage';
- $plan->project = $projectID;
- $plan->parent = $parentID ? $parentID : $projectID;
- $plan->name = $names[$key];
- $plan->percent = $percents[$key];
- $plan->attribute = empty($parentID) ? $attributes[$key] : $parentAttribute;
- $plan->milestone = $milestone[$key];
- $plan->begin = empty($begin[$key]) ? '0000-00-00' : $begin[$key];
- $plan->end = empty($end[$key]) ? '0000-00-00' : $end[$key];
- $plan->realBegan = empty($realBegan[$key]) ? '0000-00-00' : $realBegan[$key];
- $plan->realEnd = empty($realEnd[$key]) ? '0000-00-00' : $realEnd[$key];
- $plan->output = empty($output[$key]) ? '' : implode(',', $output[$key]);
- $plan->acl = empty($parentID) ? $acl[$key] : $parentACL;
-
- $datas[] = $plan;
- }
-
- $totalPercent = 0;
- $totalDevType = 0;
- $milestone = 0;
- foreach($datas as $plan)
- {
- if($plan->percent and !preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $plan->percent))
- {
- dao::$errors['message'][] = $this->lang->programplan->error->percentNumber;
- return false;
- }
- if($plan->end != '0000-00-00' and $plan->end < $plan->begin)
- {
- dao::$errors['message'][] = $this->lang->programplan->error->planFinishSmall;
- return false;
- }
-
- if($plan->begin == '0000-00-00') $plan->begin = '';
- if($plan->end == '0000-00-00') $plan->end = '';
- foreach(explode(',', $this->config->programplan->create->requiredFields) as $field)
- {
- $field = trim($field);
- if($field and empty($plan->$field))
- {
- dao::$errors['message'][] = sprintf($this->lang->error->notempty, $this->lang->programplan->$field);
- return false;
- }
- }
-
- $plan->percent = (float)$plan->percent;
- $totalPercent += $plan->percent;
-
- if($plan->milestone) $milestone = 1;
- }
-
- if($totalPercent > 100) return dao::$errors['message'][] = $this->lang->programplan->error->percentOver;
-
- $this->loadModel('action');
- $this->loadModel('user');
- $this->loadModel('project');
- $this->app->loadLang('doc');
- $account = $this->app->user->account;
- $now = helper::now();
- foreach($datas as $data)
- {
- /* Set planDuration and realDuration. */
- $data->planDuration = $this->getDuration($data->begin, $data->end);
- $data->realDuration = $this->getDuration($data->realBegan, $data->realEnd);
-
- $projectChanged = false;
- $data->days = helper::diffDate($data->end, $data->begin) + 1;
- if($data->id)
- {
- $stageID = $data->id;
- unset($data->id);
-
- $oldStage = $this->getByID($stageID);
- $planChanged = ($oldStage->name != $data->name || $oldStage->milestone != $data->milestone || $oldStage->begin != $data->begin || $oldStage->end != $data->end);
-
- if($planChanged) $data->version = $oldStage->version + 1;
- $this->dao->update(TABLE_PROJECT)->data($data)
- ->autoCheck()
- ->batchCheck($this->config->programplan->edit->requiredFields, 'notempty')
- ->checkIF($plan->percent != '', 'percent', 'float')
- ->where('id')->eq($stageID)
- ->exec();
-
- if($data->acl != 'open') $this->user->updateUserView($stageID, 'sprint');
-
- /* Record version change information. */
- if($planChanged)
- {
- $spec = new stdclass();
- $spec->project = $stageID;
- $spec->version = $data->version;
- $spec->name = $data->name;
- $spec->milestone = $data->milestone;
- $spec->begin = $data->begin;
- $spec->end = $data->end;
- $this->dao->insert(TABLE_PROJECTSPEC)->data($spec)->exec();
- }
-
- $changes = common::createChanges($oldStage, $data);
- $actionID = $this->action->create('execution', $stageID, 'edited');
- $this->action->logHistory($actionID, $changes);
- }
- else
- {
- unset($data->id);
- $data->status = 'wait';
- $data->version = 1;
- $data->parentVersion = $data->parent == 0 ? 0 : $this->dao->findByID($data->parent)->from(TABLE_PROJECT)->fetch('version');
- $data->team = substr($data->name,0, 30);
- $data->openedBy = $account;
- $data->openedDate = $now;
- $data->openedVersion = $this->config->version;
- if(!isset($data->acl)) $data->acl = $this->dao->findByID($data->parent)->from(TABLE_PROJECT)->fetch('acl');
- $this->dao->insert(TABLE_PROJECT)->data($data)
- ->autoCheck()
- ->batchCheck($this->config->programplan->create->requiredFields, 'notempty')
- ->checkIF($plan->percent != '', 'percent', 'float')
- ->exec();
-
- if(!dao::isError())
- {
- $stageID = $this->dao->lastInsertID();
-
- if($data->acl != 'open') $this->user->updateUserView($stageID, 'sprint');
- $this->dao->update(TABLE_PROJECT)->set('`order`')->eq($stageID * 5)->where('id')->eq($stageID)->exec();
-
- /* Create doc lib. */
- $lib = new stdclass();
- $lib->project = $stageID;
- $lib->name = $this->lang->doclib->main['project'];
- $lib->type = 'project';
- $lib->main = '1';
- $lib->acl = 'default';
- $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec();
-
- /* Add creators to stage teams and project teams. */
- $member = new stdclass();
- $member->root = $stageID;
- $member->account = $account;
- $member->role = $this->lang->user->roleList[$this->app->user->role];
- $member->join = $now;
- $member->type = $data->type;
- $member->days = $data->days;
- $member->hours = $this->config->project->defaultWorkhours;
- $this->dao->insert(TABLE_TEAM)->data($member)->exec();
- $this->project->addProjectMembers($data->project, array($member));
-
- $this->setTreePath($stageID);
- if($data->acl != 'open') $this->user->updateUserView($stageID, 'sprint');
-
- $this->post->set('products', array(0 => $productID));
- $this->project->updateProducts($stageID);
-
- /* Record version change information. */
- $spec = new stdclass();
- $spec->project = $stageID;
- $spec->version = $data->version;
- $spec->name = $data->name;
- $spec->milestone = $data->milestone;
- $spec->begin = $data->begin;
- $spec->end = $data->end;
- $this->dao->insert(TABLE_PROJECTSPEC)->data($spec)->exec();
-
- $this->action->create('execution', $stageID, 'opened', '', join(',', $_POST['products']));
- }
- }
-
- /* If child plans has milestone, update parent plan set milestone eq 0 . */
- if($parentID and $milestone) $this->dao->update(TABLE_PROJECT)->set('milestone')->eq(0)->where('id')->eq($parentID)->exec();
-
- if(dao::isError()) die(js::error(dao::getError()));
- }
- }
-
- /**
- * Set stage tree path.
- *
- * @param int $planID
- * @access public
- * @return bool
- */
- public function setTreePath($planID)
- {
- $stage = $this->dao->select('id,type,parent,path,grade')->from(TABLE_PROJECT)->where('id')->eq($planID)->fetch();
- $parent = $this->dao->select('id,type,parent,path,grade')->from(TABLE_PROJECT)->where('id')->eq($stage->parent)->fetch();
-
- if($parent->type == 'project')
- {
- $path['path'] = ",{$parent->id},{$stage->id},";
- $path['grade'] = 1;
- }
- elseif($parent->type == 'stage')
- {
- $path['path'] = $parent->path . "{$stage->id},";
- $path['grade'] = $parent->grade + 1;
- }
- $this->dao->update(TABLE_PROJECT)->set('path')->eq($path['path'])->set('grade')->eq($path['grade'])->where('id')->eq($stage->id)->exec();
- }
-
- /**
- * Update a plan.
- *
- * @param int $planID
- * @param int $projectID
- * @access public
- * @return bool|array
- */
- public function update($planID = 0, $projectID = 0)
- {
- /* Get oldPlan and the data from the post. */
- $oldPlan = $this->getByID($planID);
- $plan = fixer::input('post')
- ->setDefault('begin', '0000-00-00')
- ->setDefault('end', '0000-00-00')
- ->setDefault('realBegan', '0000-00-00')
- ->setDefault('realEnd', '0000-00-00')
- ->join('output', ',')
- ->get();
-
- /* Judgment of required items. */
- if($plan->begin == '0000-00-00') dao::$errors['begin'][] = sprintf($this->lang->error->notempty, $this->lang->programplan->begin);
- if($plan->end == '0000-00-00') dao::$errors['end'][] = sprintf($this->lang->error->notempty, $this->lang->programplan->end);
-
- $planChanged = ($oldPlan->name != $plan->name || $oldPlan->milestone != $plan->milestone || $oldPlan->begin != $plan->begin || $oldPlan->end != $plan->end);
-
- if($plan->parent > 0)
- {
- $parentStage = $this->getByID($plan->parent);
- $plan->attribute = $parentStage->attribute;
- $plan->acl = $parentStage->acl;
- $parentPercent = $parentStage->percent;
-
- $childrenTotalPercent = $this->getTotalPercent($parentStage, true);
- $childrenTotalPercent = $plan->parent == $oldPlan->parent ? ($childrenTotalPercent - $oldPlan->percent + $plan->percent) : ($childrenTotalPercent + $plan->percent);
- if($childrenTotalPercent > 100) return dao::$errors['percent'][] = $this->lang->programplan->error->percentOver;
-
- /* If child plan has milestone, update parent plan set milestone eq 0 . */
- if($plan->milestone and $parentStage->milestone) $this->dao->update(TABLE_PROJECT)->set('milestone')->eq(0)->where('id')->eq($oldPlan->parent)->exec();
- }
- else
- {
- /* Synchronously update sub-phase permissions. */
- $childrenIDList = $this->dao->select('*')->from(TABLE_PROJECT)->where('parent')->eq($oldPlan->id)->fetch('id');
- if(!empty($childrenIDList)) $this->dao->update(TABLE_PROJECT)->set('acl')->eq($plan->acl)->where('id')->in($childrenIDList)->exec();
-
- /* The workload of the parent plan cannot exceed 100%. */
- $oldPlan->parent = $plan->parent;
- $totalPercent = $this->getTotalPercent($oldPlan);
- $totalPercent = $totalPercent + $plan->percent;
- if($totalPercent > 100) return dao::$errors['percent'][] = $this->lang->programplan->error->percentOver;
- }
-
- /* Set planDuration and realDuration. */
- $plan->planDuration = $this->getDuration($plan->begin, $plan->end);
- $plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd);
-
- if($planChanged) $plan->version = $oldPlan->version + 1;
- if(empty($plan->parent)) $plan->parent = $projectID;
-
- $this->dao->update(TABLE_PROJECT)->data($plan)
- ->autoCheck()
- ->batchCheck($this->config->programplan->edit->requiredFields, 'notempty')
- ->checkIF($plan->end != '0000-00-00', 'end', 'ge', $plan->begin)
- ->checkIF($plan->percent != false, 'percent', 'float')
- ->where('id')->eq($planID)
- ->exec();
-
- if(dao::isError()) return false;
- $this->setTreePath($planID);
- if($plan->acl != 'open') $this->loadModel('user')->updateUserView($planID, 'sprint');
-
- if($planChanged)
- {
- $spec = new stdclass();
- $spec->project = $planID;
- $spec->version = $plan->version;
- $spec->name = $plan->name;
- $spec->milestone = $plan->milestone;
- $spec->begin = $plan->begin;
- $spec->end = $plan->end;
-
- $this->dao->insert(TABLE_PROJECTSPEC)->data($spec)->exec();
- }
-
- return common::createChanges($oldPlan, $plan);
- }
-
- /**
- * Print cell.
- *
- * @param int $col
- * @param int $plan
- * @param int $users
- * @param int $projectID
- * @access public
- * @return string
- */
- public function printCell($col, $plan, $users, $projectID)
- {
- $id = $col->id;
- if($col->show)
- {
- $class = 'c-' . $id;
- $title = '';
- $idList = array('id','name','output','percent','attribute','version','begin','end','realBegan','realEnd', 'openedBy', 'openedDate');
- if(in_array($id,$idList))
- {
- $class .= ' text-left';
- $title = "title='{$plan->$id}'";
- if($id == 'output') $class .= ' text-ellipsis';
- if(!empty($plan->children)) $class .= ' has-child';
- }
- else
- {
- $class .= ' text-center';
- }
- if($id == 'actions') $class .= ' c-actions';
-
- echo "";
- if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('programplan', $plan, $id);
- switch($id)
- {
- case 'id':
- echo sprintf('%03d', $plan->id);
- break;
- case 'name':
- $milestoneFlag = $plan->milestone ? " lang->programplan->milestone}'>" : '';
- if($plan->grade > 1) echo '' . $this->lang->programplan->childrenAB . ' ';
- echo $plan->name . $milestoneFlag;
- if(!empty($plan->children)) echo '';
- break;
- case 'percent':
- echo $plan->percent . '%';
- break;
- case 'attribute':
- echo zget($this->lang->stage->typeList, $plan->attribute, '');
- break;
- case 'begin':
- echo $plan->begin;
- break;
- case 'end':
- echo $plan->end;
- break;
- case 'realBegan':
- echo $plan->realBegan;
- break;
- case 'realEnd':
- echo $plan->realEnd;
- break;
- case 'output':
- echo $plan->output;
- break;
- case 'version':
- echo $plan->version;
- break;
- case 'editedBy':
- echo zget($users, $plan->editedBy);
- break;
- case 'editedDate':
- echo substr($plan->editedDate, 5, 11);
- break;
- case 'openedBy':
- echo zget($users, $plan->openedBy);
- break;
- case 'openedDate':
- echo substr($plan->openedDate, 5, 11);
- break;
- case 'actions':
- common::printIcon('project', 'start', "projectID={$plan->id}", $plan, 'list', '', '', 'iframe', true);
- $class = !empty($plan->children) ? 'disabled' : '';
- common::printIcon('task', 'create', "projectID={$plan->id}", $plan, 'list', '', '', $class);
-
- if($plan->grade == 1 && $this->isCreateTask($plan->id))
- {
- common::printIcon('programplan', 'create', "program={$plan->parent}&productID=$plan->product&planID=$plan->id", $plan, 'list', 'split', '', '', '', '', $this->lang->programplan->createSubPlan);
- }
- else
- {
- $disabled = ($plan->grade == 2) ? ' disabled' : '';
- echo html::a('javascript:alert("' . $this->lang->programplan->error->createdTask . '");', '', '', 'class="btn ' . $disabled . '"');
- }
-
- common::printIcon('programplan', 'edit', "planID=$plan->id&projectID=$projectID", $plan, 'list', '', '', 'iframe', true);
-
- $disabled = !empty($plan->children) ? ' disabled' : '';
- if(common::hasPriv('project', 'delete', $plan))
- {
- common::printIcon('project', 'delete', "planID=$plan->id&confirm=no", $plan, 'list', 'trash', 'hiddenwin' , $disabled);
- }
- break;
- }
- echo ' | ';
- }
- }
-
- /**
- * Is create task.
- *
- * @param int $planID
- * @access public
- * @return bool
- */
- public function isCreateTask($planID)
- {
- $task = $this->dao->select('*')->from(TABLE_TASK)->where('project')->eq($planID)->limit(1)->fetch();
- return empty($task) ? true : false;
- }
-
- /**
- * Is clickable.
- *
- * @param int $plan
- * @param int $action
- * @static
- * @access public
- * @return bool
- */
- public static function isClickable($plan, $action)
- {
- $action = strtolower($action);
-
- if($action == 'create' and $plan->grade > 1) return false;
-
- return true;
- }
-
- /**
- * Get the stage set to milestone.
- *
- * @param int $projectID
- * @access public
- * @return object
- */
- public function getMilestones($projectID = 0)
- {
- return $this->dao->select('id, name')->from(TABLE_PROJECT)
- ->where('project')->eq($projectID)
- ->andWhere('type')->eq('stage')
- ->andWhere('milestone')->eq(1)
- ->andWhere('deleted')->eq(0)
- ->orderBy('id_desc')
- ->fetchPairs();
- }
-
- /**
- * Get milestone by product.
- *
- * @param int $productID
- * @access public
- * @return object
- */
- public function getMilestoneByProduct($productID)
- {
- return $this->dao->select('t1.id, t1.name')->from(TABLE_PROJECT)->alias('t1')
- ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id=t2.project')
- ->where('t2.product')->eq($productID)
- ->andWhere('t1.type')->eq('stage')
- ->andWhere('t1.milestone')->eq(1)
- ->andWhere('t1.deleted')->eq(0)
- ->orderBy('t1.begin asc')
- ->fetchPairs();
- }
-
- /**
- * Get parent stage list.
- *
- * @param int $projectID
- * @param int $planID
- * @param int $productID
- * @access public
- * @return array
- */
- public function getParentStageList($projectID, $planID, $productID)
- {
- $parentStage = $this->dao->select('t2.id, t2.name')->from(TABLE_PROJECTPRODUCT)
- ->alias('t1')->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
- ->where('t1.product')->eq($productID)
- ->andWhere('t2.project')->eq($projectID)
- ->andWhere('t2.grade')->eq(1)
- ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()
- ->orderBy('t2.id desc')
- ->fetchPairs();
-
- /* Remove the currently edited stage. */
- if(isset($parentStage[$planID])) unset($parentStage[$planID]);
-
- $plan = $this->getByID($planID);
- foreach($parentStage as $key => $stage)
- {
- $isCreate = $this->isCreateTask($key);
- if($isCreate === false and $key != $plan->parent) unset($parentStage[$key]);
- }
- $parentStage[0] = $this->lang->programplan->emptyParent;
- ksort($parentStage);
-
- return $parentStage;
- }
-}
diff --git a/module/programplan/view/browse.html.php b/module/programplan/view/browse.html.php
deleted file mode 100644
index c732b2be1d..0000000000
--- a/module/programplan/view/browse.html.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
- * @package programplan
- * @version $Id: browse.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $
- * @link http://www.zentao.net
- */
-?>
-
-
-
-
-
-
-
- programplan->noData;?>
-
- createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), " " . $lang->programplan->create, '', "class='btn btn-info'");?>
-
-
-
-
-
-
-
-
-
-
- programplan->create;
- if($planID) $title = $programPlan->name . $lang->project->statge . '（' . $programPlan->begin . $lang->project->to . $programPlan->end . '）';
- echo "{$title}";
- ?>
-
-
-
-
-
-
programplan->edit;?>
-
-
-
-