diff --git a/config/zentaopms.php b/config/zentaopms.php index 9d3653bd3f..59ea1c162a 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_WORKESTIMATION')) define('TABLE_WORKESTIMATION', '`' . $config->db->prefix . 'workestimation`'); if(!defined('TABLE_BUDGET')) define('TABLE_BUDGET', '`' . $config->db->prefix . 'budget`'); if(!defined('TABLE_SEARCHINDEX')) define('TABLE_SEARCHINDEX', $config->db->prefix . 'searchindex'); diff --git a/db/update15.0.sql b/db/update15.0.sql index 480588439b..cfabe33029 100644 --- a/db/update15.0.sql +++ b/db/update15.0.sql @@ -146,26 +146,6 @@ CREATE TABLE IF NOT EXISTS `zt_budget` ( PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; --- DROP TABLE IF EXISTS `zt_workestimation`; -CREATE TABLE IF NOT EXISTS `zt_workestimation` ( - `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, - `PRJ` mediumint(8) unsigned NOT NULL, - `scale` decimal(10, 2) unsigned NOT NULL, - `productivity` decimal(10, 2) unsigned NOT NULL, - `duration` decimal(10, 2) unsigned NOT NULL, - `unitLaborCost` decimal(10, 2) unsigned NOT NULL, - `totalLaborCost` decimal(10, 2) unsigned NOT NULL, - `createdBy` varchar(30) NOT NULL, - `createdDate` datetime NOT NULL, - `editedBy` varchar(30) NOT NULL, - `editedDate` datetime NOT NULL, - `assignedTo` varchar(30) NOT NULL, - `assignedDate` datetime NOT NULL, - `deleted` enum('0','1') NOT NULL DEFAULT '0', - `dayHour` decimal(10,2) DEFAULT NULL, - 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 379df175cc..c90b2cb1d2 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1274,25 +1274,6 @@ CREATE TABLE IF NOT EXISTS `zt_webhook` ( `deleted` enum('0', '1') NOT NULL DEFAULT '0', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; --- DROP TABLE IF EXISTS `zt_workestimation`; -CREATE TABLE `zt_workestimation` ( - `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, - `PRJ` mediumint(8) unsigned NOT NULL, - `scale` decimal(10,2) unsigned NOT NULL, - `productivity` decimal(10,2) unsigned NOT NULL, - `duration` decimal(10,2) unsigned NOT NULL, - `unitLaborCost` decimal(10,2) unsigned NOT NULL, - `totalLaborCost` decimal(10,2) unsigned NOT NULL, - `createdBy` varchar(30) NOT NULL, - `createdDate` datetime NOT NULL, - `editedBy` varchar(30) NOT NULL, - `editedDate` datetime NOT NULL, - `assignedTo` varchar(30) NOT NULL, - `assignedDate` datetime NOT NULL, - `deleted` enum('0','1') NOT NULL DEFAULT '0', - `dayHour` decimal(10,2) DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_log`; CREATE TABLE IF NOT EXISTS `zt_log` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, diff --git a/module/block/control.php b/module/block/control.php index 8e1fa1c3cb..06377dddb3 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1245,7 +1245,7 @@ class block extends control */ public function printWaterfallEstimateBlock() { - if(isset($this->config->maxVersion)) $this->app->loadLang('durationestimation'); + $this->app->loadLang('durationestimation'); $programID = $this->session->PRJ; $members = $this->loadModel('project')->getTeamMemberPairs($programID); $budget = $this->loadModel('workestimation')->getBudget($programID); diff --git a/module/block/view/waterfallestimateblock.html.php b/module/block/view/waterfallestimateblock.html.php index f643e03f2f..7b2b8c1e8e 100644 --- a/module/block/view/waterfallestimateblock.html.php +++ b/module/block/view/waterfallestimateblock.html.php @@ -1,13 +1,11 @@