diff --git a/db/update17.6.2.sql b/db/update17.6.2.sql index c704ef4859..d5afb0b26a 100644 --- a/db/update17.6.2.sql +++ b/db/update17.6.2.sql @@ -4,12 +4,13 @@ CREATE TABLE IF NOT EXISTS `zt_ticket` ( `module` mediumint(8) unsigned NOT NULL, `title` varchar(255) NOT NULL, `type` varchar(30) NOT NULL, - `solution` varchar(255) NOT NULL, `desc` text NOT NULL, `openedBuild` varchar(255) NOT NULL, `assignedTo` varchar(255) NOT NULL, `assignedDate` datetime NOT NULL, `realStarted` datetime NOT NULL, + `startBy` varchar(255) NOT NULL, + `startDate` datetime NOT NULL, `deadline` date NOT NULL, `pri` tinyint unsigned NOT NULL DEFAULT '0', `estimate` float unsigned NOT NULL, @@ -21,11 +22,13 @@ CREATE TABLE IF NOT EXISTS `zt_ticket` ( `activatedCount` int(10) NOT NULL, `activatedBy` varchar(30) NOT NULL, `activatedDate` datetime NOT NULL, - `finishedBy` varchar(30) NOT NULL, - `finishedDate` datetime NOT NULL, `closedBy` varchar(30) NOT NULL, `closedDate` datetime NOT NULL, - `closedReason` varchar(30) NOT NULL, + `finishedBy` varchar(30) NOT NULL, + `finishedDate` datetime NOT NULL, + `resolvedBy` varchar(30) NOT NULL, + `resolvedDate` datetime NOT NULL, + `resolution` varchar(1000) NOT NULL, `editedBy` varchar(30) NOT NULL, `editedDate` datetime NOT NULL, `keyword` varchar(255) NOT NULL, @@ -45,4 +48,7 @@ CREATE TABLE IF NOT EXISTS `zt_ticketsource` ( `createdDate` datetime NOT NULL, PRIMARY KEY (`id`), key `ticketId` (`ticketId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +ALTER TABLE `zt_product` ADD `ticket` varchar(30) NOT NULL AFTER `feedback`; \ No newline at end of file diff --git a/db/zentao.sql b/db/zentao.sql index bf10d8989f..2463dfb341 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -7121,12 +7121,13 @@ CREATE TABLE IF NOT EXISTS `zt_ticket` ( `module` mediumint(8) unsigned NOT NULL, `title` varchar(255) NOT NULL, `type` varchar(30) NOT NULL, - `solution` varchar(255) NOT NULL, `desc` text NOT NULL, `openedBuild` varchar(255) NOT NULL, `assignedTo` varchar(255) NOT NULL, `assignedDate` datetime NOT NULL, `realStarted` datetime NOT NULL, + `startBy` varchar(255) NOT NULL, + `startDate` datetime NOT NULL, `deadline` date NOT NULL, `pri` tinyint unsigned NOT NULL DEFAULT '0', `estimate` float unsigned NOT NULL, @@ -7138,11 +7139,13 @@ CREATE TABLE IF NOT EXISTS `zt_ticket` ( `activatedCount` int(10) NOT NULL, `activatedBy` varchar(30) NOT NULL, `activatedDate` datetime NOT NULL, - `finishedBy` varchar(30) NOT NULL, - `finishedDate` datetime NOT NULL, `closedBy` varchar(30) NOT NULL, `closedDate` datetime NOT NULL, - `closedReason` varchar(30) NOT NULL, + `finishedBy` varchar(30) NOT NULL, + `finishedDate` datetime NOT NULL, + `resolvedBy` varchar(30) NOT NULL, + `resolvedDate` datetime NOT NULL, + `resolution` varchar(1000) NOT NULL, `editedBy` varchar(30) NOT NULL, `editedDate` datetime NOT NULL, `keyword` varchar(255) NOT NULL, @@ -7669,6 +7672,7 @@ ADD `grade` tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER `path`, ADD `order` smallint(5) unsigned NOT NULL DEFAULT '0' AFTER `grade`; ALTER TABLE `zt_product` ADD `feedback` varchar(30) COLLATE 'utf8_general_ci' NOT NULL AFTER `RD`; +ALTER TABLE `zt_product` ADD `ticket` varchar(30) COLLATE 'utf8_general_ci' NOT NULL AFTER `feedback`; ALTER TABLE `zt_leave` ADD `level` tinyint(3) NOT NULL; ALTER TABLE `zt_leave` ADD `assignedTo` varchar(30) NOT NULL; diff --git a/module/product/css/view.css b/module/product/css/view.css index f8860cc652..71d10b732b 100644 --- a/module/product/css/view.css +++ b/module/product/css/view.css @@ -9,4 +9,3 @@ td.acl {white-space: nowrap;} .c-openedBy ,.c-acl ,.c-prs ,.c-common {width:110px !important;} .c-bugs ,.c-type {width:120px !important;} .c-release {padding-right: 20px !important;} -.c-feedback {padding-right: 20px !important;}