diff --git a/.gitfox/lint.yaml b/.gitfox/lint.yaml
index 318f4d8ff9..abf897e7cc 100644
--- a/.gitfox/lint.yaml
+++ b/.gitfox/lint.yaml
@@ -39,7 +39,7 @@ spec:
type: run
spec:
container:
- image: hub.zentao.net/ci/zentao-package:master
+ image: hub.zentao.net/ci/zentao-package:master-250527
script:
- DOWNGRADE_CODE_DIR=$(mktemp -d)
- mkdir $DOWNGRADE_CODE_DIR/diff
diff --git a/.gitfox/unittestcheck.yaml b/.gitfox/unittestcheck.yaml
index 1c4e410496..03f1b4cb0a 100644
--- a/.gitfox/unittestcheck.yaml
+++ b/.gitfox/unittestcheck.yaml
@@ -18,7 +18,13 @@ spec:
- DOWNGRADE_GIT_REPO=$(jq -r .pkg.downgrade.gitRepo < ci.json)
- DOWNGRADE_EXT_GIT_REPO=$(jq -r .pkg.downgradeExt.gitRepo <
ci.json)
+ - EXT_BRANCH=$(jq -r .pkg.zentaoext.gitVersion < ci.json)
+ - MAX_BRANCH=$(jq -r .pkg.zentaomax.gitVersion < ci.json)
+ - IPD_BRANCH=$(jq -r .pkg.zentaoipd.gitVersion < ci.json)
- echo "XUANVERSION=${XUANVERSION}" >> $GITFOX_CUSTOM_ENV
+ - echo "EXT_BRANCH=${EXT_BRANCH}" >> $GITFOX_CUSTOM_ENV
+ - echo "MAX_BRANCH=${MAX_BRANCH}" >> $GITFOX_CUSTOM_ENV
+ - echo "IPD_BRANCH=${IPD_BRANCH}" >> $GITFOX_CUSTOM_ENV
- echo "export ZENTAOEXT_GIT_REPO=${ZENTAOEXT_GIT_REPO}" >>
$GITFOX_CUSTOM_ENV
- echo "export DOWNGRADE_GIT_REPO=${DOWNGRADE_GIT_REPO}" >>
@@ -42,12 +48,12 @@ spec:
script:
- git clone -q http://${GITFOX_SERVER}/git/xuan/xuanxuan.git
xuansrc && cd xuansrc && git checkout $XUANVERSION && cd -
- - git clone --depth 1 -q
+ - git clone --depth 1 -q -b ${EXT_BRANCH}
http://${GITFOX_SERVER}/git/${ZENTAOEXT_GIT_REPO}.git
zentaoext
- - git clone --depth 1
+ - git clone --depth 1 -b ${MAX_BRANCH}
http://${GITFOX_SERVER}/git/zentao/zentaomax.git zentaomax
- - git clone --depth 1
+ - git clone --depth 1 -b ${IPD_BRANCH}
http://${GITFOX_SERVER}/git/zentao/zentaoipd.git zentaoipd
- name: 版本变量设定
type: run
@@ -101,15 +107,13 @@ spec:
-f misc/ci/Dockerfile.test .
- name: unit test
type: run
- when: |
- build.target == "main"
spec:
envs:
MYSQL_INTERNAL: "true"
container:
image: hub.qc.oop.cc/zentao-ztf:${{ build.number }}-${{ build.after }}
script:
- - git rev-list $(git rev-parse origin/main )..$(git rev-parse HEAD)
+ - git rev-list $(git rev-parse origin/$GITFOX_TARGET_BRANCH)..$(git rev-parse HEAD)
- sh -c 'nohup /usr/bin/entrypoint.sh >/dev/null 2>&1 &'
- . /etc/s6/s6-init/envs
- sleep 5
diff --git a/.gitfox/unittestforcommitid.yaml b/.gitfox/unittestforcommitid.yaml
index cd6799e728..894f511527 100644
--- a/.gitfox/unittestforcommitid.yaml
+++ b/.gitfox/unittestforcommitid.yaml
@@ -26,15 +26,13 @@ spec:
- docker buildx build --pull --push --platform linux/amd64 --build-arg VERSION=${ZENTAO_VERSION} --build-arg MIRROR=true -t hub.qc.oop.cc/zentao-ztf:${GITFOX_BUILD_NUMBER}-${GITFOX_COMMIT} -f misc/ci/Dockerfile.test .
- name: unit test
type: run
- when: |
- build.target == "main"
spec:
envs:
MYSQL_INTERNAL: "true"
container:
image: hub.qc.oop.cc/zentao-ztf:${{ build.number }}-${{ build.after }}
script:
- - git rev-list $(git rev-parse origin/main )..$(git rev-parse HEAD)
+ - git rev-list $(git rev-parse origin/$GITFOX_TARGET_BRANCH )..$(git rev-parse HEAD)
- sh -c 'nohup /usr/bin/entrypoint.sh >/dev/null 2>&1 &'
- . /etc/s6/s6-init/envs
- sleep 5
diff --git a/VERSION b/VERSION
index 2a813a8652..328328a48d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-21.7
\ No newline at end of file
+21.7.1
diff --git a/api/v1/entries/testresults.php b/api/v1/entries/testresults.php
index a915d33511..cc570e834b 100644
--- a/api/v1/entries/testresults.php
+++ b/api/v1/entries/testresults.php
@@ -84,7 +84,7 @@ class testresultsEntry extends entry
$reals[$stepID] = $step->real;
}
$this->setPost('result', $results);
- $this->setPost('reals', $reals);
+ $this->setPost('real', $reals);
}
$control->runCase($runID, $caseID, $version);
diff --git a/ci.json b/ci.json
index ee64caeac2..c07e0e66df 100644
--- a/ci.json
+++ b/ci.json
@@ -6,13 +6,13 @@
},
"zentaoext": {
"gitRepo": "zentao/zentaoext",
- "gitVersion": "patch/11.7"
+ "gitVersion": "release/12.0"
},
"zentaomax": {
- "gitVersion": "patch/6.7"
+ "gitVersion": "release/7.0"
},
"zentaoipd": {
- "gitVersion": "patch/3.7"
+ "gitVersion": "release/4.0"
},
"devops": {
"gitRepo": "zentao/devops"
diff --git a/config/config.php b/config/config.php
index 682acf0585..0486149295 100644
--- a/config/config.php
+++ b/config/config.php
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* 基本设置。Basic settings. */
-$config->version = '21.7'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version = '21.7.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->liteVersion = '1.2'; // 迅捷版版本。 The version of Lite.
$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time.
diff --git a/config/zentaopms.php b/config/zentaopms.php
index 7f6d012c62..97041891c9 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -429,6 +429,7 @@ define('TABLE_ACL', '`' . $config->db->prefix . 'acl`');
define('TABLE_DESIGN', '`' . $config->db->prefix . 'design`');
define('TABLE_DESIGNSPEC', '`' . $config->db->prefix . 'designspec`');
+define('TABLE_DELIVERABLE', '`' . $config->db->prefix . 'deliverable`');
define('TABLE_DOCLIB', '`' . $config->db->prefix . 'doclib`');
define('TABLE_DOC', '`' . $config->db->prefix . 'doc`');
define('TABLE_DOCBLOCK', '`' . $config->db->prefix . 'docblock`');
@@ -672,6 +673,7 @@ $config->objectTables['demand'] = TABLE_DEMAND;
$config->objectTables['demandpool'] = TABLE_DEMANDPOOL;
$config->objectTables['demandspec'] = TABLE_DEMANDSPEC;
$config->objectTables['demandreview'] = TABLE_DEMANDREVIEW;
+$config->objectTables['deliverable'] = TABLE_DELIVERABLE;
$config->objectTables['todo'] = TABLE_TODO;
$config->objectTables['custom'] = TABLE_LANG;
$config->objectTables['branch'] = TABLE_BRANCH;
diff --git a/db/demo.sql b/db/demo.sql
index 73027466c9..302ade2ed0 100644
--- a/db/demo.sql
+++ b/db/demo.sql
@@ -578,7 +578,8 @@ REPLACE INTO `zt_searchdict` (`key`, `value`) VALUES
(39564, '验'),
(39588, '骤'),
(65292, '，');
-REPLACE INTO `zt_searchindex` (`id`, `vision`, `objectType`, `objectID`, `title`, `content`, `addedDate`, `editedDate`) VALUES
+TRUNCATE TABLE `zt_searchindex`;
+INSERT INTO `zt_searchindex` (`id`, `vision`, `objectType`, `objectID`, `title`, `content`, `addedDate`, `editedDate`) VALUES
(1, 'rnd', 'program', 1, ' 20225 19994 31649 29702', '', '2024-04-02 14:25:12', '2024-04-02 14:25:12'),
(2, 'rnd', 'product', 1, ' 20844 21496 20225 19994 32593 31449 24314 35774', ' 24314 31435 20844 21496 20225 19994 32593 31449 65292 21487 20197 26356 22909 23545 22806 23637 31034 12290', '2024-04-02 14:30:13', '2024-04-02 14:30:13'),
(3, 'rnd', 'product', 2, ' 20225 19994 20869 37096 24037 26102 31649 29702 31995 32479', '', '2024-04-02 14:30:55', '2024-04-02 14:30:55'),
diff --git a/db/endemo.sql b/db/endemo.sql
index 906cdc4be1..0ae568f0c4 100644
--- a/db/endemo.sql
+++ b/db/endemo.sql
@@ -577,7 +577,8 @@ REPLACE INTO `zt_searchdict` (`key`, `value`) VALUES
(39564, '验'),
(39588, '骤'),
(65292, '，');
-REPLACE INTO `zt_searchindex` (`id`, `vision`, `objectType`, `objectID`, `title`, `content`, `addedDate`, `editedDate`) VALUES
+TRUNCATE TABLE `zt_searchindex`;
+INSERT INTO `zt_searchindex` (`id`, `vision`, `objectType`, `objectID`, `title`, `content`, `addedDate`, `editedDate`) VALUES
(1, 'rnd', 'program', 1, ' 20225 19994 31649 29702', '', '2024-04-02 14:25:12', '2024-04-02 14:25:12'),
(2, 'rnd', 'product', 1, ' 20844 21496 20225 19994 32593 31449 24314 35774', ' 24314 31435 20844 21496 20225 19994 32593 31449 65292 21487 20197 26356 22909 23545 22806 23637 31034 12290', '2024-04-02 14:30:13', '2024-04-02 14:30:13'),
(3, 'rnd', 'product', 2, ' 20225 19994 20869 37096 24037 26102 31649 29702 31995 32479', '', '2024-04-02 14:30:55', '2024-04-02 14:30:55'),
diff --git a/db/standard/zentao21.7.1.sql b/db/standard/zentao21.7.1.sql
new file mode 100644
index 0000000000..5d92c6b88e
--- /dev/null
+++ b/db/standard/zentao21.7.1.sql
@@ -0,0 +1,4318 @@
+CREATE TABLE `zt_acl` (
+ `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+ `account` char(30) NOT NULL DEFAULT '',
+ `objectType` char(30) NOT NULL DEFAULT '',
+ `objectID` mediumint(9) NOT NULL DEFAULT 0,
+ `type` char(40) NOT NULL DEFAULT 'whitelist',
+ `source` char(30) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_action` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `objectType` varchar(30) NOT NULL DEFAULT '',
+ `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` text DEFAULT NULL,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `actor` varchar(100) NOT NULL DEFAULT '',
+ `action` varchar(80) NOT NULL DEFAULT '',
+ `date` datetime DEFAULT NULL,
+ `comment` text DEFAULT NULL,
+ `files` text DEFAULT NULL,
+ `extra` text DEFAULT NULL,
+ `read` enum('0','1') NOT NULL DEFAULT '0',
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `efforted` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ KEY `date` (`date`),
+ KEY `actor` (`actor`),
+ KEY `project` (`project`),
+ KEY `action` (`action`),
+ KEY `objectID` (`objectID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_actionrecent` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `objectType` varchar(30) NOT NULL DEFAULT '',
+ `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` text DEFAULT NULL,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `actor` varchar(100) NOT NULL DEFAULT '',
+ `action` varchar(80) NOT NULL DEFAULT '',
+ `date` datetime DEFAULT NULL,
+ `comment` text DEFAULT NULL,
+ `files` text DEFAULT NULL,
+ `extra` text DEFAULT NULL,
+ `read` enum('0','1') NOT NULL DEFAULT '0',
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `efforted` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ KEY `date` (`date`),
+ KEY `actor` (`actor`),
+ KEY `project` (`project`),
+ KEY `action` (`action`),
+ KEY `objectID` (`objectID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_activity` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `process` mediumint(9) NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `optional` varchar(255) NOT NULL DEFAULT '',
+ `tailorNorm` varchar(255) NOT NULL DEFAULT '',
+ `content` mediumtext DEFAULT NULL,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `assignedBy` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `order` mediumint(8) DEFAULT 0,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_ai_assistant` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(30) NOT NULL,
+ `modelId` mediumint(8) unsigned NOT NULL,
+ `desc` text NOT NULL,
+ `systemMessage` text NOT NULL,
+ `greetings` text NOT NULL,
+ `icon` varchar(30) NOT NULL DEFAULT 'coding-1',
+ `enabled` enum('0','1') NOT NULL DEFAULT '1',
+ `createdDate` datetime NOT NULL,
+ `publishedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_ai_message` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `appID` mediumint(8) unsigned NOT NULL,
+ `user` mediumint(8) unsigned NOT NULL,
+ `type` enum('req','res','ntf') NOT NULL,
+ `content` text NOT NULL,
+ `createdDate` datetime NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `zt_ai_miniprogram` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(30) NOT NULL,
+ `category` varchar(30) NOT NULL,
+ `desc` text DEFAULT NULL,
+ `model` mediumint(8) unsigned DEFAULT NULL,
+ `icon` varchar(30) NOT NULL DEFAULT 'writinghand-7',
+ `createdBy` varchar(30) NOT NULL,
+ `createdDate` datetime NOT NULL,
+ `editedBy` varchar(30) NOT NULL,
+ `editedDate` datetime NOT NULL,
+ `published` enum('0','1') NOT NULL DEFAULT '0',
+ `publishedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `prompt` text NOT NULL,
+ `builtIn` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `zt_ai_miniprogramfield` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `appID` mediumint(8) unsigned NOT NULL,
+ `name` varchar(30) NOT NULL,
+ `type` enum('radio','checkbox','text','textarea') DEFAULT 'text',
+ `placeholder` text DEFAULT NULL,
+ `options` text DEFAULT NULL,
+ `required` enum('0','1') DEFAULT '1',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `zt_ai_miniprogramstar` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `appID` mediumint(8) unsigned NOT NULL,
+ `userID` mediumint(8) unsigned NOT NULL,
+ `createdDate` datetime NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `appID` (`appID`,`userID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `zt_ai_model` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `type` varchar(20) NOT NULL,
+ `vendor` varchar(20) NOT NULL,
+ `credentials` text NOT NULL,
+ `proxy` text DEFAULT NULL,
+ `name` varchar(20) DEFAULT NULL,
+ `desc` text DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL,
+ `createdDate` datetime NOT NULL,
+ `editedBy` varchar(30) DEFAULT NULL,
+ `editedDate` datetime DEFAULT NULL,
+ `enabled` enum('0','1') NOT NULL DEFAULT '1',
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_ai_prompt` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(20) NOT NULL,
+ `desc` text DEFAULT NULL,
+ `model` mediumint(8) unsigned DEFAULT NULL,
+ `module` varchar(30) DEFAULT NULL,
+ `source` text DEFAULT NULL,
+ `targetForm` varchar(30) DEFAULT NULL,
+ `purpose` text DEFAULT NULL,
+ `elaboration` text DEFAULT NULL,
+ `role` text DEFAULT NULL,
+ `characterization` text DEFAULT NULL,
+ `status` enum('draft','active') NOT NULL DEFAULT 'draft',
+ `createdBy` varchar(30) NOT NULL,
+ `createdDate` datetime NOT NULL,
+ `editedBy` varchar(30) DEFAULT NULL,
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_ai_promptrole` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(30) DEFAULT NULL,
+ `desc` text DEFAULT NULL,
+ `model` mediumint(8) unsigned DEFAULT NULL,
+ `role` text DEFAULT NULL,
+ `characterization` text DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_api` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `product` varchar(255) NOT NULL DEFAULT '',
+ `lib` int(11) unsigned NOT NULL DEFAULT 0,
+ `module` int(11) unsigned NOT NULL DEFAULT 0,
+ `title` varchar(100) NOT NULL DEFAULT '',
+ `path` varchar(255) NOT NULL DEFAULT '',
+ `protocol` varchar(10) NOT NULL DEFAULT '',
+ `method` varchar(10) NOT NULL DEFAULT '',
+ `requestType` varchar(100) NOT NULL DEFAULT '',
+ `responseType` varchar(100) NOT NULL DEFAULT '',
+ `status` varchar(20) NOT NULL DEFAULT '',
+ `owner` varchar(30) NOT NULL DEFAULT '0',
+ `desc` mediumtext DEFAULT NULL,
+ `version` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `params` text DEFAULT NULL,
+ `paramsExample` text DEFAULT NULL,
+ `responseExample` text DEFAULT NULL,
+ `response` text DEFAULT NULL,
+ `commonParams` text DEFAULT NULL,
+ `addedBy` varchar(30) NOT NULL DEFAULT '0',
+ `addedDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_api_lib_release` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `lib` int(11) unsigned NOT NULL DEFAULT 0,
+ `desc` varchar(255) NOT NULL DEFAULT '',
+ `version` varchar(255) NOT NULL DEFAULT '',
+ `snap` mediumtext DEFAULT NULL,
+ `addedBy` varchar(30) NOT NULL DEFAULT '0',
+ `addedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_apispec` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `doc` int(11) unsigned NOT NULL DEFAULT 0,
+ `module` int(11) unsigned NOT NULL DEFAULT 0,
+ `title` varchar(100) NOT NULL DEFAULT '',
+ `path` varchar(255) NOT NULL DEFAULT '',
+ `protocol` varchar(10) NOT NULL DEFAULT '',
+ `method` varchar(10) NOT NULL DEFAULT '',
+ `requestType` varchar(100) NOT NULL DEFAULT '',
+ `responseType` varchar(100) NOT NULL DEFAULT '',
+ `status` varchar(20) NOT NULL DEFAULT '',
+ `owner` varchar(255) NOT NULL DEFAULT '0',
+ `desc` mediumtext DEFAULT NULL,
+ `version` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `params` text DEFAULT NULL,
+ `paramsExample` text DEFAULT NULL,
+ `responseExample` text DEFAULT NULL,
+ `response` text DEFAULT NULL,
+ `addedBy` varchar(30) NOT NULL DEFAULT '0',
+ `addedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_apistruct` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `lib` int(11) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(30) NOT NULL DEFAULT '',
+ `type` varchar(50) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `version` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `attribute` text DEFAULT NULL,
+ `addedBy` varchar(30) NOT NULL DEFAULT '0',
+ `addedDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_apistruct_spec` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(50) NOT NULL DEFAULT '',
+ `desc` varchar(255) NOT NULL DEFAULT '',
+ `attribute` text DEFAULT NULL,
+ `version` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `addedBy` varchar(30) NOT NULL DEFAULT '0',
+ `addedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_approval` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `flow` mediumint(8) NOT NULL DEFAULT 0,
+ `objectType` varchar(30) NOT NULL DEFAULT '',
+ `objectID` mediumint(9) NOT NULL DEFAULT 0,
+ `nodes` mediumtext DEFAULT NULL,
+ `version` mediumint(9) NOT NULL DEFAULT 0,
+ `status` varchar(20) NOT NULL DEFAULT 'doing',
+ `result` varchar(20) NOT NULL DEFAULT '',
+ `extra` text DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `deleted` tinyint(4) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_approvalflow` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `code` varchar(100) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `version` mediumint(8) NOT NULL DEFAULT 1,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `workflow` varchar(30) NOT NULL DEFAULT '',
+ `deleted` tinyint(4) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_approvalflowobject` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `root` int(8) NOT NULL DEFAULT 0,
+ `flow` int(8) NOT NULL DEFAULT 0,
+ `objectType` char(30) NOT NULL DEFAULT '',
+ `objectID` mediumint(9) NOT NULL DEFAULT 0,
+ `extra` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_approvalflowspec` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `flow` mediumint(8) NOT NULL DEFAULT 0,
+ `version` mediumint(8) NOT NULL DEFAULT 0,
+ `nodes` mediumtext DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_approvalnode` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `approval` mediumint(8) NOT NULL DEFAULT 0,
+ `type` enum('review','cc') NOT NULL DEFAULT 'review',
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `account` char(30) NOT NULL DEFAULT '',
+ `node` varchar(100) NOT NULL DEFAULT '',
+ `reviewType` varchar(100) NOT NULL DEFAULT 'manual',
+ `agentType` varchar(100) NOT NULL DEFAULT 'pass',
+ `multipleType` enum('and','or') NOT NULL DEFAULT 'and',
+ `percent` smallint(6) NOT NULL DEFAULT 0,
+ `needAll` enum('0','1') NOT NULL DEFAULT '0',
+ `solicit` enum('0','1') NOT NULL DEFAULT '0',
+ `prev` mediumtext DEFAULT NULL,
+ `next` mediumtext DEFAULT NULL,
+ `status` varchar(20) NOT NULL DEFAULT 'wait',
+ `result` varchar(10) NOT NULL DEFAULT '',
+ `date` date DEFAULT NULL,
+ `opinion` mediumtext DEFAULT NULL,
+ `extra` mediumtext DEFAULT NULL,
+ `revertTo` char(30) NOT NULL DEFAULT '',
+ `forwardBy` char(30) NOT NULL DEFAULT '',
+ `reviewedBy` char(30) NOT NULL DEFAULT '',
+ `reviewedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `idx_reviewed_date` (`reviewedDate`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_approvalobject` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `approval` int(8) NOT NULL DEFAULT 0,
+ `objectType` char(30) NOT NULL DEFAULT '',
+ `objectID` mediumint(8) NOT NULL DEFAULT 0,
+ `reviewers` text DEFAULT NULL,
+ `opinion` text DEFAULT NULL,
+ `result` varchar(10) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `appliedBy` char(30) NOT NULL DEFAULT '',
+ `appliedDate` datetime DEFAULT NULL,
+ `desc` text DEFAULT NULL,
+ `extra` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_approvalrole` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `code` char(30) NOT NULL DEFAULT '',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `users` longtext DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_artifactrepo` (
+ `id` smallint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(45) NOT NULL DEFAULT '',
+ `products` varchar(255) NOT NULL DEFAULT '',
+ `serverID` smallint(8) NOT NULL DEFAULT 0,
+ `repoName` varchar(45) NOT NULL DEFAULT '',
+ `format` varchar(10) NOT NULL DEFAULT '',
+ `type` char(7) NOT NULL DEFAULT '',
+ `status` varchar(10) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` tinyint(4) unsigned NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_assetlib` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(255) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `order` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_attend` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `account` char(30) NOT NULL DEFAULT '',
+ `date` date DEFAULT NULL,
+ `signIn` time DEFAULT NULL,
+ `signOut` time DEFAULT NULL,
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `ip` varchar(100) NOT NULL DEFAULT '',
+ `device` varchar(30) NOT NULL DEFAULT '',
+ `client` varchar(20) NOT NULL DEFAULT '',
+ `manualIn` time DEFAULT NULL,
+ `manualOut` time DEFAULT NULL,
+ `reason` varchar(30) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `reviewStatus` varchar(30) DEFAULT NULL,
+ `reviewedBy` char(30) NOT NULL DEFAULT '',
+ `reviewedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `attend` (`date`,`account`),
+ KEY `account` (`account`),
+ KEY `date` (`date`),
+ KEY `status` (`status`),
+ KEY `reason` (`reason`),
+ KEY `reviewStatus` (`reviewStatus`),
+ KEY `reviewedBy` (`reviewedBy`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_attendstat` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `account` char(30) NOT NULL DEFAULT '',
+ `month` char(10) NOT NULL DEFAULT '',
+ `normal` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `late` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `early` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `absent` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `trip` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `egress` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `lieu` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `paidLeave` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `unpaidLeave` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `timeOvertime` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `restOvertime` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `holidayOvertime` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `deserve` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `actual` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `status` char(30) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `attend` (`month`,`account`),
+ KEY `account` (`account`),
+ KEY `month` (`month`),
+ KEY `status` (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_auditcl` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `model` char(30) NOT NULL DEFAULT 'waterfall',
+ `practiceArea` char(30) NOT NULL DEFAULT '',
+ `type` char(30) NOT NULL DEFAULT '',
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `objectType` char(30) NOT NULL DEFAULT '',
+ `objectID` int(11) NOT NULL DEFAULT 0,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `assignedBy` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_auditplan` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `dateType` char(30) NOT NULL DEFAULT '',
+ `config` text DEFAULT NULL,
+ `objectID` mediumint(9) NOT NULL DEFAULT 0,
+ `objectType` char(30) NOT NULL DEFAULT '',
+ `process` mediumint(9) NOT NULL DEFAULT 0,
+ `processType` char(30) NOT NULL DEFAULT '',
+ `checkDate` date DEFAULT NULL,
+ `checkedBy` varchar(30) NOT NULL DEFAULT '',
+ `realCheckDate` date DEFAULT NULL,
+ `result` char(30) NOT NULL DEFAULT '',
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `assignedBy` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `checkBy` varchar(30) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_auditresult` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `auditplan` mediumint(8) NOT NULL DEFAULT 0,
+ `listID` mediumint(8) NOT NULL DEFAULT 0,
+ `result` char(30) NOT NULL DEFAULT '',
+ `checkedBy` varchar(30) NOT NULL DEFAULT '',
+ `checkedDate` date DEFAULT NULL,
+ `comment` text DEFAULT NULL,
+ `severity` char(30) NOT NULL DEFAULT '',
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `assignedBy` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_autocache` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `code` varchar(30) NOT NULL DEFAULT '',
+ `fields` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `cache` (`code`,`fields`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_automation` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `node` int(11) unsigned NOT NULL DEFAULT 0,
+ `product` int(11) unsigned NOT NULL DEFAULT 0,
+ `scriptPath` varchar(255) NOT NULL DEFAULT '',
+ `shell` mediumtext DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_basicmeas` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `purpose` varchar(50) NOT NULL DEFAULT '',
+ `scope` char(30) NOT NULL DEFAULT '',
+ `object` char(30) NOT NULL DEFAULT '',
+ `name` varchar(90) NOT NULL DEFAULT '',
+ `code` char(30) NOT NULL DEFAULT '',
+ `unit` varchar(100) NOT NULL DEFAULT '',
+ `configure` text DEFAULT NULL,
+ `params` text DEFAULT NULL,
+ `definition` text DEFAULT NULL,
+ `source` varchar(255) NOT NULL DEFAULT '',
+ `collectType` varchar(30) NOT NULL DEFAULT '',
+ `collectConf` text DEFAULT NULL,
+ `execTime` varchar(30) NOT NULL DEFAULT '',
+ `collectedBy` varchar(10) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `order` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `code` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_block` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `account` char(30) NOT NULL DEFAULT '',
+ `dashboard` varchar(20) NOT NULL DEFAULT '',
+ `module` varchar(20) NOT NULL DEFAULT '',
+ `title` varchar(100) NOT NULL DEFAULT '',
+ `block` varchar(30) NOT NULL DEFAULT '',
+ `code` varchar(30) NOT NULL DEFAULT '',
+ `width` enum('1','2','3') NOT NULL DEFAULT '1',
+ `height` smallint(6) unsigned NOT NULL DEFAULT 3,
+ `left` enum('0','1','2') NOT NULL DEFAULT '0',
+ `top` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `params` text DEFAULT NULL,
+ `hidden` tinyint(1) unsigned NOT NULL DEFAULT 0,
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ PRIMARY KEY (`id`),
+ KEY `account` (`account`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_branch` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `default` enum('0','1') NOT NULL DEFAULT '0',
+ `status` enum('active','closed') NOT NULL DEFAULT 'active',
+ `desc` varchar(255) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `closedDate` date DEFAULT NULL,
+ `order` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `product` (`product`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_budget` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `stage` char(30) NOT NULL DEFAULT '',
+ `subject` mediumint(8) NOT NULL DEFAULT 0,
+ `amount` char(30) NOT NULL DEFAULT '',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `lastEditedBy` char(30) NOT NULL DEFAULT '',
+ `lastEditedDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_bug` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `injection` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `identify` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `plan` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+ `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `toTask` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `toStory` mediumint(8) NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `keywords` varchar(255) NOT NULL DEFAULT '',
+ `severity` tinyint(4) NOT NULL DEFAULT 0,
+ `pri` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `type` varchar(30) NOT NULL DEFAULT '',
+ `os` varchar(255) NOT NULL DEFAULT '',
+ `browser` varchar(255) NOT NULL DEFAULT '',
+ `hardware` varchar(30) NOT NULL DEFAULT '',
+ `found` varchar(30) NOT NULL DEFAULT '',
+ `steps` mediumtext DEFAULT NULL,
+ `status` enum('active','resolved','closed') NOT NULL DEFAULT 'active',
+ `subStatus` varchar(30) NOT NULL DEFAULT '',
+ `color` char(7) NOT NULL DEFAULT '',
+ `confirmed` tinyint(1) NOT NULL DEFAULT 0,
+ `activatedCount` smallint(6) NOT NULL DEFAULT 0,
+ `activatedDate` datetime DEFAULT NULL,
+ `feedbackBy` varchar(100) NOT NULL DEFAULT '',
+ `notifyEmail` varchar(100) NOT NULL DEFAULT '',
+ `mailto` text DEFAULT NULL,
+ `openedBy` varchar(30) NOT NULL DEFAULT '',
+ `openedDate` datetime DEFAULT NULL,
+ `openedBuild` varchar(255) NOT NULL DEFAULT '',
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `deadline` date DEFAULT NULL,
+ `resolvedBy` varchar(30) NOT NULL DEFAULT '',
+ `resolution` varchar(30) NOT NULL DEFAULT '',
+ `resolvedBuild` varchar(30) NOT NULL DEFAULT '',
+ `resolvedDate` datetime DEFAULT NULL,
+ `closedBy` varchar(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `duplicateBug` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `relatedBug` varchar(255) NOT NULL DEFAULT '',
+ `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `caseVersion` smallint(6) NOT NULL DEFAULT 1,
+ `feedback` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `result` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `repo` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `mr` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `entry` text DEFAULT NULL,
+ `lines` varchar(10) NOT NULL DEFAULT '',
+ `v1` varchar(255) NOT NULL DEFAULT '',
+ `v2` varchar(255) NOT NULL DEFAULT '',
+ `repoType` varchar(30) NOT NULL DEFAULT '',
+ `issueKey` varchar(50) NOT NULL DEFAULT '',
+ `testtask` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `product` (`product`),
+ KEY `execution` (`execution`),
+ KEY `status` (`status`),
+ KEY `plan` (`plan`),
+ KEY `story` (`story`),
+ KEY `case` (`case`),
+ KEY `toStory` (`toStory`),
+ KEY `result` (`result`),
+ KEY `assignedTo` (`assignedTo`),
+ KEY `deleted` (`deleted`),
+ KEY `project` (`project`),
+ KEY `product_status_deleted` (`product`,`status`,`deleted`),
+ KEY `idx_repo` (`repo`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_build` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `branch` varchar(255) NOT NULL DEFAULT '0',
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `builds` varchar(255) NOT NULL DEFAULT '',
+ `name` char(150) NOT NULL DEFAULT '',
+ `system` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `scmPath` char(255) NOT NULL DEFAULT '',
+ `filePath` char(255) NOT NULL DEFAULT '',
+ `date` date DEFAULT NULL,
+ `stories` text DEFAULT NULL,
+ `bugs` text DEFAULT NULL,
+ `artifactRepoID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `builder` char(30) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `product` (`product`),
+ KEY `execution` (`execution`),
+ KEY `idx_system` (`system`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_burn` (
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `date` date NOT NULL,
+ `estimate` float NOT NULL DEFAULT 0,
+ `left` float NOT NULL DEFAULT 0,
+ `consumed` float NOT NULL DEFAULT 0,
+ `storyPoint` float NOT NULL DEFAULT 0,
+ UNIQUE KEY `execution_task` (`execution`,`date`,`task`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_case` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `lib` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `path` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `story` mediumint(30) unsigned NOT NULL DEFAULT 0,
+ `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `precondition` text DEFAULT NULL,
+ `keywords` varchar(255) NOT NULL DEFAULT '',
+ `pri` tinyint(3) unsigned NOT NULL DEFAULT 3,
+ `type` char(30) NOT NULL DEFAULT '1',
+ `auto` varchar(10) NOT NULL DEFAULT 'no',
+ `frame` varchar(10) NOT NULL DEFAULT '',
+ `stage` varchar(255) NOT NULL DEFAULT '',
+ `howRun` varchar(30) NOT NULL DEFAULT '',
+ `script` longtext DEFAULT NULL,
+ `scriptedBy` varchar(30) NOT NULL DEFAULT '',
+ `scriptedDate` date DEFAULT NULL,
+ `scriptStatus` varchar(30) NOT NULL DEFAULT '',
+ `scriptLocation` varchar(255) NOT NULL DEFAULT '',
+ `status` char(30) NOT NULL DEFAULT '1',
+ `subStatus` varchar(30) NOT NULL DEFAULT '',
+ `color` char(7) NOT NULL DEFAULT '',
+ `frequency` enum('1','2','3') NOT NULL DEFAULT '1',
+ `order` tinyint(30) unsigned NOT NULL DEFAULT 0,
+ `openedBy` char(30) NOT NULL DEFAULT '',
+ `openedDate` datetime DEFAULT NULL,
+ `reviewedBy` varchar(255) NOT NULL DEFAULT '',
+ `reviewedDate` date DEFAULT NULL,
+ `lastEditedBy` char(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `version` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `linkCase` varchar(255) NOT NULL DEFAULT '',
+ `fromBug` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `fromCaseID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `fromCaseVersion` mediumint(8) unsigned NOT NULL DEFAULT 1,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `lastRunner` varchar(30) NOT NULL DEFAULT '',
+ `lastRunDate` datetime DEFAULT NULL,
+ `lastRunResult` char(30) NOT NULL DEFAULT '',
+ `scene` int(11) NOT NULL DEFAULT 0,
+ `sort` int(11) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ KEY `product` (`product`),
+ KEY `story` (`story`),
+ KEY `fromBug` (`fromBug`),
+ KEY `module` (`module`),
+ KEY `scene` (`scene`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_casespec` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `case` mediumint(9) NOT NULL DEFAULT 0,
+ `version` smallint(6) NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `precondition` text DEFAULT NULL,
+ `files` text DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `case` (`case`,`version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_casestep` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `version` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `type` varchar(10) NOT NULL DEFAULT 'step',
+ `desc` text DEFAULT NULL,
+ `expect` text DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `case` (`case`),
+ KEY `version` (`version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_cfd` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `execution` int(8) NOT NULL DEFAULT 0,
+ `type` char(30) NOT NULL DEFAULT '',
+ `name` char(30) NOT NULL DEFAULT '',
+ `count` smallint(6) NOT NULL DEFAULT 0,
+ `date` date DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `execution_type_name_date` (`execution`,`type`,`name`,`date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_chart` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `code` varchar(255) NOT NULL DEFAULT '',
+ `driver` enum('mysql','duckdb') NOT NULL DEFAULT 'mysql',
+ `mode` enum('text','builder') NOT NULL DEFAULT 'builder',
+ `dimension` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `type` varchar(30) NOT NULL DEFAULT '',
+ `group` varchar(255) NOT NULL DEFAULT '',
+ `dataset` varchar(30) NOT NULL DEFAULT '0',
+ `desc` text DEFAULT NULL,
+ `acl` enum('open','private') NOT NULL DEFAULT 'open',
+ `whitelist` text DEFAULT NULL,
+ `settings` mediumtext DEFAULT NULL,
+ `filters` mediumtext DEFAULT NULL,
+ `step` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `fields` mediumtext DEFAULT NULL,
+ `langs` text DEFAULT NULL,
+ `sql` mediumtext DEFAULT NULL,
+ `version` varchar(10) NOT NULL DEFAULT '1',
+ `stage` enum('draft','published') NOT NULL DEFAULT 'draft',
+ `builtin` tinyint(1) unsigned NOT NULL DEFAULT 0,
+ `objects` mediumtext DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` tinyint(4) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_charter` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `level` varchar(255) NOT NULL DEFAULT '',
+ `category` char(30) NOT NULL DEFAULT '',
+ `market` varchar(30) NOT NULL DEFAULT '',
+ `check` enum('0','1') NOT NULL DEFAULT '0',
+ `appliedBy` char(30) NOT NULL DEFAULT '',
+ `appliedDate` datetime DEFAULT NULL,
+ `appliedReviewer` text DEFAULT NULL,
+ `budget` char(30) NOT NULL DEFAULT '',
+ `budgetUnit` char(30) NOT NULL DEFAULT '',
+ `product` text DEFAULT NULL,
+ `roadmap` text DEFAULT NULL,
+ `plan` text DEFAULT NULL,
+ `type` varchar(30) NOT NULL DEFAULT 'roadmap',
+ `filesConfig` text DEFAULT NULL,
+ `spec` mediumtext DEFAULT NULL,
+ `status` char(30) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `charterFiles` text DEFAULT NULL,
+ `completionFiles` text DEFAULT NULL,
+ `canceledFiles` text DEFAULT NULL,
+ `prevCanceledStatus` varchar(30) NOT NULL DEFAULT '',
+ `closedBy` char(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `closedReason` varchar(255) NOT NULL DEFAULT '',
+ `activatedBy` char(30) NOT NULL DEFAULT '',
+ `activatedDate` datetime DEFAULT NULL,
+ `activatedReviewer` text DEFAULT NULL,
+ `reviewedBy` varchar(255) NOT NULL DEFAULT '',
+ `reviewedResult` char(30) NOT NULL DEFAULT '',
+ `reviewedDate` datetime DEFAULT NULL,
+ `reviewStatus` varchar(30) NOT NULL DEFAULT 'wait',
+ `completedBy` varchar(30) NOT NULL DEFAULT '',
+ `completedDate` datetime DEFAULT NULL,
+ `completedReviewer` text DEFAULT NULL,
+ `canceledBy` varchar(30) NOT NULL DEFAULT '',
+ `canceledDate` datetime DEFAULT NULL,
+ `canceledReviewer` text DEFAULT NULL,
+ `meetingDate` date DEFAULT NULL,
+ `meetingLocation` varchar(255) NOT NULL DEFAULT '',
+ `meetingMinutes` mediumtext DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_cmcl` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `type` char(30) NOT NULL DEFAULT '',
+ `projectType` varchar(255) NOT NULL DEFAULT '',
+ `title` int(11) NOT NULL DEFAULT 0,
+ `contents` text DEFAULT NULL,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `order` int(11) NOT NULL DEFAULT 0,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_company` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` char(120) DEFAULT NULL,
+ `phone` char(20) DEFAULT NULL,
+ `fax` char(20) DEFAULT NULL,
+ `address` char(120) DEFAULT NULL,
+ `zipcode` char(10) DEFAULT NULL,
+ `website` char(120) DEFAULT NULL,
+ `backyard` char(120) DEFAULT NULL,
+ `guest` enum('1','0') NOT NULL DEFAULT '0',
+ `admins` char(255) DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_compile` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) NOT NULL DEFAULT '',
+ `job` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `queue` mediumint(8) NOT NULL DEFAULT 0,
+ `status` varchar(100) NOT NULL DEFAULT '',
+ `logs` longtext DEFAULT NULL,
+ `atTime` varchar(10) NOT NULL DEFAULT '',
+ `testtask` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `tag` varchar(255) NOT NULL DEFAULT '',
+ `times` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `updateDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `idx_created_status` (`createdDate`,`status`,`deleted`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_config` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `vision` varchar(10) NOT NULL DEFAULT '',
+ `owner` char(30) NOT NULL DEFAULT '',
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `section` char(30) NOT NULL DEFAULT '',
+ `key` char(30) NOT NULL DEFAULT '',
+ `value` longtext DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique` (`vision`,`owner`,`module`,`section`,`key`),
+ KEY `vision` (`vision`),
+ KEY `owner` (`owner`),
+ KEY `module` (`module`),
+ KEY `key` (`key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_cron` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `m` varchar(20) NOT NULL DEFAULT '',
+ `h` varchar(20) NOT NULL DEFAULT '',
+ `dom` varchar(20) NOT NULL DEFAULT '',
+ `mon` varchar(20) NOT NULL DEFAULT '',
+ `dow` varchar(20) NOT NULL DEFAULT '',
+ `command` text DEFAULT NULL,
+ `remark` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(20) NOT NULL DEFAULT '',
+ `buildin` tinyint(1) NOT NULL DEFAULT 0,
+ `status` varchar(20) NOT NULL DEFAULT '',
+ `lastTime` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `lastTime` (`lastTime`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_dashboard` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `dimension` int(8) NOT NULL DEFAULT 0,
+ `module` mediumint(8) NOT NULL DEFAULT 0,
+ `desc` mediumtext DEFAULT NULL,
+ `layout` mediumtext DEFAULT NULL,
+ `filters` mediumtext DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `deleted` tinyint(4) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_dataset` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(155) NOT NULL DEFAULT '',
+ `sql` text DEFAULT NULL,
+ `fields` mediumtext DEFAULT NULL,
+ `objects` mediumtext DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `deleted` tinyint(4) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_dataview` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(155) NOT NULL DEFAULT '',
+ `code` varchar(50) NOT NULL DEFAULT '',
+ `mode` varchar(50) NOT NULL DEFAULT 'builder',
+ `driver` enum('mysql','duckdb') NOT NULL DEFAULT 'mysql',
+ `view` varchar(57) NOT NULL DEFAULT '',
+ `sql` text DEFAULT NULL,
+ `fields` text DEFAULT NULL,
+ `langs` text DEFAULT NULL,
+ `objects` text DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` tinyint(4) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_demand` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `pool` int(8) NOT NULL DEFAULT 0,
+ `module` int(8) NOT NULL DEFAULT 0,
+ `product` varchar(255) NOT NULL DEFAULT '',
+ `parent` mediumint(8) NOT NULL DEFAULT 0,
+ `pri` char(30) NOT NULL DEFAULT '',
+ `category` char(30) NOT NULL DEFAULT '',
+ `source` char(30) NOT NULL DEFAULT '',
+ `sourceNote` varchar(255) NOT NULL DEFAULT '',
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `feedbackedBy` varchar(255) NOT NULL DEFAULT '',
+ `email` varchar(255) NOT NULL DEFAULT '',
+ `assignedTo` char(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `reviewedBy` text DEFAULT NULL,
+ `reviewedDate` datetime DEFAULT NULL,
+ `status` char(30) NOT NULL DEFAULT '',
+ `stage` enum('wait','distributed','inroadmap','incharter','developing','delivering','delivered','closed') NOT NULL DEFAULT 'wait',
+ `duration` char(30) NOT NULL DEFAULT '',
+ `BSA` char(30) NOT NULL DEFAULT '',
+ `story` mediumint(8) NOT NULL DEFAULT 0,
+ `roadmap` mediumint(8) NOT NULL DEFAULT 0,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `mailto` text DEFAULT NULL,
+ `duplicateDemand` mediumint(8) DEFAULT NULL,
+ `childDemands` varchar(255) NOT NULL DEFAULT '',
+ `version` varchar(255) NOT NULL DEFAULT '',
+ `parentVersion` smallint(6) NOT NULL DEFAULT 0,
+ `vision` varchar(255) NOT NULL DEFAULT 'or',
+ `color` varchar(255) NOT NULL DEFAULT '',
+ `changedBy` char(30) NOT NULL DEFAULT '',
+ `changedDate` datetime DEFAULT NULL,
+ `closedBy` char(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `closedReason` varchar(30) NOT NULL DEFAULT '',
+ `submitedBy` varchar(30) NOT NULL DEFAULT '',
+ `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `activatedDate` datetime DEFAULT NULL,
+ `distributedBy` varchar(30) NOT NULL DEFAULT '',
+ `distributedDate` datetime DEFAULT NULL,
+ `feedback` mediumint(9) NOT NULL DEFAULT 0,
+ `keywords` varchar(255) NOT NULL DEFAULT '',
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_demandpool` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `status` char(30) NOT NULL DEFAULT '',
+ `products` varchar(255) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `owner` text DEFAULT NULL,
+ `reviewer` text DEFAULT NULL,
+ `acl` char(30) DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_demandreview` (
+ `demand` mediumint(9) NOT NULL DEFAULT 0,
+ `version` smallint(6) NOT NULL DEFAULT 0,
+ `reviewer` varchar(30) NOT NULL DEFAULT '',
+ `result` varchar(30) NOT NULL DEFAULT '',
+ `reviewDate` datetime DEFAULT NULL,
+ UNIQUE KEY `demand` (`demand`,`version`,`reviewer`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_demandspec` (
+ `demand` mediumint(9) NOT NULL DEFAULT 0,
+ `version` smallint(6) NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `spec` mediumtext DEFAULT NULL,
+ `verify` mediumtext DEFAULT NULL,
+ `files` text DEFAULT NULL,
+ UNIQUE KEY `demand` (`demand`,`version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_deploy` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `begin` datetime DEFAULT NULL,
+ `end` datetime DEFAULT NULL,
+ `estimate` datetime DEFAULT NULL,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `host` varchar(255) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `status` varchar(20) NOT NULL DEFAULT '',
+ `owner` char(30) NOT NULL DEFAULT '',
+ `members` text DEFAULT NULL,
+ `notify` text DEFAULT NULL,
+ `cases` text DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `result` varchar(20) NOT NULL DEFAULT '',
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_deployproduct` (
+ `deploy` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `release` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ UNIQUE KEY `deploy_product_release` (`deploy`,`product`,`release`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_deploystep` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `deploy` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `stage` varchar(30) NOT NULL DEFAULT '',
+ `content` text DEFAULT NULL,
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `assignedTo` char(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `finishedBy` char(30) NOT NULL DEFAULT '',
+ `finishedDate` datetime DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_dept` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` char(60) NOT NULL DEFAULT '',
+ `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `path` char(255) NOT NULL DEFAULT '',
+ `grade` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `order` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `position` char(30) NOT NULL DEFAULT '',
+ `function` char(255) NOT NULL DEFAULT '',
+ `manager` char(30) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ KEY `parent` (`parent`),
+ KEY `path` (`path`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_design` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` varchar(255) NOT NULL DEFAULT '',
+ `product` varchar(255) NOT NULL DEFAULT '',
+ `commit` text DEFAULT NULL,
+ `commitedBy` varchar(30) NOT NULL DEFAULT '',
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `assignedBy` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `story` char(30) NOT NULL DEFAULT '',
+ `storyVersion` smallint(6) unsigned NOT NULL DEFAULT 1,
+ `desc` mediumtext DEFAULT NULL,
+ `version` smallint(6) NOT NULL DEFAULT 0,
+ `type` char(30) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_designspec` (
+ `design` mediumint(8) NOT NULL DEFAULT 0,
+ `version` smallint(6) NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `files` varchar(255) NOT NULL DEFAULT '',
+ UNIQUE KEY `design` (`design`,`version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_dimension` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(90) NOT NULL DEFAULT '',
+ `code` varchar(45) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `acl` enum('open','private') NOT NULL DEFAULT 'open',
+ `whitelist` text DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `code` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_doc` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `lib` varchar(30) NOT NULL DEFAULT '',
+ `template` varchar(30) NOT NULL DEFAULT '',
+ `templateType` varchar(30) NOT NULL DEFAULT '',
+ `chapterType` varchar(30) NOT NULL DEFAULT '',
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `keywords` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(30) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT 'normal',
+ `parent` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `path` char(255) NOT NULL DEFAULT '',
+ `grade` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `order` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `views` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `assetLib` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `assetLibType` varchar(30) NOT NULL DEFAULT '',
+ `from` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `fromVersion` smallint(6) NOT NULL DEFAULT 1,
+ `draft` longtext DEFAULT NULL,
+ `collects` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `addedBy` varchar(30) NOT NULL DEFAULT '',
+ `addedDate` datetime DEFAULT NULL,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `approvedDate` date DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `editingDate` text DEFAULT NULL,
+ `editedList` text DEFAULT NULL,
+ `mailto` text DEFAULT NULL,
+ `acl` varchar(10) NOT NULL DEFAULT 'open',
+ `groups` varchar(255) NOT NULL DEFAULT '',
+ `users` text DEFAULT NULL,
+ `version` smallint(6) unsigned NOT NULL DEFAULT 1,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `product` (`product`),
+ KEY `execution` (`execution`),
+ KEY `lib` (`lib`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_docaction` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `doc` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `action` varchar(80) NOT NULL DEFAULT '',
+ `actor` char(30) NOT NULL DEFAULT '',
+ `date` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `doc` (`doc`),
+ KEY `actor` (`actor`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_docblock` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `doc` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `type` varchar(50) NOT NULL DEFAULT '',
+ `settings` text DEFAULT NULL,
+ `content` mediumtext DEFAULT NULL,
+ `extra` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `idx_doc` (`doc`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_doccontent` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `doc` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `digest` varchar(255) NOT NULL DEFAULT '',
+ `content` longtext DEFAULT NULL,
+ `rawContent` longtext DEFAULT NULL,
+ `files` text DEFAULT NULL,
+ `type` varchar(10) NOT NULL DEFAULT '',
+ `addedBy` varchar(30) NOT NULL DEFAULT '',
+ `addedDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `version` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `fromVersion` smallint(6) unsigned NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `doc_version` (`doc`,`version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_doclib` (
+ `id` smallint(6) unsigned NOT NULL AUTO_INCREMENT,
+ `type` varchar(30) NOT NULL DEFAULT '',
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(60) NOT NULL DEFAULT '',
+ `baseUrl` varchar(255) NOT NULL DEFAULT '',
+ `acl` varchar(10) NOT NULL DEFAULT 'open',
+ `groups` varchar(255) NOT NULL DEFAULT '',
+ `users` text DEFAULT NULL,
+ `main` enum('0','1') NOT NULL DEFAULT '0',
+ `collector` text DEFAULT NULL,
+ `desc` mediumtext DEFAULT NULL,
+ `order` tinyint(5) unsigned NOT NULL DEFAULT 0,
+ `addedBy` varchar(30) NOT NULL DEFAULT '',
+ `addedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `orderBy` varchar(30) NOT NULL DEFAULT 'id_asc',
+ PRIMARY KEY (`id`),
+ KEY `product` (`product`),
+ KEY `execution` (`execution`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_duckdbqueue` (
+ `object` varchar(255) NOT NULL DEFAULT '',
+ `updatedTime` datetime DEFAULT NULL,
+ `syncTime` datetime DEFAULT NULL,
+ UNIQUE KEY `object` (`object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_durationestimation` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `stage` mediumint(9) NOT NULL DEFAULT 0,
+ `workload` varchar(255) NOT NULL DEFAULT '',
+ `worktimeRate` varchar(255) NOT NULL DEFAULT '',
+ `people` varchar(255) NOT NULL DEFAULT '',
+ `startDate` date DEFAULT NULL,
+ `endDate` date DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_effort` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `objectType` varchar(30) NOT NULL DEFAULT '',
+ `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` text DEFAULT NULL,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `account` varchar(30) NOT NULL DEFAULT '',
+ `work` text DEFAULT NULL,
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `date` date DEFAULT NULL,
+ `left` float NOT NULL DEFAULT 0,
+ `consumed` float NOT NULL DEFAULT 0,
+ `begin` smallint(4) unsigned zerofill NOT NULL DEFAULT 0000,
+ `end` smallint(4) unsigned zerofill NOT NULL DEFAULT 0000,
+ `extra` text DEFAULT NULL,
+ `order` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `execution` (`execution`),
+ KEY `objectID` (`objectID`),
+ KEY `date` (`date`),
+ KEY `account` (`account`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_entry` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) NOT NULL DEFAULT '',
+ `account` varchar(30) NOT NULL DEFAULT '',
+ `code` varchar(20) NOT NULL DEFAULT '',
+ `key` varchar(32) NOT NULL DEFAULT '',
+ `freePasswd` enum('0','1') NOT NULL DEFAULT '0',
+ `ip` varchar(100) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `calledTime` int(11) unsigned NOT NULL DEFAULT 0,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_expect` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `userID` mediumint(8) NOT NULL DEFAULT 0,
+ `project` mediumint(8) NOT NULL DEFAULT 0,
+ `expect` text DEFAULT NULL,
+ `progress` text DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_extension` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(150) NOT NULL DEFAULT '',
+ `code` varchar(30) NOT NULL DEFAULT '',
+ `version` varchar(50) NOT NULL DEFAULT '',
+ `author` varchar(100) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `license` text DEFAULT NULL,
+ `type` varchar(20) NOT NULL DEFAULT 'extension',
+ `site` varchar(150) NOT NULL DEFAULT '',
+ `zentaoCompatible` text DEFAULT NULL,
+ `installedTime` datetime DEFAULT NULL,
+ `depends` varchar(100) NOT NULL DEFAULT '',
+ `dirs` mediumtext DEFAULT NULL,
+ `files` mediumtext DEFAULT NULL,
+ `status` varchar(20) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `code` (`code`),
+ KEY `name` (`name`),
+ KEY `installedTime` (`installedTime`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_extuser` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `code` varchar(255) NOT NULL,
+ `account` char(30) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_faq` (
+ `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+ `module` mediumint(9) NOT NULL DEFAULT 0,
+ `product` mediumint(9) NOT NULL DEFAULT 0,
+ `question` varchar(255) NOT NULL DEFAULT '',
+ `answer` text DEFAULT NULL,
+ `addedtime` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_feedback` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `type` char(30) NOT NULL DEFAULT '',
+ `solution` char(30) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `pri` tinyint(3) unsigned NOT NULL DEFAULT 2,
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `subStatus` varchar(30) NOT NULL DEFAULT '',
+ `public` enum('0','1') NOT NULL DEFAULT '0',
+ `notify` enum('0','1') NOT NULL DEFAULT '0',
+ `notifyEmail` varchar(100) NOT NULL DEFAULT '',
+ `source` varchar(255) NOT NULL DEFAULT '',
+ `likes` text DEFAULT NULL,
+ `result` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `faq` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `openedBy` char(30) NOT NULL DEFAULT '',
+ `openedDate` datetime DEFAULT NULL,
+ `reviewedBy` varchar(255) NOT NULL DEFAULT '',
+ `reviewedDate` datetime DEFAULT NULL,
+ `processedBy` char(30) NOT NULL DEFAULT '',
+ `processedDate` datetime DEFAULT NULL,
+ `closedBy` char(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `closedReason` varchar(30) NOT NULL DEFAULT '',
+ `editedBy` char(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `assignedTo` varchar(255) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `activatedBy` varchar(30) NOT NULL DEFAULT '',
+ `activatedDate` datetime DEFAULT NULL,
+ `feedbackBy` varchar(100) NOT NULL DEFAULT '',
+ `repeatFeedback` mediumint(8) NOT NULL DEFAULT 0,
+ `mailto` varchar(255) NOT NULL DEFAULT '',
+ `keywords` varchar(255) NOT NULL DEFAULT '',
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_feedbackview` (
+ `account` char(30) NOT NULL DEFAULT '',
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ UNIQUE KEY `account_product` (`account`,`product`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_file` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `pathname` char(100) NOT NULL DEFAULT '',
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `extension` char(30) NOT NULL DEFAULT '',
+ `size` int(11) unsigned NOT NULL DEFAULT 0,
+ `objectType` char(30) NOT NULL DEFAULT '',
+ `objectID` mediumint(9) NOT NULL DEFAULT 0,
+ `gid` char(48) NOT NULL DEFAULT '',
+ `addedBy` char(30) NOT NULL DEFAULT '',
+ `addedDate` datetime DEFAULT NULL,
+ `downloads` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `extra` varchar(255) NOT NULL DEFAULT '',
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `objectType` (`objectType`),
+ KEY `objectID` (`objectID`),
+ KEY `gid` (`gid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_gapanalysis` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `account` varchar(30) NOT NULL DEFAULT '',
+ `role` varchar(20) NOT NULL DEFAULT '',
+ `analysis` mediumtext DEFAULT NULL,
+ `needTrain` enum('no','yes') NOT NULL DEFAULT 'no',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `project_account` (`project`,`account`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_group` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `name` char(30) NOT NULL DEFAULT '',
+ `role` char(30) NOT NULL DEFAULT '',
+ `desc` char(255) NOT NULL DEFAULT '',
+ `acl` text DEFAULT NULL,
+ `developer` enum('0','1') NOT NULL DEFAULT '1',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_grouppriv` (
+ `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` char(30) NOT NULL DEFAULT '',
+ `method` char(30) NOT NULL DEFAULT '',
+ UNIQUE KEY `group` (`group`,`module`,`method`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_history` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `action` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `field` varchar(30) NOT NULL DEFAULT '',
+ `old` text DEFAULT NULL,
+ `oldValue` text DEFAULT NULL,
+ `new` text DEFAULT NULL,
+ `newValue` text DEFAULT NULL,
+ `diff` mediumtext DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `action` (`action`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_holiday` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(30) NOT NULL DEFAULT '',
+ `type` enum('holiday','working') NOT NULL DEFAULT 'holiday',
+ `desc` text DEFAULT NULL,
+ `year` char(4) NOT NULL DEFAULT '',
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `year` (`year`),
+ KEY `name` (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_host` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(30) NOT NULL DEFAULT 'normal',
+ `hostType` varchar(30) NOT NULL DEFAULT '',
+ `mac` varchar(128) NOT NULL DEFAULT '',
+ `memory` varchar(30) NOT NULL DEFAULT '',
+ `diskSize` varchar(30) NOT NULL DEFAULT '',
+ `status` varchar(50) NOT NULL DEFAULT '',
+ `secret` varchar(50) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `tokenSN` varchar(50) NOT NULL DEFAULT '',
+ `tokenTime` datetime DEFAULT NULL,
+ `oldTokenSN` varchar(50) NOT NULL DEFAULT '',
+ `vsoft` varchar(30) NOT NULL DEFAULT '',
+ `heartbeat` datetime DEFAULT NULL,
+ `zap` varchar(10) NOT NULL DEFAULT '',
+ `vnc` int(11) NOT NULL DEFAULT 0,
+ `ztf` int(11) NOT NULL DEFAULT 0,
+ `zd` int(11) NOT NULL DEFAULT 0,
+ `ssh` int(11) NOT NULL DEFAULT 0,
+ `parent` int(11) unsigned NOT NULL DEFAULT 0,
+ `image` int(11) unsigned NOT NULL DEFAULT 0,
+ `admin` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `serverRoom` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `cpuNumber` varchar(16) NOT NULL DEFAULT '',
+ `cpuCores` varchar(30) NOT NULL DEFAULT '',
+ `intranet` varchar(128) NOT NULL DEFAULT '',
+ `extranet` varchar(128) NOT NULL DEFAULT '',
+ `osName` varchar(64) NOT NULL DEFAULT '',
+ `osVersion` varchar(64) NOT NULL DEFAULT '',
+ `group` varchar(128) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_image` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `host` int(11) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(64) NOT NULL DEFAULT '',
+ `localName` varchar(64) NOT NULL DEFAULT '',
+ `address` varchar(64) NOT NULL DEFAULT '',
+ `path` varchar(64) NOT NULL DEFAULT '',
+ `status` varchar(20) NOT NULL DEFAULT '',
+ `osName` varchar(32) NOT NULL DEFAULT '',
+ `from` varchar(10) NOT NULL DEFAULT 'zentao',
+ `memory` float unsigned NOT NULL DEFAULT 0,
+ `disk` float unsigned NOT NULL DEFAULT 0,
+ `fileSize` float unsigned NOT NULL DEFAULT 0,
+ `md5` varchar(64) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `restoreDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_instance` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `space` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `solution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` char(50) NOT NULL DEFAULT '',
+ `appID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `appName` char(50) NOT NULL DEFAULT '',
+ `appVersion` char(20) NOT NULL DEFAULT '',
+ `chart` char(50) NOT NULL DEFAULT '',
+ `logo` varchar(255) NOT NULL DEFAULT '',
+ `version` char(50) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `introduction` text DEFAULT NULL,
+ `source` char(20) NOT NULL DEFAULT '',
+ `channel` char(20) NOT NULL DEFAULT '',
+ `k8name` char(64) NOT NULL DEFAULT '',
+ `status` char(20) NOT NULL DEFAULT '',
+ `pinned` enum('0','1') NOT NULL DEFAULT '0',
+ `domain` char(255) NOT NULL DEFAULT '',
+ `smtpSnippetName` char(30) NOT NULL DEFAULT '',
+ `ldapSnippetName` char(30) NOT NULL DEFAULT '',
+ `ldapSettings` text DEFAULT NULL,
+ `dbSettings` text DEFAULT NULL,
+ `autoBackup` tinyint(1) NOT NULL DEFAULT 0,
+ `backupKeepDays` int(10) unsigned NOT NULL DEFAULT 1,
+ `autoRestore` tinyint(1) NOT NULL DEFAULT 0,
+ `env` text DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdAt` datetime DEFAULT NULL,
+ `deleted` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ KEY `space` (`space`),
+ KEY `k8name` (`k8name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_intervention` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `activity` mediumint(8) NOT NULL DEFAULT 0,
+ `status` char(30) NOT NULL DEFAULT '',
+ `partake` text DEFAULT NULL,
+ `begin` date DEFAULT NULL,
+ `realBegin` date DEFAULT NULL,
+ `situation` varchar(255) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `project` (`project`,`activity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_issue` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `resolvedBy` varchar(30) NOT NULL DEFAULT '',
+ `project` varchar(255) NOT NULL DEFAULT '',
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `pri` char(30) NOT NULL DEFAULT '',
+ `severity` char(30) NOT NULL DEFAULT '',
+ `type` char(30) NOT NULL DEFAULT '',
+ `activity` varchar(255) NOT NULL DEFAULT '',
+ `deadline` date DEFAULT NULL,
+ `resolution` char(30) NOT NULL DEFAULT '',
+ `resolutionComment` text DEFAULT NULL,
+ `objectID` varchar(255) NOT NULL DEFAULT '',
+ `resolvedDate` date DEFAULT NULL,
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `owner` varchar(255) NOT NULL DEFAULT '',
+ `lib` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `from` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `version` smallint(6) NOT NULL DEFAULT 1,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `activateBy` varchar(30) NOT NULL DEFAULT '',
+ `activateDate` date DEFAULT NULL,
+ `closedBy` varchar(30) NOT NULL DEFAULT '',
+ `closedDate` date DEFAULT NULL,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `assignedBy` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `approvedDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_job` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) NOT NULL DEFAULT '',
+ `repo` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `frame` varchar(20) NOT NULL DEFAULT '',
+ `engine` varchar(20) NOT NULL DEFAULT '',
+ `autoRun` enum('0','1') NOT NULL DEFAULT '1',
+ `server` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `pipeline` varchar(500) NOT NULL DEFAULT '',
+ `triggerType` varchar(255) NOT NULL DEFAULT '',
+ `sonarqubeServer` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `projectKey` varchar(255) NOT NULL DEFAULT '',
+ `svnDir` varchar(255) NOT NULL DEFAULT '',
+ `atDay` varchar(255) NOT NULL DEFAULT '',
+ `atTime` varchar(10) NOT NULL DEFAULT '',
+ `customParam` text DEFAULT NULL,
+ `comment` varchar(255) NOT NULL DEFAULT '',
+ `triggerActions` varchar(255) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `lastExec` datetime DEFAULT NULL,
+ `lastStatus` varchar(255) NOT NULL DEFAULT '',
+ `lastTag` varchar(255) NOT NULL DEFAULT '',
+ `lastSyncDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `idx_repo_deleted` (`repo`,`deleted`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_kanban` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `space` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `owner` varchar(30) NOT NULL DEFAULT '',
+ `team` text DEFAULT NULL,
+ `desc` mediumtext DEFAULT NULL,
+ `acl` char(30) NOT NULL DEFAULT 'open',
+ `whitelist` text DEFAULT NULL,
+ `archived` enum('0','1') NOT NULL DEFAULT '1',
+ `performable` enum('0','1') NOT NULL DEFAULT '0',
+ `status` enum('active','closed') NOT NULL DEFAULT 'active',
+ `order` mediumint(8) NOT NULL DEFAULT 0,
+ `displayCards` smallint(6) NOT NULL DEFAULT 0,
+ `showWIP` enum('0','1') NOT NULL DEFAULT '1',
+ `fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
+ `colWidth` smallint(4) NOT NULL DEFAULT 264,
+ `minColWidth` smallint(4) NOT NULL DEFAULT 200,
+ `maxColWidth` smallint(4) NOT NULL DEFAULT 384,
+ `object` varchar(255) NOT NULL DEFAULT '',
+ `alignment` varchar(10) NOT NULL DEFAULT 'center',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `lastEditedBy` char(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `closedBy` char(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `activatedBy` char(30) NOT NULL DEFAULT '',
+ `activatedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_kanbancard` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `kanban` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `region` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `fromID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `fromType` varchar(30) NOT NULL DEFAULT '',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT 'doing',
+ `pri` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `assignedTo` text DEFAULT NULL,
+ `desc` mediumtext DEFAULT NULL,
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ `estimate` float unsigned NOT NULL DEFAULT 0,
+ `progress` float unsigned NOT NULL DEFAULT 0,
+ `color` char(7) NOT NULL DEFAULT '',
+ `acl` char(30) NOT NULL DEFAULT 'open',
+ `whitelist` text DEFAULT NULL,
+ `order` mediumint(8) NOT NULL DEFAULT 0,
+ `archived` enum('0','1') NOT NULL DEFAULT '0',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `lastEditedBy` char(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `archivedBy` char(30) NOT NULL DEFAULT '',
+ `archivedDate` datetime DEFAULT NULL,
+ `assignedBy` char(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_kanbancell` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `kanban` mediumint(8) NOT NULL DEFAULT 0,
+ `lane` mediumint(8) NOT NULL DEFAULT 0,
+ `column` mediumint(8) NOT NULL DEFAULT 0,
+ `type` char(30) NOT NULL DEFAULT '',
+ `cards` mediumtext DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `card_group` (`kanban`,`type`,`lane`,`column`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_kanbancolumn` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `parent` mediumint(8) NOT NULL DEFAULT 0,
+ `type` char(30) NOT NULL DEFAULT '',
+ `region` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `group` mediumint(8) NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `color` char(30) NOT NULL DEFAULT '',
+ `limit` smallint(6) NOT NULL DEFAULT -1,
+ `order` mediumint(8) NOT NULL DEFAULT 0,
+ `archived` enum('0','1') NOT NULL DEFAULT '0',
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_kanbangroup` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `kanban` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `region` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `order` smallint(6) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_kanbanlane` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `execution` mediumint(8) NOT NULL DEFAULT 0,
+ `type` char(30) NOT NULL DEFAULT '',
+ `region` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `groupby` char(30) NOT NULL DEFAULT '',
+ `extra` char(30) NOT NULL DEFAULT '',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `color` char(30) NOT NULL DEFAULT '',
+ `order` smallint(6) NOT NULL DEFAULT 0,
+ `lastEditedTime` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_kanbanregion` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `space` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `kanban` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `order` mediumint(8) NOT NULL DEFAULT 0,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `lastEditedBy` char(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_kanbanspace` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(50) NOT NULL DEFAULT '',
+ `owner` varchar(30) NOT NULL DEFAULT '',
+ `team` text DEFAULT NULL,
+ `desc` mediumtext DEFAULT NULL,
+ `acl` char(30) NOT NULL DEFAULT 'open',
+ `whitelist` text DEFAULT NULL,
+ `status` enum('active','closed') NOT NULL DEFAULT 'active',
+ `order` mediumint(8) NOT NULL DEFAULT 0,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `lastEditedBy` char(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `closedBy` char(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `activatedBy` char(30) NOT NULL DEFAULT '',
+ `activatedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_lang` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `lang` varchar(30) NOT NULL DEFAULT '',
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `section` varchar(50) NOT NULL DEFAULT '',
+ `key` varchar(60) NOT NULL DEFAULT '',
+ `value` text DEFAULT NULL,
+ `system` enum('0','1') NOT NULL DEFAULT '1',
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `lang` (`lang`,`module`,`section`,`key`,`vision`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_leave` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `year` char(4) NOT NULL DEFAULT '',
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ `start` time DEFAULT NULL,
+ `finish` time DEFAULT NULL,
+ `hours` float(4,1) unsigned NOT NULL DEFAULT 0.0,
+ `backDate` datetime DEFAULT NULL,
+ `type` varchar(30) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `reviewedBy` char(30) NOT NULL DEFAULT '',
+ `reviewedDate` datetime DEFAULT NULL,
+ `level` tinyint(3) NOT NULL DEFAULT 0,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `reviewers` text DEFAULT NULL,
+ `backReviewers` text DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `year` (`year`),
+ KEY `type` (`type`),
+ KEY `status` (`status`),
+ KEY `createdBy` (`createdBy`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_lieu` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `year` char(4) NOT NULL DEFAULT '',
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ `start` time DEFAULT NULL,
+ `finish` time DEFAULT NULL,
+ `hours` float(4,1) unsigned NOT NULL DEFAULT 0.0,
+ `overtime` char(255) NOT NULL DEFAULT '',
+ `trip` char(255) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `reviewedBy` char(30) NOT NULL DEFAULT '',
+ `reviewedDate` datetime DEFAULT NULL,
+ `level` tinyint(3) NOT NULL DEFAULT 0,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `reviewers` text DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `year` (`year`),
+ KEY `status` (`status`),
+ KEY `createdBy` (`createdBy`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_log` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `objectType` varchar(30) NOT NULL DEFAULT '',
+ `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `action` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `date` datetime DEFAULT NULL,
+ `url` varchar(255) NOT NULL DEFAULT '',
+ `contentType` varchar(30) NOT NULL DEFAULT '',
+ `data` text DEFAULT NULL,
+ `result` text DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `objectType` (`objectType`),
+ KEY `obejctID` (`objectID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_mark` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `objectType` varchar(50) NOT NULL DEFAULT '',
+ `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `version` varchar(50) NOT NULL DEFAULT '',
+ `account` char(30) NOT NULL DEFAULT '',
+ `date` datetime DEFAULT NULL,
+ `mark` varchar(50) NOT NULL DEFAULT '',
+ `extra` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ KEY `idx_object` (`objectType`,`objectID`),
+ KEY `idx_account` (`account`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_market` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `industry` char(255) NOT NULL DEFAULT '',
+ `scale` decimal(10,2) NOT NULL DEFAULT 0.00,
+ `maturity` char(255) NOT NULL DEFAULT '',
+ `speed` varchar(255) NOT NULL DEFAULT '',
+ `competition` char(255) NOT NULL DEFAULT '',
+ `strategy` varchar(255) NOT NULL DEFAULT '',
+ `ppm` varchar(20) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `openedBy` varchar(30) NOT NULL DEFAULT '',
+ `openedDate` datetime DEFAULT NULL,
+ `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_marketreport` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `market` mediumint(8) NOT NULL DEFAULT 0,
+ `research` mediumint(8) NOT NULL DEFAULT 0,
+ `maturity` varchar(30) NOT NULL DEFAULT '',
+ `owner` varchar(30) NOT NULL DEFAULT '',
+ `participants` char(255) NOT NULL DEFAULT '',
+ `source` varchar(30) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `status` varchar(20) NOT NULL DEFAULT '',
+ `openedBy` varchar(30) NOT NULL DEFAULT '',
+ `openedDate` datetime DEFAULT NULL,
+ `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `publishedBy` varchar(30) NOT NULL DEFAULT '',
+ `publishedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_measqueue` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `type` varchar(30) NOT NULL DEFAULT '',
+ `mid` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `status` varchar(100) NOT NULL DEFAULT '',
+ `logs` text DEFAULT NULL,
+ `execTime` varchar(10) NOT NULL DEFAULT '',
+ `params` text DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `updateDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `status_deleted` (`status`,`deleted`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_measrecords` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `type` varchar(30) NOT NULL DEFAULT '',
+ `mid` mediumint(8) NOT NULL DEFAULT 0,
+ `measCode` char(50) NOT NULL DEFAULT '',
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `params` text DEFAULT NULL,
+ `year` char(4) NOT NULL DEFAULT '',
+ `month` char(6) NOT NULL DEFAULT '',
+ `week` char(8) NOT NULL DEFAULT '',
+ `day` char(8) NOT NULL DEFAULT '',
+ `value` varchar(255) NOT NULL DEFAULT '',
+ `date` date DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `time` (`year`,`month`,`day`,`week`),
+ KEY `product` (`product`),
+ KEY `project` (`project`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_meastemplate` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `model` char(30) NOT NULL DEFAULT '',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `content` mediumtext DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_meeting` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) NOT NULL DEFAULT 0,
+ `execution` mediumint(8) NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(255) NOT NULL DEFAULT '',
+ `begin` time DEFAULT NULL,
+ `end` time DEFAULT NULL,
+ `dept` mediumint(8) NOT NULL DEFAULT 0,
+ `mode` varchar(255) NOT NULL DEFAULT '',
+ `host` varchar(30) NOT NULL DEFAULT '',
+ `participant` text DEFAULT NULL,
+ `date` date DEFAULT NULL,
+ `room` int(11) NOT NULL DEFAULT 0,
+ `minutes` text DEFAULT NULL,
+ `minutedBy` varchar(30) NOT NULL DEFAULT '',
+ `minutedDate` datetime DEFAULT NULL,
+ `objectType` varchar(30) NOT NULL DEFAULT '',
+ `objectID` mediumint(8) NOT NULL DEFAULT 0,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_meetingroom` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `position` varchar(30) NOT NULL DEFAULT '',
+ `seats` int(11) NOT NULL DEFAULT 0,
+ `equipment` varchar(255) NOT NULL DEFAULT '',
+ `openTime` varchar(255) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_metric` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `purpose` varchar(50) NOT NULL DEFAULT '',
+ `scope` char(30) NOT NULL DEFAULT '',
+ `object` char(30) NOT NULL DEFAULT '',
+ `stage` enum('wait','released') DEFAULT 'wait',
+ `type` enum('php','sql') DEFAULT 'php',
+ `name` varchar(90) NOT NULL DEFAULT '',
+ `alias` varchar(90) NOT NULL DEFAULT '',
+ `code` varchar(90) NOT NULL DEFAULT '',
+ `unit` varchar(10) NOT NULL DEFAULT '',
+ `dateType` varchar(50) NOT NULL DEFAULT '',
+ `collector` text DEFAULT NULL,
+ `desc` text DEFAULT NULL,
+ `definition` text DEFAULT NULL,
+ `when` varchar(30) NOT NULL DEFAULT '',
+ `event` varchar(30) NOT NULL DEFAULT '',
+ `cronCFG` varchar(30) NOT NULL DEFAULT '',
+ `time` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `implementedBy` varchar(30) NOT NULL DEFAULT '',
+ `implementedDate` datetime DEFAULT NULL,
+ `delistedBy` varchar(30) NOT NULL DEFAULT '',
+ `delistedDate` datetime DEFAULT NULL,
+ `builtin` enum('0','1') NOT NULL DEFAULT '0',
+ `fromID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `order` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `lastCalcRows` int(11) NOT NULL DEFAULT 0,
+ `lastCalcTime` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_metriclib` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `metricID` mediumint(9) NOT NULL DEFAULT 0,
+ `metricCode` varchar(100) NOT NULL DEFAULT '',
+ `system` char(30) NOT NULL DEFAULT '0',
+ `program` char(30) NOT NULL DEFAULT '',
+ `project` char(30) NOT NULL DEFAULT '',
+ `product` char(30) NOT NULL DEFAULT '',
+ `execution` char(30) NOT NULL DEFAULT '',
+ `code` char(30) NOT NULL DEFAULT '',
+ `pipeline` char(30) NOT NULL DEFAULT '',
+ `repo` char(30) NOT NULL DEFAULT '',
+ `user` text DEFAULT NULL,
+ `dept` char(30) NOT NULL DEFAULT '',
+ `year` char(4) NOT NULL DEFAULT '0',
+ `month` char(2) NOT NULL DEFAULT '0',
+ `week` char(2) NOT NULL DEFAULT '0',
+ `day` char(2) NOT NULL DEFAULT '0',
+ `value` varchar(100) NOT NULL DEFAULT '0',
+ `calcType` enum('cron','inference') NOT NULL DEFAULT 'cron',
+ `calculatedBy` varchar(30) NOT NULL DEFAULT '',
+ `date` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `metricID` (`metricID`),
+ KEY `metricCode` (`metricCode`),
+ KEY `date` (`date`),
+ KEY `deleted` (`deleted`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_module` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `root` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` char(60) NOT NULL DEFAULT '',
+ `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `path` char(255) NOT NULL DEFAULT '',
+ `grade` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `order` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `type` char(30) NOT NULL DEFAULT '',
+ `from` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `owner` varchar(30) NOT NULL DEFAULT '',
+ `collector` text DEFAULT NULL,
+ `short` varchar(30) NOT NULL DEFAULT '',
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `root` (`root`),
+ KEY `type` (`type`),
+ KEY `path` (`path`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_mr` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `hostID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `sourceProject` varchar(50) NOT NULL DEFAULT '',
+ `sourceBranch` varchar(100) NOT NULL DEFAULT '',
+ `targetProject` varchar(50) NOT NULL DEFAULT '',
+ `targetBranch` varchar(100) NOT NULL DEFAULT '',
+ `mriid` int(10) unsigned NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `description` text DEFAULT NULL,
+ `assignee` varchar(255) NOT NULL DEFAULT '',
+ `reviewer` varchar(255) NOT NULL DEFAULT '',
+ `approver` varchar(255) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `status` char(30) NOT NULL DEFAULT '',
+ `mergeStatus` char(30) NOT NULL DEFAULT '',
+ `approvalStatus` char(30) NOT NULL DEFAULT '',
+ `needApproved` enum('0','1') NOT NULL DEFAULT '0',
+ `needCI` enum('0','1') NOT NULL DEFAULT '0',
+ `repoID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `jobID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `executionID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `compileID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `compileStatus` char(30) NOT NULL DEFAULT '',
+ `removeSourceBranch` enum('0','1') NOT NULL DEFAULT '0',
+ `squash` enum('0','1') NOT NULL DEFAULT '0',
+ `isFlow` enum('0','1') NOT NULL DEFAULT '0',
+ `synced` enum('0','1') NOT NULL DEFAULT '1',
+ `syncError` varchar(255) NOT NULL DEFAULT '',
+ `hasNoConflict` enum('0','1') NOT NULL DEFAULT '0',
+ `diffs` longtext DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_mrapproval` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `mrID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `account` varchar(255) NOT NULL DEFAULT '',
+ `date` datetime DEFAULT NULL,
+ `action` char(30) NOT NULL DEFAULT '',
+ `comment` text DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_nc` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `auditplan` mediumint(8) NOT NULL DEFAULT 0,
+ `listID` mediumint(8) NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `type` char(30) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT 'active',
+ `severity` char(30) NOT NULL DEFAULT '',
+ `deadline` date DEFAULT NULL,
+ `resolvedBy` varchar(30) NOT NULL DEFAULT '',
+ `resolution` char(30) NOT NULL DEFAULT '',
+ `resolvedDate` date DEFAULT NULL,
+ `closedBy` varchar(30) NOT NULL DEFAULT '',
+ `closedDate` date DEFAULT NULL,
+ `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` date DEFAULT NULL,
+ `activateDate` date DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_notify` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `objectType` varchar(50) NOT NULL DEFAULT '',
+ `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `action` mediumint(8) NOT NULL DEFAULT 0,
+ `toList` text DEFAULT NULL,
+ `ccList` text DEFAULT NULL,
+ `subject` text DEFAULT NULL,
+ `data` text DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `sendTime` datetime DEFAULT NULL,
+ `status` varchar(10) NOT NULL DEFAULT 'wait',
+ `failReason` text DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `objectType` (`objectType`),
+ KEY `status` (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_oauth` (
+ `account` varchar(30) NOT NULL DEFAULT '',
+ `openID` varchar(255) NOT NULL DEFAULT '',
+ `providerType` varchar(30) NOT NULL DEFAULT '',
+ `providerID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ UNIQUE KEY `account_openID` (`account`,`openID`,`providerType`,`providerID`),
+ KEY `account` (`account`),
+ KEY `providerType` (`providerType`),
+ KEY `providerID` (`providerID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_object` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) NOT NULL DEFAULT 0,
+ `from` mediumint(8) NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `category` char(30) NOT NULL DEFAULT '',
+ `version` varchar(255) NOT NULL DEFAULT '',
+ `type` enum('reviewed','taged') NOT NULL DEFAULT 'reviewed',
+ `enabled` enum('0','1') NOT NULL DEFAULT '1',
+ `range` text DEFAULT NULL,
+ `data` text DEFAULT NULL,
+ `storyEst` char(30) NOT NULL DEFAULT '',
+ `taskEst` char(30) NOT NULL DEFAULT '',
+ `requestEst` char(30) NOT NULL DEFAULT '',
+ `testEst` char(30) NOT NULL DEFAULT '',
+ `devEst` char(30) NOT NULL DEFAULT '',
+ `designEst` char(30) NOT NULL DEFAULT '',
+ `end` date DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_opportunity` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `source` char(30) NOT NULL DEFAULT '',
+ `type` char(30) NOT NULL DEFAULT '',
+ `strategy` char(30) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT 'active',
+ `impact` mediumint(8) NOT NULL DEFAULT 0,
+ `chance` mediumint(8) NOT NULL DEFAULT 0,
+ `ratio` mediumint(8) NOT NULL DEFAULT 0,
+ `pri` char(30) NOT NULL DEFAULT '',
+ `identifiedDate` date DEFAULT NULL,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` date DEFAULT NULL,
+ `approvedDate` date DEFAULT NULL,
+ `prevention` mediumtext DEFAULT NULL,
+ `plannedClosedDate` date DEFAULT NULL,
+ `actualClosedDate` date DEFAULT NULL,
+ `lib` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `from` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `desc` mediumtext DEFAULT NULL,
+ `version` smallint(6) NOT NULL DEFAULT 1,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `activatedBy` varchar(30) NOT NULL DEFAULT '',
+ `activatedDate` datetime DEFAULT NULL,
+ `closedBy` varchar(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `canceledBy` varchar(30) NOT NULL DEFAULT '',
+ `canceledDate` datetime DEFAULT NULL,
+ `cancelReason` char(30) NOT NULL DEFAULT '',
+ `hangupedBy` varchar(30) NOT NULL DEFAULT '',
+ `hangupedDate` datetime DEFAULT NULL,
+ `resolution` mediumtext DEFAULT NULL,
+ `resolvedBy` varchar(30) NOT NULL DEFAULT '',
+ `resolvedDate` datetime DEFAULT NULL,
+ `lastCheckedBy` varchar(30) NOT NULL DEFAULT '',
+ `lastCheckedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_overtime` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `year` char(4) NOT NULL DEFAULT '',
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ `start` time DEFAULT NULL,
+ `finish` time DEFAULT NULL,
+ `hours` float(4,1) unsigned NOT NULL DEFAULT 0.0,
+ `leave` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(30) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `rejectReason` varchar(100) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `reviewedBy` char(30) NOT NULL DEFAULT '',
+ `reviewedDate` datetime DEFAULT NULL,
+ `level` tinyint(3) NOT NULL DEFAULT 0,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `reviewers` text DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `year` (`year`),
+ KEY `type` (`type`),
+ KEY `status` (`status`),
+ KEY `createdBy` (`createdBy`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_pipeline` (
+ `id` smallint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `type` char(30) NOT NULL DEFAULT '',
+ `name` varchar(50) NOT NULL DEFAULT '',
+ `url` varchar(255) DEFAULT NULL,
+ `account` varchar(30) DEFAULT NULL,
+ `password` varchar(255) DEFAULT NULL,
+ `token` varchar(255) DEFAULT NULL,
+ `private` char(32) DEFAULT NULL,
+ `instanceID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_pivot` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `dimension` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `group` varchar(255) NOT NULL DEFAULT '',
+ `code` varchar(255) NOT NULL DEFAULT '',
+ `driver` enum('mysql','duckdb') NOT NULL DEFAULT 'mysql',
+ `mode` varchar(10) NOT NULL DEFAULT 'builder',
+ `name` text DEFAULT NULL,
+ `desc` text DEFAULT NULL,
+ `acl` enum('open','private') NOT NULL DEFAULT 'open',
+ `whitelist` text DEFAULT NULL,
+ `sql` text DEFAULT NULL,
+ `fields` text DEFAULT NULL,
+ `langs` text DEFAULT NULL,
+ `vars` text DEFAULT NULL,
+ `objects` text DEFAULT NULL,
+ `settings` text DEFAULT NULL,
+ `filters` text DEFAULT NULL,
+ `step` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `stage` enum('draft','published') NOT NULL DEFAULT 'draft',
+ `builtin` enum('0','1') NOT NULL DEFAULT '0',
+ `version` varchar(10) NOT NULL DEFAULT '1',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `dimension` (`dimension`),
+ KEY `group` (`group`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_pivotdrill` (
+ `pivot` mediumint(9) NOT NULL,
+ `version` varchar(10) NOT NULL DEFAULT '1',
+ `field` varchar(255) NOT NULL,
+ `object` varchar(40) NOT NULL,
+ `whereSql` mediumtext NOT NULL,
+ `condition` mediumtext NOT NULL,
+ `status` enum('design','published') NOT NULL DEFAULT 'published',
+ `account` varchar(30) NOT NULL DEFAULT '',
+ `type` enum('auto','manual') NOT NULL DEFAULT 'manual'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_pivotspec` (
+ `pivot` mediumint(8) NOT NULL,
+ `version` varchar(10) NOT NULL,
+ `driver` enum('mysql','duckdb') NOT NULL DEFAULT 'mysql',
+ `mode` varchar(10) NOT NULL DEFAULT 'builder',
+ `name` text DEFAULT NULL,
+ `desc` text DEFAULT NULL,
+ `sql` text DEFAULT NULL,
+ `fields` text DEFAULT NULL,
+ `langs` text DEFAULT NULL,
+ `vars` text DEFAULT NULL,
+ `objects` text DEFAULT NULL,
+ `settings` text DEFAULT NULL,
+ `filters` text DEFAULT NULL,
+ `createdDate` datetime DEFAULT NULL,
+ UNIQUE KEY `idx_pivot_version` (`pivot`,`version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_planstory` (
+ `plan` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `order` mediumint(9) NOT NULL DEFAULT 0,
+ UNIQUE KEY `plan_story` (`plan`,`story`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_practice` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `code` char(50) NOT NULL DEFAULT '',
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `labels` varchar(255) NOT NULL DEFAULT '',
+ `summary` varchar(255) NOT NULL DEFAULT '',
+ `content` text DEFAULT NULL,
+ `contributor` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `code` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_priv` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `method` varchar(30) NOT NULL DEFAULT '',
+ `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `edition` varchar(30) NOT NULL DEFAULT ',open,biz,max,',
+ `vision` varchar(30) NOT NULL DEFAULT ',rnd,',
+ `system` enum('0','1') NOT NULL DEFAULT '0',
+ `order` mediumint(8) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `priv` (`module`,`method`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_privlang` (
+ `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `objectType` enum('priv','manager') NOT NULL DEFAULT 'priv',
+ `lang` varchar(30) NOT NULL DEFAULT '',
+ `key` varchar(100) NOT NULL DEFAULT '',
+ `value` varchar(255) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ UNIQUE KEY `objectlang` (`objectID`,`objectType`,`lang`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_privmanager` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `code` varchar(100) NOT NULL DEFAULT '',
+ `type` enum('view','module','package') NOT NULL DEFAULT 'package',
+ `edition` varchar(30) NOT NULL DEFAULT ',open,biz,max,',
+ `vision` varchar(30) NOT NULL DEFAULT ',rnd,',
+ `order` mediumint(8) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_privrelation` (
+ `priv` varchar(100) NOT NULL DEFAULT '',
+ `type` varchar(30) NOT NULL DEFAULT '',
+ `relationPriv` varchar(100) NOT NULL DEFAULT '',
+ UNIQUE KEY `privrelation` (`priv`,`type`,`relationPriv`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_process` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `model` char(30) NOT NULL DEFAULT 'waterfall',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `type` char(30) NOT NULL DEFAULT '',
+ `abbr` char(30) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `order` mediumint(9) NOT NULL DEFAULT 0,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `assignedBy` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_product` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `program` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(110) NOT NULL DEFAULT '',
+ `code` varchar(45) NOT NULL DEFAULT '',
+ `shadow` tinyint(1) unsigned NOT NULL DEFAULT 0,
+ `bind` enum('0','1') NOT NULL DEFAULT '0',
+ `line` mediumint(8) NOT NULL DEFAULT 0,
+ `type` varchar(30) NOT NULL DEFAULT 'normal',
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `subStatus` varchar(30) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `PO` varchar(30) NOT NULL DEFAULT '',
+ `QD` varchar(30) NOT NULL DEFAULT '',
+ `RD` varchar(30) NOT NULL DEFAULT '',
+ `feedback` varchar(30) NOT NULL DEFAULT '',
+ `ticket` varchar(30) NOT NULL DEFAULT '',
+ `workflowGroup` int(8) NOT NULL DEFAULT 0,
+ `acl` enum('open','private','custom') NOT NULL DEFAULT 'open',
+ `groups` text DEFAULT NULL,
+ `whitelist` text DEFAULT NULL,
+ `reviewer` text DEFAULT NULL,
+ `PMT` text DEFAULT NULL,
+ `draftEpics` mediumint(8) NOT NULL DEFAULT 0,
+ `activeEpics` mediumint(8) NOT NULL DEFAULT 0,
+ `changingEpics` mediumint(8) NOT NULL DEFAULT 0,
+ `reviewingEpics` mediumint(8) NOT NULL DEFAULT 0,
+ `finishedEpics` mediumint(8) NOT NULL DEFAULT 0,
+ `closedEpics` mediumint(8) NOT NULL DEFAULT 0,
+ `totalEpics` mediumint(8) NOT NULL DEFAULT 0,
+ `draftRequirements` mediumint(8) NOT NULL DEFAULT 0,
+ `activeRequirements` mediumint(8) NOT NULL DEFAULT 0,
+ `changingRequirements` mediumint(8) NOT NULL DEFAULT 0,
+ `reviewingRequirements` mediumint(8) NOT NULL DEFAULT 0,
+ `finishedRequirements` mediumint(8) NOT NULL DEFAULT 0,
+ `closedRequirements` mediumint(8) NOT NULL DEFAULT 0,
+ `totalRequirements` mediumint(8) NOT NULL DEFAULT 0,
+ `draftStories` mediumint(8) NOT NULL DEFAULT 0,
+ `activeStories` mediumint(8) NOT NULL DEFAULT 0,
+ `changingStories` mediumint(8) NOT NULL DEFAULT 0,
+ `reviewingStories` mediumint(8) NOT NULL DEFAULT 0,
+ `finishedStories` mediumint(8) NOT NULL DEFAULT 0,
+ `closedStories` mediumint(8) NOT NULL DEFAULT 0,
+ `totalStories` mediumint(8) NOT NULL DEFAULT 0,
+ `unresolvedBugs` mediumint(8) NOT NULL DEFAULT 0,
+ `closedBugs` mediumint(8) NOT NULL DEFAULT 0,
+ `fixedBugs` mediumint(8) NOT NULL DEFAULT 0,
+ `totalBugs` mediumint(8) NOT NULL DEFAULT 0,
+ `plans` mediumint(8) NOT NULL DEFAULT 0,
+ `releases` mediumint(8) NOT NULL DEFAULT 0,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `createdVersion` varchar(20) NOT NULL DEFAULT '',
+ `closedDate` date DEFAULT NULL,
+ `order` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `acl` (`acl`),
+ KEY `order` (`order`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_productplan` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `branch` varchar(255) NOT NULL DEFAULT '0',
+ `parent` mediumint(9) NOT NULL DEFAULT 0,
+ `title` varchar(90) NOT NULL DEFAULT '',
+ `status` enum('wait','doing','done','closed') NOT NULL DEFAULT 'wait',
+ `desc` mediumtext DEFAULT NULL,
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ `finishedDate` datetime DEFAULT NULL,
+ `closedDate` datetime DEFAULT NULL,
+ `order` text DEFAULT NULL,
+ `closedReason` varchar(20) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `product` (`product`),
+ KEY `end` (`end`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_programactivity` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `process` mediumint(8) NOT NULL DEFAULT 0,
+ `activity` mediumint(8) NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `content` text DEFAULT NULL,
+ `reason` varchar(255) NOT NULL DEFAULT '',
+ `result` char(30) NOT NULL DEFAULT '',
+ `linkedBy` char(30) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_programoutput` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `process` mediumint(8) NOT NULL DEFAULT 0,
+ `activity` mediumint(8) NOT NULL DEFAULT 0,
+ `output` mediumint(8) NOT NULL DEFAULT 0,
+ `content` text DEFAULT NULL,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `reason` varchar(255) NOT NULL DEFAULT '',
+ `result` char(30) NOT NULL DEFAULT '',
+ `linkedBy` char(30) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_programprocess` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `process` mediumint(8) NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `type` char(30) NOT NULL DEFAULT '',
+ `abbr` char(30) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `reason` varchar(255) NOT NULL DEFAULT '',
+ `linkedBy` char(30) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_programreport` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `template` mediumint(8) NOT NULL DEFAULT 0,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `params` text DEFAULT NULL,
+ `content` text DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_project` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) NOT NULL DEFAULT 0,
+ `charter` mediumint(8) NOT NULL DEFAULT 0,
+ `model` char(30) NOT NULL DEFAULT '',
+ `type` char(30) NOT NULL DEFAULT 'sprint',
+ `category` char(30) NOT NULL DEFAULT '',
+ `lifetime` char(30) NOT NULL DEFAULT '',
+ `budget` varchar(30) NOT NULL DEFAULT '0',
+ `budgetUnit` char(30) NOT NULL DEFAULT 'CNY',
+ `attribute` varchar(30) NOT NULL DEFAULT '',
+ `percent` float unsigned NOT NULL DEFAULT 0,
+ `milestone` enum('0','1') NOT NULL DEFAULT '0',
+ `output` text DEFAULT NULL,
+ `auth` char(30) NOT NULL DEFAULT '',
+ `storyType` char(30) NOT NULL DEFAULT '',
+ `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `path` varchar(255) NOT NULL DEFAULT '',
+ `grade` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(90) NOT NULL DEFAULT '',
+ `code` varchar(45) NOT NULL DEFAULT '',
+ `hasProduct` tinyint(1) unsigned NOT NULL DEFAULT 1,
+ `workflowGroup` int(8) NOT NULL DEFAULT 0,
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ `firstEnd` date DEFAULT NULL,
+ `realBegan` date DEFAULT NULL,
+ `realEnd` date DEFAULT NULL,
+ `days` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `status` varchar(10) NOT NULL DEFAULT '',
+ `subStatus` varchar(30) NOT NULL DEFAULT '',
+ `pri` enum('1','2','3','4') NOT NULL DEFAULT '1',
+ `desc` mediumtext DEFAULT NULL,
+ `version` smallint(6) NOT NULL DEFAULT 0,
+ `parentVersion` smallint(6) NOT NULL DEFAULT 0,
+ `planDuration` int(11) NOT NULL DEFAULT 0,
+ `realDuration` int(11) NOT NULL DEFAULT 0,
+ `progress` decimal(5,2) NOT NULL DEFAULT 0.00,
+ `estimate` float NOT NULL DEFAULT 0,
+ `left` float NOT NULL DEFAULT 0,
+ `consumed` float NOT NULL DEFAULT 0,
+ `teamCount` int(11) NOT NULL DEFAULT 0,
+ `market` mediumint(8) NOT NULL DEFAULT 0,
+ `openedBy` varchar(30) NOT NULL DEFAULT '',
+ `openedDate` datetime DEFAULT NULL,
+ `openedVersion` varchar(20) NOT NULL DEFAULT '',
+ `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `closedBy` varchar(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `closedReason` varchar(20) NOT NULL DEFAULT '',
+ `canceledBy` varchar(30) NOT NULL DEFAULT '',
+ `canceledDate` datetime DEFAULT NULL,
+ `suspendedDate` date DEFAULT NULL,
+ `PO` varchar(30) NOT NULL DEFAULT '',
+ `PM` varchar(30) NOT NULL DEFAULT '',
+ `QD` varchar(30) NOT NULL DEFAULT '',
+ `RD` varchar(30) NOT NULL DEFAULT '',
+ `team` varchar(90) NOT NULL DEFAULT '',
+ `acl` char(30) NOT NULL DEFAULT 'open',
+ `whitelist` text DEFAULT NULL,
+ `order` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `stageBy` enum('project','product') NOT NULL DEFAULT 'product',
+ `displayCards` smallint(6) NOT NULL DEFAULT 0,
+ `fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
+ `multiple` enum('0','1') NOT NULL DEFAULT '1',
+ `parallel` mediumint(9) NOT NULL DEFAULT 0,
+ `enabled` enum('on','off') NOT NULL DEFAULT 'on',
+ `linkType` varchar(30) NOT NULL DEFAULT 'plan',
+ `colWidth` smallint(6) NOT NULL DEFAULT 264,
+ `minColWidth` smallint(6) NOT NULL DEFAULT 200,
+ `maxColWidth` smallint(6) NOT NULL DEFAULT 384,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `parent` (`parent`),
+ KEY `begin` (`begin`),
+ KEY `end` (`end`),
+ KEY `status` (`status`),
+ KEY `acl` (`acl`),
+ KEY `order` (`order`),
+ KEY `project` (`project`),
+ KEY `type_order` (`type`,`order`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_projectadmin` (
+ `group` smallint(6) NOT NULL DEFAULT 0,
+ `account` char(30) NOT NULL DEFAULT '',
+ `programs` text DEFAULT NULL,
+ `projects` text DEFAULT NULL,
+ `products` text DEFAULT NULL,
+ `executions` text DEFAULT NULL,
+ UNIQUE KEY `group_account` (`group`,`account`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_projectcase` (
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `count` mediumint(8) unsigned NOT NULL DEFAULT 1,
+ `version` smallint(6) NOT NULL DEFAULT 1,
+ `order` smallint(6) unsigned NOT NULL DEFAULT 0,
+ UNIQUE KEY `project` (`project`,`case`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_projectproduct` (
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `plan` varchar(255) NOT NULL DEFAULT '',
+ `roadmap` varchar(255) NOT NULL DEFAULT '',
+ UNIQUE KEY `project_product` (`project`,`product`,`branch`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_projectspec` (
+ `project` mediumint(8) NOT NULL DEFAULT 0,
+ `version` smallint(6) NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `milestone` enum('0','1') NOT NULL DEFAULT '0',
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ UNIQUE KEY `project` (`project`,`version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_projectstory` (
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `version` smallint(6) NOT NULL DEFAULT 1,
+ `order` smallint(6) unsigned NOT NULL DEFAULT 0,
+ UNIQUE KEY `project` (`project`,`story`),
+ KEY `story` (`story`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_queue` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `cron` mediumint(9) NOT NULL,
+ `type` varchar(255) NOT NULL,
+ `command` text NOT NULL,
+ `status` enum('wait','doing','done') NOT NULL DEFAULT 'wait',
+ `execId` int(11) DEFAULT NULL,
+ `createdDate` datetime NOT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `status_createdDate` (`status`,`createdDate`),
+ KEY `cron_createdDate` (`cron`,`createdDate`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_relation` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) NOT NULL DEFAULT 0,
+ `product` mediumint(8) NOT NULL DEFAULT 0,
+ `execution` mediumint(8) NOT NULL DEFAULT 0,
+ `AType` char(30) NOT NULL DEFAULT '',
+ `AID` mediumint(8) NOT NULL DEFAULT 0,
+ `AVersion` char(30) NOT NULL DEFAULT '',
+ `relation` char(30) NOT NULL DEFAULT '',
+ `BType` char(30) NOT NULL DEFAULT '',
+ `BID` mediumint(8) NOT NULL DEFAULT 0,
+ `BVersion` char(30) NOT NULL DEFAULT '',
+ `extra` char(30) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `relation` (`product`,`relation`,`AType`,`BType`,`AID`,`BID`),
+ KEY `AID` (`AType`,`AID`),
+ KEY `BID` (`BType`,`BID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_relationoftasks` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `execution` mediumint(8) unsigned NOT NULL,
+ `pretask` mediumint(8) unsigned NOT NULL,
+ `condition` enum('begin','end') NOT NULL,
+ `task` mediumint(8) unsigned NOT NULL,
+ `action` enum('begin','end') NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `relationoftasks` (`execution`,`task`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_release` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` varchar(255) NOT NULL DEFAULT '0',
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `branch` varchar(255) NOT NULL DEFAULT '0',
+ `shadow` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `build` varchar(255) NOT NULL DEFAULT '',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `system` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `releases` varchar(255) NOT NULL DEFAULT '',
+ `marker` enum('0','1') NOT NULL DEFAULT '0',
+ `date` date DEFAULT NULL,
+ `releasedDate` date DEFAULT NULL,
+ `stories` text DEFAULT NULL,
+ `bugs` text DEFAULT NULL,
+ `leftBugs` text DEFAULT NULL,
+ `desc` mediumtext DEFAULT NULL,
+ `mailto` text DEFAULT NULL,
+ `notify` varchar(255) NOT NULL DEFAULT '',
+ `status` varchar(20) NOT NULL DEFAULT 'normal',
+ `subStatus` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `product` (`product`),
+ KEY `build` (`build`),
+ KEY `idx_system` (`system`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_releaserelated` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `release` int(11) unsigned NOT NULL,
+ `objectID` int(11) unsigned NOT NULL,
+ `objectType` varchar(10) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique` (`release`,`objectID`,`objectType`),
+ KEY `objectID` (`objectID`),
+ KEY `objectType` (`objectType`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_repo` (
+ `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+ `product` varchar(255) NOT NULL DEFAULT '',
+ `projects` varchar(255) NOT NULL DEFAULT '',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `path` varchar(255) NOT NULL DEFAULT '',
+ `prefix` varchar(100) NOT NULL DEFAULT '',
+ `encoding` varchar(20) NOT NULL DEFAULT '',
+ `SCM` varchar(10) NOT NULL DEFAULT '',
+ `client` varchar(100) NOT NULL DEFAULT '',
+ `serviceHost` varchar(50) NOT NULL DEFAULT '',
+ `serviceProject` varchar(100) NOT NULL DEFAULT '',
+ `commits` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `account` varchar(30) NOT NULL DEFAULT '',
+ `password` varchar(30) NOT NULL DEFAULT '',
+ `encrypt` varchar(30) NOT NULL DEFAULT 'plain',
+ `acl` text DEFAULT NULL,
+ `synced` tinyint(1) NOT NULL DEFAULT 0,
+ `lastSync` datetime DEFAULT NULL,
+ `lastCommit` datetime DEFAULT NULL,
+ `desc` text DEFAULT NULL,
+ `extra` char(30) NOT NULL DEFAULT '',
+ `preMerge` enum('0','1') NOT NULL DEFAULT '0',
+ `job` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `fileServerUrl` text DEFAULT NULL,
+ `fileServerAccount` varchar(40) NOT NULL DEFAULT '',
+ `fileServerPassword` varchar(100) NOT NULL DEFAULT '',
+ `deleted` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_repobranch` (
+ `repo` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `revision` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `branch` varchar(255) NOT NULL DEFAULT '',
+ UNIQUE KEY `repo_revision_branch` (`repo`,`revision`,`branch`),
+ KEY `branch` (`branch`),
+ KEY `revision` (`revision`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_repofiles` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `repo` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `revision` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `path` varchar(255) NOT NULL DEFAULT '',
+ `oldPath` varchar(255) NOT NULL DEFAULT '',
+ `parent` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(20) NOT NULL DEFAULT '',
+ `action` char(1) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ KEY `path` (`path`),
+ KEY `parent` (`parent`),
+ KEY `repo` (`repo`),
+ KEY `revision` (`revision`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_repohistory` (
+ `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+ `repo` mediumint(9) NOT NULL DEFAULT 0,
+ `revision` varchar(40) NOT NULL DEFAULT '',
+ `commit` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `comment` text DEFAULT NULL,
+ `committer` varchar(100) NOT NULL DEFAULT '',
+ `time` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `repo` (`repo`),
+ KEY `revision` (`revision`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_report` (
+ `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+ `code` varchar(100) NOT NULL DEFAULT '',
+ `name` text DEFAULT NULL,
+ `dimension` int(8) NOT NULL DEFAULT 0,
+ `module` varchar(100) NOT NULL DEFAULT '',
+ `sql` text DEFAULT NULL,
+ `vars` text DEFAULT NULL,
+ `langs` text DEFAULT NULL,
+ `params` text DEFAULT NULL,
+ `step` tinyint(1) NOT NULL DEFAULT 2,
+ `desc` text DEFAULT NULL,
+ `addedBy` char(30) NOT NULL DEFAULT '',
+ `addedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `code` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_researchplan` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `customer` varchar(255) NOT NULL DEFAULT '',
+ `stakeholder` varchar(255) NOT NULL DEFAULT '',
+ `objective` varchar(255) NOT NULL DEFAULT '',
+ `begin` datetime DEFAULT NULL,
+ `end` datetime DEFAULT NULL,
+ `location` varchar(255) NOT NULL DEFAULT '',
+ `team` varchar(255) NOT NULL DEFAULT '',
+ `method` enum('','videoConference','interview','questionnaire','telephoneInterview') NOT NULL DEFAULT '',
+ `outline` mediumtext DEFAULT NULL,
+ `schedule` mediumtext DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_researchreport` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `relatedPlan` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `author` varchar(30) NOT NULL DEFAULT '',
+ `content` mediumtext DEFAULT NULL,
+ `customer` varchar(255) NOT NULL DEFAULT '',
+ `researchObjects` varchar(255) NOT NULL DEFAULT '',
+ `begin` datetime DEFAULT NULL,
+ `end` datetime DEFAULT NULL,
+ `location` varchar(255) NOT NULL DEFAULT '',
+ `method` enum('','videoConference','interview','questionnaire','telephoneInterview') NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_review` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `object` mediumint(8) NOT NULL DEFAULT 0,
+ `template` mediumint(8) NOT NULL DEFAULT 0,
+ `doc` varchar(255) NOT NULL DEFAULT '',
+ `docVersion` varchar(255) NOT NULL DEFAULT '',
+ `status` char(30) NOT NULL DEFAULT '',
+ `reviewedBy` varchar(255) NOT NULL DEFAULT '',
+ `auditedBy` varchar(255) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `begin` date DEFAULT NULL,
+ `deadline` date DEFAULT NULL,
+ `lastReviewedBy` varchar(255) NOT NULL DEFAULT '',
+ `lastReviewedDate` date DEFAULT NULL,
+ `lastAuditedBy` varchar(255) NOT NULL DEFAULT '',
+ `lastAuditedDate` date DEFAULT NULL,
+ `toAuditBy` varchar(30) NOT NULL DEFAULT '',
+ `toAuditDate` datetime DEFAULT NULL,
+ `lastEditedBy` varchar(255) NOT NULL DEFAULT '',
+ `lastEditedDate` date DEFAULT NULL,
+ `result` char(30) NOT NULL DEFAULT '',
+ `auditResult` char(30) NOT NULL DEFAULT '',
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_reviewcl` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `object` char(30) NOT NULL DEFAULT '',
+ `category` char(30) NOT NULL DEFAULT '',
+ `type` varchar(255) NOT NULL DEFAULT '',
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `order` mediumint(8) DEFAULT 0,
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `assignedBy` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_reviewissue` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `review` mediumint(8) NOT NULL DEFAULT 0,
+ `approval` mediumint(8) NOT NULL DEFAULT 0,
+ `injection` mediumint(8) NOT NULL DEFAULT 0,
+ `identify` mediumint(8) NOT NULL DEFAULT 0,
+ `type` char(30) NOT NULL DEFAULT 'review',
+ `listID` mediumint(8) NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `opinion` mediumtext DEFAULT NULL,
+ `opinionDate` date DEFAULT NULL,
+ `status` char(30) NOT NULL DEFAULT '',
+ `resolution` char(30) NOT NULL DEFAULT '',
+ `resolutionBy` char(30) NOT NULL DEFAULT '',
+ `resolutionDate` date DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_reviewlist` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `object` char(30) NOT NULL DEFAULT '',
+ `category` char(30) NOT NULL DEFAULT '',
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `assignedBy` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_reviewresult` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `review` mediumint(8) NOT NULL DEFAULT 0,
+ `type` char(30) NOT NULL DEFAULT 'review',
+ `result` char(30) NOT NULL DEFAULT '',
+ `opinion` text DEFAULT NULL,
+ `reviewer` char(30) NOT NULL DEFAULT '',
+ `remainIssue` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `consumed` float NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `reviewer` (`review`,`reviewer`,`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_risk` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` varchar(255) NOT NULL DEFAULT '',
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `source` char(30) NOT NULL DEFAULT '',
+ `category` char(30) NOT NULL DEFAULT '',
+ `strategy` char(30) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT 'active',
+ `impact` char(30) NOT NULL DEFAULT '',
+ `probability` char(30) NOT NULL DEFAULT '',
+ `rate` char(30) NOT NULL DEFAULT '',
+ `pri` char(30) NOT NULL DEFAULT '',
+ `identifiedDate` date DEFAULT NULL,
+ `prevention` mediumtext DEFAULT NULL,
+ `remedy` mediumtext DEFAULT NULL,
+ `plannedClosedDate` date DEFAULT NULL,
+ `actualClosedDate` date DEFAULT NULL,
+ `lib` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `from` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `version` smallint(6) NOT NULL DEFAULT 1,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `resolution` mediumtext DEFAULT NULL,
+ `resolvedBy` varchar(30) NOT NULL DEFAULT '',
+ `activateBy` varchar(30) NOT NULL DEFAULT '',
+ `activateDate` date DEFAULT NULL,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `closedBy` varchar(30) NOT NULL DEFAULT '',
+ `closedDate` date DEFAULT NULL,
+ `cancelBy` varchar(30) NOT NULL DEFAULT '',
+ `cancelDate` date DEFAULT NULL,
+ `cancelReason` char(30) NOT NULL DEFAULT '',
+ `hangupBy` varchar(30) NOT NULL DEFAULT '',
+ `hangupDate` date DEFAULT NULL,
+ `trackedBy` varchar(30) NOT NULL DEFAULT '',
+ `trackedDate` date DEFAULT NULL,
+ `assignedDate` date DEFAULT NULL,
+ `approvedDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_riskissue` (
+ `risk` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `issue` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ UNIQUE KEY `risk_issue` (`risk`,`issue`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_roadmap` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `product` mediumint(8) NOT NULL DEFAULT 0,
+ `branch` mediumint(8) NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `status` char(30) NOT NULL DEFAULT '',
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ `desc` longtext DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `closedBy` char(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `closedReason` enum('done','canceled') DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_roadmapstory` (
+ `roadmap` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `order` mediumint(8) unsigned NOT NULL,
+ UNIQUE KEY `roadmap_story` (`roadmap`,`story`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_scene` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `sort` int(11) unsigned NOT NULL DEFAULT 0,
+ `openedBy` char(30) NOT NULL DEFAULT '',
+ `openedDate` datetime DEFAULT NULL,
+ `lastEditedBy` char(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `parent` int(11) NOT NULL DEFAULT 0,
+ `grade` tinyint(3) NOT NULL DEFAULT 0,
+ `path` varchar(1000) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_score` (
+ `id` bigint(12) unsigned NOT NULL AUTO_INCREMENT,
+ `account` varchar(30) NOT NULL DEFAULT '',
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `method` varchar(30) NOT NULL DEFAULT '',
+ `desc` varchar(250) NOT NULL DEFAULT '',
+ `before` int(11) NOT NULL DEFAULT 0,
+ `score` int(11) NOT NULL DEFAULT 0,
+ `after` int(11) NOT NULL DEFAULT 0,
+ `time` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `account` (`account`),
+ KEY `module` (`module`),
+ KEY `method` (`method`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_screen` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `dimension` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `acl` enum('open','private') NOT NULL DEFAULT 'open',
+ `whitelist` text DEFAULT NULL,
+ `cover` mediumtext DEFAULT NULL,
+ `scheme` mediumtext DEFAULT NULL,
+ `status` enum('draft','published') NOT NULL DEFAULT 'draft',
+ `builtin` enum('0','1') NOT NULL DEFAULT '0',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` char(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_searchdict` (
+ `key` smallint(6) unsigned NOT NULL DEFAULT 0,
+ `value` char(3) NOT NULL DEFAULT '',
+ UNIQUE KEY `key_value` (`key`,`value`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_searchindex` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `objectType` char(20) NOT NULL DEFAULT '',
+ `objectID` mediumint(9) NOT NULL DEFAULT 0,
+ `title` text DEFAULT NULL,
+ `content` text DEFAULT NULL,
+ `addedDate` datetime DEFAULT NULL,
+ `editedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `object` (`objectType`,`objectID`),
+ KEY `addedDate` (`addedDate`),
+ FULLTEXT KEY `title_content` (`title`,`content`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_serverroom` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(128) NOT NULL DEFAULT '',
+ `city` varchar(128) NOT NULL DEFAULT '',
+ `line` varchar(20) NOT NULL DEFAULT '',
+ `bandwidth` varchar(128) NOT NULL DEFAULT '',
+ `provider` varchar(128) NOT NULL DEFAULT '',
+ `owner` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` char(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_session` (
+ `id` varchar(32) NOT NULL,
+ `data` mediumtext DEFAULT NULL,
+ `timestamp` int(10) unsigned DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `timestamp` (`timestamp`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_solution` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` char(50) NOT NULL DEFAULT '',
+ `appID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `appName` char(50) NOT NULL DEFAULT '',
+ `appVersion` char(20) NOT NULL DEFAULT '',
+ `version` char(50) NOT NULL DEFAULT '',
+ `chart` char(50) NOT NULL DEFAULT '',
+ `cover` varchar(255) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `introduction` varchar(255) NOT NULL DEFAULT '',
+ `source` char(20) NOT NULL DEFAULT '',
+ `channel` char(20) NOT NULL DEFAULT '',
+ `components` text DEFAULT NULL,
+ `status` char(20) NOT NULL DEFAULT '',
+ `deleted` tinyint(1) NOT NULL DEFAULT 0,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdAt` datetime DEFAULT NULL,
+ `updatedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_solutions` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `contents` text NOT NULL,
+ `support` text NOT NULL,
+ `measures` text NOT NULL,
+ `type` char(30) NOT NULL DEFAULT '',
+ `addedBy` varchar(30) NOT NULL DEFAULT '',
+ `addedDate` date DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_space` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(200) NOT NULL,
+ `k8space` char(64) NOT NULL,
+ `owner` char(30) NOT NULL,
+ `default` tinyint(1) NOT NULL DEFAULT 0,
+ `createdAt` datetime DEFAULT NULL,
+ `deleted` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ KEY `name` (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_sqlbuilder` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `objectID` mediumint(8) NOT NULL,
+ `objectType` varchar(50) NOT NULL,
+ `sql` text DEFAULT NULL,
+ `setting` text DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_sqlview` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(90) NOT NULL DEFAULT '',
+ `code` varchar(45) NOT NULL DEFAULT '',
+ `sql` text DEFAULT NULL,
+ `desc` text DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_stage` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `percent` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(255) NOT NULL DEFAULT '',
+ `projectType` varchar(255) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_stakeholder` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `objectID` mediumint(8) NOT NULL DEFAULT 0,
+ `objectType` char(30) NOT NULL DEFAULT '',
+ `user` char(30) NOT NULL DEFAULT '',
+ `type` char(30) NOT NULL DEFAULT '',
+ `key` enum('0','1') NOT NULL DEFAULT '0',
+ `from` char(30) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `editedBy` char(30) NOT NULL DEFAULT '',
+ `editedDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `objectID` (`objectID`),
+ KEY `objectType` (`objectType`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_story` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `parent` mediumint(9) NOT NULL DEFAULT 0,
+ `isParent` enum('0','1') NOT NULL DEFAULT '0',
+ `root` mediumint(9) NOT NULL DEFAULT 0,
+ `path` text DEFAULT NULL,
+ `grade` smallint(6) NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `plan` text DEFAULT NULL,
+ `source` varchar(20) NOT NULL DEFAULT '',
+ `sourceNote` varchar(255) NOT NULL DEFAULT '',
+ `fromBug` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `feedback` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `keywords` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(30) NOT NULL DEFAULT 'story',
+ `category` varchar(30) NOT NULL DEFAULT 'feature',
+ `pri` tinyint(3) unsigned NOT NULL DEFAULT 3,
+ `estimate` float unsigned NOT NULL DEFAULT 0,
+ `status` enum('','changing','active','draft','closed','reviewing','launched','developing') NOT NULL DEFAULT '',
+ `subStatus` varchar(30) NOT NULL DEFAULT '',
+ `color` char(7) NOT NULL DEFAULT '',
+ `stage` enum('','wait','inroadmap','incharter','planned','projected','designing','designed','developing','developed','testing','tested','verified','rejected','delivering','delivered','released','closed') NOT NULL DEFAULT 'wait',
+ `stagedBy` char(30) NOT NULL DEFAULT '',
+ `mailto` text DEFAULT NULL,
+ `lib` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `fromStory` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `fromVersion` smallint(6) NOT NULL DEFAULT 1,
+ `openedBy` varchar(30) NOT NULL DEFAULT '',
+ `openedDate` datetime DEFAULT NULL,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `approvedDate` date DEFAULT NULL,
+ `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `changedBy` varchar(30) NOT NULL DEFAULT '',
+ `changedDate` datetime DEFAULT NULL,
+ `reviewedBy` varchar(255) NOT NULL DEFAULT '',
+ `reviewedDate` datetime DEFAULT NULL,
+ `releasedDate` datetime DEFAULT NULL,
+ `closedBy` varchar(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `closedReason` varchar(30) NOT NULL DEFAULT '',
+ `activatedDate` datetime DEFAULT NULL,
+ `toBug` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `linkStories` varchar(255) NOT NULL DEFAULT '',
+ `linkRequirements` varchar(255) NOT NULL DEFAULT '',
+ `twins` varchar(255) NOT NULL DEFAULT '',
+ `duplicateStory` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `version` smallint(6) NOT NULL DEFAULT 1,
+ `parentVersion` smallint(6) NOT NULL DEFAULT 0,
+ `demandVersion` smallint(6) NOT NULL DEFAULT 0,
+ `storyChanged` enum('0','1') NOT NULL DEFAULT '0',
+ `feedbackBy` varchar(100) NOT NULL DEFAULT '',
+ `notifyEmail` varchar(100) NOT NULL DEFAULT '',
+ `BSA` char(30) NOT NULL DEFAULT '',
+ `duration` char(30) NOT NULL DEFAULT '',
+ `demand` mediumint(8) NOT NULL DEFAULT 0,
+ `submitedBy` varchar(30) NOT NULL DEFAULT '',
+ `roadmap` varchar(255) NOT NULL DEFAULT '',
+ `URChanged` enum('0','1') NOT NULL DEFAULT '0',
+ `unlinkReason` enum('','omit','other') NOT NULL DEFAULT '',
+ `retractedReason` enum('','omit','other') NOT NULL DEFAULT '',
+ `retractedBy` varchar(30) NOT NULL DEFAULT '',
+ `retractedDate` datetime DEFAULT NULL,
+ `verifiedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `product` (`product`),
+ KEY `root` (`root`),
+ KEY `status` (`status`),
+ KEY `assignedTo` (`assignedTo`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_storyestimate` (
+ `story` mediumint(9) NOT NULL DEFAULT 0,
+ `round` smallint(6) NOT NULL DEFAULT 0,
+ `estimate` text DEFAULT NULL,
+ `average` float NOT NULL DEFAULT 0,
+ `openedBy` varchar(30) NOT NULL DEFAULT '',
+ `openedDate` datetime DEFAULT NULL,
+ UNIQUE KEY `story` (`story`,`round`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_storygrade` (
+ `type` enum('story','requirement','epic') NOT NULL,
+ `grade` smallint(6) NOT NULL,
+ `name` char(30) NOT NULL,
+ `status` char(30) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_storyreview` (
+ `story` mediumint(9) NOT NULL DEFAULT 0,
+ `version` smallint(6) NOT NULL DEFAULT 0,
+ `reviewer` varchar(30) NOT NULL DEFAULT '',
+ `result` varchar(30) NOT NULL DEFAULT '',
+ `reviewDate` datetime DEFAULT NULL,
+ UNIQUE KEY `story` (`story`,`version`,`reviewer`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_storyspec` (
+ `story` mediumint(9) NOT NULL DEFAULT 0,
+ `version` smallint(6) NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `spec` mediumtext DEFAULT NULL,
+ `verify` mediumtext DEFAULT NULL,
+ `files` text DEFAULT NULL,
+ UNIQUE KEY `story` (`story`,`version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_storystage` (
+ `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `branch` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `stage` varchar(50) NOT NULL DEFAULT '',
+ `stagedBy` char(30) NOT NULL DEFAULT '',
+ UNIQUE KEY `story_branch` (`story`,`branch`),
+ KEY `story` (`story`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_suitecase` (
+ `suite` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `version` smallint(5) unsigned NOT NULL DEFAULT 0,
+ UNIQUE KEY `suitecase` (`suite`,`case`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_system` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(100) NOT NULL DEFAULT '',
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `integrated` enum('0','1') NOT NULL DEFAULT '0',
+ `latestRelease` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `latestDate` datetime DEFAULT NULL,
+ `children` varchar(255) NOT NULL DEFAULT '',
+ `status` enum('active','inactive') NOT NULL DEFAULT 'active',
+ `desc` mediumtext DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `idx_product` (`product`),
+ KEY `idx_status` (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_task` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `parent` mediumint(8) NOT NULL DEFAULT 0,
+ `isParent` tinyint(1) NOT NULL DEFAULT 0,
+ `path` text DEFAULT NULL,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `design` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `story` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+ `designVersion` smallint(6) unsigned NOT NULL DEFAULT 1,
+ `fromBug` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `feedback` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `fromIssue` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(20) NOT NULL DEFAULT '',
+ `mode` varchar(10) NOT NULL DEFAULT '',
+ `pri` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `estimate` float unsigned NOT NULL DEFAULT 0,
+ `consumed` float unsigned NOT NULL DEFAULT 0,
+ `left` float unsigned NOT NULL DEFAULT 0,
+ `deadline` date DEFAULT NULL,
+ `status` enum('wait','doing','done','pause','cancel','closed') NOT NULL DEFAULT 'wait',
+ `subStatus` varchar(30) NOT NULL DEFAULT '',
+ `color` char(7) NOT NULL DEFAULT '',
+ `mailto` text DEFAULT NULL,
+ `keywords` varchar(255) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `version` smallint(6) NOT NULL DEFAULT 0,
+ `openedBy` varchar(30) NOT NULL DEFAULT '',
+ `openedDate` datetime DEFAULT NULL,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `estStarted` date DEFAULT NULL,
+ `realStarted` datetime DEFAULT NULL,
+ `finishedBy` varchar(30) NOT NULL DEFAULT '',
+ `finishedDate` datetime DEFAULT NULL,
+ `finishedList` text DEFAULT NULL,
+ `canceledBy` varchar(30) NOT NULL DEFAULT '',
+ `canceledDate` datetime DEFAULT NULL,
+ `closedBy` varchar(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `planDuration` int(11) NOT NULL DEFAULT 0,
+ `realDuration` int(11) NOT NULL DEFAULT 0,
+ `closedReason` varchar(30) NOT NULL DEFAULT '',
+ `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `activatedDate` datetime DEFAULT NULL,
+ `order` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `repo` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `mr` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `entry` varchar(255) NOT NULL DEFAULT '',
+ `lines` varchar(10) NOT NULL DEFAULT '',
+ `v1` varchar(40) NOT NULL DEFAULT '',
+ `v2` varchar(40) NOT NULL DEFAULT '',
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ PRIMARY KEY (`id`),
+ KEY `execution` (`execution`),
+ KEY `story` (`story`),
+ KEY `parent` (`parent`),
+ KEY `assignedTo` (`assignedTo`),
+ KEY `order` (`order`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_taskestimate` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `date` date DEFAULT NULL,
+ `left` float unsigned NOT NULL DEFAULT 0,
+ `consumed` float unsigned NOT NULL DEFAULT 0,
+ `account` char(30) NOT NULL DEFAULT '',
+ `work` text DEFAULT NULL,
+ `order` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ KEY `task` (`task`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_taskspec` (
+ `task` mediumint(8) NOT NULL DEFAULT 0,
+ `version` smallint(6) NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `estStarted` date DEFAULT NULL,
+ `deadline` date DEFAULT NULL,
+ UNIQUE KEY `task` (`task`,`version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_taskteam` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `account` char(30) NOT NULL DEFAULT '',
+ `estimate` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `consumed` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `left` decimal(12,2) NOT NULL DEFAULT 0.00,
+ `transfer` char(30) NOT NULL DEFAULT '',
+ `status` enum('wait','doing','done','cancel','closed') NOT NULL DEFAULT 'wait',
+ `storyVersion` smallint(6) NOT NULL DEFAULT 1,
+ `order` int(8) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ KEY `task` (`task`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_team` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `root` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `type` enum('project','task','execution') NOT NULL DEFAULT 'project',
+ `account` char(30) NOT NULL DEFAULT '',
+ `role` char(30) NOT NULL DEFAULT '',
+ `position` varchar(30) NOT NULL DEFAULT '',
+ `limited` char(8) NOT NULL DEFAULT 'no',
+ `join` date DEFAULT NULL,
+ `days` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `hours` float(3,1) unsigned NOT NULL DEFAULT 0.0,
+ `estimate` decimal(12,2) unsigned NOT NULL DEFAULT 0.00,
+ `consumed` decimal(12,2) unsigned NOT NULL DEFAULT 0.00,
+ `left` decimal(12,2) unsigned NOT NULL DEFAULT 0.00,
+ `order` tinyint(3) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `team` (`root`,`type`,`account`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_testreport` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `tasks` varchar(255) NOT NULL DEFAULT '',
+ `builds` varchar(255) NOT NULL DEFAULT '',
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ `owner` char(30) NOT NULL DEFAULT '',
+ `members` text DEFAULT NULL,
+ `stories` text DEFAULT NULL,
+ `bugs` text DEFAULT NULL,
+ `cases` text DEFAULT NULL,
+ `report` text DEFAULT NULL,
+ `objectType` varchar(20) NOT NULL DEFAULT '',
+ `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_testresult` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `run` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `version` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `job` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `compile` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `caseResult` char(30) NOT NULL DEFAULT '',
+ `stepResults` text DEFAULT NULL,
+ `ZTFResult` text DEFAULT NULL,
+ `node` int(8) unsigned NOT NULL DEFAULT 0,
+ `lastRunner` varchar(30) NOT NULL DEFAULT '',
+ `date` datetime DEFAULT NULL,
+ `duration` float NOT NULL DEFAULT 0,
+ `xml` text DEFAULT NULL,
+ `deploy` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ KEY `case` (`case`),
+ KEY `version` (`version`),
+ KEY `run` (`run`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_testrun` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `task` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `case` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `version` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `assignedTo` char(30) NOT NULL DEFAULT '',
+ `lastRunner` varchar(30) NOT NULL DEFAULT '',
+ `lastRunDate` datetime DEFAULT NULL,
+ `lastRunResult` char(30) NOT NULL DEFAULT '',
+ `status` char(30) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `task` (`task`,`case`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_testsuite` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `type` varchar(20) NOT NULL DEFAULT '',
+ `order` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `addedBy` char(30) NOT NULL DEFAULT '',
+ `addedDate` datetime DEFAULT NULL,
+ `lastEditedBy` char(30) NOT NULL DEFAULT '',
+ `lastEditedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `product` (`product`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_testtask` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` char(90) NOT NULL DEFAULT '',
+ `execution` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `build` char(30) NOT NULL DEFAULT '',
+ `type` varchar(255) NOT NULL DEFAULT '',
+ `owner` varchar(30) NOT NULL DEFAULT '',
+ `pri` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ `realBegan` date DEFAULT NULL,
+ `realFinishedDate` datetime DEFAULT NULL,
+ `mailto` text DEFAULT NULL,
+ `desc` mediumtext DEFAULT NULL,
+ `report` text DEFAULT NULL,
+ `status` enum('blocked','doing','wait','done') NOT NULL DEFAULT 'wait',
+ `testreport` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `auto` varchar(10) NOT NULL DEFAULT 'no',
+ `subStatus` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `members` text DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `product` (`product`),
+ KEY `build` (`build`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_ticket` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `product` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `title` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(30) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `openedBuild` varchar(255) NOT NULL DEFAULT '',
+ `feedback` mediumint(8) NOT NULL DEFAULT 0,
+ `assignedTo` varchar(255) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `realStarted` datetime DEFAULT NULL,
+ `startedBy` varchar(255) NOT NULL DEFAULT '',
+ `startedDate` datetime DEFAULT NULL,
+ `deadline` date DEFAULT NULL,
+ `pri` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `estimate` float unsigned NOT NULL DEFAULT 0,
+ `left` float unsigned NOT NULL DEFAULT 0,
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `openedBy` varchar(30) NOT NULL DEFAULT '',
+ `openedDate` datetime DEFAULT NULL,
+ `activatedCount` int(11) NOT NULL DEFAULT 0,
+ `activatedBy` varchar(30) NOT NULL DEFAULT '',
+ `activatedDate` datetime DEFAULT NULL,
+ `closedBy` varchar(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `closedReason` varchar(30) NOT NULL DEFAULT '',
+ `finishedBy` varchar(30) NOT NULL DEFAULT '',
+ `finishedDate` datetime DEFAULT NULL,
+ `resolvedBy` varchar(30) NOT NULL DEFAULT '',
+ `resolvedDate` datetime DEFAULT NULL,
+ `resolution` text DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `keywords` varchar(255) NOT NULL DEFAULT '',
+ `repeatTicket` mediumint(8) NOT NULL DEFAULT 0,
+ `mailto` varchar(255) NOT NULL DEFAULT '',
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `subStatus` varchar(30) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ KEY `product` (`product`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_ticketrelation` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `ticketId` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `objectId` mediumint(8) NOT NULL DEFAULT 0,
+ `objectType` varchar(100) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ KEY `ticketId` (`ticketId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_ticketsource` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `ticketId` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `customer` varchar(100) NOT NULL DEFAULT '',
+ `contact` varchar(100) NOT NULL DEFAULT '',
+ `notifyEmail` varchar(100) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `ticketId` (`ticketId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_todo` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `account` char(30) NOT NULL DEFAULT '',
+ `date` date DEFAULT NULL,
+ `begin` smallint(4) unsigned zerofill NOT NULL DEFAULT 0000,
+ `end` smallint(4) unsigned zerofill NOT NULL DEFAULT 0000,
+ `feedback` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `type` char(15) NOT NULL DEFAULT '',
+ `cycle` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `pri` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `name` char(150) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `status` enum('wait','doing','done','closed') NOT NULL DEFAULT 'wait',
+ `private` tinyint(1) NOT NULL DEFAULT 0,
+ `config` varchar(1000) NOT NULL DEFAULT '',
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `assignedBy` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `finishedBy` varchar(30) NOT NULL DEFAULT '',
+ `finishedDate` datetime DEFAULT NULL,
+ `closedBy` varchar(30) NOT NULL DEFAULT '',
+ `closedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ PRIMARY KEY (`id`),
+ KEY `account` (`account`),
+ KEY `assignedTo` (`assignedTo`),
+ KEY `finishedBy` (`finishedBy`),
+ KEY `date` (`date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_traincategory` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `name` char(30) NOT NULL DEFAULT '',
+ `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `path` char(255) NOT NULL DEFAULT '',
+ `grade` tinyint(3) NOT NULL DEFAULT 0,
+ `order` mediumint(8) NOT NULL DEFAULT 0,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `parent` (`parent`),
+ KEY `path` (`path`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_traincontents` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `code` varchar(50) NOT NULL DEFAULT '',
+ `course` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `type` varchar(30) NOT NULL DEFAULT '',
+ `parent` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `path` char(255) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `order` mediumint(8) NOT NULL DEFAULT 0,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_traincourse` (
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+ `code` varchar(255) NOT NULL DEFAULT '',
+ `category` mediumint(8) NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `status` varchar(10) NOT NULL DEFAULT '',
+ `teacher` varchar(30) NOT NULL DEFAULT '',
+ `desc` mediumtext DEFAULT NULL,
+ `importedStatus` enum('','wait','doing','done') NOT NULL DEFAULT '',
+ `lastUpdatedTime` int(10) unsigned NOT NULL DEFAULT 0,
+ `createdBy` varchar(255) NOT NULL DEFAULT '',
+ `createdDate` date DEFAULT NULL,
+ `editedBy` varchar(255) NOT NULL DEFAULT '',
+ `editedDate` date DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_trainplan` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ `place` varchar(255) NOT NULL DEFAULT '',
+ `trainee` text DEFAULT NULL,
+ `lecturer` varchar(20) NOT NULL DEFAULT '',
+ `type` enum('inside','outside') NOT NULL DEFAULT 'inside',
+ `status` varchar(20) NOT NULL DEFAULT '',
+ `summary` mediumtext DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_trainrecords` (
+ `user` char(30) NOT NULL DEFAULT '',
+ `objectId` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `objectType` varchar(10) NOT NULL DEFAULT '',
+ `status` varchar(10) NOT NULL DEFAULT '',
+ UNIQUE KEY `object` (`user`,`objectId`,`objectType`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_trip` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `type` enum('trip','egress') NOT NULL DEFAULT 'trip',
+ `customers` varchar(20) NOT NULL DEFAULT '',
+ `name` char(30) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `year` char(4) NOT NULL DEFAULT '',
+ `begin` date DEFAULT NULL,
+ `end` date DEFAULT NULL,
+ `start` time DEFAULT NULL,
+ `finish` time DEFAULT NULL,
+ `from` char(50) NOT NULL DEFAULT '',
+ `to` char(50) NOT NULL DEFAULT '',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `year` (`year`),
+ KEY `createdBy` (`createdBy`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_user` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `company` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `type` char(30) NOT NULL DEFAULT 'inside',
+ `dept` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `account` char(30) NOT NULL DEFAULT '',
+ `password` char(32) NOT NULL DEFAULT '',
+ `role` char(10) NOT NULL DEFAULT '',
+ `realname` varchar(100) NOT NULL DEFAULT '',
+ `superior` char(30) DEFAULT '',
+ `pinyin` varchar(255) NOT NULL DEFAULT '',
+ `nickname` char(60) NOT NULL DEFAULT '',
+ `commiter` varchar(100) NOT NULL DEFAULT '',
+ `avatar` text DEFAULT NULL,
+ `birthday` date DEFAULT NULL,
+ `gender` enum('f','m') NOT NULL DEFAULT 'f',
+ `email` char(90) NOT NULL DEFAULT '',
+ `skype` char(90) NOT NULL DEFAULT '',
+ `qq` char(20) NOT NULL DEFAULT '',
+ `mobile` char(11) NOT NULL DEFAULT '',
+ `phone` char(20) NOT NULL DEFAULT '',
+ `weixin` varchar(90) NOT NULL DEFAULT '',
+ `dingding` varchar(90) NOT NULL DEFAULT '',
+ `slack` varchar(90) NOT NULL DEFAULT '',
+ `whatsapp` varchar(90) NOT NULL DEFAULT '',
+ `address` char(120) NOT NULL DEFAULT '',
+ `zipcode` char(10) NOT NULL DEFAULT '',
+ `nature` text DEFAULT NULL,
+ `analysis` text DEFAULT NULL,
+ `strategy` text DEFAULT NULL,
+ `join` date DEFAULT NULL,
+ `visits` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `visions` varchar(20) NOT NULL DEFAULT 'rnd,lite',
+ `ip` varchar(255) NOT NULL DEFAULT '',
+ `last` int(11) unsigned NOT NULL DEFAULT 0,
+ `fails` tinyint(5) NOT NULL DEFAULT 0,
+ `locked` datetime DEFAULT NULL,
+ `feedback` enum('0','1') NOT NULL DEFAULT '0',
+ `ranzhi` char(30) NOT NULL DEFAULT '',
+ `ldap` char(30) NOT NULL DEFAULT '',
+ `score` int(11) NOT NULL DEFAULT 0,
+ `scoreLevel` int(11) NOT NULL DEFAULT 0,
+ `resetToken` varchar(50) NOT NULL DEFAULT '',
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `clientStatus` enum('online','away','busy','offline','meeting') NOT NULL DEFAULT 'offline',
+ `clientLang` varchar(10) NOT NULL DEFAULT 'zh-cn',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `account` (`account`),
+ KEY `dept` (`dept`),
+ KEY `email` (`email`),
+ KEY `commiter` (`commiter`),
+ KEY `deleted` (`deleted`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_usercontact` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `account` char(30) NOT NULL DEFAULT '',
+ `listName` varchar(60) NOT NULL DEFAULT '',
+ `userList` text DEFAULT NULL,
+ `public` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ KEY `account` (`account`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_usergroup` (
+ `account` char(30) NOT NULL DEFAULT '',
+ `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `project` text DEFAULT NULL,
+ UNIQUE KEY `account` (`account`,`group`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_userquery` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `account` char(30) NOT NULL DEFAULT '',
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `title` varchar(90) NOT NULL DEFAULT '',
+ `form` text DEFAULT NULL,
+ `sql` text DEFAULT NULL,
+ `shortcut` enum('0','1') NOT NULL DEFAULT '0',
+ `common` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `account` (`account`),
+ KEY `module` (`module`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_usertpl` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `account` char(30) NOT NULL DEFAULT '',
+ `type` char(30) NOT NULL DEFAULT '',
+ `title` varchar(150) NOT NULL DEFAULT '',
+ `content` text DEFAULT NULL,
+ `public` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `account` (`account`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_userview` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `account` char(30) NOT NULL DEFAULT '',
+ `programs` mediumtext DEFAULT NULL,
+ `products` mediumtext DEFAULT NULL,
+ `projects` mediumtext DEFAULT NULL,
+ `sprints` mediumtext DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `account` (`account`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_webhook` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `type` varchar(15) NOT NULL DEFAULT 'default',
+ `name` varchar(50) NOT NULL DEFAULT '',
+ `url` varchar(255) NOT NULL DEFAULT '',
+ `domain` varchar(255) NOT NULL DEFAULT '',
+ `secret` varchar(255) NOT NULL DEFAULT '',
+ `contentType` varchar(30) NOT NULL DEFAULT 'application/json',
+ `sendType` enum('sync','async') NOT NULL DEFAULT 'sync',
+ `products` text DEFAULT NULL,
+ `executions` text DEFAULT NULL,
+ `params` varchar(100) NOT NULL DEFAULT '',
+ `actions` text DEFAULT NULL,
+ `desc` text DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_weeklyreport` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `weekStart` date DEFAULT NULL,
+ `pv` float(9,2) NOT NULL DEFAULT 0.00,
+ `ev` float(9,2) NOT NULL DEFAULT 0.00,
+ `ac` float(9,2) NOT NULL DEFAULT 0.00,
+ `sv` float(9,2) NOT NULL DEFAULT 0.00,
+ `cv` float(9,2) NOT NULL DEFAULT 0.00,
+ `staff` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `progress` varchar(255) NOT NULL DEFAULT '',
+ `workload` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `week` (`project`,`weekStart`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workestimation` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `project` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `scale` decimal(10,2) unsigned NOT NULL DEFAULT 0.00,
+ `productivity` decimal(10,2) unsigned NOT NULL DEFAULT 0.00,
+ `duration` decimal(10,2) unsigned NOT NULL DEFAULT 0.00,
+ `unitLaborCost` decimal(10,2) unsigned NOT NULL DEFAULT 0.00,
+ `totalLaborCost` decimal(10,2) unsigned NOT NULL DEFAULT 0.00,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `assignedTo` varchar(30) NOT NULL DEFAULT '',
+ `assignedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ `dayHour` decimal(10,2) NOT NULL DEFAULT 0.00,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflow` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `parent` varchar(30) NOT NULL DEFAULT '',
+ `child` varchar(30) NOT NULL DEFAULT '',
+ `type` varchar(10) NOT NULL DEFAULT 'flow',
+ `navigator` varchar(10) NOT NULL DEFAULT '',
+ `app` varchar(20) NOT NULL DEFAULT '',
+ `position` varchar(30) NOT NULL DEFAULT '',
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `table` varchar(50) NOT NULL DEFAULT '',
+ `name` varchar(30) NOT NULL DEFAULT '',
+ `icon` varchar(30) NOT NULL DEFAULT 'flow',
+ `titleField` varchar(30) NOT NULL DEFAULT '',
+ `contentField` text DEFAULT NULL,
+ `flowchart` text DEFAULT NULL,
+ `js` text DEFAULT NULL,
+ `css` text DEFAULT NULL,
+ `order` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `buildin` tinyint(1) unsigned NOT NULL DEFAULT 0,
+ `role` varchar(10) NOT NULL DEFAULT 'buildin',
+ `belong` varchar(50) NOT NULL DEFAULT '',
+ `administrator` text DEFAULT NULL,
+ `desc` text DEFAULT NULL,
+ `version` varchar(10) NOT NULL DEFAULT '1.0',
+ `status` varchar(10) NOT NULL DEFAULT 'wait',
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `approval` enum('enabled','disabled') NOT NULL DEFAULT 'disabled',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique` (`group`,`app`,`module`,`vision`),
+ KEY `type` (`type`),
+ KEY `app` (`app`),
+ KEY `module` (`module`),
+ KEY `order` (`order`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowaction` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `action` varchar(50) NOT NULL DEFAULT '',
+ `method` varchar(50) NOT NULL DEFAULT '',
+ `name` varchar(50) NOT NULL DEFAULT '',
+ `type` enum('single','batch') NOT NULL DEFAULT 'single',
+ `batchMode` enum('same','different') NOT NULL DEFAULT 'different',
+ `extensionType` varchar(10) NOT NULL DEFAULT 'override',
+ `open` varchar(20) NOT NULL DEFAULT '',
+ `position` enum('menu','browseandview','browse','view') NOT NULL DEFAULT 'browseandview',
+ `layout` char(20) NOT NULL DEFAULT '',
+ `show` enum('dropdownlist','direct') NOT NULL DEFAULT 'dropdownlist',
+ `order` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `buildin` tinyint(1) unsigned NOT NULL DEFAULT 0,
+ `role` varchar(10) NOT NULL DEFAULT 'custom',
+ `virtual` tinyint(1) unsigned NOT NULL DEFAULT 0,
+ `conditions` text DEFAULT NULL,
+ `verifications` text DEFAULT NULL,
+ `hooks` text DEFAULT NULL,
+ `linkages` text DEFAULT NULL,
+ `js` text DEFAULT NULL,
+ `css` text DEFAULT NULL,
+ `toList` char(255) NOT NULL DEFAULT '',
+ `blocks` text DEFAULT NULL,
+ `desc` text DEFAULT NULL,
+ `status` varchar(10) NOT NULL DEFAULT 'enable',
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique` (`group`,`module`,`action`,`vision`),
+ KEY `module` (`module`),
+ KEY `action` (`action`),
+ KEY `order` (`order`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowdatasource` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `type` enum('system','sql','func','option','lang','category') NOT NULL DEFAULT 'option',
+ `name` varchar(30) NOT NULL DEFAULT '',
+ `code` varchar(30) NOT NULL DEFAULT '',
+ `datasource` text DEFAULT NULL,
+ `view` varchar(20) NOT NULL DEFAULT '',
+ `keyField` varchar(50) NOT NULL DEFAULT '',
+ `valueField` varchar(50) NOT NULL DEFAULT '',
+ `buildin` tinyint(1) unsigned NOT NULL DEFAULT 0,
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` char(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `type` (`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowfield` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `field` varchar(50) NOT NULL DEFAULT '',
+ `type` varchar(20) NOT NULL DEFAULT 'varchar',
+ `length` varchar(10) NOT NULL DEFAULT '',
+ `name` varchar(50) NOT NULL DEFAULT '',
+ `control` varchar(20) NOT NULL DEFAULT '',
+ `expression` text DEFAULT NULL,
+ `options` text DEFAULT NULL,
+ `default` varchar(100) NOT NULL DEFAULT '',
+ `rules` varchar(255) NOT NULL DEFAULT '',
+ `placeholder` varchar(255) NOT NULL DEFAULT '',
+ `order` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `searchOrder` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `exportOrder` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `canExport` enum('0','1') NOT NULL DEFAULT '0',
+ `canSearch` enum('0','1') NOT NULL DEFAULT '0',
+ `isValue` enum('0','1') NOT NULL DEFAULT '0',
+ `readonly` enum('0','1') NOT NULL DEFAULT '0',
+ `buildin` tinyint(1) unsigned NOT NULL DEFAULT 0,
+ `role` varchar(10) NOT NULL DEFAULT 'custom',
+ `desc` text DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique` (`group`,`module`,`field`),
+ KEY `module` (`module`),
+ KEY `field` (`field`),
+ KEY `order` (`order`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowgroup` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `type` varchar(10) NOT NULL DEFAULT '',
+ `projectModel` varchar(10) NOT NULL DEFAULT '',
+ `projectType` varchar(10) NOT NULL DEFAULT '',
+ `name` varchar(30) NOT NULL DEFAULT '',
+ `code` varchar(30) NOT NULL DEFAULT '',
+ `desc` text DEFAULT NULL,
+ `disabledModules` varchar(255) NOT NULL DEFAULT '',
+ `status` varchar(10) NOT NULL DEFAULT 'wait',
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ `main` enum('0','1') NOT NULL DEFAULT '0',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `type` (`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowlabel` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `action` varchar(30) NOT NULL DEFAULT 'browse',
+ `code` varchar(30) NOT NULL DEFAULT '',
+ `label` varchar(255) NOT NULL DEFAULT '',
+ `params` text DEFAULT NULL,
+ `orderBy` text DEFAULT NULL,
+ `order` tinyint(3) NOT NULL DEFAULT 0,
+ `buildin` tinyint(1) unsigned NOT NULL DEFAULT 0,
+ `role` varchar(10) NOT NULL DEFAULT 'custom',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` char(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `module` (`module`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowlayout` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `action` varchar(50) NOT NULL DEFAULT '',
+ `ui` mediumint(8) NOT NULL DEFAULT 0,
+ `field` varchar(50) NOT NULL DEFAULT '',
+ `order` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `width` varchar(50) NOT NULL DEFAULT '0',
+ `position` text DEFAULT NULL,
+ `readonly` enum('0','1') NOT NULL DEFAULT '0',
+ `mobileShow` enum('0','1') NOT NULL DEFAULT '1',
+ `summary` varchar(20) NOT NULL DEFAULT '',
+ `defaultValue` text DEFAULT NULL,
+ `layoutRules` varchar(255) NOT NULL DEFAULT '',
+ `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique` (`group`,`module`,`action`,`ui`,`field`,`vision`),
+ KEY `module` (`module`),
+ KEY `action` (`action`),
+ KEY `order` (`order`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowlinkdata` (
+ `objectType` varchar(30) NOT NULL DEFAULT '',
+ `objectID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `linkedType` varchar(30) NOT NULL DEFAULT '',
+ `linkedID` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ UNIQUE KEY `unique` (`objectType`,`objectID`,`linkedType`,`linkedID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowrelation` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `prev` varchar(30) NOT NULL DEFAULT '',
+ `next` varchar(30) NOT NULL DEFAULT '',
+ `field` varchar(50) NOT NULL DEFAULT '',
+ `actions` varchar(20) NOT NULL DEFAULT '',
+ `actionCodes` text DEFAULT NULL,
+ `buildin` enum('0','1') NOT NULL DEFAULT '0',
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowrelationlayout` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `prev` varchar(30) NOT NULL DEFAULT '',
+ `next` varchar(30) NOT NULL DEFAULT '',
+ `action` varchar(50) NOT NULL DEFAULT '',
+ `ui` mediumint(8) NOT NULL DEFAULT 0,
+ `field` varchar(50) NOT NULL DEFAULT '',
+ `order` smallint(5) unsigned NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique` (`prev`,`next`,`action`,`ui`,`field`),
+ KEY `prev` (`prev`),
+ KEY `next` (`next`),
+ KEY `action` (`action`),
+ KEY `order` (`order`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowreport` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `module` varchar(30) NOT NULL,
+ `name` varchar(100) NOT NULL,
+ `type` enum('pie','line','bar') NOT NULL DEFAULT 'pie',
+ `countType` enum('sum','count') NOT NULL DEFAULT 'sum',
+ `displayType` enum('value','percent') NOT NULL DEFAULT 'value',
+ `dimension` varchar(130) NOT NULL,
+ `fields` text NOT NULL,
+ `order` smallint(5) unsigned NOT NULL DEFAULT 0,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowrule` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `type` enum('system','regex','func') NOT NULL DEFAULT 'regex',
+ `name` varchar(30) NOT NULL DEFAULT '',
+ `rule` text DEFAULT NULL,
+ `createdBy` char(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` char(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `type` (`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowsql` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `field` varchar(50) NOT NULL DEFAULT '',
+ `action` varchar(50) NOT NULL DEFAULT '',
+ `sql` text DEFAULT NULL,
+ `vars` text DEFAULT NULL,
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `module` (`module`),
+ KEY `field` (`field`),
+ KEY `action` (`action`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowui` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `group` mediumint(8) unsigned NOT NULL DEFAULT 0,
+ `module` varchar(30) NOT NULL,
+ `action` varchar(50) NOT NULL,
+ `name` varchar(30) NOT NULL,
+ `conditions` text DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `module` (`module`),
+ KEY `action` (`action`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_workflowversion` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `module` varchar(30) NOT NULL DEFAULT '',
+ `version` varchar(10) NOT NULL DEFAULT '',
+ `fields` text DEFAULT NULL,
+ `actions` text DEFAULT NULL,
+ `layouts` text DEFAULT NULL,
+ `sqls` text DEFAULT NULL,
+ `labels` text DEFAULT NULL,
+ `table` text DEFAULT NULL,
+ `datas` text DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `moduleversion` (`module`,`version`),
+ KEY `module` (`module`),
+ KEY `version` (`version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+CREATE TABLE `zt_zoutput` (
+ `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `activity` mediumint(8) NOT NULL DEFAULT 0,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `content` mediumtext DEFAULT NULL,
+ `optional` char(20) NOT NULL DEFAULT '',
+ `tailorNorm` varchar(255) NOT NULL DEFAULT '',
+ `status` varchar(30) NOT NULL DEFAULT '',
+ `createdBy` varchar(30) NOT NULL DEFAULT '',
+ `createdDate` datetime DEFAULT NULL,
+ `editedBy` varchar(30) NOT NULL DEFAULT '',
+ `editedDate` datetime DEFAULT NULL,
+ `order` mediumint(8) DEFAULT 0,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
diff --git a/db/update21.6.1.sql b/db/update21.6.1.sql
index ea92b0ec26..169db5f37a 100644
--- a/db/update21.6.1.sql
+++ b/db/update21.6.1.sql
@@ -4,4 +4,4 @@ ALTER TABLE `zt_storyspec` ADD COLUMN `docs` text NULL AFTER `files`;
ALTER TABLE `zt_storyspec` ADD COLUMN `docVersions` text NULL AFTER `docs`;
ALTER TABLE `zt_design` ADD COLUMN `docs` text NULL AFTER `storyVersion`;
ALTER TABLE `zt_design` ADD COLUMN `docVersions` text NULL AFTER `docs`;
-ALTER TABLE `zt_project` ADD `taskDateLimit` varchar(30) NOT NULL DEFAULT 'auto' AFTER `linkType`;
+ALTER TABLE `zt_project` ADD `taskDateLimit` varchar(30) NOT NULL DEFAULT 'auto' AFTER `linkType`;
\ No newline at end of file
diff --git a/db/update21.7.sql b/db/update21.7.sql
new file mode 100644
index 0000000000..35374c8e93
--- /dev/null
+++ b/db/update21.7.sql
@@ -0,0 +1,53 @@
+DELETE FROM `zt_workflowaction` WHERE `module` = 'story' AND `action` = 'browse';
+DELETE FROM `zt_workflowlayout` WHERE `module` = 'story' AND `action` = 'browse';
+
+DELETE FROM `zt_workflowaction` WHERE `module` = 'epic' AND `action` = 'browse';
+DELETE FROM `zt_workflowlayout` WHERE `module` = 'epic' AND `action` = 'browse';
+
+DELETE FROM `zt_workflowaction` WHERE `module` = 'requirement' AND `action` = 'browse';
+DELETE FROM `zt_workflowlayout` WHERE `module` = 'requirement' AND `action` = 'browse';
+
+UPDATE `zt_workflowaction` SET `module` = 'story', `action` = 'browse' WHERE `module` = 'product' AND `action` = 'browse';
+UPDATE `zt_workflowlayout` SET `module` = 'story', `action` = 'browse' WHERE `module` = 'product' AND `action` = 'browse';
+
+UPDATE `zt_workflowaction` SET `module` = 'requirement', `action` = 'browse' WHERE `module` = 'product' AND `action` = 'requirement';
+UPDATE `zt_workflowlayout` SET `module` = 'requirement', `action` = 'browse' WHERE `module` = 'product' AND `action` = 'requirement';
+
+UPDATE `zt_workflowaction` SET `module` = 'epic', `action` = 'browse' WHERE `module` = 'product' AND `action` = 'epic';
+UPDATE `zt_workflowlayout` SET `module` = 'epic', `action` = 'browse' WHERE `module` = 'product' AND `action` = 'epic';
+
+UPDATE `zt_workflowaction` SET `module` = 'build', `action` = 'browse' WHERE `module` = 'execution' AND `action` = 'build';
+UPDATE `zt_workflowlayout` SET `module` = 'build', `action` = 'browse' WHERE `module` = 'execution' AND `action` = 'build';
+
+UPDATE `zt_workflowaction` SET `module` = 'task', `action` = 'browse' WHERE `module` = 'execution' AND `action` = 'task';
+UPDATE `zt_workflowlayout` SET `module` = 'task', `action` = 'browse' WHERE `module` = 'execution' AND `action` = 'task';
+
+ALTER TABLE `zt_relationoftasks` ADD COLUMN `project` mediumint(8) unsigned NOT NULL DEFAULT 0 AFTER `id`;
+ALTER TABLE `zt_relationoftasks` MODIFY `execution` char(30) NOT NULL DEFAULT '' AFTER `project`;
+UPDATE `zt_relationoftasks` SET `project` = (SELECT `project` FROM `zt_task` WHERE `id` = `zt_relationoftasks`.`task`);
+
+CREATE TABLE IF NOT EXISTS `zt_deliverable` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL,
+ `module` varchar(30) NULL,
+ `method` varchar(30) NULL,
+ `model` text NULL,
+ `type` enum('doc','file') NULL DEFAULT 'file',
+ `desc` text NULL,
+ `files` varchar(255) NULL,
+ `createdBy` varchar(30) NULL,
+ `createdDate` date NULL,
+ `lastEditedBy` varchar(30) NULL,
+ `lastEditedDate` date NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+ALTER TABLE `zt_workflowgroup` ADD `objectID` mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER `id`;
+ALTER TABLE `zt_workflowgroup` ADD COLUMN `deliverable` text NULL AFTER `editedDate`;
+ALTER TABLE `zt_project` ADD COLUMN `deliverable` text NULL AFTER `maxColWidth`;
+
+UPDATE `zt_workflowgroup` SET `name` = '瀑布型产品研发' WHERE `code` = 'waterfallproduct';
+UPDATE `zt_workflowgroup` SET `name` = '瀑布型项目研发' WHERE `code` = 'waterfallproject';
+UPDATE `zt_workflowgroup` SET `name` = '敏捷型产品研发' WHERE `code` = 'scrumproduct';
+UPDATE `zt_workflowgroup` SET `name` = '敏捷型项目研发' WHERE `code` = 'scrumproject';
diff --git a/db/zentao.sql b/db/zentao.sql
index 927f52c362..17beef003b 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -578,6 +578,24 @@ CREATE TABLE IF NOT EXISTS `zt_screen` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+-- DROP TABLE IF EXISTS `zt_deliverable`;
+CREATE TABLE IF NOT EXISTS `zt_deliverable` (
+ `id` int(8) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL,
+ `module` varchar(30) NULL,
+ `method` varchar(30) NULL,
+ `model` text NULL,
+ `type` enum('doc','file') NULL DEFAULT 'file',
+ `desc` text NULL,
+ `files` varchar(255) NULL,
+ `createdBy` varchar(30) NULL,
+ `createdDate` date NULL,
+ `lastEditedBy` varchar(30) NULL,
+ `lastEditedDate` date NULL,
+ `deleted` enum('0','1') NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
-- DROP TABLE IF EXISTS `zt_dimension`;
CREATE TABLE IF NOT EXISTS `zt_dimension` (
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
@@ -1596,6 +1614,7 @@ CREATE TABLE IF NOT EXISTS `zt_project` (
`colWidth` smallint(6) NOT NULL DEFAULT '264',
`minColWidth` smallint(6) NOT NULL DEFAULT '200',
`maxColWidth` smallint(6) NOT NULL DEFAULT '384',
+ `deliverable` text NULL,
`deleted` enum('0','1') NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -13234,6 +13253,7 @@ CREATE INDEX `order` ON `zt_workflow` (`order`);
-- DROP TABLE IF EXISTS `zt_workflowgroup`;
CREATE TABLE IF NOT EXISTS `zt_workflowgroup` (
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `objectID` mediumint(8) unsigned NOT NULL DEFAULT '0',
`type` varchar(10) NOT NULL DEFAULT '',
`projectModel` varchar(10) NOT NULL DEFAULT '',
`projectType` varchar(10) NOT NULL DEFAULT '',
@@ -13249,6 +13269,7 @@ CREATE TABLE IF NOT EXISTS `zt_workflowgroup` (
`createdDate` datetime NULL,
`editedBy` varchar(30) NOT NULL DEFAULT '',
`editedDate` datetime NULL,
+ `deliverable` text NULL,
`deleted` enum('0', '1') NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -13527,11 +13548,11 @@ REPLACE INTO `zt_workflowrule`(`type`, `name`, `rule`, `createdBy`, `createdDate
('system','IP','ip','admin','2020-10-14 14:06:14');
INSERT INTO `zt_workflowgroup` (`type`, `projectModel`, `projectType`, `name`, `code`, `status`, `vision`, `main`) VALUES
-('product', '', 'project', '默认流程', 'productproject', 'normal', 'rnd', '1'),
-('project', 'scrum', 'product', '产品型敏捷项目流程', 'scrumproduct', 'normal', 'rnd', '1'),
-('project', 'scrum', 'project', '项目型敏捷项目流程', 'scrumproject', 'normal', 'rnd', '1'),
-('project', 'waterfall', 'product', '产品型瀑布项目流程', 'waterfallproduct','normal', 'rnd', '1'),
-('project', 'waterfall', 'project', '项目型瀑布项目流程', 'waterfallproject','normal', 'rnd', '1');
+('product', '', 'project', '默认流程', 'productproject', 'normal', 'rnd', '1'),
+('project', 'scrum', 'product', '敏捷型产品研发', 'scrumproduct', 'normal', 'rnd', '1'),
+('project', 'scrum', 'project', '敏捷型项目研发', 'scrumproject', 'normal', 'rnd', '1'),
+('project', 'waterfall', 'product', '瀑布型产品研发', 'waterfallproduct','normal', 'rnd', '1'),
+('project', 'waterfall', 'project', '瀑布型项目研发', 'waterfallproject','normal', 'rnd', '1');
INSERT INTO `zt_workflowdatasource` (`type`, `name`, `code`, `buildin`, `vision`, `createdBy`, `createdDate`, `datasource`, `view`, `keyField`, `valueField`) VALUES
('system', '产品', 'products', '1', 'rnd', 'admin', '1970-01-01 00:00:01', '{\"app\":\"system\",\"module\":\"product\",\"method\":\"getPairs\",\"methodDesc\":\"Get product pairs.\",\"params\":[{\"name\":\"mode\",\"type\":\"string\",\"desc\":\"\",\"value\":\"all\"}]}', '', '', ''),
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index a593d9d88d..80c89a3c02 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,138 @@
+2025-05-30 21.7.1
+完成的需求
+开源版：
+74489 在文档编辑器顶部工具栏中打印上传附件按钮
+74488 在文档编辑器顶部工具栏中打印插入图片按钮
+74487 在文档编辑器顶部工具栏中打印超链接按钮
+74486 在文档编辑器顶部工具栏中打印待办事项列表按钮
+74485 在文档编辑器顶部工具栏中打印序号列表项相关的按钮
+74483 批量创建Bug页面增加所属计划字段
+73303 点击文档顶部工具栏中更多按钮，在下拉菜单中打印相关数据
+73293 调整文档中目录、章节和文档的图标和颜色
+73292 调整编辑和浏览文档时的可视区域宽度
+73247 在文档编辑器顶部工具栏中打印文字样式的相关按钮
+73013 在文档编辑器顶部工具栏中打印文字基础格式的相关按钮
+73011 文档顶部固定工具栏中打印插入更多数据的按钮
+73010 实现文档Blocksuite编辑器顶部工具栏常驻显示的组件
+60167 创建Bug页面增加所属计划字段
+14272 导出Bug时增加所属计划字段
+企业版：
+74602 项目中支持单独维护单个项目的项目流程
+74439 工作流的流程模板列表不展示项目自定义的流程
+74429 项目中支持配置项目流程
+73561 构建列表动作展示在构建工作流中
+73560 任务列表动作展示在任务工作流中
+73559 业务需求列表动作展示在业务需求工作流中
+73558 用户需求列表动作展示在用户需求工作流中
+73557 研发需求列表动作展示在研发需求工作流中
+63771 工单工作流增加审批设置
+旗舰版：
+74722 项目交付物维护页面隐藏创建时的交付物
+74712 隐藏创建项目页面中的交付物组件
+74710 调整交付物配置页面的帮助说明
+74709 交付物配置页面隐藏创建时的交付物列
+74708 后台编辑交付物页面置灰动作字段
+74707 后台添加交付物页面置灰动作字段
+74181 前台提交交付物的相关页面中增加提交文件限制
+74126 编辑已提交付物的独立执行和顶级执行不允许关联父执行
+74125 流程模板中交付物配置改变时不会影响已创建的项目
+74091 后台系统功能配置的通用功能中增加交付物功能开关
+74088 实现项目交付物历史记录功能
+74078 编辑项目页面增加项目流程字段
+74077 编辑已提交交付物的项目时禁用项目模型、项目类型或项目流程字段
+73952 项目流程模板详情的历史记录中记录交付物配置的动态
+73827 实现维护执行交付物的权限配置
+73826 实现维护项目交付物的权限配置
+73824 实现流程模板交付物配置的权限配置
+73822 实现后台交付物配置的权限配置
+73716 实现创建项目页面中的交付物组件
+73671 实现项目交付物维护页面
+73621 实现独立执行和顶级执行交付物维护弹窗
+73616 项目列表支持查看交付物的提交比例
+73607 独立执行和顶级执行列表支持查看交付物的提交比例
+73587 项目菜单打印交付物
+73585 关闭最后一个未关闭的子执行后引导用户关闭顶级执行
+73583 批量关闭执行时提示无法关闭进行中的执行
+73552 实现交付物列表的搜索功能
+73551 实现按标签筛选列表中的交付物
+73549 实现添加交付物页面模板字段的互斥逻辑
+73548 实现交付物页面适用范围下拉菜单与后台阶段类型同步
+73488 调整独立执行和顶级执行的类型导致交付物发生改变时保留已提交的交付物
+73475 关闭进行中的独立执行和顶级执行时支持提交交付物
+73457 关闭进行中的项目时支持提交交付物
+73453 创建项目时支持提交交付物
+73447 交付物配置页打印保存和返回按钮
+73446 交付物配置页始终显示帮助说明
+73445 交付物配置页标题可以依据不同流程模板命名
+73443 交付物配置页支持按对象动作关联交付物
+73442 项目流程模板列表操作列打印交付物配置按钮
+73439 实现删除交付物功能
+73438 实现编辑交付物功能
+73436 实现交付物详情页面
+73429 实现交付物列表页面
+73347 添加交付物页面支持定义交付物的基本信息
+73346 交付物列表页打印添加交付物的按钮
+73329 项目模型配置的通用菜单中打印交付物
+73327 后台模型配置名称调整为项目模型配置
+IPD版：
+73927 批量维护阶段页面增加提示语
+修复的Bug
+开源版：
+62317 创建bug页面完整版表单下控件位置建议优化
+62339 影子产品创建Bug页面简洁版显示了所属计划字段
+62662 需求批量转任务页面工时和优先级同上应该置灰取需求的工时和优先级
+62746 标题内容输入数字时工具栏会一直刷新
+62778 windows一键安装包退出登录报错
+62779 瀑布项目阶段列表页点击编辑按钮，页面报错
+62787 测试单关联用例页面，搜索表单没显示
+62794 全局创建文档页面顶部没有工具栏
+62797 批量修改需求所属计划没有空选项
+62812 任务看板中的卡片不能正常显示
+62813 普通用户无法进行项目的关闭设置
+62817 BUG列表批量编辑修改影响版本会导致BUG关联对象被清空 (Feedback#9383)
+62819 批量编辑任务会与最新版本的需求解绑
+62821 设置父子任务时间不符合时，页面显示了提示但是保存成功了
+62823 复制Bug后所属计划不会复制上
+62881 文档中切换禅道数据列表分页数有报错
+企业版：
+62725 执行列表中预计消耗剩余展示为空 (Feedback#9327)
+62741 父任务的起止日期修改为空，子任务的起止日期字段显示原有日期且置灰
+62766 升级后执行工作流中语言项错误
+62767 执行工作流下执行列表对应的动作显示所有
+62780 编辑项目管理方式，项目流程没有更新
+62788 编辑导出的多人任务后再导入只能导入一条数据
+62795 产品下导入需求报错
+62805 项目开启项目级流程后，编辑项目页面流程还显示原来的
+62811 工作流下自定义流程启用时选择单独启用后流程模板下的该流程也启用了
+62824 编辑项目页面没有根据项目管理方式判断是否显示项目流程字段
+62840 添加透视表使用手动输入SQL查询输入语句点查询报错502
+62842 配置office collabora时填写错误的地址保存有报错
+62855 编辑项目管理方式项目流程错误
+62856 创建 office文档弹窗中权限控制没有修改
+62860 编辑项目时项目流程下拉选项显示了其它项目的项目级流程
+62861 设计透视表报错
+旗舰版：
+62733 瀑布项目阶段列表页提交交付物后，保存报错
+62744 关闭进行中的执行页面没有显示交付物组件
+62755 复制瀑布项目完善阶段信息页保存时报错
+62796 安装oceanbase数据库，最后一步有报错
+62802 项目下交付物不能预览和下载
+62804 升级后项目下启用项目流程无法启用
+62806 进入项目下项目流程页面后二级导航的自定义流程不显示了
+62807 windows包项目下选择文档交付物，保存报错
+62810 关闭子阶段，提示去关闭父阶段，实际没跳转到父阶段关闭页面
+62815 创建项目报错
+62818 执行下维护交付物页面保存时报错
+62825 升级后进入项目概况页不显示流程名称
+62827 工作流流程下新建并发布流程后项目流程下未显示该流程
+62829 复制项目时默认带入的项目流程不正确
+62843 交付物数量在列表没显示
+62858 升级后工作流下产品/项目模板列表有报错
+62867 看板项目概况页显示了流程名称
+IPD版：
+62731 OR界面调研项目设置阶段报错
+62789 IPD项目下编辑阶段页面阶段类型可编辑
+
2025-05-16 21.7
完成的需求
开源版：
diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index 0af23871f7..a0323c6a15 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -3403,7 +3403,11 @@ class baseRouter
$fh = fopen($sqlLog, 'a');
fwrite($fh, date('Ymd H:i:s') . ": " . $this->getURI() . "\n");
- foreach(dao::$querys as $query) fwrite($fh, " $query\n");
+ foreach(dbh::$queries as $key => $query)
+ {
+ fwrite($fh, " $query\n");
+ fwrite($fh, ' └' . dbh::$traces[$key] . "\n");
+ }
fwrite($fh, "\n");
fclose($fh);
}
diff --git a/framework/control.class.php b/framework/control.class.php
index 9d9c7da6ac..8bf985df95 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -527,6 +527,8 @@ class control extends baseControl
$flow = $this->loadModel('workflow')->getByModule($moduleName, false, $groupID);
if(!$flow) return $fields;
+ if($groupID && $moduleName == 'project' && $methodName == 'create') $groupID = 0; // 项目创建页面用通用的工作流配置
+
$action = $this->loadModel('workflowaction')->getByModuleAndAction($flow->module, $methodName, $groupID);
if(!$action || $action->extensionType != 'extend') return $fields;
diff --git a/lib/base/dao/dao.class.php b/lib/base/dao/dao.class.php
index 759a0bb9da..74b58c4e31 100644
--- a/lib/base/dao/dao.class.php
+++ b/lib/base/dao/dao.class.php
@@ -1477,15 +1477,7 @@ class baseDAO
**/
else
{
- /*
- * 使用$arg0, $arg1... 生成调用的参数。
- * Create the max counts of sql class methods, and then create $arg0, $arg1...
- **/
- for($i = 0; $i < SQL::MAX_ARGS; $i ++)
- {
- ${"arg$i"} = isset($funcArgs[$i]) ? $funcArgs[$i] : null;
- }
- $this->sqlobj->$funcName($arg0, $arg1, $arg2);
+ $this->sqlobj->$funcName(...$funcArgs);
return $this;
}
}
@@ -1876,11 +1868,13 @@ class baseDAO
}
if(empty($profiles)) $profiles = $this->query('SHOW PROFILES')->fetchAll();
- foreach($profiles as $profile)
+ $basePath = $this->app->getBasePath();
+ foreach($profiles as $key => $profile)
{
$profile->Duration = round((float)$profile->Duration, 4);
$profile->Explain = [];
$profile->Error = '';
+ $profile->Code = str_replace($basePath, '', dbh::$traces[$key]);
$sql = trim($profile->Query);
if(stripos($sql, 'select') !== 0
@@ -1921,6 +1915,21 @@ class baseDAO
return $profiles;
}
+
+ /**
+ * 创建临时表。
+ * Create temporary table.
+ *
+ * @param int $ids 用于创建临时表的 id 列表，字符串或数组。
+ * @param bool $filterDuplicate 是否过滤重复的表名，默认值为 true。
+ * @param int $limit 用于创建临时表的 id 列表的数量限制，数量小于这个值时不创建临时表，0 表示不限制数量。
+ * @access public
+ * @return false|string
+ */
+ public function createTemporaryTable($idList, $filterDuplicate = true, $limit = 100)
+ {
+ return $this->sqlobj->createTemporaryTable($idList, $filterDuplicate, $limit);
+ }
}
/**
@@ -1947,6 +1956,15 @@ class baseSQL
*/
public $sql = '';
+ /**
+ * 全局对象$app
+ * The global app object.
+ *
+ * @var object
+ * @access public
+ */
+ public $app;
+
/**
* 全局变量$dbh。
* The global $dbh.
@@ -2073,6 +2091,15 @@ class baseSQL
*/
public $currentTable;
+ /**
+ * 已创建的临时表。
+ * The temporary tables.
+ *
+ * @var array
+ * @access public
+ */
+ public $tempTables = [];
+
/**
* 构造方法。
* The construct function.
@@ -2082,7 +2109,8 @@ class baseSQL
*/
public function __construct($table = '')
{
- global $dbh;
+ global $app, $dbh;
+ $this->app = $app;
$this->dbh = $dbh;
$this->data = new stdclass();
$this->skipFields = '';
@@ -2594,17 +2622,105 @@ class baseSQL
* 创建IN部分。
* Create in part.
*
- * @param string|array $ids ','分割的字符串或者数组 list string by ',' or an array
+ * @param string|array $ids ','分割的字符串或者数组。List string by ',' or an array.
+ * @param bool $useTemporaryTable 是否使用临时表。 Use temporary table or not.
+ * @param bool $filterDuplicate 是否过滤重复的表名，默认值为 true。Filter duplicate table name or not.
* @access public
* @return static|sql the sql object.
*/
- public function in($ids)
+ public function in($ids, $useTemporaryTable = false, $filterDuplicate = true)
{
if($this->inCondition and !$this->conditionIsTrue) return $this;
- $this->sql .= is_null($ids) ? ' IS NULL' : helper::dbIN($ids);
+
+ if(is_null($ids))
+ {
+ $this->sql .= ' IS NULL';
+ return $this;
+ }
+
+ if($useTemporaryTable)
+ {
+ $tableName = $this->createTemporaryTable($ids, $filterDuplicate);
+ if($tableName)
+ {
+ $this->sql .= " IN (SELECT id FROM $tableName)";
+ return $this;
+ }
+ }
+
+ $this->sql .= helper::dbIN($ids);
return $this;
}
+ /**
+ * 创建临时表。
+ * Create temporary table.
+ *
+ * @param int $ids 用于创建临时表的 id 列表，字符串或数组。
+ * @param bool $filterDuplicate 是否过滤重复的表名，默认值为 true。
+ * @param int $limit 用于创建临时表的 id 列表的数量限制，数量小于这个值时不创建临时表，0 表示不限制数量。
+ * @access public
+ * @return false|string
+ */
+ public function createTemporaryTable($ids, $filterDuplicate = true, $limit = 100)
+ {
+ if(!is_string($ids) && !is_array($ids))
+ {
+ $this->app->triggerError('The idList must be a string or an array.', __FILE__, __LINE__);
+ return false;
+ }
+
+ if(is_string($ids)) $ids = explode(',', $ids);
+
+ $idList = [];
+ foreach($ids as $id)
+ {
+ if(empty($id)) continue;
+
+ $intID = (int)$id;
+ if($intID != $id) continue;
+
+ $idList[$intID] = $intID;
+ }
+
+ if($limit && count($idList) < $limit)
+ {
+ $this->app->triggerError("The idList count must be greater than $limit", __FILE__, __LINE__);
+ return false;
+ }
+
+ $tableName = '';
+ if($filterDuplicate)
+ {
+ /* 如果开启了唯一表名，那么将表名设置为 md5(idList). */
+ asort($idList);
+ $rows = '(' . implode('),(', $idList) . ')';
+ $tableName = "temp_" . md5($rows);
+
+ if(isset($this->tempTables[$tableName])) return $tableName;
+ }
+ else
+ {
+ $tableName = 'temp_' . uniqid();
+ $rows = '(' . implode('),(', $idList) . ')';
+ }
+
+ try
+ {
+ $this->dbh->exec("CREATE TEMPORARY TABLE IF NOT EXISTS {$tableName} (id int PRIMARY KEY)");
+ $this->dbh->exec("INSERT INTO {$tableName} VALUES {$rows}");
+ }
+ catch(PDOException $e)
+ {
+ $message = $e->getMessage() . ' ' . helper::checkDB2Repair($e);
+ $this->app->triggerError($message, __FILE__, __LINE__);
+ }
+
+ if($filterDuplicate) $this->tempTables[$tableName] = $tableName;
+
+ return $tableName;
+ }
+
/**
* 创建'NOT IN'部分。
* Create not in part.
diff --git a/lib/cache/cache.class.php b/lib/cache/cache.class.php
index 009970570d..bd49164103 100644
--- a/lib/cache/cache.class.php
+++ b/lib/cache/cache.class.php
@@ -161,6 +161,7 @@ class cache
{
$this->app = $app;
$this->dao = $app->dao;
+ $this->dbh = $app->dbh;
$this->config = $app->config;
if(empty($this->config->cache->enable)) return $this->log('The cache is not enabled', __FILE__, __LINE__);
@@ -369,12 +370,13 @@ class cache
$objectIdList = $this->cache->get($setCacheKey);
if(!is_array($objectIdList)) return;
- $objectID = $this->dao->lastInsertID();
+ $objectID = $this->dbh->lastInsertID();
if(!$objectID) return $this->log('Failed to fetch last insert id.', __FILE__, __LINE__);
/* 获取新增的数据。Get the new data. */
- $object = $this->dao->select('*')->from($this->table)->where('id')->eq($objectID)->fetch();
- if(!$object) return $this->log('Failed to fetch new object. The sql is: ' . $this->dao->get(), __FILE__, __LINE__);
+ $sql = $this->dao->select('*')->from($this->table)->where('id')->eq($objectID)->get();
+ $object = $this->query($sql, 'fetch');
+ if(!$object) return $this->log('Failed to fetch new object. The sql is: ' . $sql, __FILE__, __LINE__);
/* 把新增的数据保存到缓存中。Save the new data to cache. */
$field = $this->getTableField();
@@ -408,8 +410,9 @@ class cache
$objectIdList = array_map(function($object) use ($field) { return $object->$field; }, $this->objects);
/* 获取更新后的数据。Get the updated data. */
- $objects = $this->dao->select('*')->from($this->table)->where($field)->in($objectIdList)->fetchAll($field, false);
- if(!$objects) return $this->log('Failed to fetch updated objects. The sql is: ' . $this->dao->get(), __FILE__, __LINE__);
+ $sql = $this->dao->select('*')->from($this->table)->where($field)->in($objectIdList)->get();
+ $objects = $this->query($sql, 'fetchAll', $field);
+ if(!$objects) return $this->log('Failed to fetch updated objects. The sql is: ' . $sql, __FILE__, __LINE__);
/* 把更新后的数据保存到缓存中。Save the updated data to cache. */
$values = [];
@@ -506,6 +509,28 @@ class cache
$this->cache->deleteMultiple($keys);
}
+ /**
+ * 执行数据库查询操作。
+ * Execute database query operation.
+ *
+ * @param string $sql SQL语句。
+ * @param string $function 查询函数。
+ * @param string $field 字段名。
+ * @access private
+ * @return array|object
+ */
+ private function query($sql, $function = 'fetchAll', $field = ''): array|object
+ {
+ $rows = $this->dao->query($sql)->$function();
+ if($function == 'fetchAll' && !empty($field))
+ {
+ $objects = [];
+ foreach($rows as $row) $objects[$row->$field] = $row;
+ return $objects;
+ }
+ return $rows;
+ }
+
/**
* 检查表是否有缓存设置。
* Check if the table has cache settings.
@@ -583,7 +608,8 @@ class cache
private function initTableCache(): array
{
$field = $this->getTableField();
- $objects = $this->dao->select('*')->from($this->table)->fetchAll($field, false);
+ $sql = $this->dao->select('*')->from($this->table)->get();
+ $objects = $this->query($sql, 'fetchAll', $field);
if(!$objects) return [];
$values = [];
@@ -693,7 +719,8 @@ class cache
{
$lostObjects = [];
$diffIdList = array_keys(array_diff($keys, array_keys($objects)));
- $diffObjects = $this->dao->select('*')->from($table)->where('id')->in($diffIdList)->fetchAll('', false);
+ $sql = $this->dao->select('*')->from($table)->where('id')->in($diffIdList)->get();
+ $diffObjects = $this->query($sql, 'fetchAll');
foreach($diffObjects as $object)
{
$rawCacheKey = $this->getRawCacheKey($code, $object->id);
@@ -757,18 +784,29 @@ class cache
$field = $this->getTableField();
$dao = $this->dao->select($field)->from($table)->where('1=1');
foreach($conditions as $condition) $dao->andWhere($condition['field'])->eq($condition['value']);
- $idList = array_values($dao->fetchPairs());
+ $sql = $dao->get();
+ $objects = $this->query($sql, 'fetchAll');
+ foreach($objects as $object) $idList[] = $object->$field;
$this->saveByKey($cacheKey, $idList);
/* 把缓存键写入数据库以便执行 dao::exec() 时自动更新。Write the cache key to the database for automatic update when executing dao::exec(). */
$fields = implode(',', array_column($conditions, 'field'));
- $autoCache = $this->dao->select('1')->from(TABLE_AUTOCACHE)->where('code')->eq($code)->andWhere('fields')->eq($fields)->fetch();
+ $sql = $this->dao->select('1')->from(TABLE_AUTOCACHE)->where('code')->eq($code)->andWhere('fields')->eq($fields)->get();
+ $autoCache = $this->query($sql, 'fetch');
if(!$autoCache)
{
$autoCache = new \stdClass();
$autoCache->code = $code;
$autoCache->fields = $fields;
- $this->dao->insert(TABLE_AUTOCACHE)->data($autoCache)->exec();
+ $sql = $this->dao->insert(TABLE_AUTOCACHE)->data($autoCache)->get();
+ try
+ {
+ $this->dbh->exec($sql);
+ }
+ catch(PDOException $e)
+ {
+ $this->dao->sqlError($e);
+ }
}
}
if(!$idList) return [];
@@ -980,7 +1018,8 @@ class cache
/* 执行操作后数据已经被修改，所以需要提前获取被影响的数据。*/
$field = $this->getTableField();
- $objects = $this->dao->select('*')->from($table)->beginIF($where)->where($where)->fi()->fetchAll($field, false);
+ $sql = $this->dao->select('*')->from($table)->beginIF($where)->where($where)->fi()->get();
+ $objects = $this->query($sql, 'fetchAll', $field);
$this->setWhere($where);
$this->setObjects($objects);
@@ -1046,4 +1085,4 @@ class cache
{
return $this->cache->memory($type);
}
-}
+}
\ No newline at end of file
diff --git a/lib/dbh/dbh.class.php b/lib/dbh/dbh.class.php
index 5eb89cb63f..93088ffc67 100644
--- a/lib/dbh/dbh.class.php
+++ b/lib/dbh/dbh.class.php
@@ -59,6 +59,24 @@ class dbh
*/
private $sql;
+ /**
+ * 这是用来记录SQL执行的文件和行号。
+ * This is used to record the file and line number where the SQL was executed.
+ *
+ * @var array
+ * @access public
+ */
+ public static $traces = [];
+
+ /**
+ * 执行的请求，所有的查询都保存在该数组。
+ * The queries executed. Every query will be saved in this array.
+ *
+ * @var array
+ * @access public
+ */
+ public static $queries = [];
+
/**
* Constructor
*
@@ -81,15 +99,25 @@ class dbh
$pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+ $queries = [];
/* Mysql driver include mysql and oceanbase. */
if($driver == 'mysql')
{
- $pdo->exec("SET NAMES {$config->encoding}");
- if(isset($config->strictMode) and $config->strictMode == false) $pdo->exec("SET @@sql_mode= ''");
+ $queries[] = "SET NAMES {$config->encoding}";
+ if(isset($config->strictMode) && empty($config->strictMode)) $queries[] = "SET @@sql_mode= ''";
}
else if($setSchema)
{
- $pdo->exec("SET SCHEMA {$config->name}");
+ $queries[] = "SET SCHEMA {$config->name}";
+ }
+ if(!empty($queries))
+ {
+ foreach($queries as $query)
+ {
+ $pdo->exec($query);
+ dbh::$traces[] = 'vim +' . (__LINE__ - 1) . ' ' . __FILE__;
+ dbh::$queries[] = "[$flag] " . $query;
+ }
}
$this->pdo = $pdo;
@@ -120,6 +148,8 @@ class dbh
*/
public function exec($sql)
{
+ $this->trace();
+
$sql = $this->formatSQL($sql);
if(!$sql) return true;
@@ -127,7 +157,7 @@ class dbh
try
{
- if(class_exists('dao')) dao::$querys[] = "[$this->flag] " . dao::processKeywords($sql);
+ dbh::$queries[] = "[$this->flag] " . dao::processKeywords($sql);
return $this->pdo->exec($sql);
}
catch(PDOException $e)
@@ -146,10 +176,12 @@ class dbh
*/
public function query($sql)
{
+ $this->trace();
+
$sql = $this->formatSQL($sql);
try
{
- if(class_exists('dao')) dao::$querys[] = "[$this->flag] " . dao::processKeywords($sql);
+ dbh::$queries[] = "[$this->flag] " . dao::processKeywords($sql);
return $this->pdo->query($sql);
}
catch(PDOException $e)
@@ -191,6 +223,8 @@ class dbh
*/
public function execute($sql, $params)
{
+ $this->trace();
+
$this->statement = $this->prepare($sql);
try
@@ -214,9 +248,11 @@ class dbh
*/
public function rawQuery($sql)
{
+ $this->trace();
+
try
{
- if(class_exists('dao')) dao::$querys[] = "[$this->flag] " . dao::processKeywords($sql);
+ dbh::$queries[] = "[$this->flag] " . dao::processKeywords($sql);
return $this->pdo->query($sql);
}
catch(PDOException $e)
@@ -225,6 +261,63 @@ class dbh
}
}
+ /**
+ * 记录当前执行的 SQL 的文件和行号。
+ * Record the file and line number of the currently executed SQL.
+ *
+ * @access private
+ * @return bool
+ */
+ private function trace()
+ {
+ global $app, $config;
+ if(empty($config->debug) || $config->debug < 3) return false;
+ if(!is_null($app))
+ {
+ if(!empty($app->installing) || !empty($app->upgrading)) return false;
+ if(!isset($config->installed) || !$config->installed) return false;
+ }
+
+ $trace = $this->getTrace();
+ if(empty($trace)) return false;
+
+ $file = $trace['file'];
+ $line = $trace['line'];
+
+ dbh::$traces[] = "vim +$line $file";
+
+ return true;
+ }
+
+ /**
+ * 获取当前执行的 SQL 的调用栈信息。
+ * Get the call stack information of the currently executed SQL.
+ *
+ * @access private
+ * @return array
+ */
+ private function getTrace()
+ {
+ $traces = array_reverse(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS));
+ foreach($traces as $key => $trace)
+ {
+ $class = $trace['class'] ?? '';
+ $function = $trace['function'] ?? '';
+ if($class == 'settingModel' && strpos(',getItem,getItems,setItem,setItems,updateItem,deleteItems,', ",$function,") !== false) return $trace;
+ if($class == 'baseDAO' && strpos(',exec,fetch,fetchPairs,fetchGroup,explain,showTables,getTableEngines,descTable,', ",$function,") !== false) return $trace;
+ if($class == 'baseDAO' && $function == 'getProfiles') return $traces[$key + 1];
+ if($class == 'baseDAO' && $function == 'fetchAll')
+ {
+ if($traces[$key + 1]['class'] == 'baseDAO' && $traces[$key + 1]['function'] == 'extractSQLFields') return $traces[$key + 2];
+ return $trace;
+ }
+ if($class == 'baseDAO' && stripos($function, 'findBy') === 0) return $trace;
+ if($class == 'baseRouter' && $function == 'dbQuery') return $trace;
+ if($class == 'dbh' && strpos('exec,query,rawQuery', $function) !== false) return $trace;
+ }
+ return [];
+ }
+
/**
* Set attribute.
*
diff --git a/lib/trace/trace.class.php b/lib/trace/trace.class.php
index 974b988987..4fdbedad30 100644
--- a/lib/trace/trace.class.php
+++ b/lib/trace/trace.class.php
@@ -43,7 +43,7 @@ class trace
'method' => $this->app->server->request_method,
'timeUsed' => round(getTime() - $this->app->startTime, 4) * 1000,
'memory' => round(memory_get_peak_usage() / 1024, 1),
- 'querys' => count(dao::$querys),
+ 'querys' => count(dbh::$queries),
'caches' => 0,
'files' => count(get_included_files()),
'session' => session_id(),
@@ -70,7 +70,7 @@ class trace
*/
public function getRequestSqls()
{
- $this->trace['sqlQuery'] = dao::$querys;
+ $this->trace['sqlQuery'] = dbh::$queries;
}
/**
diff --git a/lib/zin/func.php b/lib/zin/func.php
index 469d0979a9..e651f5237a 100644
--- a/lib/zin/func.php
+++ b/lib/zin/func.php
@@ -249,6 +249,7 @@ function iconPicker(): iconPicker {return createWg('iconPicker', func_get_args()
function relatedObjectList(): relatedObjectList {return createWg('relatedObjectList', func_get_args());}
function taskAssignedTo(): taskAssignedTo {return createWg('taskAssignedTo', func_get_args());}
function docList(): docList {return createWg('docList', func_get_args());}
+function deliverable(): deliverable {return createWg('deliverable', func_get_args());}
if(is_dir(__DIR__ . DS . 'wg' . DS . 'schedule'))
{
@@ -258,4 +259,4 @@ if(is_dir(__DIR__ . DS . 'wg' . DS . 'schedule'))
if(is_dir(__DIR__ . DS . 'wg' . DS . 'boardeditor'))
{
function boardEditor(): boardEditor {return createWg('boardeditor', func_get_args());}
-}
+}
\ No newline at end of file
diff --git a/lib/zin/wg/backbtn/v1.php b/lib/zin/wg/backbtn/v1.php
index 5b20fca7ac..0f67b0e291 100644
--- a/lib/zin/wg/backbtn/v1.php
+++ b/lib/zin/wg/backbtn/v1.php
@@ -96,7 +96,9 @@ class backBtn extends btn
'approvalflow' => 'approvalflow-browse',
'host' => 'host-browse,my-index',
'deploy' => 'deploy-browse',
- 'program' => 'program-browse,program-productview'
+ 'program' => 'program-browse,program-productview',
+ 'workflowgroup' => 'workflowgroup-project,workflowgroup-deliverable',
+ 'deliverable' => 'deliverable-browse'
);
$props = parent::getProps();
diff --git a/lib/zin/wg/deliverable/css/v1.css b/lib/zin/wg/deliverable/css/v1.css
new file mode 100644
index 0000000000..43d93b3dd3
--- /dev/null
+++ b/lib/zin/wg/deliverable/css/v1.css
@@ -0,0 +1 @@
+.deliverable-item {padding-left: 3.5rem !important}
diff --git a/lib/zin/wg/deliverable/js/v1.js b/lib/zin/wg/deliverable/js/v1.js
new file mode 100644
index 0000000000..8649ce15b1
--- /dev/null
+++ b/lib/zin/wg/deliverable/js/v1.js
@@ -0,0 +1,44 @@
+/**
+ * 获取附件的操作按钮。
+ * Get file actions.
+ */
+window.getDeliverableFileActions = function(file, deliverable)
+{
+ let actions = [];
+ if(canDownload && typeof file.id != 'undefined') actions[0] = {icon: 'download', key: 'download', url: $.createLink('file', 'download', 'id=' + file.id), target: '_blank'};
+ actions[1] = {icon: 'edit', key: 'rename'};
+ actions[2] = {icon: 'trash', key: 'delete'};
+
+ /* 可以预览的文件。 */
+ if(['txt', 'jpg', 'jpeg', 'gif', 'png', 'bmp', 'mp4'].includes(file.extension) && canDownload && typeof file.id != 'undefined')
+ {
+ actions[3] = {icon: 'eye', key: 'view', url: $.createLink('file', 'download', `fileID=${file.id}&mouse=left`), 'data-toggle' : 'modal', 'data-size' : 'lg'};
+ }
+
+ return actions;
+}
+
+/**
+ * 获取文档的操作按钮。
+ * Get file actions.
+ */
+window.getDocActions = function(doc, deliverable)
+{
+ let actions = [];
+ actions[0] = {icon: 'eye', key: 'view', url: $.createLink('doc', 'view', 'docID=' + doc.id)};
+ actions[1] = {icon: 'edit', key: 'rename'};
+ actions[2] = {icon: 'trash', key: 'delete'};
+ return actions;
+}
+
+/**
+ * 获取交付物的操作按钮。
+ * Get deliverable actions.
+ */
+window.getDeliverableActions = function(deliverable)
+{
+ let actions = [];
+ actions[0] = {text: addFile, icon: 'file', key: 'selectFile'};
+ if(deliverable.template > 0 && canDownload) actions[1] = {text: downloadTemplate, icon: 'download', key: 'downloadTemplate', url: $.createLink('file', 'download', 'templateID=' + deliverable.template), target: '_blank'};
+ return actions;
+}
diff --git a/lib/zin/wg/deliverable/v1.php b/lib/zin/wg/deliverable/v1.php
new file mode 100644
index 0000000000..4cb45d5557
--- /dev/null
+++ b/lib/zin/wg/deliverable/v1.php
@@ -0,0 +1,91 @@
+loadLang('doc');
+ $app->loadLang('file');
+ jsVar('addFile', $lang->doc->addFile);
+ jsVar('downloadTemplate', $lang->doc->downloadTemplate);
+ jsVar('deleteItem', $lang->delete);
+ jsVar('canDownload', hasPriv('file', 'download'));
+
+ return file_get_contents(__DIR__ . DS . 'js' . DS . 'v1.js');
+ }
+
+ /**
+ * 获取CSS。
+ * Get page CSS.
+ *
+ * @static
+ * @access public
+ * @return string
+ */
+ public static function getPageCSS(): ?string
+ {
+ return file_get_contents(__DIR__ . DS . 'css' . DS . 'v1.css');
+ }
+
+ /**
+ * 构建组件。
+ * Build.
+ *
+ * @access protected
+ * @return zui
+ */
+ protected function build(): zui
+ {
+ global $lang, $app;
+ $app->loadLang('doc');
+ $app->loadLang('file');
+
+ $formName = $this->prop('formName') ? $this->prop('formName') : 'deliverable';
+
+ if(!$this->hasProp('maxFileSize'))
+ {
+ $maxFileSize = ini_get('upload_max_filesize');
+ $lastChar = substr($maxFileSize, -1);
+ $fileSizeUnit = array('K', 'M', 'G', 'T');
+ if(in_array($lastChar, $fileSizeUnit)) $maxFileSize .= 'B';
+ $this->setProp('maxFileSize', $maxFileSize);
+ }
+
+ return zui::deliverableList
+ (
+ set::formName($formName),
+ set::items($this->prop('items')),
+ set::docPicker(array('placeholder' => $lang->doc->selectDoc, 'items' => helper::createLink('doc', 'ajaxGetMineDocs', 'keyword={search}'))),
+ set::getFileActions(jsRaw('window.getDeliverableFileActions')),
+ set::getDocActions(jsRaw('window.getDocActions')),
+ set::getEmptyActions(jsRaw('window.getDeliverableActions')),
+ set::maxFileSize($this->prop('maxFileSize')),
+ set::extraCategory($lang->other)
+ );
+ }
+}
diff --git a/lib/zin/wg/docapp/js/v1.js b/lib/zin/wg/docapp/js/v1.js
index 4d9bd859e2..390ce93628 100644
--- a/lib/zin/wg/docapp/js/v1.js
+++ b/lib/zin/wg/docapp/js/v1.js
@@ -1135,10 +1135,11 @@ const actionsMap =
const doc = info.doc;
const file = info.data;
const docApp = getDocApp();
+ const isReadonly = docApp.mode === 'view';
const privs = docApp.props.privs;
const lang = getLang();
- const canEdit = privs.edit && (!doc.privs || doc.privs.edit !== false) && privs.editFile;
- const canDelete = privs.edit && (!doc.privs || doc.privs.edit !== false) && privs.deleteFile;
+ const canEdit = !isReadonly && privs.edit && (!doc.privs || doc.privs.edit !== false) && privs.editFile;
+ const canDelete = !isReadonly && privs.edit && (!doc.privs || doc.privs.edit !== false) && privs.deleteFile;
const hasExtension = file.title.lastIndexOf('.' + file.extension) == (file.title.length - file.extension.length - 1);
const canPreview = hasExtension && 'mp4,txt,jpg,jpeg,gif,png,bmp'.split(',').includes(file.extension);
return [
@@ -2091,6 +2092,34 @@ function getSpaceFetcher(spaceType, spaceID = 0)
}
}
+function initOfficePreview(options)
+{
+ const officeTypes = new Set(['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'pdf']);
+ zui.Editor.setGlobalConfig(
+ {
+ canPreviewFile: (file) => {
+ const extension = file.name.split('.').pop();
+ return officeTypes.has(extension);
+ },
+ onPreviewFile: (file) => {
+ const doc = getDocApp().doc || {data: {id: 0}};
+ $.getJSON(zui.formatString(options.fileInfoUrl, {
+ gid: btoa(`g-${file.key}`),
+ objectType: 'doc',
+ objectID: doc.data.id,
+ title: '',
+ extra: '',
+ })).then(res => {
+ if(res.result === 'success' && res.data)
+ {
+ const editable = doc.data.editable !== false;
+ window.open($.createLink('file', 'download', `fileID=${res.data.id}&mouse=left&edit=${editable ? '0' : 'never'}`), '_blank');
+ }
+ });
+ }
+ });
+}
+
/**
* 设置文档应用组件选项。
* Set the doc app options.
@@ -2102,6 +2131,8 @@ window.setDocAppOptions = function(_, options)
userPrivs = options.privs;
docLangData = options.langData;
+ if(options.canPreviewOffice && options.fileInfoUrl) initOfficePreview(options);
+
return $.extend(
{
defaultState : {listType: '', libReleaseMap: {}},
diff --git a/lib/zin/wg/docapp/v1.php b/lib/zin/wg/docapp/v1.php
index 22fca67279..e5f9e1b3a5 100644
--- a/lib/zin/wg/docapp/v1.php
+++ b/lib/zin/wg/docapp/v1.php
@@ -144,6 +144,7 @@ class docApp extends wg
$libSummariesFetcher = createLink('doc', 'ajaxGetLibSummaries', 'spaceType={spaceType}&spaceList={spaceList}');
$uploadUrl = createLink('file', 'ajaxUpload', 'uid={uid}&objectType={objectType}&objectID={objectID}&extra={extra}&field={field}&api={api}&gid={gid}');
$downloadUrl = createLink('file', 'ajaxQuery', 'fileID={gid}&objectType={objectType}&objectID={objectID}&title={title}&extra={extra}');
+ $fileInfoUrl = createLink('file', 'ajaxQuery', 'fileID={gid}&objectType={objectType}&objectID={objectID}&title={title}&extra={extra}', 'json');
/**
* 定义文档界面上的文件下载链接。
@@ -269,6 +270,7 @@ class docApp extends wg
}
$historyPanelProps = array('fileListProps' => $fileListProps);
+ $canPreviewOffice = $canDownload && isset($config->file->libreOfficeTurnon) and $config->file->libreOfficeTurnon == 1;
return zui::docApp
(
@@ -312,6 +314,9 @@ class docApp extends wg
set::viewModeUrl($viewModeUrl),
set::langData($langData),
set::historyPanel($historyPanelProps),
+ set::showToolbar(true),
+ set::canPreviewOffice($canPreviewOffice),
+ set::fileInfoUrl($fileInfoUrl),
jsCall('setZentaoSlashMenu', $this->getZentaoListMenu(), $lang->doc->zentaoData, $config->vision, $config->doc->zentaoListMenuPosition)
);
}
diff --git a/lib/zin/wg/doclist/v1.php b/lib/zin/wg/doclist/v1.php
index 74cc0e96d8..76a77a579c 100644
--- a/lib/zin/wg/doclist/v1.php
+++ b/lib/zin/wg/doclist/v1.php
@@ -51,7 +51,7 @@ class docList extends wg
setClass('docItem flex items-center py-1'),
span(setClass('mr-4 p-1 docTitle'), icon(setClass('mr-2'), 'file-text'), $link),
div(setClass('w-24'), $mode == 'edit' ? picker(set::required(true), set::name("docVersions[$docID]"), set::items($oldDocVersions[$docID]), set::value($data->docVersions[$docID])) : "#{$data->docVersions[$docID]}"),
- $mode == 'edit' && $oldDocs[$docID]->version != $data->docVersions[$docID] ? label(setClass('ml-2 warning'), $lang->task->docSyncTips) : null,
+ $mode == 'edit' && $oldDocs[$docID]->version != $data->docVersions[$docID] ? label(setClass('ml-2 warning w-80'), $lang->task->docSyncTips) : null,
$mode == 'edit' ? input(setClass('hidden'), set::name("oldDocs[$docID]"), set::value($docID)) : null,
$mode == 'edit' ? btn(setClass('ghost ml-2'), icon('trash'), setData(array('on' => 'click', 'call' => 'window.removeDocs', 'params' => 'event'))) : null
);
@@ -70,7 +70,7 @@ class docList extends wg
set::multiple(true),
set::maxItemsCount(50),
set::menu(array('checkbox' => true)),
- !empty($items) ? set::toolbar(true) : null
+ !empty($docs) ? set::toolbar(true) : null
) : null,
div(setClass('mt-2'), $docBox)
);
diff --git a/lib/zin/wg/dropmenu/css/v1.css b/lib/zin/wg/dropmenu/css/v1.css
index a1308d5d1a..9904ddbb1d 100644
--- a/lib/zin/wg/dropmenu/css/v1.css
+++ b/lib/zin/wg/dropmenu/css/v1.css
@@ -1,4 +1,4 @@
-#pick-pop-admin-menu {width: 139px!important;}
+#pick-pop-admin-menu {width: 145px!important;}
#pick-pop-admin-menu .dropmenu-list {padding: 8px;}
#pick-pop-admin-menu .dropmenu-item + .dropmenu-item {margin-top: 4px}
#pick-pop-admin-menu .dropmenu-item.active {background-color: unset;}
diff --git a/lib/zin/wg/monaco/css/v1.css b/lib/zin/wg/monaco/css/v1.css
index 0d9b84fee0..8533efe6c4 100644
--- a/lib/zin/wg/monaco/css/v1.css
+++ b/lib/zin/wg/monaco/css/v1.css
@@ -3,5 +3,3 @@
/* 半透明黄色 */
.monaco-editor .yellow-decoration {background-color: rgba(255, 255, 0, 0.2);}
-
-.monaco-editor .margin .line-numbers {padding-left: 16px;}
diff --git a/lib/zin/wg/monaco/js/v1.js b/lib/zin/wg/monaco/js/v1.js
index 24851083a8..ee7e32cb32 100644
--- a/lib/zin/wg/monaco/js/v1.js
+++ b/lib/zin/wg/monaco/js/v1.js
@@ -154,7 +154,7 @@ function resize(id)
mainMenuHeight = mainMenuHeight ? mainMenuHeight : 0;
mainNavbar = mainNavbar ? mainNavbar : 0;
- var codeHeight = windowHeight - headerHeight - appsBarHeight - tabsHeight - appTabsHeight - mainMenuHeight - mainNavbar;
+ var codeHeight = windowHeight - headerHeight - appsBarHeight - tabsHeight - appTabsHeight - mainMenuHeight - mainNavbar;
if(codeHeight > 0) $.cookie.set(id + 'Height', codeHeight);
diff --git a/lib/zin/wg/stepseditor/js/v1.js b/lib/zin/wg/stepseditor/js/v1.js
index 0cf87e343c..80ab9b466f 100644
--- a/lib/zin/wg/stepseditor/js/v1.js
+++ b/lib/zin/wg/stepseditor/js/v1.js
@@ -291,7 +291,8 @@ class StepsEditor extends zui.Component
{
const options = this.options;
let $row = $rows.filter(`[data-id="${item.id}"]`);
- if(!$row.length) $row = this._createRow(item, options);
+ let isNew = !$row.length;
+ if(isNew) $row = this._createRow(item, options);
if($preRow) $row.insertAfter($preRow);
else $list.prepend($row);
@@ -303,20 +304,22 @@ class StepsEditor extends zui.Component
.toggleClass('has-children', hasSub)
.toggleClass('no-child', !hasSub)
.removeClass('is-expired');
- $row.css('--name-indent', `${(item.level - 1) * 14}px`).find('.steps-editor-step-name').css('width', item.name.length * 12).text(item.name).css('paddingLeft', (item.level - 1) * 14);
- $row.find('.steps-editor-step-text').attr('name', `${options.name}[${item.name}]`);
- $row.find('.steps-editor-step-type').attr('name', `stepType[${item.name}]`).val(hasSub ? 'group' : (!!item.parent && item.parent != '0' ? 'item' : 'step'));
- if(options.postDataID) $row.find('.steps-editor-post-data-id').attr('name', `id[${item.name}]`);
- const $expect = $row.find('.steps-editor-step-expect').attr(
- {
- name: `${options.expectsName}[${item.name}]`,
- disabled: hasSub && options.expectDisabled ? 'disabled' : null
- }).toggleClass('disabled', hasSub && options.expectDisabled);
- $expect.parent().toggleClass('disabled', hasSub && options.expectDisabled);
- $row.find('.steps-editor-col-delete .btn').toggleClass('disabled', hasSub || this._items.length == 1);
- $row.find('.steps-editor-col-delete .btn.disabled').attr('title', options.deleteStepTip);
- $row.find('.steps-editor-col-add .btn-action[data-action="sub"]').toggleClass('disabled', item.level >= 3);
- $row.find('textarea').autoHeight();
+ requestAnimationFrame(() => {
+ $row.css('--name-indent', `${(item.level - 1) * 14}px`).find('.steps-editor-step-name').css('width', item.name.length * 12).text(item.name).css('paddingLeft', (item.level - 1) * 14);
+ $row.find('.steps-editor-step-text').attr('name', `${options.name}[${item.name}]`);
+ $row.find('.steps-editor-step-type').attr('name', `stepType[${item.name}]`).val(hasSub ? 'group' : (!!item.parent && item.parent != '0' ? 'item' : 'step'));
+ if(options.postDataID) $row.find('.steps-editor-post-data-id').attr('name', `id[${item.name}]`);
+ const $expect = $row.find('.steps-editor-step-expect').attr(
+ {
+ name: `${options.expectsName}[${item.name}]`,
+ disabled: hasSub && options.expectDisabled ? 'disabled' : null
+ }).toggleClass('disabled', hasSub && options.expectDisabled);
+ $expect.parent().toggleClass('disabled', hasSub && options.expectDisabled);
+ $row.find('.steps-editor-col-delete .btn').toggleClass('disabled', hasSub || this._items.length == 1);
+ $row.find('.steps-editor-col-delete .btn.disabled').attr('title', options.deleteStepTip);
+ $row.find('.steps-editor-col-add .btn-action[data-action="sub"]').toggleClass('disabled', item.level >= 3);
+ if(isNew) $row.find('textarea').autoHeight({fast: true});
+ });
return $row;
}
diff --git a/module/action/config.php b/module/action/config.php
index 9899981166..1c26be3a42 100755
--- a/module/action/config.php
+++ b/module/action/config.php
@@ -71,6 +71,7 @@ $config->action->objectNameFields['prompt'] = 'name';
$config->action->objectNameFields['miniprogram'] = 'name';
$config->action->objectNameFields['holiday'] = 'name';
$config->action->objectNameFields['system'] = 'name';
+$config->action->objectNameFields['deliverable'] = 'name';
$config->action->commonImgSize = 870;
diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 17418cb670..40f0be5363 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -191,6 +191,7 @@ $lang->action->objectTypes['board'] = 'Board';
$lang->action->objectTypes['boardspace'] = 'Board Space';
$lang->action->objectTypes['productline'] = 'Product Line';
$lang->action->objectTypes['system'] = $lang->product->system;
+$lang->action->objectTypes['deliverable'] = 'Deliverable';
/* Used to describe operation history. */
$lang->action->desc = new stdclass();
@@ -937,6 +938,7 @@ $lang->action->label->instance = 'Application|instance|view|id=%s';
$lang->action->label->prompt = 'Prompt|ai|promptview|id=%s';
$lang->action->label->miniprogram = 'Mini Program|aiapp|browseminiprogram|id=%s';
$lang->action->label->holiday = 'Holiday|holiday|browse|';
+$lang->action->label->deliverable = 'Deliverable|deliverable|view|id=%s';
/* Object type. */
$lang->action->search = new stdclass();
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index bc5d4af4ea..5860a6b5fd 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -191,6 +191,7 @@ $lang->action->objectTypes['board'] = 'Board';
$lang->action->objectTypes['boardspace'] = 'Board Space';
$lang->action->objectTypes['productline'] = 'Product Line';
$lang->action->objectTypes['system'] = $lang->product->system;
+$lang->action->objectTypes['deliverable'] = 'Deliverable';
/* Used to describe operation history. */
$lang->action->desc = new stdclass();
@@ -937,6 +938,7 @@ $lang->action->label->instance = 'Application|instance|view|id=%s';
$lang->action->label->prompt = 'Prompt|ai|promptview|id=%s';
$lang->action->label->miniprogram = 'Mini Program|aiapp|browseminiprogram|id=%s';
$lang->action->label->holiday = 'Holiday|holiday|browse|';
+$lang->action->label->deliverable = 'Deliverable|deliverable|view|id=%s';
/* Object type. */
$lang->action->search = new stdclass();
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 5fce10c0f7..61ee3a5353 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -191,6 +191,7 @@ $lang->action->objectTypes['board'] = 'Board';
$lang->action->objectTypes['boardspace'] = 'Board Space';
$lang->action->objectTypes['productline'] = 'Product Line';
$lang->action->objectTypes['system'] = $lang->product->system;
+$lang->action->objectTypes['deliverable'] = 'Deliverable';
/* Used to describe operation history. */
$lang->action->desc = new stdclass();
@@ -937,6 +938,7 @@ $lang->action->label->instance = 'Application|instance|view|id=%s';
$lang->action->label->prompt = 'Prompt|ai|promptview|id=%s';
$lang->action->label->miniprogram = 'Mini Program|aiapp|browseminiprogram|id=%s';
$lang->action->label->holiday = 'Holiday|holiday|browse|';
+$lang->action->label->deliverable = 'Deliverable|deliverable|view|id=%s';
/* Object type. */
$lang->action->search = new stdclass();
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 6d33955720..2a0de805e2 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -191,6 +191,7 @@ $lang->action->objectTypes['board'] = '白板';
$lang->action->objectTypes['boardspace'] = '白板空间';
$lang->action->objectTypes['productline'] = '产品线';
$lang->action->objectTypes['system'] = $lang->product->system;
+$lang->action->objectTypes['deliverable'] = '交付物';
/* 用来描述操作历史记录。*/
$lang->action->desc = new stdclass();
@@ -937,6 +938,7 @@ $lang->action->label->instance = '服务|instance|view|id=%s';
$lang->action->label->prompt = '提词|ai|promptview|id=%s';
$lang->action->label->miniprogram = '小程序|aiapp|browseminiprogram|id=%s';
$lang->action->label->holiday = '节假日|holiday|browse|';
+$lang->action->label->deliverable = '交付物|deliverable|view|id=%s';
/* Object type. */
$lang->action->search = new stdclass();
diff --git a/module/action/model.php b/module/action/model.php
index 4c0b54675b..75e4b8cf66 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -197,7 +197,6 @@ class actionModel extends model
$this->loadModel('workflow');
foreach($actions as $actionID => $action)
{
- $extra = $action->extra;
$actionName = strtolower($action->action);
if($this->config->edition != 'open' && !isset($flowList[$action->objectType])) $flowList[$action->objectType] = $this->workflow->getByModule($action->objectType);
@@ -940,6 +939,12 @@ class actionModel extends model
foreach($actions as $action)
{
$item = new stdClass();
+ if(strlen(trim(($action->comment))) !== 0)
+ {
+ $item->comment = $this->formatActionComment($action->comment);
+ $currentUserCanEdit = $action->id == $endAction->id && $action->actor == $account && $action->action == 'commented';
+ $item->commentEditable = $commentEditable && common::hasPriv('action', 'editComment') && $currentUserCanEdit;
+ }
if($action->action === 'assigned' || $action->action === 'toaudit')
{
@@ -951,7 +956,7 @@ class actionModel extends model
$action->actor = zget($users, $action->actor);
if(str_contains($action->actor, ':')) $action->actor = substr($action->actor, strpos($action->actor, ':') + 1);
- if(!empty($action->history)) $item->historyChanges = $this->renderChanges($action->objectType, $action->history);
+ if(!empty($action->history)) $item->historyChanges = $this->renderChanges($action->objectType, $action->objectID, $action->history);
$item->id = $action->id;
$item->action = $action->action;
@@ -1166,7 +1171,7 @@ class actionModel extends model
/* If idList include ',*,' Format ',*,' to '*'. */
$projectIdList = array();
- foreach($projectGroups as $key => $idList)
+ foreach($projectGroups as $idList)
{
$idList = explode(',', (string)$idList);
foreach($idList as $id) $projectIdList[] = $id;
@@ -1452,12 +1457,13 @@ class actionModel extends model
* Render histories of every action.
*
* @param string $objectType
+ * @param int $objectID
* @param array $histories
* @param bool $canChangeTag
* @access public
* @return string
*/
- public function renderChanges(string $objectType, array $histories, bool $canChangeTag = true): string
+ public function renderChanges(string $objectType, int $objectID, array $histories, bool $canChangeTag = true): string
{
if(empty($histories)) return '';
@@ -1507,7 +1513,14 @@ class actionModel extends model
}
else
{
- $content .= sprintf($this->lang->action->desc->diff1, $history->fieldLabel, $history->old, $history->new);
+ if($history->field == 'deliverable' && ($objectType == 'project' || $objectType == 'execution'))
+ {
+ $content .= $this->processDeliverableJson($objectType, $objectID, $history);
+ }
+ else
+ {
+ $content .= sprintf($this->lang->action->desc->diff1, $history->fieldLabel, $history->old, $history->new);
+ }
}
}
return $content;
@@ -1518,14 +1531,15 @@ class actionModel extends model
* Print histories of every action.
*
* @param string $objectType
+ * @param int $objectID
* @param array $histories
* @param bool $canChangeTag
* @access public
* @return void
*/
- public function printChanges(string $objectType, array $histories, bool $canChangeTag = true): void
+ public function printChanges(string $objectType, int $objectID, array $histories, bool $canChangeTag = true): void
{
- $content = $this->renderChanges($objectType, $histories, $canChangeTag);
+ $content = $this->renderChanges($objectType, $objectID, $histories, $canChangeTag);
if(is_string($content)) echo $content;
}
diff --git a/module/admin/config.php b/module/admin/config.php
index 48b6d8c167..f205582b85 100755
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -8,7 +8,7 @@ if(!isset($config->safe->weak)) $config->safe->weak = '123456,password,12345,123
$config->admin->menuGroup['system'] = array('custom|mode', 'backup', 'cron', 'action|trash', 'admin|xuanxuan', 'setting|xuanxuan', 'admin|license', 'admin|checkweak', 'admin|resetpwdsetting', 'admin|safe', 'cache|setting', 'custom|timezone', 'search|buildindex', 'admin|tableengine', 'ldap', 'custom|libreoffice', 'conference', 'watermark', 'client', 'system|browsebackup', 'system|restorebackup');
$config->admin->menuGroup['company'] = array('dept', 'company', 'user', 'group', 'tutorial');
$config->admin->menuGroup['switch'] = array('admin|setmodule');
-$config->admin->menuGroup['model'] = array('auditcl', 'stage', 'design', 'cmcl', 'reviewcl', 'custom|required', 'custom|set', 'custom|flow', 'custom|code', 'custom|percent','custom|estimate', 'custom|hours', 'subject', 'process', 'activity', 'zoutput', 'classify', 'holiday', 'reviewsetting', 'custom|project');
+$config->admin->menuGroup['model'] = array('auditcl', 'stage', 'deliverable', 'design', 'cmcl', 'reviewcl', 'custom|required', 'custom|set', 'custom|flow', 'custom|code', 'custom|percent','custom|estimate', 'custom|hours', 'subject', 'process', 'activity', 'zoutput', 'classify', 'holiday', 'reviewsetting', 'custom|project');
$config->admin->menuGroup['feature'] = array('custom|set', 'custom|product', 'custom|execution', 'custom|required', 'custom|kanban', 'measurement', 'meetingroom', 'custom|browsestoryconcept', 'custom|kanban', 'sqlbuilder', 'report', 'custom|limittaskdate', 'measurement');
$config->admin->menuGroup['template'] = array('custom|set', 'baseline');
$config->admin->menuGroup['message'] = array('mail', 'webhook', 'sms', 'message');
diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index f46edad4ef..11bc8a98f8 100755
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -118,6 +118,7 @@ $lang->admin->setModule->opportunitylib = 'Opportunity Lib';
$lang->admin->setModule->practicelib = 'Practice Lib';
$lang->admin->setModule->componentlib = 'Component Lib';
$lang->admin->setModule->devops = 'DevOps';
+$lang->admin->setModule->deliverable = 'Deliverable';
$lang->admin->setModule->kanban = 'Kanban';
$lang->admin->setModule->OA = 'OA';
$lang->admin->setModule->deploy = 'Deploy';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index ca0b92b227..aec0983c5b 100755
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -118,6 +118,7 @@ $lang->admin->setModule->opportunitylib = 'Opportunity Lib';
$lang->admin->setModule->practicelib = 'Practice Lib';
$lang->admin->setModule->componentlib = 'Component Lib';
$lang->admin->setModule->devops = 'DevOps';
+$lang->admin->setModule->deliverable = 'Deliverable';
$lang->admin->setModule->kanban = 'Kanban';
$lang->admin->setModule->OA = 'OA';
$lang->admin->setModule->deploy = 'Deploy';
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index 1d5b91d323..38b0490e3a 100755
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -118,6 +118,7 @@ $lang->admin->setModule->opportunitylib = 'Opportunity Lib';
$lang->admin->setModule->practicelib = 'Practice Lib';
$lang->admin->setModule->componentlib = 'Component Lib';
$lang->admin->setModule->devops = 'DevOps';
+$lang->admin->setModule->deliverable = 'Deliverable';
$lang->admin->setModule->kanban = 'Kanban';
$lang->admin->setModule->OA = 'OA';
$lang->admin->setModule->deploy = 'Deploy';
diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index cef8ec25a5..8acf9d1353 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -74,7 +74,7 @@ $lang->admin->menuList->company['menuOrder']['5'] = 'dept';
$lang->admin->menuList->company['menuOrder']['10'] = 'browseUser';
$lang->admin->menuList->company['menuOrder']['15'] = 'group';
-$lang->admin->menuList->model['subMenu']['common'] = array('link' => "{$lang->globalSetting}|custom|required|module=project", 'subModule' => 'custom,subject,holiday,stage', 'exclude' => 'stage-browse,stage-plusbrowse,stage-create,stage-edit,stage-batchcreate');
+$lang->admin->menuList->model['subMenu']['common'] = array('link' => "{$lang->globalSetting}|custom|required|module=project", 'subModule' => 'custom,subject,holiday,stage,deliverable', 'exclude' => 'stage-browse,stage-plusbrowse,stage-create,stage-edit,stage-batchcreate');
$lang->admin->menuList->model['subMenu']['scrum'] = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|", 'subModule' => 'auditcl');
$lang->admin->menuList->model['subMenu']['waterfall'] = array('link' => "{$lang->waterfallModel}|stage|browse|", 'subModule' => 'stage', 'exclude' => 'stage-settype,stage-plusbrowse');
$lang->admin->menuList->model['subMenu']['agileplus'] = array('link' => "{$lang->agilePlusModel}|auditcl|agileplusbrowse|", 'subModule' => 'auditcl');
@@ -86,13 +86,14 @@ $lang->admin->menuList->model['menuOrder']['15'] = 'waterfall';
$lang->admin->menuList->model['menuOrder']['20'] = 'agileplus';
$lang->admin->menuList->model['menuOrder']['25'] = 'waterfallplus';
-$lang->admin->menuList->model['tabMenu']['common']['project'] = array('link' => "{$lang->project->common}|custom|required|module=project", 'alias' => 'set,project', 'exclude' => 'custom-required', 'links' => array('custom|set|module=project&field=unitList'));
-if(helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus')) $lang->admin->menuList->model['tabMenu']['common']['stage'] = array('link' => "{$lang->stage->type}|stage|settype|", 'subModule' => 'stage');
-$lang->admin->menuList->model['tabMenu']['common']['build'] = array('link' => "{$lang->build->common}|custom|required|module=build", 'alias' => 'set', 'exclude' => 'custom');
-$lang->admin->menuList->model['tabMenu']['common']['flow'] = array('link' => "{$lang->custom->flow}|custom|flow|", 'divider' => true);
+$lang->admin->menuList->model['tabMenu']['common']['project'] = array('link' => "{$lang->project->common}|custom|required|module=project", 'alias' => 'set,project', 'exclude' => 'custom-required', 'links' => array('custom|set|module=project&field=unitList'));
+if(helper::hasFeature('waterfall') || helper::hasFeature('waterfallplus')) $lang->admin->menuList->model['tabMenu']['common']['stage'] = array('link' => "{$lang->stage->type}|stage|settype|", 'subModule' => 'stage');
+if(helper::hasFeature('deliverable') && ($config->edition == 'max' || $config->edition == 'ipd')) $lang->admin->menuList->model['tabMenu']['common']['deliverable'] = array('link' => "{$lang->deliverable->common}|deliverable|browse|", 'subModule' => 'deliverable');
+$lang->admin->menuList->model['tabMenu']['common']['build'] = array('link' => "{$lang->build->common}|custom|required|module=build", 'alias' => 'set', 'exclude' => 'custom');
+$lang->admin->menuList->model['tabMenu']['common']['flow'] = array('link' => "{$lang->custom->flow}|custom|flow|", 'divider' => true);
-$lang->admin->menuList->model['tabMenu']['common']['percent'] = array('link' => "{$lang->stage->percent}|custom|percent|");
-$lang->admin->menuList->model['tabMenu']['common']['hours'] = array('link' => "{$lang->workingHour}|custom|hours|", 'subModule' => 'holiday', 'links' => array('holiday|browse|', 'custom|hours|'));
+$lang->admin->menuList->model['tabMenu']['common']['percent'] = array('link' => "{$lang->stage->percent}|custom|percent|");
+$lang->admin->menuList->model['tabMenu']['common']['hours'] = array('link' => "{$lang->workingHour}|custom|hours|", 'subModule' => 'holiday', 'links' => array('holiday|browse|', 'custom|hours|'));
if(helper::hasFeature('waterfall')) $lang->admin->menuList->model['tabMenu']['waterfall']['stage'] = array('link' => "{$lang->stage->list}|stage|browse|", 'subModule' => 'stage', 'exclude' => 'stage-plusbrowse');
if(helper::hasFeature('waterfallplus')) $lang->admin->menuList->model['tabMenu']['waterfallplus']['stage'] = array('link' => "{$lang->stage->list}|stage|plusbrowse|", 'subModule' => 'stage', 'exclude' => 'stage-browse');
$lang->admin->menuList->model['tabMenu']['menuOrder']['common']['5'] = 'project';
@@ -103,6 +104,10 @@ $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['40'] = 'p
$lang->admin->menuList->model['tabMenu']['menuOrder']['common']['45'] = 'hours';
if(helper::hasFeature('waterfall')) $lang->admin->menuList->model['tabMenu']['menuOrder']['waterfall']['5'] = 'stage';
if(helper::hasFeature('waterfallplus')) $lang->admin->menuList->model['tabMenu']['menuOrder']['waterfallplus']['5'] = 'stage';
+if($config->edition == 'max' or $config->edition == 'ipd')
+{
+ $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['15'] = 'deliverable';
+}
$lang->admin->menuList->feature['subMenu']['my'] = array('link' => "{$lang->my->common}|custom|set|module=todo&field=priList", 'exclude' => 'set,required');
$lang->admin->menuList->feature['subMenu']['product'] = array('link' => "{$lang->productCommon}|custom|required|module=product", 'exclude' => 'set,required', 'alias' => 'browsestoryconcept,product');
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index 2be5c58512..18dbf40abe 100755
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -118,6 +118,7 @@ $lang->admin->setModule->opportunitylib = '机会库';
$lang->admin->setModule->practicelib = '最佳实践库';
$lang->admin->setModule->componentlib = '组件库';
$lang->admin->setModule->devops = 'DevOps';
+$lang->admin->setModule->deliverable = '交付物';
$lang->admin->setModule->kanban = '通用看板';
$lang->admin->setModule->OA = '办公';
$lang->admin->setModule->deploy = '运维';
@@ -170,7 +171,7 @@ $lang->admin->menuSetting['user']['name'] = '人员管理';
$lang->admin->menuSetting['user']['desc'] = '维护部门、添加人员、分组配置权限。';
$lang->admin->menuSetting['switch']['name'] = '功能开关';
$lang->admin->menuSetting['switch']['desc'] = '打开、关闭系统部分功能。';
-$lang->admin->menuSetting['model']['name'] = '模型配置';
+$lang->admin->menuSetting['model']['name'] = '项目模型配置';
$lang->admin->menuSetting['model']['desc'] = '不同项目管理模型和项目通用要素配置。';
$lang->admin->menuSetting['feature']['name'] = '功能配置';
$lang->admin->menuSetting['feature']['desc'] = '按照功能菜单进行系统的要素配置。';
diff --git a/module/bug/config.php b/module/bug/config.php
index f8caed6827..034f396f3b 100755
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -34,14 +34,14 @@ $config->bug->list->allFields = 'id, module, execution, story, task,
$config->bug->list->defaultFields = 'id,title,severity,pri,openedBy,assignedTo,resolvedBy,resolution';
$config->bug->list->customCreateFields = 'execution,noticefeedbackBy,story,task,pri,severity,os,browser,deadline,mailto,keywords';
$config->bug->list->customBatchEditFields = 'type,severity,pri,productplan,assignedTo,deadline,resolvedBy,resolution,os,browser,keywords';
-$config->bug->list->customBatchCreateFields = 'project,execution,steps,type,pri,deadline,severity,os,browser,keywords';
+$config->bug->list->customBatchCreateFields = 'project,execution,plan,steps,type,pri,deadline,severity,os,browser,keywords';
$config->bug->custom = new stdclass();
$config->bug->custom->createFields = $config->bug->list->customCreateFields;
$config->bug->custom->batchCreateFields = 'project,execution,deadline,steps,type,pri,severity,os,browser,%s';
$config->bug->custom->batchEditFields = 'type,severity,pri,assignedTo,deadline,status,resolvedBy,resolution';
-$config->bug->exportFields = 'id, product, branch, module, project, execution, story, task,
+$config->bug->exportFields = 'id, product, branch, module, project, execution, plan, story, task,
title, keywords, severity, pri, type, os, browser,
steps, status, deadline, activatedCount, confirmed, mailto,
openedBy, openedDate, openedBuild,
diff --git a/module/bug/config/form.php b/module/bug/config/form.php
index 9736e3f52d..12057be640 100644
--- a/module/bug/config/form.php
+++ b/module/bug/config/form.php
@@ -10,6 +10,7 @@ $config->bug->form->create['openedBuild'] = array('required' => true, 'type' =>
$config->bug->form->create['product'] = array('required' => false, 'type' => 'int', 'default' => 0);
$config->bug->form->create['branch'] = array('required' => false, 'type' => 'int', 'default' => 0);
$config->bug->form->create['module'] = array('required' => false, 'type' => 'int', 'default' => 0);
+$config->bug->form->create['plan'] = array('required' => false, 'type' => 'int', 'default' => 0);
$config->bug->form->create['project'] = array('required' => false, 'type' => 'int', 'default' => 0);
$config->bug->form->create['execution'] = array('required' => false, 'type' => 'int', 'default' => 0);
$config->bug->form->create['assignedTo'] = array('required' => false, 'type' => 'string', 'default' => '');
@@ -159,6 +160,7 @@ $config->bug->form->batchCreate['story'] = array('required' => false, 'typ
$config->bug->form->batchCreate['branch'] = array('required' => false, 'type' => 'int', 'default' => 0);
$config->bug->form->batchCreate['laneID'] = array('required' => false, 'type' => 'int', 'default' => 0);
$config->bug->form->batchCreate['openedBuild'] = array('required' => true, 'type' => 'array', 'default' => '', 'filter' => 'join');
+$config->bug->form->batchCreate['plan'] = array('required' => false, 'type' => 'int', 'default' => 0);
$config->bug->form->batchCreate['title'] = array('required' => true, 'type' => 'string', 'default' => '', 'base' => true);
$config->bug->form->batchCreate['deadline'] = array('required' => false, 'type' => 'date', 'default' => null);
$config->bug->form->batchCreate['steps'] = array('required' => false, 'type' => 'string', 'default' => '', 'control' => 'editor');
diff --git a/module/bug/config/table.php b/module/bug/config/table.php
index c6116e204b..856b198bd4 100644
--- a/module/bug/config/table.php
+++ b/module/bug/config/table.php
@@ -70,11 +70,12 @@ $config->bug->dtable->fieldList['execution']['group'] = 3;
$config->bug->dtable->fieldList['execution']['dataSource'] = array('module' => 'execution', 'method' =>'getPairs', 'params' => ['projectID' => 0]);
$config->bug->dtable->fieldList['execution']['sortType'] = true;
-$config->bug->dtable->fieldList['plan']['title'] = $lang->bug->plan;
-$config->bug->dtable->fieldList['plan']['width'] = 120;
-$config->bug->dtable->fieldList['plan']['group'] = 3;
-$config->bug->dtable->fieldList['plan']['sortType'] = true;
-$config->bug->dtable->fieldList['plan']['hint'] = true;
+$config->bug->dtable->fieldList['plan']['title'] = $lang->bug->plan;
+$config->bug->dtable->fieldList['plan']['width'] = 120;
+$config->bug->dtable->fieldList['plan']['group'] = 3;
+$config->bug->dtable->fieldList['plan']['sortType'] = true;
+$config->bug->dtable->fieldList['plan']['hint'] = true;
+$config->bug->dtable->fieldList['plan']['dataSource'] = array('module' => 'productplan', 'method' =>'getPairs', 'params' => ['productIdList' => '$productIdList', 'branch' => '$branch']);
$config->bug->dtable->fieldList['openedBuild']['title'] = $lang->bug->openedBuild;
$config->bug->dtable->fieldList['openedBuild']['type'] = 'text';
diff --git a/module/bug/control.php b/module/bug/control.php
index b883f78ab4..b1b4fb23bf 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -646,7 +646,17 @@ class bug extends control
{
/* 设置bug导出的参数。 */
/* Set bug export params. */
- $this->session->set('bugTransferParams', array('productID' => $productID, 'executionID' => $executionID, 'branch' => 'all'));
+ if($executionID)
+ {
+ $productIdList = $this->loadModel('product')->getProductPairsByProject($executionID);
+ $productIdList = array_keys($productIdList);
+ }
+ else
+ {
+ $productIdList = array($productID);
+ }
+
+ $this->session->set('bugTransferParams', array('productID' => $productID, 'executionID' => $executionID, 'branch' => 'all', 'productIdList' => $productIdList));
/* 设置导出数据源。 */
/* Set export data source. */
diff --git a/module/bug/js/edit.ui.js b/module/bug/js/edit.ui.js
index b043cb7cca..48b36c7ba8 100644
--- a/module/bug/js/edit.ui.js
+++ b/module/bug/js/edit.ui.js
@@ -40,3 +40,9 @@ function linkBug()
openUrl(link, {load: 'modal', size: 'lg'});
}
+
+function setDuplicateBug()
+{
+ const productID = $('[name=product]').val();
+ loadProductBugs(productID, bug.id);
+}
diff --git a/module/bug/model.php b/module/bug/model.php
index b2fef73673..c0d51afa2d 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -41,7 +41,7 @@ class bugModel extends model
if(!empty($bug->assignedTo)) $this->action->create('bug', $bugID, 'Assigned', '', $bug->assignedTo);
/* Add score for create. */
- $files = $this->loadModel('file')->saveUpload('bug', $bugID);
+ $this->loadModel('file')->saveUpload('bug', $bugID);
if(!empty($bug->case))
{
$this->loadModel('score')->create('bug', 'createFormCase', $bug->case);
@@ -344,7 +344,7 @@ class bugModel extends model
if($changes) $this->action->logHistory($actionID, $changes);
}
- if($this->config->edition != 'open')
+ if($this->config->edition != 'open' && $this->app->rawMethod != 'batchedit')
{
if($oldBug->story > 0 || $oldBug->task > 0 || $oldBug->case > 0)
{
@@ -771,7 +771,7 @@ class bugModel extends model
$this->config->bug->search['queryID'] = $queryID;
$this->config->bug->search['params']['project']['values'] = $projectParams;
$this->config->bug->search['params']['product']['values'] = $productParams;
- $this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID);
+ $this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID, '', '', true);
$this->config->bug->search['params']['module']['values'] = $modules;
$this->config->bug->search['params']['execution']['values'] = $this->loadModel('product')->getExecutionPairsByProduct($productID, '0', (int)$projectID);
$this->config->bug->search['params']['severity']['values'] = array(0 => '') + $this->lang->bug->severityList; //Fix bug #939.
diff --git a/module/bug/ui/batchcreate.html.php b/module/bug/ui/batchcreate.html.php
index 1906819900..b8de0005af 100644
--- a/module/bug/ui/batchcreate.html.php
+++ b/module/bug/ui/batchcreate.html.php
@@ -12,6 +12,7 @@ namespace zin;
$defaultBug = array('module' => $moduleID, 'project' => $projectID, 'execution' => $executionID, 'openedBuild' => 'trunk', 'pri' => 3, 'severity' => 3);
if($product->type != 'normal') $defaultBug['branch'] = $branch;
+if($product->shadow) unset($customFields['plan']);
if(isset($executionType) && $executionType == 'kanban')
{
$defaultBug['region'] = $regionID;
@@ -64,6 +65,9 @@ $items[] = array
/* Field of openedBuild. */
$items[] = array('name' => 'openedBuild', 'label' => $lang->bug->openedBuild, 'control' => 'picker', 'items' => $builds, 'value' => 'trunk', 'multiple' => true, 'width' => '200px', 'required' => true, 'ditto' => true);
+/* Field of plan. */
+if(!$product->shadow) $items[] = array('name' => 'plan', 'label' => $lang->bug->plan, 'control' => 'picker', 'items' => $plans, 'value' => '', 'width' => '200px', 'required' => isset($requiredFields['plan']), 'ditto' => true);
+
/* Field of title. */
$items[] = array( 'name' => 'title', 'label' => $lang->bug->title, 'width' => '240px', 'required' => true, 'control' => 'colorInput');
diff --git a/module/bug/ui/common.field.php b/module/bug/ui/common.field.php
index 548b4facec..d9ef075481 100644
--- a/module/bug/ui/common.field.php
+++ b/module/bug/ui/common.field.php
@@ -58,6 +58,7 @@ if(data('executionType') && data('executionType') == 'kanban')
}
$fields->field('title')
+ ->className('full:w-full')
->control('colorInput', array('colorValue' => data('bug.color')));
$fields->field('type')
diff --git a/module/bug/ui/create.field.php b/module/bug/ui/create.field.php
index 4e2cc0f7e1..fffdc4d53f 100644
--- a/module/bug/ui/create.field.php
+++ b/module/bug/ui/create.field.php
@@ -27,6 +27,13 @@ $fields->field('execution')
->className($isShadowProduct && $isOriginalProduct ? 'full:w-1/2' : 'full:w-1/4')
->foldable(!$isShadowProduct);
+$fields->field('plan')
+ ->label($lang->bug->plan)
+ ->className('w-1/2 full:w-1/2')
+ ->hidden($noMultipleProject)
+ ->items(data('plans'))
+ ->foldable();
+
if(common::hasPriv('build', 'create'))
{
$fields->field('openedBuild')
diff --git a/module/bug/ui/create.html.php b/module/bug/ui/create.html.php
index 68150fa7a0..15d6311d04 100644
--- a/module/bug/ui/create.html.php
+++ b/module/bug/ui/create.html.php
@@ -24,7 +24,8 @@ $fields->autoLoad('branch', 'module,execution,project,story,task,assignedTo')
->autoLoad('allUsers', 'assignedTo')
->autoLoad('region', 'lane');
-if(!$product->shadow) $fields->fullModeOrders('module,project,execution');
+if(!$product->shadow) $fields->fullModeOrders('module,project,execution,plan', 'pri,title');
+$fields->sort('execution,plan');
jsVar('bug', $bug);
jsVar('moduleID', $bug->moduleID);
diff --git a/module/bug/ui/edit.html.php b/module/bug/ui/edit.html.php
index 142a0180de..bdcd368e28 100644
--- a/module/bug/ui/edit.html.php
+++ b/module/bug/ui/edit.html.php
@@ -517,7 +517,8 @@ detailBody
set::name($lang->bug->duplicateBug),
picker
(
- set::items($productBugs),
+ on::click('setDuplicateBug'),
+ set::items(array()),
set::name('duplicateBug'),
set::value($bug->duplicateBug)
)
diff --git a/module/bug/zen.php b/module/bug/zen.php
index e388eaa3a0..e8b3eca51c 100644
--- a/module/bug/zen.php
+++ b/module/bug/zen.php
@@ -379,6 +379,7 @@ class bugZen extends bug
protected function getExportFields(int $executionID, object|bool $product): string
{
$exportFields = str_replace(' ', '', $this->config->bug->exportFields);
+ $isShadow = false;
if(isset($product->type) and $product->type == 'normal') $exportFields = str_replace(',branch,', ',', ",{$exportFields},");;
if(!$product)
{
@@ -387,9 +388,16 @@ class bugZen extends bug
foreach($products as $product)
{
if($product->type != 'normal') $hasBranch = true;
+ if(!empty($product->shadow)) $isShadow = true;
}
if(!$hasBranch) $exportFields = str_replace(',branch,', ',', ",{$exportFields},");
}
+ else
+ {
+ $isShadow = $product->shadow;
+ }
+
+ if($isShadow) $exportFields = str_replace(',plan,', ',', ",{$exportFields},");
if($this->app->tab == 'project' or $this->app->tab == 'execution')
{
$execution = $this->loadModel('execution')->getByID($executionID);
@@ -1104,6 +1112,7 @@ class bugZen extends bug
$this->view->branchID = $bug->branch != 'all' ? $bug->branch : '0';
$this->view->cases = $this->loadModel('testcase')->getPairsByProduct($this->session->product, array(0, $this->view->branchID));
$this->view->copyBugID = isset($bugID) ? $bugID : 0;
+ $this->view->plans = $this->loadModel('productplan')->getPairs($bug->productID, $bug->branch, 'noclosed', true);
}
/**
@@ -1133,8 +1142,6 @@ class bugZen extends bug
/* Get bugs of current product. */
$branch = '';
if($product->type == 'branch') $branch = $bug->branch > 0 ? "{$bug->branch},0" : '0';
- $productBugs = $this->bug->getProductBugPairs($bug->product, $branch);
- unset($productBugs[$bug->id]);
/* Get execution pairs. */
$unAllowedStage = array('request', 'design', 'review');
@@ -1156,7 +1163,7 @@ class bugZen extends bug
if($product->type != 'normal') $branchTagOption = $this->getBranchOptions($product->id);
if($this->config->edition == 'max') $this->view->injectionList = $this->view->identifyList = $this->loadModel('review')->getPairs($bug->project, $bug->product, true);
- $this->assignVarsForEdit($bug);
+ $this->assignVarsForEdit($bug, $product);
$this->view->title = $this->lang->bug->edit . "BUG #$bug->id $bug->title - " . $this->products[$bug->product];
$this->view->bug = $bug;
@@ -1165,7 +1172,6 @@ class bugZen extends bug
$this->view->projectID = $bug->project;
$this->view->projects = $projects;
$this->view->executions = $executions;
- $this->view->productBugs = $productBugs;
$this->view->branchTagOption = $branchTagOption;
$this->view->projectExecutionPairs = $this->loadModel('project')->getProjectExecutionPairs();
}
@@ -1175,10 +1181,11 @@ class bugZen extends bug
* Assign variables for editing bug.
*
* @param object $bug
+ * @param object $product
* @access protected
* @return void
*/
- protected function assignVarsForEdit(object $bug): void
+ protected function assignVarsForEdit(object $bug, object $product): void
{
/* Add product related to the bug when it is not in the products. */
if(!isset($this->products[$bug->product]))
@@ -1401,6 +1408,7 @@ class bugZen extends bug
$this->view->branch = $branch;
$this->view->branches = $branches;
$this->view->moduleOptionMenu = $this->tree->getOptionMenu($product->id, 'bug', 0, $branch === 'all' ? 'all' : (string)$branch);
+ $this->view->plans = $this->loadModel('productplan')->getPairs($product->id, $branch, 'noclosed', true);
}
/**
@@ -2450,7 +2458,9 @@ class bugZen extends bug
$fields = array('projectID' => $bugInfo->project, 'moduleID' => $bugInfo->module, 'executionID' => $bugInfo->execution, 'taskID' => $bugInfo->task, 'storyID' => $isSameProduct ? $bugInfo->story : 0, 'buildID' => $bugInfo->openedBuild,
'caseID' => $bugInfo->case, 'title' => $bugInfo->title, 'steps' => $bugInfo->steps, 'severity' => $bugInfo->severity, 'type' => $bugInfo->type, 'assignedTo' => $bugInfo->assignedTo, 'deadline' => (helper::isZeroDate($bugInfo->deadline) ? '' : $bugInfo->deadline),
'os' => $bugInfo->os, 'browser' => $bugInfo->browser, 'mailto' => $bugInfo->mailto, 'keywords' => $bugInfo->keywords, 'color' => $bugInfo->color, 'testtask' => $bugInfo->testtask, 'feedbackBy' => $bugInfo->feedbackBy, 'notifyEmail' => $bugInfo->notifyEmail,
- 'pri' => ($bugInfo->pri == 0 ? 3 : $bugInfo->pri));
+ 'pri' => ($bugInfo->pri == 0 ? 3 : $bugInfo->pri),
+ 'plan' => $bugInfo->plan
+ );
$bug = $this->updateBug($bug, $fields);
diff --git a/module/build/lang/de.php b/module/build/lang/de.php
index 2a28219b1b..da915fb5f5 100644
--- a/module/build/lang/de.php
+++ b/module/build/lang/de.php
@@ -10,6 +10,7 @@
* @link https://www.zentao.net
*/
$lang->build->common = "Build";
+$lang->build->browse = "Build List";
$lang->build->create = "Build erstellen";
$lang->build->edit = "Bearbeiten";
$lang->build->linkStory = "{$lang->SRCommon} verknüpfen";
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 87cdd16721..7029c0d180 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -10,6 +10,7 @@
* @link https://www.zentao.net
*/
$lang->build->common = "Build";
+$lang->build->browse = "Build List";
$lang->build->create = "Create Build";
$lang->build->edit = "Edit Build";
$lang->build->linkStory = "Link {$lang->SRCommon}";
diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php
index 85d2daf8d1..da7ea5afec 100644
--- a/module/build/lang/fr.php
+++ b/module/build/lang/fr.php
@@ -10,6 +10,7 @@
* @link https://www.zentao.net
*/
$lang->build->common = "Build";
+$lang->build->browse = "Liste Build";
$lang->build->create = "Créer Build";
$lang->build->edit = "Editer Build";
$lang->build->linkStory = "Intégrer {$lang->SRCommon}";
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index 3130868d54..5c980b8b51 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -10,6 +10,7 @@
* @link https://www.zentao.net
*/
$lang->build->common = "构建";
+$lang->build->browse = "构建列表";
$lang->build->create = "创建构建";
$lang->build->edit = "编辑构建";
$lang->build->linkStory = "关联{$lang->SRCommon}";
diff --git a/module/caselib/zen.php b/module/caselib/zen.php
index 277c9951f2..28a7156c4c 100644
--- a/module/caselib/zen.php
+++ b/module/caselib/zen.php
@@ -245,8 +245,8 @@ class caselibZen extends caselib
if(empty($rows))
{
- $row->typeValue = join("\n", $this->lang->testcase->typeList);
- $row->stageValue = join("\n", $this->lang->testcase->stageList);
+ $row->typeValue = implode("\n", $this->lang->testcase->typeList);
+ $row->stageValue = implode("\n", $this->lang->testcase->stageList);
}
$rows[] = $row;
@@ -444,7 +444,7 @@ class caselibZen extends caselib
$case->stage = array();
foreach($stages as $stage) $case->stage[] = array_search($stage, $this->lang->testcase->stageList);
- $case->stage = join(',', $case->stage);
+ $case->stage = implode(',', $case->stage);
}
else
{
@@ -558,7 +558,6 @@ class caselibZen extends caselib
{
$users = $this->loadModel('user')->getPairs('noletter');
$relatedModules = $this->loadModel('tree')->getModulePairs($libID, 'caselib');
- $relatedCases = $this->loadModel('testcase')->getRelatedCases($cases);
$relatedSteps = $this->testcase->getRelatedSteps(array_keys($cases));
$relatedFiles = $this->testcase->getRelatedFiles(array_keys($cases));
@@ -655,7 +654,7 @@ class caselibZen extends caselib
{
$case->stage = explode(',', $case->stage);
foreach($case->stage as $key => $stage) $case->stage[$key] = isset($this->lang->testcase->stageList[$stage]) ? $this->lang->testcase->stageList[$stage] : $stage;
- $case->stage = join("\n", $case->stage);
+ $case->stage = implode("\n", $case->stage);
}
/**
@@ -697,6 +696,6 @@ class caselibZen extends caselib
$linkCaseID = trim($linkCaseID);
$tmpLinkCases[] = isset($relatedCases[$linkCaseID]) ? $relatedCases[$linkCaseID] . "(#$linkCaseID)" : $linkCaseID;
}
- $case->linkCase = join("; \n", $tmpLinkCases);
+ $case->linkCase = implode("; \n", $tmpLinkCases);
}
}
diff --git a/module/cne/model.php b/module/cne/model.php
index 503b2ab8ac..b3290746ac 100644
--- a/module/cne/model.php
+++ b/module/cne/model.php
@@ -250,8 +250,28 @@ class cneModel extends model
$result = $this->apiGet('/api/cne/statistics/cluster', array('cluster' => ''), $this->config->CNE->api->headers);
if($result->code != 200) return $statistics;
+ $nodes = $this->apiGet('/api/cne/cluster/nodes', array('cluster' => ''), $this->config->CNE->api->headers);
+ if($nodes->code != 200) return $statistics;
+
+ $readyNode = 0;
+ $nodeError = '';
+ foreach($nodes->data as $node)
+ {
+ if($node->ready)
+ {
+ $readyNode++;
+ }
+ else
+ {
+ if(empty($node->issues)) continue;
+ $nodeError .= sprintf($this->lang->system->nodeNotice, $node->name, implode(',', array_unique($node->issues))) . "\n";
+ }
+ }
$statistics = $result->data;
+ $statistics->node_count = count($nodes->data);
+ $statistics->ready_count = $readyNode;
+ $statistics->nodeError = $nodeError;
$statistics->metrics->cpu->usage = max(round($statistics->metrics->cpu->usage, 4), 0);
$statistics->metrics->cpu->capacity = max(round($statistics->metrics->cpu->capacity, 4), $statistics->metrics->cpu->usage);
$statistics->metrics->cpu->allocatable = round($statistics->metrics->cpu->allocatable, 4);
diff --git a/module/cne/test/model/cnemetrics.php b/module/cne/test/model/cnemetrics.php
index 4d3e55c4e7..1c47a520ba 100755
--- a/module/cne/test/model/cnemetrics.php
+++ b/module/cne/test/model/cnemetrics.php
@@ -7,8 +7,11 @@ title=测试 cneModel->cneMetrics();
timeout=0
cid=1
-- 获取CNE平台的集群度量属性status @normal
-
+- 获取CNE平台的集群度量状态属性status @unknown
+- 获取CNE平台的集群cpu数据属性usage @0
+- 获取CNE平台的集群cpu数据属性capacity @0
+- 获取CNE平台的集群内存属性usage @0
+- 获取CNE平台的集群内存属性capacity @0
*/
include dirname(__FILE__, 5) . '/test/lib/init.php';
@@ -20,4 +23,8 @@ $config->CNE->app->domain = 'g79n.corp.cc';
$cneModel = $tester->loadModel('cne');
-r($cneModel->cneMetrics()) && p('status') && e('normal'); // 获取CNE平台的集群度量
+r($cneModel->cneMetrics()) && p('status') && e('unknown'); // 获取CNE平台的集群度量状态
+r($cneModel->cneMetrics()->metrics->cpu) && p('usage') && e('0'); // 获取CNE平台的集群cpu数据
+r($cneModel->cneMetrics()->metrics->cpu) && p('capacity') && e('0'); // 获取CNE平台的集群cpu数据
+r($cneModel->cneMetrics()->metrics->memory) && p('usage') && e('0'); // 获取CNE平台的集群内存
+r($cneModel->cneMetrics()->metrics->memory) && p('capacity') && e('0'); // 获取CNE平台的集群内存
diff --git a/module/common/lang/common.php b/module/common/lang/common.php
index 01677fd34a..1c242060ad 100644
--- a/module/common/lang/common.php
+++ b/module/common/lang/common.php
@@ -105,8 +105,12 @@ $lang->ops = new stdclass();
$lang->domain = new stdclass();
$lang->service = new stdclass();
$lang->deployment = new stdclass();
+$lang->deliverable = new stdclass();
$lang->metric = new stdclass();
+$lang->projectDeliverable = new stdclass();
+$lang->executionDeliverable = new stdclass();
+
$lang->ai = new stdclass();
$lang->aiapp = new stdclass();
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 46ff6aea75..c46dcca65c 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -289,37 +289,40 @@ $lang->aiapp->common = 'AI';
$lang->product->system = 'Application';
$lang->configure->common = 'Configure';
-$lang->programstakeholder->common = 'Stakeholder';
-$lang->featureswitch->common = 'Features On/Off';
-$lang->importdata->common = 'Import data';
-$lang->systemsetting->common = 'System setting';
-$lang->staffmanage->common = 'User management';
-$lang->modelconfig->common = 'Pattern setting';
-$lang->featureconfig->common = 'Features config';
-$lang->doctemplate->common = 'Doc template';
-$lang->notifysetting->common = 'Notification';
-$lang->bidesign->common = 'BI design';
-$lang->personalsettings->common = 'Personal setting ';
-$lang->projectsettings->common = 'Setting';
-$lang->dataaccess->common = 'Data permission';
-$lang->executiongantt->common = 'Gantt chart';
-$lang->executionkanban->common = 'Kanban';
-$lang->executionburn->common = 'Burndown chart';
-$lang->executioncfd->common = 'Cumulative Flow Diagram';
-$lang->executionstory->common = 'Story';
-$lang->executionqa->common = 'QA';
-$lang->executionsettings->common = 'Setting';
-$lang->generalcomment->common = 'Comment';
-$lang->generalping->common = 'Timeout prevention';
-$lang->generaltemplate->common = 'Template';
-$lang->generaleffort->common = 'General log';
-$lang->productsettings->common = 'Product setting';
-$lang->projectreview->common = 'Review';
-$lang->projecttrack->common = 'Matrix';
-$lang->projectqa->common = 'QA';
-$lang->holidayseason->common = 'Holiday';
-$lang->codereview->common = 'Review';
-$lang->repocode->common = 'Code';
+$lang->programstakeholder->common = 'Stakeholder';
+$lang->featureswitch->common = 'Features On/Off';
+$lang->importdata->common = 'Import data';
+$lang->systemsetting->common = 'System setting';
+$lang->staffmanage->common = 'User management';
+$lang->modelconfig->common = 'Pattern setting';
+$lang->featureconfig->common = 'Features config';
+$lang->doctemplate->common = 'Doc template';
+$lang->notifysetting->common = 'Notification';
+$lang->bidesign->common = 'BI design';
+$lang->personalsettings->common = 'Personal setting ';
+$lang->projectsettings->common = 'Setting';
+$lang->dataaccess->common = 'Data permission';
+$lang->executiongantt->common = 'Gantt chart';
+$lang->executionkanban->common = 'Kanban';
+$lang->executionburn->common = 'Burndown chart';
+$lang->executioncfd->common = 'Cumulative Flow Diagram';
+$lang->executionstory->common = 'Story';
+$lang->executionqa->common = 'QA';
+$lang->executionsettings->common = 'Setting';
+$lang->generalcomment->common = 'Comment';
+$lang->generalping->common = 'Timeout prevention';
+$lang->generaltemplate->common = 'Template';
+$lang->generaleffort->common = 'General log';
+$lang->productsettings->common = 'Product setting';
+$lang->projectreview->common = 'Review';
+$lang->projecttrack->common = 'Matrix';
+$lang->projectqa->common = 'QA';
+$lang->holidayseason->common = 'Holiday';
+$lang->codereview->common = 'Review';
+$lang->repocode->common = 'Code';
+$lang->deliverable->common = 'Deliverable';
+$lang->projectDeliverable->common = 'Project Deliverable';
+$lang->executionDeliverable->common = 'Execution Deliverable';
$lang->personnel->common = 'Member';
$lang->personnel->invest = 'Investment';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index d15451b81a..2008ab8507 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -289,37 +289,40 @@ $lang->aiapp->common = 'AI';
$lang->product->system = 'Application';
$lang->configure->common = 'Configure';
-$lang->programstakeholder->common = 'Stakeholder';
-$lang->featureswitch->common = 'Features On/Off';
-$lang->importdata->common = 'Import data';
-$lang->systemsetting->common = 'System setting';
-$lang->staffmanage->common = 'User management';
-$lang->modelconfig->common = 'Pattern setting';
-$lang->featureconfig->common = 'Features config';
-$lang->doctemplate->common = 'Doc template';
-$lang->notifysetting->common = 'Notification';
-$lang->bidesign->common = 'BI design';
-$lang->personalsettings->common = 'Personal setting ';
-$lang->projectsettings->common = 'Setting';
-$lang->dataaccess->common = 'Data permission';
-$lang->executiongantt->common = 'Gantt chart';
-$lang->executionkanban->common = 'Kanban';
-$lang->executionburn->common = 'Burndown chart';
-$lang->executioncfd->common = 'Cumulative Flow Diagram';
-$lang->executionstory->common = 'Story';
-$lang->executionqa->common = 'QA';
-$lang->executionsettings->common = 'Setting';
-$lang->generalcomment->common = 'Comment';
-$lang->generalping->common = 'Timeout prevention';
-$lang->generaltemplate->common = 'Template';
-$lang->generaleffort->common = 'General log';
-$lang->productsettings->common = 'Product setting';
-$lang->projectreview->common = 'Review';
-$lang->projecttrack->common = 'Matrix';
-$lang->projectqa->common = 'QA';
-$lang->holidayseason->common = 'Holiday';
-$lang->codereview->common = 'Review';
-$lang->repocode->common = 'Code';
+$lang->programstakeholder->common = 'Stakeholder';
+$lang->featureswitch->common = 'Features On/Off';
+$lang->importdata->common = 'Import data';
+$lang->systemsetting->common = 'System setting';
+$lang->staffmanage->common = 'User management';
+$lang->modelconfig->common = 'Pattern setting';
+$lang->featureconfig->common = 'Features config';
+$lang->doctemplate->common = 'Doc template';
+$lang->notifysetting->common = 'Notification';
+$lang->bidesign->common = 'BI design';
+$lang->personalsettings->common = 'Personal setting ';
+$lang->projectsettings->common = 'Setting';
+$lang->dataaccess->common = 'Data permission';
+$lang->executiongantt->common = 'Gantt chart';
+$lang->executionkanban->common = 'Kanban';
+$lang->executionburn->common = 'Burndown chart';
+$lang->executioncfd->common = 'Cumulative Flow Diagram';
+$lang->executionstory->common = 'Story';
+$lang->executionqa->common = 'QA';
+$lang->executionsettings->common = 'Setting';
+$lang->generalcomment->common = 'Comment';
+$lang->generalping->common = 'Timeout prevention';
+$lang->generaltemplate->common = 'Template';
+$lang->generaleffort->common = 'General log';
+$lang->productsettings->common = 'Product setting';
+$lang->projectreview->common = 'Review';
+$lang->projecttrack->common = 'Matrix';
+$lang->projectqa->common = 'QA';
+$lang->holidayseason->common = 'Holiday';
+$lang->codereview->common = 'Review';
+$lang->repocode->common = 'Code';
+$lang->deliverable->common = 'Deliverable';
+$lang->projectDeliverable->common = 'Project Deliverable';
+$lang->executionDeliverable->common = 'Execution Deliverable';
$lang->personnel->common = 'Member';
$lang->personnel->invest = 'Investment';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 1a85fd6b83..fe0936db33 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -289,37 +289,40 @@ $lang->aiapp->common = 'AI';
$lang->product->system = 'Application';
$lang->configure->common = 'Configure';
-$lang->programstakeholder->common = 'Stakeholder';
-$lang->featureswitch->common = 'Features On/Off';
-$lang->importdata->common = 'Import data';
-$lang->systemsetting->common = 'System setting';
-$lang->staffmanage->common = 'User management';
-$lang->modelconfig->common = 'Pattern setting';
-$lang->featureconfig->common = 'Features config';
-$lang->doctemplate->common = 'Doc template';
-$lang->notifysetting->common = 'Notification';
-$lang->bidesign->common = 'BI design';
-$lang->personalsettings->common = 'Personal setting ';
-$lang->projectsettings->common = 'Setting';
-$lang->dataaccess->common = 'Data permission';
-$lang->executiongantt->common = 'Gantt chart';
-$lang->executionkanban->common = 'Kanban';
-$lang->executionburn->common = 'Burndown chart';
-$lang->executioncfd->common = 'Cumulative Flow Diagram';
-$lang->executionstory->common = 'Story';
-$lang->executionqa->common = 'QA';
-$lang->executionsettings->common = 'Setting';
-$lang->generalcomment->common = 'Comment';
-$lang->generalping->common = 'Timeout prevention';
-$lang->generaltemplate->common = 'Template';
-$lang->generaleffort->common = 'General log';
-$lang->productsettings->common = 'Product setting';
-$lang->projectreview->common = 'Review';
-$lang->projecttrack->common = 'Matrix';
-$lang->projectqa->common = 'QA';
-$lang->holidayseason->common = 'Holiday';
-$lang->codereview->common = 'Review';
-$lang->repocode->common = 'Code';
+$lang->programstakeholder->common = 'Stakeholder';
+$lang->featureswitch->common = 'Features On/Off';
+$lang->importdata->common = 'Import data';
+$lang->systemsetting->common = 'System setting';
+$lang->staffmanage->common = 'User management';
+$lang->modelconfig->common = 'Pattern setting';
+$lang->featureconfig->common = 'Features config';
+$lang->doctemplate->common = 'Doc template';
+$lang->notifysetting->common = 'Notification';
+$lang->bidesign->common = 'BI design';
+$lang->personalsettings->common = 'Personal setting ';
+$lang->projectsettings->common = 'Setting';
+$lang->dataaccess->common = 'Data permission';
+$lang->executiongantt->common = 'Gantt chart';
+$lang->executionkanban->common = 'Kanban';
+$lang->executionburn->common = 'Burndown chart';
+$lang->executioncfd->common = 'Cumulative Flow Diagram';
+$lang->executionstory->common = 'Story';
+$lang->executionqa->common = 'QA';
+$lang->executionsettings->common = 'Setting';
+$lang->generalcomment->common = 'Comment';
+$lang->generalping->common = 'Timeout prevention';
+$lang->generaltemplate->common = 'Template';
+$lang->generaleffort->common = 'General log';
+$lang->productsettings->common = 'Product setting';
+$lang->projectreview->common = 'Review';
+$lang->projecttrack->common = 'Matrix';
+$lang->projectqa->common = 'QA';
+$lang->holidayseason->common = 'Holiday';
+$lang->codereview->common = 'Review';
+$lang->repocode->common = 'Code';
+$lang->deliverable->common = 'Deliverable';
+$lang->projectDeliverable->common = 'Project Deliverable';
+$lang->executionDeliverable->common = 'Execution Deliverable';
$lang->personnel->common = 'Member';
$lang->personnel->invest = 'Investment';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 8d2217cec7..fd3161b489 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -240,7 +240,7 @@ if(helper::hasFeature('devops')) $lang->scrum->menu->devops = array('link'
$lang->scrum->menu->build = array('link' => "{$lang->build->common}|projectbuild|browse|project=%s", 'subModule' => 'projectbuild');
$lang->scrum->menu->release = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease,system');
$lang->scrum->menu->dynamic = array('link' => "$lang->dynamic|project|dynamic|project=%s");
-$lang->scrum->menu->settings = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'tree,stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team', 'exclude' => 'tree-browsetask');
+$lang->scrum->menu->settings = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'tree,stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team,workflowgroup', 'exclude' => 'tree-browsetask');
$lang->scrum->dividerMenu = ',execution,programplan,doc,settings,';
@@ -783,6 +783,7 @@ $lang->navGroup->extension = 'admin';
$lang->navGroup->action = 'admin';
$lang->navGroup->convert = 'admin';
$lang->navGroup->stage = 'admin';
+$lang->navGroup->deliverable = 'admin';
$lang->navGroup->featureswitch = 'admin';
$lang->navGroup->importdata = 'admin';
$lang->navGroup->systemsetting = 'admin';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 22bd919f27..c6b088a140 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -289,37 +289,40 @@ $lang->aiapp->common = 'AI';
$lang->product->system = '应用';
$lang->configure->common = '配置';
-$lang->programstakeholder->common = '干系人';
-$lang->featureswitch->common = '功能开关';
-$lang->importdata->common = '数据导入';
-$lang->systemsetting->common = '系统设置';
-$lang->staffmanage->common = '人员管理';
-$lang->modelconfig->common = '模型配置';
-$lang->featureconfig->common = '功能配置';
-$lang->doctemplate->common = '文档模板';
-$lang->notifysetting->common = '通知设置';
-$lang->bidesign->common = 'BI设计';
-$lang->personalsettings->common = '个人设置';
-$lang->projectsettings->common = '设置';
-$lang->dataaccess->common = '数据权限';
-$lang->executiongantt->common = '甘特图';
-$lang->executionkanban->common = '看板';
-$lang->executionburn->common = '燃尽图';
-$lang->executioncfd->common = '累积流图';
-$lang->executionstory->common = '研发需求';
-$lang->executionqa->common = '测试';
-$lang->executionsettings->common = '设置';
-$lang->generalcomment->common = '备注';
-$lang->generalping->common = '防超时';
-$lang->generaltemplate->common = '模板';
-$lang->generaleffort->common = '通用日志';
-$lang->productsettings->common = '产品设置';
-$lang->projectreview->common = '评审';
-$lang->projecttrack->common = '矩阵';
-$lang->projectqa->common = '测试';
-$lang->holidayseason->common = '节假日';
-$lang->codereview->common = '问题';
-$lang->repocode->common = '代码';
+$lang->programstakeholder->common = '干系人';
+$lang->featureswitch->common = '功能开关';
+$lang->importdata->common = '数据导入';
+$lang->systemsetting->common = '系统设置';
+$lang->staffmanage->common = '人员管理';
+$lang->modelconfig->common = '项目模型配置';
+$lang->featureconfig->common = '功能配置';
+$lang->doctemplate->common = '文档模板';
+$lang->notifysetting->common = '通知设置';
+$lang->bidesign->common = 'BI设计';
+$lang->personalsettings->common = '个人设置';
+$lang->projectsettings->common = '设置';
+$lang->dataaccess->common = '数据权限';
+$lang->executiongantt->common = '甘特图';
+$lang->executionkanban->common = '看板';
+$lang->executionburn->common = '燃尽图';
+$lang->executioncfd->common = '累积流图';
+$lang->executionstory->common = '研发需求';
+$lang->executionqa->common = '测试';
+$lang->executionsettings->common = '设置';
+$lang->generalcomment->common = '备注';
+$lang->generalping->common = '防超时';
+$lang->generaltemplate->common = '模板';
+$lang->generaleffort->common = '通用日志';
+$lang->productsettings->common = '产品设置';
+$lang->projectreview->common = '评审';
+$lang->projecttrack->common = '矩阵';
+$lang->projectqa->common = '测试';
+$lang->holidayseason->common = '节假日';
+$lang->codereview->common = '问题';
+$lang->repocode->common = '代码';
+$lang->deliverable->common = '交付物';
+$lang->projectDeliverable->common = '项目交付物';
+$lang->executionDeliverable->common = '执行交付物';
$lang->personnel->common = '人员';
$lang->personnel->invest = '投入人员';
diff --git a/module/common/model.php b/module/common/model.php
index 34f83cf79f..a4faa6f1eb 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -516,7 +516,7 @@ class commonModel extends model
{
$info['timeUsed'] = round(getTime() - $startTime, 4) * 1000;
$info['memory'] = round(memory_get_peak_usage() / 1024, 1);
- $info['querys'] = count(dao::$querys);
+ $info['querys'] = count(dbh::$queries);
vprintf($this->lang->runInfo, $info);
return $info;
}
diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php
index d1dadede7f..46c53b7416 100755
--- a/module/common/view/action.html.php
+++ b/module/common/view/action.html.php
@@ -61,7 +61,7 @@
history)):?>
- action->printChanges($action->objectType, $action->history);?>
+ action->printChanges($action->objectType, $action->objectID, $action->history);?>
comment))) != 0):?>
diff --git a/module/common/view/mail.footer.html.php b/module/common/view/mail.footer.html.php
index 3d8d365619..3f632ce7b5 100644
--- a/module/common/view/mail.footer.html.php
+++ b/module/common/view/mail.footer.html.php
@@ -28,7 +28,7 @@ if(file_exists($extViewFile))
history)):?>
|
- action->printChanges($action->objectType, $action->history, false);?>
+ action->printChanges($action->objectType, $action->objectID, $action->history, false);?>
|
diff --git a/module/custom/control.php b/module/custom/control.php
index 1d4cc17991..b9ee63b120 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -595,7 +595,7 @@ class custom extends control
$menus = json_decode($items);
$menuNames = array();
- foreach($menus as $key => $item) $menuNames[] = $item->name;
+ foreach($menus as $item) $menuNames[] = $item->name;
foreach($oldMenus as $key => $item)
{
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index fceb862f67..25d5846cf8 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -55,6 +55,7 @@ $lang->custom->role = 'Role';
$lang->custom->dept = 'Dept';
$lang->custom->code = $lang->code;
$lang->custom->setCode = 'Enable or Disable Code';
+$lang->custom->projectCommon = $lang->projectCommon . ' Setting';
$lang->custom->executionCommon = 'Execution';
$lang->custom->selectDefaultProgram = 'Please select default program';
$lang->custom->defaultProgram = 'Default program';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 04a80eb86a..abaaaf6ed1 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -55,6 +55,7 @@ $lang->custom->role = 'Role';
$lang->custom->dept = 'Dept';
$lang->custom->code = $lang->code;
$lang->custom->setCode = 'Enable or Disable Code';
+$lang->custom->projectCommon = $lang->projectCommon . ' Setting';
$lang->custom->executionCommon = 'Execution';
$lang->custom->selectDefaultProgram = 'Please select default program';
$lang->custom->defaultProgram = 'Default program';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 537d988bb6..76b2ad005b 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -55,6 +55,7 @@ $lang->custom->role = 'Role';
$lang->custom->dept = 'Dept';
$lang->custom->code = $lang->code;
$lang->custom->setCode = 'Activer ou Désactiver le Code';
+$lang->custom->projectCommon = $lang->projectCommon . ' Setting';
$lang->custom->executionCommon = 'Execution';
$lang->custom->selectDefaultProgram = 'Please select default program';
$lang->custom->defaultProgram = 'Default program';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 23d4a0e6cf..51c63b7a3d 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -55,6 +55,7 @@ $lang->custom->role = '职位';
$lang->custom->dept = '部门';
$lang->custom->code = $lang->code;
$lang->custom->setCode = '是否启用代号';
+$lang->custom->projectCommon = $lang->projectCommon . '设置';
$lang->custom->executionCommon = '执行';
$lang->custom->selectDefaultProgram = '请选择一个默认项目集';
$lang->custom->defaultProgram = '默认项目集';
diff --git a/module/datatable/model.php b/module/datatable/model.php
index 47aad7a5e9..5d0632f9cb 100644
--- a/module/datatable/model.php
+++ b/module/datatable/model.php
@@ -446,25 +446,23 @@ class datatableModel extends model
*/
public function appendWorkflowFields(string $module, string $method): array
{
- if(in_array($module, array('epic', 'story', 'requirement')))
+ if($module == 'build' && $method == 'build')
{
- $method = $module == 'story' ? 'browse' : $module; // 需求加载product-browse的layout配置。
- $module = 'product';
+ $module = 'build';
+ $method = 'browse'; // 版本加载build-browse的layout配置。
}
- elseif($module == 'build')
+ elseif($module == 'task' && $method == 'task')
{
- $module = 'execution';
- $method = 'build'; // 版本加载execution-build的layout配置。
- }
- elseif($module == 'task')
- {
- $module = 'execution';
- $method = 'task'; // 任务加载execution-task的layout配置。
+ $method = 'browse'; // 任务加载task-browse的layout配置。
}
elseif($module == 'bug' && $method == 'bug')
{
$method = 'browse'; // 执行bug列表加载bug-browse的layout配置。
}
+ elseif($module == 'story' && $method == 'story')
+ {
+ $method = 'browse'; // 执行需求列表加载story-browse的layout配置。
+ }
elseif($module == 'testcase' && $method == 'testcase')
{
$method = 'browse'; // 执行用例列表加载testcase-browse的layout配置。
@@ -520,4 +518,4 @@ class datatableModel extends model
return $this->loadModel('flow')->buildDtableCols($fields, [], [], isset($flow->buildin) && !$flow->buildin);
}
-}
+}
\ No newline at end of file
diff --git a/module/doc/control.php b/module/doc/control.php
index c11e94f027..90fd2fec3a 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -164,6 +164,8 @@ class doc extends control
return $this->sendError($this->lang->notFound);
}
+ $this->app->loadClass('pager', true);
+
$this->view->title = sprintf($this->lang->doc->insertTitle, $this->lang->doc->zentaoList[$type]);
$this->view->type = $type;
$this->view->settings = $blockData->settings;
@@ -172,6 +174,7 @@ class doc extends control
$this->view->data = $blockData->content->data;
$this->view->users = $this->loadModel('user')->getPairs('noletter|pofirst|nodeleted');
$this->view->blockID = $blockID;
+ $this->view->pager = new pager(count($this->view->data), 10);
if(strpos(',productStory,ER,UR,planStory,projectStory', $type) !== false) $this->docZen->assignStoryGradeData($type);
diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index efa160a474..e8b1f5eed7 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -253,6 +253,8 @@ $lang->doc->uploadFormat = 'Upload Format';
$lang->doc->editedList = 'File editor';
$lang->doc->moveTo = 'Move to';
$lang->doc->notSupportExport = 'This document does not support export';
+$lang->doc->downloadTemplate = 'Download Template';
+$lang->doc->addFile = 'Add File';
$lang->doc->preview = 'Preview';
$lang->doc->insertTitle = 'Insert %s list';
@@ -439,6 +441,7 @@ $lang->doc->noCollectedDoc = 'Sie haben kein Dokument gesammelt.';
$lang->doc->errorEmptyLib = 'No data in document library.';
$lang->doc->confirmUpdateContent = 'You have a document that is not saved from last time. Do you want to continue editing it?';
$lang->doc->selectLibType = 'Please select a type of doc library.';
+$lang->doc->selectDoc = 'Please select a doc';
$lang->doc->noLibreOffice = 'You does not have access to office conversion settings!';
$lang->doc->errorParentChapter = 'The parent chapter cannot be its own chapter or sub chapter!';
$lang->doc->errorOthersCreated = 'There are documents created by others in this library. You cannot move it.';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index d8ee47e89f..a51c5e3105 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -253,6 +253,8 @@ $lang->doc->uploadFormat = 'Upload Format';
$lang->doc->editedList = 'File editor';
$lang->doc->moveTo = 'Move to';
$lang->doc->notSupportExport = 'This document does not support export';
+$lang->doc->downloadTemplate = 'Download Template';
+$lang->doc->addFile = 'Add File';
$lang->doc->preview = 'Preview';
$lang->doc->insertTitle = 'Insert %s list';
@@ -439,6 +441,7 @@ $lang->doc->noCollectedDoc = 'You have not favorited any documents.
$lang->doc->errorEmptyLib = 'No data in document library.';
$lang->doc->confirmUpdateContent = 'You have a document that is not saved from last time. Do you want to continue editing it?';
$lang->doc->selectLibType = 'Please select a type of doc library.';
+$lang->doc->selectDoc = 'Please select a doc';
$lang->doc->noLibreOffice = 'You does not have access to office conversion settings!';
$lang->doc->errorParentChapter = 'The parent chapter cannot be its own chapter or sub chapter!';
$lang->doc->errorOthersCreated = 'There are documents created by others in this library. You cannot move it.';
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index dd6f2b11ff..9668928712 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -253,6 +253,8 @@ $lang->doc->uploadFormat = 'Upload Format';
$lang->doc->editedList = 'File editor';
$lang->doc->moveTo = 'Move to';
$lang->doc->notSupportExport = 'This document does not support export';
+$lang->doc->downloadTemplate = 'Download Template';
+$lang->doc->addFile = 'Add File';
$lang->doc->preview = 'Preview';
$lang->doc->insertTitle = 'Insert %s list';
@@ -439,6 +441,7 @@ $lang->doc->noCollectedDoc = "Vous avez aucun document dans vos fav
$lang->doc->errorEmptyLib = 'No data in document library.';
$lang->doc->confirmUpdateContent = 'You have a document that is not saved from last time. Do you want to continue editing it?';
$lang->doc->selectLibType = 'Please select a type of doc library.';
+$lang->doc->selectDoc = 'Please select a doc';
$lang->doc->noLibreOffice = 'You does not have access to office conversion settings!';
$lang->doc->errorParentChapter = 'The parent chapter cannot be its own chapter or sub chapter!';
$lang->doc->errorOthersCreated = 'There are documents created by others in this library. You cannot move it.';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 1adcfed06d..99ab4dbb73 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -253,6 +253,8 @@ $lang->doc->uploadFormat = '上传格式';
$lang->doc->editedList = '文档编辑者';
$lang->doc->moveTo = '移动至';
$lang->doc->notSupportExport = '（此文档暂不支持导出）';
+$lang->doc->downloadTemplate = '下载模板';
+$lang->doc->addFile = '提交文件';
$lang->doc->preview = '预览';
$lang->doc->insertTitle = '插入%s列表';
@@ -439,6 +441,7 @@ $lang->doc->noCollectedDoc = '您还没有收藏任何文档。';
$lang->doc->errorEmptyLib = '文档库暂无数据。';
$lang->doc->confirmUpdateContent = '检查到您有未保存的文档内容，是否继续编辑？';
$lang->doc->selectLibType = '请选择文档库类型';
+$lang->doc->selectDoc = '请选择文档';
$lang->doc->noLibreOffice = '您还没有office转换设置访问权限!';
$lang->doc->errorParentChapter = '父章节不能是自身章节及子章节！';
$lang->doc->errorOthersCreated = '该库下其他人创建的文档暂不支持移动，是否确认移动？';
diff --git a/module/doc/model.php b/module/doc/model.php
index 37f0671d0a..28f7146cf2 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -1571,12 +1571,12 @@ class docModel extends model
}
$files = $this->loadModel('file')->getUpload();
- if($doc->type == 'attachment' && (empty($files) || isset($files['name']))) return dao::$errors['files'] = sprintf($this->lang->error->notempty, $this->lang->doc->uploadFile);
+ if($doc->type == 'attachment' && empty($doc->copy) && (empty($files) || isset($files['name']))) return dao::$errors['files'] = sprintf($this->lang->error->notempty, $this->lang->doc->uploadFile);
$doc->draft = $isDraft ? $docContent->content : '';
$doc->vision = $this->config->vision;
$doc->version = $isDraft ? 0 : 1;
- $this->dao->insert(TABLE_DOC)->data($doc, 'content')->autoCheck()->batchCheck($requiredFields, 'notempty')->exec();
+ $this->dao->insert(TABLE_DOC)->data($doc, 'content,copy')->autoCheck()->batchCheck($requiredFields, 'notempty')->exec();
if(dao::isError()) return false;
$docID = $this->dao->lastInsertID();
diff --git a/module/doc/ui/zentaolist.html.php b/module/doc/ui/zentaolist.html.php
index c05545a5f1..61507468d5 100644
--- a/module/doc/ui/zentaolist.html.php
+++ b/module/doc/ui/zentaolist.html.php
@@ -21,6 +21,9 @@ $actions = array();
$actions[] = array('icon' => 'menu-backend', 'text' => $lang->doc->zentaoAction['set'], 'data-toggle' => 'modal', 'url' => str_replace('{blockID}', "$blockID", $settings), 'data-size' => 'lg');
$actions[] = array('icon' => 'trash', 'text' => $lang->doc->zentaoAction['delete'], 'zui-on-click' => "deleteZentaoList($blockID)");
+$pagerSetting = usePager();
+unset($pagerSetting['linkCreator']);
+
div
(
set('data-id', $blockID),
@@ -58,6 +61,9 @@ div
set::colResize(true),
set::customCols(false),
set::onRenderCell(jsRaw('window.renderCell')),
+ set::localPager(),
+ set::footPager($pagerSetting),
+ set::footer(array('flex', 'pager')),
$type == 'productRelease' ? set::plugins(array('cellspan')) : null,
$type == 'productRelease' ? set::getCellSpan(jsRaw('window.getCellSpan')) : null
)
diff --git a/module/doc/zen.php b/module/doc/zen.php
index 116e33def3..6e272308fb 100644
--- a/module/doc/zen.php
+++ b/module/doc/zen.php
@@ -614,7 +614,16 @@ class docZen extends doc
{
$execution = $this->loadModel('execution')->getByID($objectID);
$objects = $this->execution->getPairs($execution->project, 'all', "multiple,leaf,noprefix");
- $objects = $this->execution->resetExecutionSorts($objects, array(), $execution->project);
+
+ $parentExecutions = $childExecutions = array();
+ $executions = $this->execution->fetchExecutionList($execution->project, 'all', 0, 0, 'order_asc');
+ foreach($executions as $execution)
+ {
+ if($execution->grade == 1) $parentExecutions[$execution->id] = $execution;
+ if($execution->grade > 1 && $execution->parent) $childExecutions[$execution->parent][$execution->id] = $execution;
+ }
+
+ $objects = $this->execution->resetExecutionSorts($objects, $parentExecutions, $childExecutions);
}
elseif($objectType == 'product')
{
diff --git a/module/execution/config/dtable.php b/module/execution/config/dtable.php
index 0fe823bf71..790d50be86 100644
--- a/module/execution/config/dtable.php
+++ b/module/execution/config/dtable.php
@@ -49,6 +49,17 @@ $config->execution->dtable->fieldList['status']['width'] = '80';
$config->execution->dtable->fieldList['status']['group'] = '1';
$config->execution->dtable->fieldList['status']['show'] = true;
+if(in_array($config->edition, array('max', 'ipd')) && helper::hasFeature('deliverable'))
+{
+ $config->execution->dtable->fieldList['deliverable']['title'] = $lang->execution->deliverableAbbr;
+ $config->execution->dtable->fieldList['deliverable']['name'] = 'deliverable';
+ $config->execution->dtable->fieldList['deliverable']['type'] = 'html';
+ $config->execution->dtable->fieldList['deliverable']['width'] = '100px';
+ $config->execution->dtable->fieldList['deliverable']['group'] = '1';
+ $config->execution->dtable->fieldList['deliverable']['show'] = true;
+ $config->execution->dtable->fieldList['deliverable']['sortType'] = false;
+}
+
$config->execution->dtable->fieldList['PM']['title'] = $lang->execution->execPM;
$config->execution->dtable->fieldList['PM']['name'] = 'PM';
$config->execution->dtable->fieldList['PM']['type'] = 'avatarBtn';
diff --git a/module/execution/control.php b/module/execution/control.php
index 2f13d2ae81..566acc0a44 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1362,7 +1362,7 @@ class execution extends control
}
$executionIDList = $this->post->executionIDList;
- $executions = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIDList)->fetchAll('id');
+ $executions = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIDList)->fetchAll('id', false);
$relatedProjects = $this->dao->select('id,project')->from(TABLE_PROJECT)->where('id')->in($executionIDList)->fetchPairs(); /* 获取执行所属的项目列表。*/
$projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->in($relatedProjects)->fetchAll('id'); /* 获取执行所属的项目列表中每个项目的项目信息。*/
@@ -1415,8 +1415,8 @@ class execution extends control
$executionIdList = $this->post->executionIDList;
if(is_string($executionIdList)) $executionIdList = explode(',', $executionIdList);
- $filteredStages = $this->execution->batchChangeStatus($executionIdList, $status);
- if(!$filteredStages) return $this->sendSuccess(array('load' => true));
+ $message = $this->execution->batchChangeStatus($executionIdList, $status);
+ if(empty($message['byChild']) && empty($message['byDeliverable'])) return $this->sendSuccess(array('load' => true));
$alertMsg = '';
if($status == 'wait')
@@ -1426,18 +1426,28 @@ class execution extends control
if(empty($project) or (!empty($project) and strpos($project->model, 'waterfall') !== false))
{
$executionLang = (empty($project) or (!empty($project) and $project->model == 'waterfallplus')) ? $this->lang->execution->common : $this->lang->stage->common;
- $alertMsg = sprintf($this->lang->execution->hasStartedTaskOrSubStage, $executionLang, $filteredStages);
+ $alertMsg = sprintf($this->lang->execution->hasStartedTaskOrSubStage, $executionLang, $message['byChild']);
}
if(!empty($project) and strpos('agileplus,scrum', $project->model) !== false)
{
$executionLang = $project->model == 'scrum' ? $this->lang->executionCommon : $this->lang->execution->common;
- $alertMsg = sprintf($this->lang->execution->hasStartedTask, $executionLang, $filteredStages);
+ $alertMsg = sprintf($this->lang->execution->hasStartedTask, $executionLang, $message['byChild']);
+ }
+ }
+ if($status == 'suspended') $alertMsg = sprintf($this->lang->execution->hasSuspendedOrClosedChildren, $message['byChild']);
+ if($status == 'closed')
+ {
+ if(!empty($message['byChild']))
+ {
+ $alertMsg .= sprintf($this->lang->execution->hasNotClosedChildren, $message['byChild']);
+ }
+ elseif(!empty($message['byDeliverable']))
+ {
+ $alertMsg .= sprintf($this->lang->execution->cannotCloseByDeliverable, $message['byDeliverable']);
}
}
- if($status == 'suspended') $alertMsg = sprintf($this->lang->execution->hasSuspendedOrClosedChildren, $filteredStages);
- if($status == 'closed') $alertMsg = sprintf($this->lang->execution->hasNotClosedChildren, $filteredStages);
- return $this->sendSuccess(array('message' => $alertMsg, 'load' => true));
+ return $this->send(array('load' => array('alert' => $alertMsg), 'result' => 'success'));
}
/**
@@ -1666,7 +1676,11 @@ class execution extends control
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$project = $this->loadModel('project')->getById($execution->project);
- if(in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))) $this->loadModel('programplan')->computeProgress($executionID, 'close');
+ if(in_array($project->model, array('waterfall', 'waterfallplus', 'ipd')))
+ {
+ $result = $this->loadModel('programplan')->computeProgress($executionID, 'close');
+ if(is_array($result)) return $this->send($result);
+ }
$this->executeHooks($executionID);
@@ -2739,11 +2753,11 @@ class execution extends control
foreach($executions as $execution)
{
if($execution->grade == 1) $topExecutions[$execution->id] = $execution->id;
- if($execution->grade > 1 && $execution->parent) $parentExecutions[$execution->parent] = $execution->parent;
+ if($execution->grade > 1 && $execution->parent) $parentExecutions[$execution->parent][$execution->id] = $execution;
}
/* 获取排序后的执行列表，并给每个执行设置团队信息。*/
- $executions = $this->execution->resetExecutionSorts($executions, $topExecutions);
+ $executions = $this->execution->resetExecutionSorts($executions, $topExecutions, $parentExecutions);
foreach($executions as $execution)
{
$execution->teams = zget($teams, $execution->id, array());
@@ -2893,6 +2907,7 @@ class execution extends control
$this->app->loadLang('stage');
$this->app->loadLang('programplan');
$this->loadModel('product');
+ $this->loadModel('project');
$this->loadModel('datatable');
$from = $this->app->tab;
@@ -3480,7 +3495,7 @@ class execution extends control
$this->loadModel('task');
$result = array();
- foreach($array as $key => $object)
+ foreach($array as $object)
{
$result[$object->id] = $object;
$tasks = zget($object, 'tasks', array());
diff --git a/module/execution/js/batchedit.ui.js b/module/execution/js/batchedit.ui.js
index 9360903740..18c91de382 100644
--- a/module/execution/js/batchedit.ui.js
+++ b/module/execution/js/batchedit.ui.js
@@ -25,7 +25,16 @@ window.renderRowData = function($row, index, row)
options.disabled = row.grade > 1 && parentType != 'mix';
if(projectModel == 'ipd') options.disabled = true;
}
+
$row.attr('data-parent', row.parent);
+
+ $row.find('[data-name="lifetime"]').find('.picker-box').on('inited', function(e, info)
+ {
+ let $attribute = info[0];
+ $attribute.render({items: stageItems, required: true, name: 'attribute[' + row.id + ']', disabled: row.grade > 1 && parentType != 'mix'});
+ if(typeof row != 'undefined' && typeof row.hasDeliverable != 'undefined') $attribute.render({disabled: true});
+ $(e.target).attr('data-parent', row.parent);
+ });
}
$row.find('[data-name="lifetime"]').find('.picker-box').on('inited', function(e, info) { info[0].render(options); });
diff --git a/module/execution/js/taskkanban.ui.js b/module/execution/js/taskkanban.ui.js
index 8a61d83b6c..15bd92bf57 100644
--- a/module/execution/js/taskkanban.ui.js
+++ b/module/execution/js/taskkanban.ui.js
@@ -222,6 +222,8 @@ window.getItem = function(info)
let assignedTo = '';
let avatar = "";
+ info.item.originalTitle = info.item.title;
+
if(begin < '1970-01-01' && end > '1970-01-01')
{
beginAndEnd = end + ' ' + cardLang.deadlineAB;
@@ -315,7 +317,7 @@ window.getItem = function(info)
info.item.titleUrl = $.createLink(info.laneInfo.type, 'view', `id=${info.item.id}&from=execution`);
}
- info.item.titleAttrs = {'data-toggle': 'modal', 'data-size': 'lg', 'title': info.item.title, 'class': 'card-title clip'};
+ info.item.titleAttrs = {'data-toggle': 'modal', 'data-size': 'lg', 'title': info.item.originalTitle, 'class': 'card-title clip'};
info.item.content = {html: content};
if(info.item.color && info.item.color != '#fff') info.item.className = 'color-' + info.item.color.replace('#', '');
diff --git a/module/execution/model.php b/module/execution/model.php
index b4c383f131..cb7270bf5c 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -539,17 +539,24 @@ class executionModel extends model
* @param array $executionIdList
* @param string $status
* @access public
- * @return string 返回不符合条件被过滤了的执行，来提示执行下任务或子阶段已经开始，无法修改，已过滤。参见 story#41875。
+ * @return array 返回不符合条件被过滤了的执行，来提示执行下任务或子阶段已经开始，无法修改，已过滤。参见 story#41875。
*/
- public function batchChangeStatus(array $executionIdList, string $status): string
+ public function batchChangeStatus(array $executionIdList, string $status): array
{
/* Sort the IDs, the child stage comes first, and the parent stage follows. */
- $executionIdList = $this->dao->select('id')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->orderBy('grade_desc')->fetchPairs();
+ $executionList = $this->dao->select('id,name,status,grade,deliverable')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->orderBy('grade_desc')->fetchAll('id');
$this->loadModel('programplan');
- $filteredStages = '';
- foreach($executionIdList as $executionID)
+ $message = array('byChild' => '', 'byDeliverable' => '');
+ foreach($executionList as $executionID => $execution)
{
+ $needCheckDeliverable = $status == 'closed' && $execution->status == 'doing' && $execution->grade == 1;
+ if(in_array($this->config->edition, array('max', 'ipd')) && $needCheckDeliverable && !$this->canCloseByDeliverable($execution))
+ {
+ $message['byDeliverable'] .= '#' . $execution->id . ' ' . $execution->name . "\n";
+ continue;
+ }
+
/* The state of the parent stage or the sibling stage may be affected by the child stage before the change, so it cannot be checked in advance. */
$selfAndChildrenList = $this->programplan->getSelfAndChildrenList($executionID);
$selfAndChildren = $selfAndChildrenList[$executionID];
@@ -557,7 +564,7 @@ class executionModel extends model
if($status == 'wait' and $execution->status != 'wait')
{
- $filteredStages .= $this->changeStatus2Wait($executionID, $selfAndChildren);
+ $message['byChild'] .= $this->changeStatus2Wait($executionID, $selfAndChildren);
}
if($status == 'doing' and $execution->status != 'doing')
@@ -567,11 +574,12 @@ class executionModel extends model
if(($status == 'suspended' and $execution->status != 'suspended') or ($status == 'closed' and $execution->status != 'closed'))
{
- $filteredStages .= $this->changeStatus2Inactive($executionID, $status, $selfAndChildren);
+ $message['byChild'] .= $this->changeStatus2Inactive($executionID, $status, $selfAndChildren);
}
}
- return trim($filteredStages, ',');
+ $message['byChild'] = trim($message['byChild'], ',');
+ return $message;
}
/**
@@ -906,9 +914,9 @@ class executionModel extends model
* @param int $executionID
* @param object $postData
* @access public
- * @return array|false
+ * @return int|false
*/
- public function close(int $executionID, object $postData): array|false
+ public function close(int $executionID, object $postData): int|false
{
$oldExecution = $this->fetchById($executionID); /* Save previous execution to variable for later compare. */
@@ -937,7 +945,7 @@ class executionModel extends model
}
$this->loadModel('score')->create('execution', 'close', $oldExecution);
- return $changes;
+ return $actionID;
}
/**
@@ -1452,7 +1460,7 @@ class executionModel extends model
->fi()
->orderBy($orderBy)
->page($pager, 't1.id')
- ->fetchAll('id');
+ ->fetchAll('id', false);
}
/**
@@ -1481,6 +1489,7 @@ class executionModel extends model
$today = helper::today();
$burns = $this->getBurnData($executions);
$parentExecutions = $this->dao->select('parent,parent')->from(TABLE_EXECUTION)->where('parent')->ne(0)->andWhere('deleted')->eq(0)->fetchPairs();
+ $statusGroup = $this->dao->select('parent,status')->from(TABLE_EXECUTION)->where('parent')->in(array_keys($executions))->andWhere('deleted')->eq(0)->fetchGroup('parent', 'status');
/* Get workingDays. */
$earliestEnd = $today;
@@ -1492,10 +1501,13 @@ class executionModel extends model
foreach($executions as $execution)
{
- $execution->productName = isset($productList[$execution->id]) ? trim($productList[$execution->id]->productName, ',') : '';
- $execution->product = $productID;
- $execution->productID = $productID;
- $execution->delay = 0;
+ $execution->productName = isset($productList[$execution->id]) ? trim($productList[$execution->id]->productName, ',') : '';
+ $execution->product = $productID;
+ $execution->productID = $productID;
+ $execution->delay = 0;
+ $execution->totalEstimate = $execution->estimate;
+ $execution->totalConsumed = $execution->consumed;
+ $execution->totalLeft = $execution->left;
if($execution->end) $execution->end = date(DT_DATE1, strtotime($execution->end));
if(!isset($execution->projectName)) $execution->projectName = $project->name;
if(!isset($execution->projectModel)) $execution->projectModel = $project->model;
@@ -1503,6 +1515,13 @@ class executionModel extends model
if(isset($parentExecutions[$execution->id])) $executions[$execution->id]->isParent = 1;
if(empty($productID) && !empty($productList[$execution->id])) $execution->product = trim($productList[$execution->id]->product, ',');
+ /** 如果子执行都关闭了，则父执行可以手动关闭。 */
+ if(isset($statusGroup[$execution->id]))
+ {
+ $childStatus = array_keys($statusGroup[$execution->id]);
+ if(count($childStatus) == 1 && $childStatus[0] == 'closed') $execution->parentCanClose = true;
+ }
+
/* Judge whether the execution is delayed. */
if($execution->status != 'done' && $execution->status != 'closed' && $execution->status != 'suspended' && !empty($workingDays))
{
@@ -1806,11 +1825,14 @@ class executionModel extends model
public function getChildExecutions(int $executionID, string $orderBy = 'id_desc', string $type = 'child'): array
{
$executionID = (int)$executionID;
- $path = '';
- if($type != 'child') $path = $this->dao->select('path')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('path');
-
if(empty($executionID)) return array();
- if($type != 'child' && empty($path)) return array();
+
+ $path = '';
+ if($type != 'child')
+ {
+ $path = $this->dao->select('path')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('path');
+ if(empty($path)) return array();
+ }
return $this->dao->select('*')->from(TABLE_EXECUTION)
->where('deleted')->eq(0)
@@ -3827,7 +3849,7 @@ class executionModel extends model
$action = strtolower($action);
if($action == 'start') return $execution->status == 'wait';
- if($action == 'close') return $execution->status != 'closed' && (!isset($execution->isParent) || (isset($execution->isParent) && !$execution->isParent));
+ if($action == 'close') return $execution->status != 'closed' && (empty($execution->isParent) || !empty($execution->parentCanClose));
if($action == 'suspend') return $execution->status == 'wait' || $execution->status == 'doing';
if($action == 'putoff') return $execution->status == 'wait' || $execution->status == 'doing';
if($action == 'activate') return $execution->status == 'suspended' || $execution->status == 'closed';
@@ -4797,6 +4819,7 @@ class executionModel extends model
$execution->id = 'pid' . (string)$execution->id;
$execution->projectID = $execution->project;
$execution->project = $execution->projectName;
+ $execution->rawParent = $execution->parent;
$execution->parent = (isset($executionList[$execution->parent]) && $execution->parent && $execution->grade > 1) ? 'pid' . (string)$execution->parent : '';
$execution->hasChild = !empty($execution->isParent);
$execution->isParent = !empty($execution->isParent) or !empty($execution->tasks);
@@ -4841,6 +4864,8 @@ class executionModel extends model
$execution->PMAvatar = zget($avatarList, $execution->PMAccount, '');
}
+ if(in_array($this->config->edition, array('max', 'ipd'))) $execution->deliverable = $this->project->countDeliverable($execution, 'execution');
+
$rows[$execution->id] = $execution;
/* Append tasks and child stages. */
@@ -5143,33 +5168,28 @@ class executionModel extends model
*
* @param array $executions
* @param array $parentExecutions
- * @param int $projectID
+ * @param array $childExecutions
* @access public
* @return array
*/
- public function resetExecutionSorts(array $executions, array $parentExecutions = array(), int $projectID = 0): array
+ public function resetExecutionSorts(array $executions, array $parentExecutions = array(), array $childExecutions = array()): array
{
if(empty($executions)) return array();
- if(empty($parentExecutions))
+
+ if(empty($parentExecutions) && empty($childExecutions))
{
- $execution = current($executions);
- $projectID = isset($execution->project) ? $execution->project : $projectID;
- $parentExecutions = $this->dao->select('*')->from(TABLE_EXECUTION)
- ->where('deleted')->eq(0)
- ->andWhere('type')->in('kanban,sprint,stage')
- ->andWhere('grade')->eq(1)
- ->andWhere('project')->eq($projectID)
- ->orderBy('order_asc')
- ->fetchAll('id');
+ foreach($executions as $execution)
+ {
+ if($execution->grade == 1) $parentExecutions[$execution->id] = $execution;
+ if($execution->grade > 1 && $execution->parent) $childExecutions[$execution->parent][$execution->id] = $execution;
+ }
}
$sortedExecutions = array();
foreach($parentExecutions as $executionID => $execution)
{
if(!isset($sortedExecutions[$executionID]) and isset($executions[$executionID])) $sortedExecutions[$executionID] = $executions[$executionID];
-
- $children = $this->getChildExecutions($executionID, 'order_asc');
- if(!empty($children)) $sortedExecutions += $this->resetExecutionSorts($executions, $children);
+ if(!empty($childExecutions[$executionID])) $sortedExecutions += $this->resetExecutionSorts($executions, $childExecutions[$executionID], $childExecutions);
}
return $sortedExecutions;
}
@@ -5292,4 +5312,33 @@ class executionModel extends model
return array($toList, $ccList);
}
+
+ /**
+ * 检查迭代是否可以关闭。
+ * Check if the execution can be closed.
+ *
+ * @param object $execution
+ * @access public
+ * @return bool
+ */
+ public function canCloseByDeliverable(object $execution): bool
+ {
+ if(empty($execution->deliverable)) return true;
+
+ $deliverables = json_decode($execution->deliverable, true);
+
+ foreach($deliverables as $methods)
+ {
+ foreach($methods as $itemList)
+ {
+ foreach($itemList as $item)
+ {
+ if(!empty($item['required']) && empty($item['file']) && empty($item['doc'])) return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
}
diff --git a/module/execution/tao.php b/module/execution/tao.php
index 984290a0fd..071f91c29d 100644
--- a/module/execution/tao.php
+++ b/module/execution/tao.php
@@ -142,8 +142,8 @@ class executionTao extends executionModel
$executions[$executionID]->lastEditedBy = $this->app->user->account;
$executions[$executionID]->lastEditedDate = helper::now();
- if(isset($postData->code)) $executions[$executionID]->code = $executionCode;
- if(isset($postData->project)) $executions[$executionID]->project = zget($postData->project, $executionID, 0);
+ if(isset($postData->code)) $executions[$executionID]->code = $executionCode;
+ if(isset($postData->project)) $executions[$executionID]->project = zget($postData->project, $executionID, 0);
if(isset($postData->attribute[$executionID])) $executions[$executionID]->attribute = zget($postData->attribute, $executionID, '');
if(isset($postData->lifetime[$executionID])) $executions[$executionID]->lifetime = $postData->lifetime[$executionID];
diff --git a/module/execution/test/lib/execution.unittest.class.php b/module/execution/test/lib/execution.unittest.class.php
index a3d9c7dd4c..99ecd4c58f 100644
--- a/module/execution/test/lib/execution.unittest.class.php
+++ b/module/execution/test/lib/execution.unittest.class.php
@@ -2633,30 +2633,18 @@ class executionTest
* @access public
* @return string
*/
- public function resetExecutionSortsTest(int $projectID, string $type = ''): string
+ public function resetExecutionSortsTest(int $projectID): string
{
$executions = array();
$executionIDList = '';
- $firstGradeExecutions = array();
- if($projectID)
- {
- $executions = $this->executionModel->dao->select('*')->from(TABLE_EXECUTION)
- ->where('deleted')->eq(0)
- ->andWhere('project')->eq($projectID)
- ->andWhere('type')->in('sprint,stage,kanban')
- ->orderBy('order_asc')
- ->fetchAll('id');
+ $executions = $this->executionModel->dao->select('*')->from(TABLE_EXECUTION)
+ ->where('deleted')->eq(0)
+ ->andWhere('project')->eq($projectID)
+ ->andWhere('type')->in('sprint,stage,kanban')
+ ->orderBy('order_asc')
+ ->fetchAll('id');
- if($type == 'hasParent')
- {
- foreach($executions as $execution)
- {
- if($execution->grade == 1) $firstGradeExecutions[$execution->id] = $execution->id;
- }
- }
- }
-
- $executions = $this->executionModel->resetExecutionSorts($executions, $firstGradeExecutions);
+ $executions = $this->executionModel->resetExecutionSorts($executions);
if(!empty($executions))
{
$executionIDList = array_keys($executions);
diff --git a/module/execution/test/model/canclosebydeliverable.php b/module/execution/test/model/canclosebydeliverable.php
new file mode 100755
index 0000000000..3ceb37e3e8
--- /dev/null
+++ b/module/execution/test/model/canclosebydeliverable.php
@@ -0,0 +1,46 @@
+#!/usr/bin/env php
+gen(5);
+$execution->id->range('1-5');
+$execution->name->range('迭代1,迭代2,迭代3,迭代4,迭代5');
+$execution->type->range('stage');
+$execution->status->range('doing');
+$execution->parent->range('0,0,1,1,1');
+$execution->grade->range('1{2},2{3}');
+$execution->path->range('1,2,`1,3`,`1,4`,`1,5`')->prefix(',')->postfix(',');
+$execution->begin->range('20230102 000000:0')->type('timestamp')->format('YY/MM/DD');
+$execution->end->range('20230212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$execution->deliverable->range('`{"product_waterfall_request":{"whenClosed":[{"deliverable":"1","required":true,"category":"test","template":""}]}}`');
+$execution->gen(5);
+su('admin');
+
+/**
+
+title=executionModel->getByID();
+timeout=0
+cid=1
+
+- 查看执行1是否可关闭 @1
+- 查看执行2是否可关闭 @1
+- 查看执行3是否可关闭 @1
+- 查看执行4是否可关闭 @1
+- 查看执行5是否可关闭 @1
+
+*/
+
+global $tester;
+$tester->loadModel('execution');
+$execution1 = $tester->execution->getByID(1);
+$execution2 = $tester->execution->getByID(2);
+$execution3 = $tester->execution->getByID(3);
+$execution4 = $tester->execution->getByID(4);
+$execution5 = $tester->execution->getByID(5);
+
+r($tester->execution->canCloseByDeliverable($execution1)) && p('') && e('1'); // 查看执行1是否可关闭
+r($tester->execution->canCloseByDeliverable($execution2)) && p('') && e('1'); // 查看执行2是否可关闭
+r($tester->execution->canCloseByDeliverable($execution3)) && p('') && e('1'); // 查看执行3是否可关闭
+r($tester->execution->canCloseByDeliverable($execution4)) && p('') && e('1'); // 查看执行4是否可关闭
+r($tester->execution->canCloseByDeliverable($execution5)) && p('') && e('1'); // 查看执行5是否可关闭
\ No newline at end of file
diff --git a/module/execution/test/model/resetexecutionsorts.php b/module/execution/test/model/resetexecutionsorts.php
index 5620e18ee0..2a4c51a249 100755
--- a/module/execution/test/model/resetexecutionsorts.php
+++ b/module/execution/test/model/resetexecutionsorts.php
@@ -27,11 +27,25 @@ title=测试executionModel->resetExecutionSorts();
timeout=0
cid=1
+- 检查没有执行时的排序 @0
+- 检查项目 2 的执行排序 @3,5,7,8,6,4
+
+- 检查项目 60 的执行排序 @106,112,107,113,108,114,109,115,110,116,111,117
+
+- 检查项目 61 的执行排序 @118,119,120,121,122,123
+
+- 检查项目 100 的执行排序 @124,125,126
+
*/
-$projectList = array(0, 2);
+$projectList = array(0, 2, 60, 61, 100);
$executionTester = new executionTest();
-r($executionTester->resetExecutionSortsTest($projectList[0])) && p() && e('0'); // 检查没有执行时的排序
-r($executionTester->resetExecutionSortsTest($projectList[1])) && p() && e('3,5,7,8,6,4'); // 检查有执行时的排序
-r($executionTester->resetExecutionSortsTest($projectList[1], 'hasParent')) && p() && e('3,5,7,8,6,4'); // 检查有执行并且传parenExecutions时的排序
+r($executionTester->resetExecutionSortsTest($projectList[0])) && p() && e('0'); // 检查没有执行时的排序
+r($executionTester->resetExecutionSortsTest($projectList[1])) && p() && e('3,5,7,8,6,4'); // 检查项目 2 的执行排序
+
+zenData('project')->loadYaml('execution')->gen('30');
+
+r($executionTester->resetExecutionSortsTest($projectList[2])) && p() && e('106,112,107,113,108,114,109,115,110,116,111,117'); // 检查项目 60 的执行排序
+r($executionTester->resetExecutionSortsTest($projectList[3])) && p() && e('118,119,120,121,122,123'); // 检查项目 61 的执行排序
+r($executionTester->resetExecutionSortsTest($projectList[4])) && p() && e('124,125,126'); // 检查项目 100 的执行排序
diff --git a/module/execution/test/tao/setkanbanmenu.php b/module/execution/test/tao/setkanbanmenu.php
index 782884b17c..d5499a2938 100644
--- a/module/execution/test/tao/setkanbanmenu.php
+++ b/module/execution/test/tao/setkanbanmenu.php
@@ -11,7 +11,17 @@ title=测试executionModel->setKanbanMenu();
timeout=0
cid=1
+- 测试替换看板执行的二级菜单第kanban条的link属性 @看板|execution|kanban|executionID=%s
+- 查看交付物菜单第deliverable条的link属性 @交付物|execution|deliverable|executionID=%s
+- 查看构建菜单第build条的link属性 @构建|execution|build|executionID=%s
+- 查看累积流图菜单第CFD条的link属性 @累积流图|execution|cfd|executionID=%s
+- 查看设置菜单第settings条的link属性 @设置|execution|view|executionID=%s
+
*/
$executionTester = new executionTest();
-r($executionTester->setKanbanMenuTest()) && p('kanban:link') && e('看板|execution|kanban|executionID=%s'); // 测试替换看板执行的二级菜单
+r($executionTester->setKanbanMenuTest()) && p('kanban:link') && e('看板|execution|kanban|executionID=%s'); // 测试替换看板执行的二级菜单
+r($executionTester->setKanbanMenuTest()) && p('deliverable:link') && e('交付物|execution|deliverable|executionID=%s'); // 查看交付物菜单
+r($executionTester->setKanbanMenuTest()) && p('build:link') && e('构建|execution|build|executionID=%s'); // 查看构建菜单
+r($executionTester->setKanbanMenuTest()) && p('CFD:link') && e('累积流图|execution|cfd|executionID=%s'); // 查看累积流图菜单
+r($executionTester->setKanbanMenuTest()) && p('settings:link') && e('设置|execution|view|executionID=%s'); // 查看设置菜单
\ No newline at end of file
diff --git a/module/extension/model.php b/module/extension/model.php
index 65226c2e8f..ff59e05951 100644
--- a/module/extension/model.php
+++ b/module/extension/model.php
@@ -724,7 +724,7 @@ class extensionModel extends model
{
$commandTips[] = PHP_OS == 'Linux' ? "sudo rm -fr $appRoot$dir" : "rmdir $appRoot$dir /s /q";
}
- elseif(!@rmdir($path))
+ elseif(!$this->classFile->removeDir($path))
{
$commandTips[] = PHP_OS == 'Linux' ? "sudo rm -fr $appRoot$dir" : "rmdir $appRoot$dir /s /q";
}
diff --git a/module/file/control.php b/module/file/control.php
index db69bd4785..e3359d633d 100755
--- a/module/file/control.php
+++ b/module/file/control.php
@@ -571,6 +571,11 @@ class file extends control
}
if($file)
{
+ if($this->viewType === 'json')
+ {
+ echo json_encode(array('result' => 'success', 'data' => array('id' => $file->id, 'title' => $file->title, 'extension' => $file->extension, 'size' => $file->realPath, 'gid' => $file->gid, 'addedBy' => $file->addedBy, 'addedDate' => $file->addedDate, 'objectType' => $file->objectType, 'objectID' => $file->objectID)));
+ return;
+ }
$fileID = $file->id;
return $this->fetch('file', 'read', "fileID=$fileID&stream=$stream");
}
@@ -582,6 +587,13 @@ class file extends control
$file = $this->file->query($objectType, $objectID, $title, $extra);
if(empty($file)) return $this->send(array('result' => 'fail', 'message' => $this->lang->file->fileNotFound, 'load' => helper::createLink('my', 'index'), 'closeModal' => true));
$fileID = $file->id;
+
+ if($this->viewType === 'json')
+ {
+ echo json_encode(array('result' => 'success', 'data' => array('id' => $file->id, 'title' => $file->title, 'extension' => $file->extension, 'size' => $file->realPath, 'gid' => $file->gid, 'addedBy' => $file->addedBy, 'addedDate' => $file->addedDate, 'objectType' => $file->objectType, 'objectID' => $file->objectID)));
+ return;
+ }
+
return $this->fetch('file', 'read', "fileID=$fileID&stream=$stream");
}
diff --git a/module/file/model.php b/module/file/model.php
index 611e7bc02e..5b4732dedc 100755
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -185,7 +185,7 @@ class fileModel extends model
$file['objectID'] = $objectID;
$file['addedBy'] = $this->app->user->account;
$file['addedDate'] = $now;
- $file['extra'] = $extra;
+ if($extra) $file['extra'] = $extra;
unset($file['tmpname']);
$this->dao->insert(TABLE_FILE)->data($file)->exec();
$fileTitles[$this->dao->lastInsertId()] = $file['title'];
@@ -279,6 +279,7 @@ class fileModel extends model
$file['title'] = $purifier->purify($file['title']);
$file['size'] = $size[$id];
$file['tmpname'] = $tmp_name[$id];
+ $file['extra'] = !empty($extra[$id]) ? $extra[$id] : '';
$files[] = $file;
}
}
@@ -464,12 +465,12 @@ class fileModel extends model
/**
* Set path name of the uploaded file to be saved.
*
- * @param int $fileID
- * @param string $extension
+ * @param string|int $fileID
+ * @param string $extension
* @access public
* @return string
*/
- public function setPathName(int $fileID, string $extension): string
+ public function setPathName(string|int $fileID, string $extension): string
{
$sessionID = session_id();
$randString = substr($sessionID, mt_rand(0, strlen($sessionID) - 5), 3);
diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index 95043ed545..0e305e773b 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -690,7 +690,7 @@ class gitlab extends control
$groups = $this->gitlab->apiGetGroups($gitlabID, 'name_asc', 'maintainer');
foreach($groups as $group) $groupIDList[] = $group->id;
- foreach($result['projects'] as $key => $project)
+ foreach($result['projects'] as $project)
{
$project->adminer = (bool)$this->app->user->admin;
if(!$project->adminer and isset($project->owner) and $project->owner->id == $openID) $project->adminer = true;
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 97ab3d9934..540fcf7ef1 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -634,11 +634,12 @@ class gitlabModel extends model
if(empty($result)) return array('pager' => null, 'projects' => array());
$header = $result['header'];
- $recTotal = isset($header['X-Total']) ? $header['X-Total']: $header['x-total'];
- $recPerPage = isset($header['X-Per-Page']) ? $header['X-Per-Page'] : $header['x-per-page'];
+ $recTotal = isset($header['X-Total']) ? $header['X-Total']: zget($header, 'x-total', 0);
+ $recPerPage = isset($header['X-Per-Page']) ? $header['X-Per-Page'] : zget($header, 'x-per-page', 0);
$this->app->loadClass('pager', true);
$pager = pager::init($recTotal, $recPerPage, $pager->pageID);
+ if(empty($recTotal)) return array('pager' => $pager, 'projects' => array());
return array('pager' => $pager, 'projects' => json_decode($result['body']));
}
diff --git a/module/group/lang/de.php b/module/group/lang/de.php
index c5242f8351..8c14b1a702 100644
--- a/module/group/lang/de.php
+++ b/module/group/lang/de.php
@@ -488,6 +488,7 @@ $lang->group->package->projectBuild = 'Project Build';
$lang->group->package->importCaseLib = 'Import Case Lib';
$lang->group->package->commonSetting = 'Common Setting';
$lang->group->package->stageSetting = 'Stage Setting';
+$lang->group->package->deliverable = 'Deliverable Setting';
$lang->group->package->classify = 'Classify';
$lang->group->package->cmcl = 'Cmcl';
$lang->group->package->auditcl = 'Auditcl';
@@ -620,5 +621,7 @@ $lang->group->package->application = 'Manage Application';
$lang->group->package->component = 'Component';
$lang->group->package->browseRule = 'Browse Rule';
$lang->group->package->manageRule = 'Manage Rule';
+$lang->group->package->executionDeliverable = 'Execution Deliverable';
+$lang->group->package->projectDeliverable = 'Project Deliverable';
include (dirname(__FILE__) . '/resource.php');
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 0077e8d7b3..2d6cb05ddb 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -488,6 +488,7 @@ $lang->group->package->projectBuild = 'Project Build';
$lang->group->package->importCaseLib = 'Import Case Lib';
$lang->group->package->commonSetting = 'Common Setting';
$lang->group->package->stageSetting = 'Stage Setting';
+$lang->group->package->deliverable = 'Deliverable Setting';
$lang->group->package->classify = 'Classify';
$lang->group->package->cmcl = 'Cmcl';
$lang->group->package->auditcl = 'Auditcl';
@@ -620,5 +621,7 @@ $lang->group->package->application = 'Manage Application';
$lang->group->package->component = 'Component';
$lang->group->package->browseRule = 'Browse Rule';
$lang->group->package->manageRule = 'Manage Rule';
+$lang->group->package->executionDeliverable = 'Execution Deliverable';
+$lang->group->package->projectDeliverable = 'Project Deliverable';
include (dirname(__FILE__) . '/resource.php');
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index 8b10db5e55..035195166c 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -488,6 +488,7 @@ $lang->group->package->projectBuild = 'Project Build';
$lang->group->package->importCaseLib = 'Import Case Lib';
$lang->group->package->commonSetting = 'Common Setting';
$lang->group->package->stageSetting = 'Stage Setting';
+$lang->group->package->deliverable = 'Deliverable Setting';
$lang->group->package->classify = 'Classify';
$lang->group->package->cmcl = 'Cmcl';
$lang->group->package->auditcl = 'Auditcl';
@@ -620,5 +621,7 @@ $lang->group->package->application = 'Manage Application';
$lang->group->package->component = 'Component';
$lang->group->package->browseRule = 'Browse Rule';
$lang->group->package->manageRule = 'Manage Rule';
+$lang->group->package->executionDeliverable = 'Execution Deliverable';
+$lang->group->package->projectDeliverable = 'Project Deliverable';
include (dirname(__FILE__) . '/resource.php');
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index af21d0cf7b..9d005d006f 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1605,6 +1605,7 @@ $lang->mail->methodOrder[50] = 'resend';
$lang->resource->custom = new stdclass();
$lang->resource->custom->set = 'set';
$lang->resource->custom->product = 'productName';
+$lang->resource->custom->project = 'projectCommon';
$lang->resource->custom->execution = 'executionCommon';
$lang->resource->custom->required = 'required';
$lang->resource->custom->restore = 'restore';
@@ -1623,6 +1624,7 @@ $lang->resource->custom->limitTaskDate = 'limitTaskDateAction';
$lang->custom->methodOrder[10] = 'set';
$lang->custom->methodOrder[15] = 'product';
+$lang->custom->methodOrder[17] = 'project';
$lang->custom->methodOrder[20] = 'execution';
$lang->custom->methodOrder[25] = 'required';
$lang->custom->methodOrder[30] = 'restore';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 91b990594b..6dfa612257 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -442,7 +442,7 @@ $lang->group->package->workflowLabel = '工作流标签';
$lang->group->package->workflowReport = '工作流报表';
$lang->group->package->workflowDatasource = '工作流数据源';
$lang->group->package->workflowRule = '工作流验证规则';
-$lang->group->package->workflowGroup = '工作流流程模板';
+$lang->group->package->workflowGroup = '工作流流程管理';
$lang->group->package->workflow = '工作流';
$lang->group->package->rule = '规则引擎';
$lang->group->package->downloadCode = '下载代码';
@@ -488,6 +488,7 @@ $lang->group->package->projectBuild = '项目构建';
$lang->group->package->importCaseLib = '导入用例库';
$lang->group->package->commonSetting = '通用配置';
$lang->group->package->stageSetting = '阶段列表设置';
+$lang->group->package->deliverable = '交付物设置';
$lang->group->package->classify = '分类项设置';
$lang->group->package->cmcl = '审计设置';
$lang->group->package->auditcl = 'QA检查项设置';
@@ -620,5 +621,7 @@ $lang->group->package->application = '管理应用';
$lang->group->package->component = '组件';
$lang->group->package->browseRule = '浏览规则';
$lang->group->package->manageRule = '创建维护规则';
+$lang->group->package->executionDeliverable = '交付物';
+$lang->group->package->projectDeliverable = '交付物';
include (dirname(__FILE__) . '/resource.php');
diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php
index f8c3e7e6e5..16e5400ea1 100644
--- a/module/group/packagemanager.php
+++ b/module/group/packagemanager.php
@@ -65,90 +65,94 @@ $config->group->subset->project = new stdclass();
$config->group->subset->project->order = 170;
$config->group->subset->project->nav = 'project';
-$config->group->subset->projectplan = new stdclass();
-$config->group->subset->projectplan->order = 180;
-$config->group->subset->projectplan->nav = 'project';
+$config->group->subset->programplan = new stdclass();
+$config->group->subset->programplan->order = 180;
+$config->group->subset->programplan->nav = 'project';
$config->group->subset->projectstory = new stdclass();
$config->group->subset->projectstory->order = 190;
$config->group->subset->projectstory->nav = 'project';
-$config->group->subset->programplan = new stdclass();
-$config->group->subset->programplan->order = 200;
-$config->group->subset->programplan->nav = 'project';
+$config->group->subset->projectplan = new stdclass();
+$config->group->subset->projectplan->order = 200;
+$config->group->subset->projectplan->nav = 'project';
$config->group->subset->design = new stdclass();
$config->group->subset->design->order = 210;
$config->group->subset->design->nav = 'project';
-$config->group->subset->issue = new stdclass();
-$config->group->subset->issue->order = 230;
-$config->group->subset->issue->nav = 'project';
+$config->group->subset->projecttrack = new stdclass();
+$config->group->subset->projecttrack->order = 220;
+$config->group->subset->projecttrack->nav = 'project';
-$config->group->subset->risk = new stdclass();
-$config->group->subset->risk->order = 240;
-$config->group->subset->risk->nav = 'project';
+$config->group->subset->projectDeliverable = new stdclass();
+$config->group->subset->projectDeliverable->order = 230;
+$config->group->subset->projectDeliverable->nav = 'project';
-$config->group->subset->workestimation = new stdclass();
-$config->group->subset->workestimation->order = 260;
-$config->group->subset->workestimation->nav = 'project';
+$config->group->subset->projectreview = new stdclass();
+$config->group->subset->projectreview->order = 240;
+$config->group->subset->projectreview->nav = 'project';
-$config->group->subset->opportunity = new stdclass();
-$config->group->subset->opportunity->order = 290;
-$config->group->subset->opportunity->nav = 'project';
+$config->group->subset->cm = new stdclass();
+$config->group->subset->cm->order = 250;
+$config->group->subset->cm->nav = 'project';
-$config->group->subset->meeting = new stdclass();
-$config->group->subset->meeting->order = 350;
-$config->group->subset->meeting->nav = 'project';
+$config->group->subset->projectqa = new stdclass();
+$config->group->subset->projectqa->order = 260;
+$config->group->subset->projectqa->nav = 'project';
$config->group->subset->projectbuild = new stdclass();
-$config->group->subset->projectbuild->order = 360;
+$config->group->subset->projectbuild->order = 270;
$config->group->subset->projectbuild->nav = 'project';
$config->group->subset->projectrelease = new stdclass();
-$config->group->subset->projectrelease->order = 370;
+$config->group->subset->projectrelease->order = 280;
$config->group->subset->projectrelease->nav = 'project';
+$config->group->subset->projectreport = new stdclass();
+$config->group->subset->projectreport->order = 290;
+$config->group->subset->projectreport->nav = 'project';
+
+$config->group->subset->projectresearch = new stdclass();
+$config->group->subset->projectresearch->order = 300;
+$config->group->subset->projectresearch->nav = 'project';
+
+$config->group->subset->workestimation = new stdclass();
+$config->group->subset->workestimation->order = 310;
+$config->group->subset->workestimation->nav = 'project';
+
+$config->group->subset->issue = new stdclass();
+$config->group->subset->issue->order = 320;
+$config->group->subset->issue->nav = 'project';
+
+$config->group->subset->risk = new stdclass();
+$config->group->subset->risk->order = 330;
+$config->group->subset->risk->nav = 'project';
+
+$config->group->subset->opportunity = new stdclass();
+$config->group->subset->opportunity->order = 340;
+$config->group->subset->opportunity->nav = 'project';
+
+$config->group->subset->pssp = new stdclass();
+$config->group->subset->pssp->order = 350;
+$config->group->subset->pssp->nav = 'project';
+
+$config->group->subset->projectauditplan = new stdclass();
+$config->group->subset->projectauditplan->order = 360;
+$config->group->subset->projectauditplan->nav = 'project';
+
+$config->group->subset->projectgapanalysis = new stdclass();
+$config->group->subset->projectgapanalysis->order = 370;
+$config->group->subset->projectgapanalysis->nav = 'project';
+
+$config->group->subset->meeting = new stdclass();
+$config->group->subset->meeting->order = 380;
+$config->group->subset->meeting->nav = 'project';
+
$config->group->subset->projectsettings = new stdclass();
$config->group->subset->projectsettings->order = 390;
$config->group->subset->projectsettings->nav = 'project';
-$config->group->subset->projectreview = new stdclass();
-$config->group->subset->projectreview->order = 400;
-$config->group->subset->projectreview->nav = 'project';
-
-$config->group->subset->projecttrack = new stdclass();
-$config->group->subset->projecttrack->order = 410;
-$config->group->subset->projecttrack->nav = 'project';
-
-$config->group->subset->projectqa = new stdclass();
-$config->group->subset->projectqa->order = 420;
-$config->group->subset->projectqa->nav = 'project';
-
-$config->group->subset->pssp = new stdclass();
-$config->group->subset->pssp->order = 430;
-$config->group->subset->pssp->nav = 'project';
-
-$config->group->subset->cm = new stdclass();
-$config->group->subset->cm->order = 440;
-$config->group->subset->cm->nav = 'project';
-
-$config->group->subset->projectreport = new stdclass();
-$config->group->subset->projectreport->order = 490;
-$config->group->subset->projectreport->nav = 'project';
-
-$config->group->subset->projectresearch = new stdclass();
-$config->group->subset->projectresearch->order = 500;
-$config->group->subset->projectresearch->nav = 'project';
-
-$config->group->subset->projectauditplan = new stdclass();
-$config->group->subset->projectauditplan->order = 510;
-$config->group->subset->projectauditplan->nav = 'project';
-
-$config->group->subset->projectgapanalysis = new stdclass();
-$config->group->subset->projectgapanalysis->order = 520;
-$config->group->subset->projectgapanalysis->nav = 'project';
-
$config->group->subset->execution = new stdclass();
$config->group->subset->execution->order = 530;
$config->group->subset->execution->nav = 'execution';
@@ -157,34 +161,38 @@ $config->group->subset->task = new stdclass();
$config->group->subset->task->order = 540;
$config->group->subset->task->nav = 'execution';
-$config->group->subset->build = new stdclass();
-$config->group->subset->build->order = 550;
-$config->group->subset->build->nav = 'execution';
-
-$config->group->subset->executionview = new stdclass();
-$config->group->subset->executionview->order = 560;
-$config->group->subset->executionview->nav = 'execution';
-
$config->group->subset->executionkanban = new stdclass();
-$config->group->subset->executionkanban->order = 580;
+$config->group->subset->executionkanban->order = 550;
$config->group->subset->executionkanban->nav = 'execution';
$config->group->subset->executionburn = new stdclass();
-$config->group->subset->executionburn->order = 590;
+$config->group->subset->executionburn->order = 560;
$config->group->subset->executionburn->nav = 'execution';
$config->group->subset->executioncfd = new stdclass();
-$config->group->subset->executioncfd->order = 600;
+$config->group->subset->executioncfd->order = 570;
$config->group->subset->executioncfd->nav = 'execution';
+$config->group->subset->executionview = new stdclass();
+$config->group->subset->executionview->order = 580;
+$config->group->subset->executionview->nav = 'execution';
+
$config->group->subset->executionstory = new stdclass();
-$config->group->subset->executionstory->order = 610;
+$config->group->subset->executionstory->order = 590;
$config->group->subset->executionstory->nav = 'execution';
+$config->group->subset->executionDeliverable = new stdclass();
+$config->group->subset->executionDeliverable->order = 600;
+$config->group->subset->executionDeliverable->nav = 'execution';
+
$config->group->subset->executionqa = new stdclass();
-$config->group->subset->executionqa->order = 620;
+$config->group->subset->executionqa->order = 610;
$config->group->subset->executionqa->nav = 'execution';
+$config->group->subset->build = new stdclass();
+$config->group->subset->build->order = 620;
+$config->group->subset->build->nav = 'execution';
+
$config->group->subset->executionsettings = new stdclass();
$config->group->subset->executionsettings->order = 630;
$config->group->subset->executionsettings->nav = 'execution';
@@ -1010,6 +1018,7 @@ $config->group->package->manageProject->privs['project-activate'] = array(
$config->group->package->manageProject->privs['project-updateOrder'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 7, 'depend' => array('project-browse'), 'recommend' => array('project-create', 'project-edit'));
$config->group->package->manageProject->privs['project-manageProducts'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array('project-browse'), 'recommend' => array('project-create', 'project-edit'));
$config->group->package->manageProject->privs['project-programTitle'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array('project-browse'), 'recommend' => array('program-browse'));
+$config->group->package->manageProject->privs['project-workflowGroup'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('project-browse'), 'recommend' => array('program-browse'));
$config->group->package->importProject = new stdclass();
$config->group->package->importProject->order = 15;
@@ -1047,6 +1056,12 @@ $config->group->package->projectWhitelist->privs['project-whitelist'] = ar
$config->group->package->projectWhitelist->privs['project-addWhitelist'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 110, 'depend' => array('project-whitelist'), 'recommend' => array('project-unbindWhitelist'));
$config->group->package->projectWhitelist->privs['project-unbindWhitelist'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 115, 'depend' => array('project-whitelist'), 'recommend' => array('project-addWhitelist'));
+$config->group->package->projectDeliverable = new stdclass();
+$config->group->package->projectDeliverable->order = 5;
+$config->group->package->projectDeliverable->subset = 'projectDeliverable';
+$config->group->package->projectDeliverable->privs = array();
+$config->group->package->projectDeliverable->privs['project-deliverable'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array(), 'recommend' => array());
+
$config->group->package->browseExecution = new stdclass();
$config->group->package->browseExecution->order = 5;
$config->group->package->browseExecution->subset = 'execution';
@@ -1094,6 +1109,13 @@ $config->group->package->executionWhitelist->privs['execution-whitelist']
$config->group->package->executionWhitelist->privs['execution-addWhitelist'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 245, 'depend' => array('execution-whitelist'), 'recommend' => array('execution-unbindWhitelist'));
$config->group->package->executionWhitelist->privs['execution-unbindWhitelist'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 250, 'depend' => array('execution-whitelist'), 'recommend' => array('execution-addWhitelist'));
+$config->group->package->executionDeliverable = new stdclass();
+$config->group->package->executionDeliverable->order = 5;
+$config->group->package->executionDeliverable->subset = 'executionDeliverable';
+$config->group->package->executionDeliverable->nav = 'execution';
+$config->group->package->executionDeliverable->privs = array();
+$config->group->package->executionDeliverable->privs['execution-deliverable'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array(), 'recommend' => array());
+
$config->group->package->gantt = new stdclass();
$config->group->package->gantt->order = 5;
$config->group->package->gantt->subset = 'executionview';
@@ -2567,7 +2589,7 @@ $config->group->package->workflowGroup = new stdclass();
$config->group->package->workflowGroup->order = 65;
$config->group->package->workflowGroup->subset = 'workflow';
$config->group->package->workflowGroup->privs = array();
-$config->group->package->workflowGroup->privs['workflowgroup-product'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 5, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
+$config->group->package->workflowGroup->privs['workflowgroup-product'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 5, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflowGroup->privs['workflowgroup-project'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 10, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflowGroup->privs['workflowgroup-create'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 15, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflowGroup->privs['workflowgroup-edit'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 20, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
@@ -2580,6 +2602,7 @@ $config->group->package->workflowGroup->privs['workflowgroup-setExclusive'] =
$config->group->package->workflowGroup->privs['workflowgroup-activateFlow'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 55, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflowGroup->privs['workflowgroup-deactivateFlow'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 60, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflowGroup->privs['workflowgroup-rule'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 65, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
+$config->group->package->workflowGroup->privs['workflowgroup-deliverable'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 70, 'depend' => array('workflowgroup-project'), 'recommend' => array());
$config->group->package->workflow = new stdclass();
$config->group->package->workflow->order = 5;
@@ -2979,6 +3002,7 @@ $config->group->package->commonSetting = new stdclass();
$config->group->package->commonSetting->order = 5;
$config->group->package->commonSetting->subset = 'modelconfig';
$config->group->package->commonSetting->privs = array();
+$config->group->package->commonSetting->privs['custom-project'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 1, 'depend' => array(), 'recommend' => array());
$config->group->package->commonSetting->privs['stage-setType'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 25, 'depend' => array(), 'recommend' => array());
$config->group->package->commonSetting->privs['custom-flow'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 35, 'depend' => array('admin-index', 'admin-register'), 'recommend' => array());
$config->group->package->commonSetting->privs['custom-estimate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 50, 'depend' => array(), 'recommend' => array());
@@ -2998,6 +3022,16 @@ $config->group->package->stageSetting->privs['stage-edit'] = array('editi
$config->group->package->stageSetting->privs['stage-delete'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array(), 'recommend' => array('stage-create', 'stage-edit'));
$config->group->package->stageSetting->privs['stage-plusBrowse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array(), 'recommend' => array());
+$config->group->package->deliverable = new stdclass();
+$config->group->package->deliverable->order = 20;
+$config->group->package->deliverable->subset = 'modelconfig';
+$config->group->package->deliverable->privs = array();
+$config->group->package->deliverable->privs['deliverable-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array());
+$config->group->package->deliverable->privs['deliverable-create'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array('deliverable-browse'), 'recommend' => array());
+$config->group->package->deliverable->privs['deliverable-edit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array('deliverable-browse'), 'recommend' => array('deliverable-view', 'deliverable-browse'));
+$config->group->package->deliverable->privs['deliverable-delete'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array('deliverable-browse'), 'recommend' => array('deliverable-view', 'deliverable-browse'));
+$config->group->package->deliverable->privs['deliverable-view'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array('deliverable-browse'), 'recommend' => array());
+
$config->group->package->classify = new stdclass();
$config->group->package->classify->order = 30;
$config->group->package->classify->subset = 'modelconfig';
diff --git a/module/install/control.php b/module/install/control.php
index c66c9de8fd..187111e537 100644
--- a/module/install/control.php
+++ b/module/install/control.php
@@ -24,6 +24,8 @@ class install extends control
if(!$this->app->installing && $this->app->tab != 'devops' && !isInModal()) helper::end();
+ set_time_limit(0);
+
$this->app->loadLang('user');
$this->app->loadLang('admin');
$this->config->webRoot = getWebRoot();
diff --git a/module/instance/model.php b/module/instance/model.php
index 3d22a9aa5c..6ca619756a 100644
--- a/module/instance/model.php
+++ b/module/instance/model.php
@@ -50,6 +50,22 @@ class instanceModel extends model
return $instance;
}
+ /**
+ * 获取应用实例数量。
+ * Get instance count.
+ *
+ * @param string $status
+ * @access public
+ * @return int
+ */
+ public function getInstanceCount(string $status = ''): int
+ {
+ return $this->dao->select('count(*) as count')->from(TABLE_INSTANCE)
+ ->where('deleted')->eq(0)
+ ->beginIF($status)->andWhere('status')->eq($status)->fi()
+ ->fetch('count');
+ }
+
/**
* 根据应用url获取应用信息。
* Get a application by url.
diff --git a/module/instance/test/model/getinstancecount.php b/module/instance/test/model/getinstancecount.php
new file mode 100755
index 0000000000..b856663c73
--- /dev/null
+++ b/module/instance/test/model/getinstancecount.php
@@ -0,0 +1,28 @@
+#!/usr/bin/env php
+gen(200);
+
+/**
+
+title=instanceModel->getByID();
+timeout=0
+cid=1
+
+- 获取所有instance数量 @200
+- 获取运行中的instance数量 @198
+- 获取关闭的instance数量 @1
+- 获取异常的instance数量 @1
+- 获取不存在状态的instance数量 @0
+*/
+
+global $tester;
+$instance = $tester->loadModel('instance');
+
+r($instance->getInstanceCount()) && p() && e('200'); // 获取所有instance数量
+r($instance->getInstanceCount('running')) && p() && e('198'); // 获取运行中的instance数量
+r($instance->getInstanceCount('stopped')) && p() && e('1'); // 获取关闭的instance数量
+r($instance->getInstanceCount('abnormal')) && p() && e('1'); // 获取异常的instance数量
+r($instance->getInstanceCount('test')) && p() && e('0'); // 获取不存在状态的instance数量
diff --git a/module/job/model.php b/module/job/model.php
index 38c582b0b7..ec35d687e3 100644
--- a/module/job/model.php
+++ b/module/job/model.php
@@ -296,7 +296,7 @@ class jobModel extends model
->fetch();
if(!$job) return false;
- if(($this->app->rawModule != 'job' || $this->app->rawMethod != 'exec') && $this->app->rawModule != 'mr' && !empty($job->autoRun)) return false;
+ if(($this->app->rawModule != 'job' || $this->app->rawMethod != 'exec') && !in_array($this->app->rawModule, array('mr', 'sonarqube')) && !empty($job->autoRun)) return false;
$repo = $this->loadModel('repo')->getByID($job->repo);
if(!$repo) return false;
diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php
index cdb9133131..6d54f17aa5 100644
--- a/module/misc/lang/de.php
+++ b/module/misc/lang/de.php
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
+$lang->misc->releaseDate['21.7.1'] = '2025-05-30';
$lang->misc->releaseDate['21.7'] = '2025-05-16';
$lang->misc->releaseDate['21.6.1'] = '2025-04-30';
$lang->misc->releaseDate['21.6'] = '2025-04-11';
@@ -248,6 +249,8 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
+$lang->misc->feature->all['21.7.1'][] = array('title' => 'Implement enhanced project management features, including adding a top toolbar to the document editor, configuring single project workflow management, optimizing requirements, and adding deliverable management functionality.', 'desc' => '');
+$lang->misc->feature->all['21.7'][] = array('title' => 'Now, ZenTao supports bulk editing of parent-child stages across both Waterfall and Waterfall Plus methodologies, enables dependencies between cross-execution tasks, and facilitates batch stage editing within Integrated Product Development (IPD) projects, along with bug fixes.', 'desc' => '');
$lang->misc->feature->all['21.6.1'][] = array('title' => 'Documentation Bug Resolution.', 'desc' => '');
$lang->misc->feature->all['21.6'][] = array('title' => 'Jira import optimization. Multi-user document collaboration.', 'desc' => '');
$lang->misc->feature->all['21.6.beta'][] = array('title' => 'Jira 2.0 import implementation and Confluence integration deployment.', 'desc' => '');
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 7f71ca8df9..4a9041025d 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
+$lang->misc->releaseDate['21.7.1'] = '2025-05-30';
$lang->misc->releaseDate['21.7'] = '2025-05-16';
$lang->misc->releaseDate['21.6.1'] = '2025-04-30';
$lang->misc->releaseDate['21.6'] = '2025-04-11';
@@ -248,6 +249,8 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
+$lang->misc->feature->all['21.7.1'][] = array('title' => 'Implement enhanced project management features, including adding a top toolbar to the document editor, configuring single project workflow management, optimizing requirements, and adding deliverable management functionality.', 'desc' => '');
+$lang->misc->feature->all['21.7'][] = array('title' => 'Now, ZenTao supports bulk editing of parent-child stages across both Waterfall and Waterfall Plus methodologies, enables dependencies between cross-execution tasks, and facilitates batch stage editing within Integrated Product Development (IPD) projects, along with bug fixes.', 'desc' => '');
$lang->misc->feature->all['21.6.1'][] = array('title' => 'Documentation Bug Resolution.', 'desc' => '');
$lang->misc->feature->all['21.6'][] = array('title' => 'Jira import optimization. Multi-user document collaboration.', 'desc' => '');
$lang->misc->feature->all['21.6.beta'][] = array('title' => 'Jira 2.0 import implementation and Confluence integration deployment.', 'desc' => '');
diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php
index f76e8b99f6..346a65289f 100644
--- a/module/misc/lang/fr.php
+++ b/module/misc/lang/fr.php
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
+$lang->misc->releaseDate['21.7.1'] = '2025-05-30';
$lang->misc->releaseDate['21.7'] = '2025-05-16';
$lang->misc->releaseDate['21.6.1'] = '2025-04-30';
$lang->misc->releaseDate['21.6'] = '2025-04-11';
@@ -248,6 +249,8 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
+$lang->misc->feature->all['21.7.1'][] = array('title' => 'Implement enhanced project management features, including adding a top toolbar to the document editor, configuring single project workflow management, optimizing requirements, and adding deliverable management functionality.', 'desc' => '');
+$lang->misc->feature->all['21.7'][] = array('title' => 'Now, ZenTao supports bulk editing of parent-child stages across both Waterfall and Waterfall Plus methodologies, enables dependencies between cross-execution tasks, and facilitates batch stage editing within Integrated Product Development (IPD) projects, along with bug fixes.', 'desc' => '');
$lang->misc->feature->all['21.6.1'][] = array('title' => 'Documentation Bug Resolution.', 'desc' => '');
$lang->misc->feature->all['21.6'][] = array('title' => 'Jira import optimization. Multi-user document collaboration.', 'desc' => '');
$lang->misc->feature->all['21.6.beta'][] = array('title' => 'Jira 2.0 import implementation and Confluence integration deployment.', 'desc' => '');
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 9dc058b50c..381472abb7 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
+$lang->misc->releaseDate['21.7.1'] = '2025-05-30';
$lang->misc->releaseDate['21.7'] = '2025-05-16';
$lang->misc->releaseDate['21.6.1'] = '2025-04-30';
$lang->misc->releaseDate['21.6'] = '2025-04-11';
@@ -248,7 +249,8 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
-$lang->misc->feature->all['21.7'][] = array('title' => '', 'desc' => '');
+$lang->misc->feature->all['21.7.1'][] = array('title' => '文档编辑器增加顶部工具栏；单项目流程管理配置；优化需求；增加交付物管理功能。', 'desc' => '');
+$lang->misc->feature->all['21.7'][] = array('title' => '瀑布、融合瀑布支持批量维护父子阶段；支持建立跨执行任务依赖关系；IPD项目支持批量维护父子阶段，修复bug。', 'desc' => '');
$lang->misc->feature->all['21.6.1'][] = array('title' => '修复文档相关Bug。', 'desc' => '');
$lang->misc->feature->all['21.6'][] = array('title' => 'Jira导入优化，文档多人协作。', 'desc' => '');
$lang->misc->feature->all['21.6.beta'][] = array('title' => 'Jira导入2.0版本，Confluence导入。', 'desc' => '');
diff --git a/module/pivot/model.php b/module/pivot/model.php
index 3c2e36c4f0..3a0536d52b 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -1224,7 +1224,7 @@ class pivotModel extends model
public function addRowSummary(array $groupTree, array $data, array $groups, int $currentGroup = 0): array
{
$first = reset($groupTree);
- if(is_string($first))
+ if(is_scalar($first))
{
$groupData = array();
$rows = array();
diff --git a/module/product/model.php b/module/product/model.php
index d0aae19827..631c7670fb 100755
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -2041,7 +2041,7 @@ class productModel extends model
if($module == 'bug' && $method == 'view') return helper::createLink('bug', 'browse', "productID=%s&branch={$branchID}&extra=$extra");
if($module == 'bug' && $method == 'report') return helper::createLink('bug', 'browse', "productID=%s{$branchParam}");
if($module == 'qa' && $method == 'index') return helper::createLink('bug', 'browse', "productID=%s{$branchParam}");
- if($module == 'story' && $method == 'report') return helper::createLink($module, $method, "productID=%s&branch={$branchID}&extra=$extra");
+ if($module == 'story' && $method == 'report') return helper::createLink($module, $method, "productID=%s&branch={$branchID}&stroyType=$module");
if($module == 'testcase' && $method == 'browse') return helper::createLink($module, $method, "productID=%s&branch={$branchID}" . ($extra ? "&browseType=$extra" : ''));
if($module == 'testreport' && $method == 'create') return helper::createLink($module, $method, "objectID=&objectType=testtask&extra=%s");
if($module == 'testtask' && $method == 'browse') return helper::createLink($module, $method, "productID=%s&branch={$branchID}");
diff --git a/module/product/test/model/getproductlink.php b/module/product/test/model/getproductlink.php
index 51c27a5f62..ba502cca66 100644
--- a/module/product/test/model/getproductlink.php
+++ b/module/product/test/model/getproductlink.php
@@ -17,12 +17,12 @@ cid=0
- 当前页面是product-dynamic，切换1.5级导航时跳转链接。 @/product-dynamic-%s-.html
- 当前页面是project-bug，切换1.5级导航时跳转链接。 @/project-bug--%s.html
- 当前页面是qa-index，切换1.5级导航时跳转链接。 @/bug-browse-%s.html
-- 当前页面是story-report，切换1.5级导航时跳转链接。 @/story-report-%s-all-.html
+- 当前页面是story-report，切换1.5级导航时跳转链接。 @/story-report-%s-all-story.html
- 当前页面是testcase-browse，切换1.5级导航时跳转链接。 @/testcase-browse-%s-all.html
- 当前页面是testreport-create，切换1.5级导航时跳转链接。 @/testreport-create--testtask-%s.html
- 当前页面是testreport-edit，切换1.5级导航时跳转链接。 @/testreport-browse-%s.html
- 当前页面是testtask-browseUnits，切换1.5级导航时跳转链接。 @/testtask-browseUnits-%s-newest-id_desc-0-0-1.html
-- 当前页面是testtask-browse，切换1.5级导航时跳转链接。 @/testtask-browse-%s-all-.html
+- 当前页面是testtask-browse，切换1.5级导航时跳转链接。 @/testtask-browse-%s-all.html
- 当前页面是execution-bug，切换1.5级导航时跳转链接。 @/execution-bug--%s.html
- 当前页面是execution-testcase，切换1.5级导航时跳转链接。 @/execution-testcase--%s.html
- 当前页面是product-doc，切换1.5级导航时跳转链接。 @/product-doc-%s.html
@@ -81,7 +81,7 @@ r($productModel->getProductLink('product', 'project')) && p() && e('/pro
r($productModel->getProductLink('product', 'dynamic')) && p() && e('/product-dynamic-%s-.html'); //当前页面是product-dynamic，切换1.5级导航时跳转链接。
r($productModel->getProductLink('project', 'bug')) && p() && e('/project-bug--%s.html'); //当前页面是project-bug，切换1.5级导航时跳转链接。
r($productModel->getProductLink('qa', 'index')) && p() && e('/bug-browse-%s.html'); //当前页面是qa-index，切换1.5级导航时跳转链接。
-r($productModel->getProductLink('story', 'report')) && p() && e('/story-report-%s-all-.html'); //当前页面是story-report，切换1.5级导航时跳转链接。
+r($productModel->getProductLink('story', 'report')) && p() && e('/story-report-%s-all-story.html'); //当前页面是story-report，切换1.5级导航时跳转链接。
r($productModel->getProductLink('testcase', 'browse')) && p() && e('/testcase-browse-%s-all.html'); //当前页面是testcase-browse，切换1.5级导航时跳转链接。
r($productModel->getProductLink('testreport', 'create')) && p() && e('/testreport-create--testtask-%s.html'); //当前页面是testreport-create，切换1.5级导航时跳转链接。
r($productModel->getProductLink('testreport', 'edit')) && p() && e('/testreport-browse-%s.html'); //当前页面是testreport-edit，切换1.5级导航时跳转链接。
@@ -124,4 +124,4 @@ r($productModel->getProductLink('feedback', 'view')) && p() && e('/feedback-brow
$productModel->app->tab = 'project';
r($productModel->getProductLink('testcase', 'groupCase', '1')) && p() && e('/testcase-groupcase-%s-all--1.html#app=project'); //当前页面是testcase-groupcase，在项目视图下，切换1.5级导航时跳转链接。
-r($productModel->getProductLink('testcase', 'zeroCase', 'projectID=1')) && p() && e('/testcase-zerocase-%s-all--1.html#app=project'); //当前页面是testcase-zerocase，在项目视图下，切换1.5级导航时跳转链接。
+r($productModel->getProductLink('testcase', 'zeroCase', 'projectID=1')) && p() && e('/testcase-zerocase-%s-all--1.html#app=project'); //当前页面是testcase-zerocase，在项目视图下，切换1.5级导航时跳转链接。
\ No newline at end of file
diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php
index d749db9a20..e28788fb28 100644
--- a/module/product/ui/browse.html.php
+++ b/module/product/ui/browse.html.php
@@ -284,7 +284,9 @@ $fnGenerateFootToolbar = function() use ($lang, $app, $product, $productID, $pro
/* Remove empty data from data list. */
unset($lang->story->reviewResultList[''], $lang->story->reviewResultList['revert']);
unset($lang->story->reasonList[''], $lang->story->reasonList['subdivided'], $lang->story->reasonList['duplicate']);
- unset($plans[''], $lang->story->stageList[''], $users['']);
+ unset($lang->story->stageList[''], $users['']);
+
+ if($storyType == 'story') $plans = \arrayUnion(array(0 => $lang->null), $plans);
/* Generate dropdown menu items for the DataTable footer toolbar.*/
$planItems = $planItems ?? array();
diff --git a/module/program/ui/common.field.php b/module/program/ui/common.field.php
index 0db9b7a616..b4739d28dc 100644
--- a/module/program/ui/common.field.php
+++ b/module/program/ui/common.field.php
@@ -8,7 +8,6 @@ $fields->field('parent')
->control(array('control' => 'picker', 'required' => true))
->items(data('parents'))
->value(data('parentProgram.id') ? data('parentProgram.id') : 0)
- ->disabled(!empty(data('parentProgram.id')))
->data('parentBudget', data('parentProgram.budget'))
->data('parentBegin', data('parentProgram.begin'))
->data('parentEnd', data('parentProgram.end'));
diff --git a/module/programplan/js/create.ui.js b/module/programplan/js/create.ui.js
index 41c7eff0e3..2ad6dbc053 100644
--- a/module/programplan/js/create.ui.js
+++ b/module/programplan/js/create.ui.js
@@ -226,13 +226,19 @@ window.handleRenderRow = function($row, index, data)
$typePicker.render({items: typeItems});
}
+ /* 已关闭且有交付物的阶段无法变更阶段类型。 */
+ $row.find('[data-name="attribute"]').find('.picker-box').on('inited', function(e, info)
+ {
+ if(typeof data != 'undefined' && typeof data.hasDeliverable != 'undefined') info[0].render({disabled: true});
+ });
+
if(project.model == 'ipd')
{
if(planID == 0 && level == 0)
{
$row.find('[data-name="ACTIONS"]').find('[data-type="sort"]').addClass('disabled').attr('title', sortableTip);
$row.find('[data-name="ACTIONS"]').find('[data-type="addSibling"]').prop('disabled', true).attr('title', addSiblingTip);
- $row.find('[data-name="ACTIONS"]').find('[data-type="delete"]').prop('disabled', true);
+ $row.find('[data-name="ACTIONS"]').find('[data-type="delete"]').addClass('hidden');
}
$row.find('[data-name="attribute"]').find('.picker-box').on('inited', function(e, info){ info[0].render({disabled: true}); });
@@ -519,4 +525,4 @@ window.moveChildren = function(id, processedIds = new Set())
$parent.after(element);
moveChildren($(element).attr('data-gid'), processedIds);
});
-}
\ No newline at end of file
+}
diff --git a/module/programplan/model.php b/module/programplan/model.php
index b2ea2238aa..b52b8f6865 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -369,6 +369,8 @@ class programplanModel extends model
$parents[$level] = $stageID;
unset($plan->id, $plan->type);
+ if(in_array($this->config->edition, array('max', 'ipd'))) $plan = $this->execution->changeExecutionDeliverable($stageID, $plan);
+
$changes = $this->programplanTao->updateRow($stageID, $projectID, $plan);
if(dao::isError()) return false;
@@ -386,6 +388,22 @@ class programplanModel extends model
}
else
{
+ if(!empty($project->deliverable) && in_array($this->config->edition, array('max', 'ipd')))
+ {
+ $projectModel = $project->model;
+ if($projectModel == 'agileplus') $projectModel = 'scrum';
+ if($projectModel == 'waterfallplus') $projectModel = 'waterfall';
+
+ $projectType = !empty($project->hasProduct) ? 'product' : 'project';
+ $objectCode = $plan->attribute ? "{$projectType}_{$projectModel}_{$plan->attribute}" : "{$projectType}_{$projectModel}_{$plan->lifetime}";
+ if($plan->type == 'kanban') $objectCode = "{$projectType}_{$projectModel}_kanban";
+
+ $projectDeliverable = $project->deliverable;
+ $projectDeliverable = !empty($projectDeliverable) ? json_decode($projectDeliverable, true) : array();
+ $stageDeliverable = !empty($projectDeliverable[$objectCode]) ? array("{$objectCode}" => $projectDeliverable[$objectCode]) : array();
+ $plan->deliverable = $stageDeliverable ? json_encode($stageDeliverable) : '';
+ }
+
if($level > 0 && isset($parents[$level - 1])) $plan->parent = $parents[$level - 1];
$stageID = $this->programplanTao->insertStage($plan, $projectID, $productID, $level > 0 ? $plan->parent : $parentID);
if(dao::isError()) return false;
@@ -611,9 +629,9 @@ class programplanModel extends model
* @param string $action
* @param bool $isParent
* @access public
- * @return bool
+ * @return bool|array
*/
- public function computeProgress(int $stageID, string $action = '', bool $isParent = false): bool
+ public function computeProgress(int $stageID, string $action = '', bool $isParent = false): bool|array
{
$stage = $this->loadModel('execution')->fetchByID($stageID);
if(empty($stage) || empty($stage->path)) return false;
@@ -647,6 +665,17 @@ class programplanModel extends model
$newParent = $result['newParent'] ?? null;
$parentAction = $result['parentAction'] ?? '';
+ /* 如果当前是顶级阶段，并且由于交付物不能关闭，则跳转到顶级阶段的关闭页面。 */
+ if(isset($newParent->status) && $newParent->status == 'closed')
+ {
+ $isTopStage = $parent->grade == 1 && $parent->type != 'project' && $stageID != $id && $parent->status == 'doing';
+ if(in_array($this->config->edition, array('max', 'ipd')) && $isTopStage && !$this->execution->canCloseByDeliverable($parent))
+ {
+ $url = helper::createLink('execution', 'close', "executionID={$parent->id}");
+ return array('result' => 'fail', 'callback' => "zui.Modal.confirm('{$this->lang->execution->cannotAutoCloseParent}').then((res) => {if(res) {loadModal('$url', '.modal-dialog');} else {loadPage();}});");
+ }
+ }
+
/** 更新状态以及记录日志。 */
/** Update status and save log. */
if(isset($newParent) && $newParent)
diff --git a/module/programplan/ui/edit.html.php b/module/programplan/ui/edit.html.php
index 195582d4fa..aef5381878 100644
--- a/module/programplan/ui/edit.html.php
+++ b/module/programplan/ui/edit.html.php
@@ -45,6 +45,7 @@ formPanel
set::name('parent'),
set::items($parentStageList),
set::value($plan->parent),
+ set::disabled($hasUploadedDeliverable),
set::required(true),
on::change('changeParentStage')
)
@@ -95,7 +96,7 @@ formPanel
(
setID('attributeType'),
setClass('flex self-center w-full'),
- $enableOptionalAttr ? picker
+ $enableOptionalAttr && empty($plan->hasDeliverable) ? picker
(
setID('attribute'),
set::name('attribute'),
diff --git a/module/programplan/zen.php b/module/programplan/zen.php
index 6731de2836..98e0e7c8df 100644
--- a/module/programplan/zen.php
+++ b/module/programplan/zen.php
@@ -200,10 +200,7 @@ class programplanZen extends programplan
/* Compute fields for create view. */
list($visibleFields, $requiredFields, $customFields, $showFields, $defaultFields) = $this->computeFieldsCreateView($viewData);
- if($viewData->project->model == 'ipd')
- {
- $this->config->programplan->form->create['attribute']['options'] = $this->lang->stage->ipdTypeList;
- }
+ if($viewData->project->model == 'ipd') $this->config->programplan->form->create['attribute']['options'] = $this->lang->stage->ipdTypeList;
$this->view->title = $this->lang->programplan->create . $this->lang->hyphen . $viewData->project->name;
$this->view->productList = $viewData->productList;
@@ -297,25 +294,31 @@ class programplanZen extends programplan
* @access protected
* @return void
*/
- protected function buildEditView(object $plan)
+ public function buildEditView(object $plan)
{
$this->loadModel('project');
$this->loadModel('execution');
$this->app->loadLang('stage');
+ $project = $this->project->getByID($plan->project);
$parentStage = $this->project->getByID($plan->parent, 'stage');
- $this->view->title = $this->lang->programplan->edit;
- $this->view->isCreateTask = $this->programplan->isCreateTask($plan->id);
- $this->view->plan = $plan;
- $this->view->project = $this->project->getByID($plan->project);
- $this->view->parentStageList = $this->programplan->getParentStageList($plan->project, $plan->id, $plan->product);
- $this->view->enableOptionalAttr = empty($parentStage) || (!empty($parentStage) && $parentStage->attribute == 'mix');
- $this->view->isTopStage = $this->programplan->isTopStage($plan->id);
- $this->view->isLeafStage = $this->programplan->checkLeafStage($plan->id);
- $this->view->PMUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $plan->PM);
- $this->view->project = $this->project->getByID($plan->project);
- $this->view->requiredFields = $this->config->execution->edit->requiredFields;
+ $enableOptionalAttr = empty($parentStage) || (!empty($parentStage) && $parentStage->attribute == 'mix');
+ if($project->model == 'ipd') $enableOptionalAttr = false;
+
+ $this->view->title = $this->lang->programplan->edit;
+ $this->view->isCreateTask = $this->programplan->isCreateTask($plan->id);
+ $this->view->plan = $plan;
+ $this->view->project = $project;
+ $this->view->parentStageList = $this->programplan->getParentStageList($plan->project, $plan->id, $plan->product);
+ $this->view->enableOptionalAttr = $enableOptionalAttr;
+ $this->view->isTopStage = $this->programplan->isTopStage($plan->id);
+ $this->view->isLeafStage = $this->programplan->checkLeafStage($plan->id);
+ $this->view->PMUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $plan->PM);
+ $this->view->project = $this->project->getByID($plan->project);
+ $this->view->requiredFields = $this->config->execution->edit->requiredFields;
+ $this->view->hasUploadedDeliverable = in_array($this->config->edition, array('max', 'ipd')) ? $this->execution->hasUploadedDeliverable($plan) : false;
+
$this->display();
}
diff --git a/module/project/config/dtable.php b/module/project/config/dtable.php
index 97aff15b75..044546eae1 100755
--- a/module/project/config/dtable.php
+++ b/module/project/config/dtable.php
@@ -97,6 +97,17 @@ $config->project->dtable->fieldList['invested']['group'] = 5;
$config->project->dtable->fieldList['invested']['show'] = true;
$config->project->dtable->fieldList['invested']['sortType'] = false;
+if(helper::hasFeature('deliverable') && in_array($config->edition, array('max', 'ipd')))
+{
+ $config->project->dtable->fieldList['deliverable']['title'] = $lang->project->deliverableAbbr;
+ $config->project->dtable->fieldList['deliverable']['name'] = 'deliverable';
+ $config->project->dtable->fieldList['deliverable']['type'] = 'html';
+ $config->project->dtable->fieldList['deliverable']['width'] = '120px';
+ $config->project->dtable->fieldList['deliverable']['group'] = 5;
+ $config->project->dtable->fieldList['deliverable']['show'] = true;
+ $config->project->dtable->fieldList['deliverable']['sortType'] = false;
+}
+
$config->project->dtable->fieldList['begin']['title'] = $lang->project->begin;
$config->project->dtable->fieldList['begin']['name'] = 'begin';
$config->project->dtable->fieldList['begin']['type'] = 'date';
@@ -188,6 +199,17 @@ $config->project->execution->dtable->fieldList['status']['width'] = '80';
$config->project->execution->dtable->fieldList['status']['group'] = '1';
$config->project->execution->dtable->fieldList['status']['show'] = true;
+if(helper::hasFeature('deliverable') && in_array($config->edition, array('max', 'ipd')))
+{
+ $config->project->execution->dtable->fieldList['deliverable']['title'] = $lang->project->deliverableAbbr;
+ $config->project->execution->dtable->fieldList['deliverable']['name'] = 'deliverable';
+ $config->project->execution->dtable->fieldList['deliverable']['type'] = 'html';
+ $config->project->execution->dtable->fieldList['deliverable']['width'] = '100px';
+ $config->project->execution->dtable->fieldList['deliverable']['group'] = '1';
+ $config->project->execution->dtable->fieldList['deliverable']['show'] = true;
+ $config->project->execution->dtable->fieldList['deliverable']['sortType'] = false;
+}
+
$config->project->execution->dtable->fieldList['PM']['title'] = $lang->project->PM;
$config->project->execution->dtable->fieldList['PM']['name'] = 'PM';
$config->project->execution->dtable->fieldList['PM']['type'] = 'avatarBtn';
diff --git a/module/project/config/form.php b/module/project/config/form.php
index 143cfdf679..56bcdab02a 100755
--- a/module/project/config/form.php
+++ b/module/project/config/form.php
@@ -36,6 +36,7 @@ $config->project->form->edit = $config->project->form->create;
$config->project->form->edit['products'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->project->form->edit['branch'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->project->form->edit['plans'] = array('type' => 'array', 'required' => false, 'default' => array());
+$config->project->form->edit['taskDateLimit'] = array('type' => 'string', 'required' => false, 'default' => array());
unset($config->project->form->edit['hasProduct']);
unset($config->project->form->edit['stageBy']);
unset($config->project->form->edit['multiple']);
diff --git a/module/project/control.php b/module/project/control.php
index d149e07841..ac679da73a 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -652,7 +652,10 @@ class project extends control
$this->executeHooks($projectID);
list($userPairs, $userList) = $this->projectZen->buildUsers();
- if($this->config->edition != 'open') $this->view->workflowGroups = $this->loadModel('workflowgroup')->getPairs('project', $project->model, $project->hasProduct, 'all');
+ if($this->config->edition != 'open' && !empty($project->workflowGroup))
+ {
+ $this->view->workflowGroup = $this->loadModel('workflowgroup')->getByID((int)$project->workflowGroup);
+ }
$this->view->title = $this->lang->project->view;
$this->view->projectID = $projectID;
diff --git a/module/project/js/execution.ui.js b/module/project/js/execution.ui.js
index 34c170f9c4..fb34cd5df4 100644
--- a/module/project/js/execution.ui.js
+++ b/module/project/js/execution.ui.js
@@ -93,7 +93,7 @@ window.onRenderCell = function(result, {col, row})
return result;
}
if(col.name == 'rawID' && data.parent && !data.isExecution) result.push({className: 'ml-5'});
- if(['estimate', 'consumed', 'left'].includes(col.name) && result) result[0] = data.type == 'point' ? '' : {html: result[0] + ' h'};
+ if(['estimate', 'consumed', 'left', 'totalEstimate', 'totalConsumed', 'totalLeft'].includes(col.name) && result && typeof result[0] != 'undefined') result[0] = data.type == 'point' ? '' : {html: result[0] + ' h'};
if(col.name == 'progress' && data.type == 'point') result[0] = '';
return result;
diff --git a/module/project/tao.php b/module/project/tao.php
index b941368228..3ba79f722f 100755
--- a/module/project/tao.php
+++ b/module/project/tao.php
@@ -1050,6 +1050,7 @@ class projectTao extends projectModel
include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
+ if($projectModel == 'ipd') unset($lang->waterfall->menu->other['dropMenu']->deliverable);
$lang->execution->typeList['sprint'] = $executionCommonLang;
}
elseif($projectModel == 'kanban')
diff --git a/module/project/test/model/addplans.php b/module/project/test/model/addplans.php
index 7cab569203..5f9e6c3418 100755
--- a/module/project/test/model/addplans.php
+++ b/module/project/test/model/addplans.php
@@ -8,7 +8,9 @@ zenData('product')->gen(100);
zenData('productplan')->gen(100);
$storyTable = zenData('story');
$storyTable->status->range('active');
+$storyTable->version->range('1');
$storyTable->gen(100);
+zenData('storyspec')->gen(100);
zenData('planstory')->gen(100);
zenData('projectstory')->gen(0);
@@ -20,6 +22,15 @@ title=测试 projectModel::addPlans();
timeout=0
cid=1
+- 将计划1，4，7下的需求关联到项目13，查看关联后的需求数 @16
+- 将计划1，4，7下的需求关联到项目13，查看关联后的需求ID/产品ID
+ - 第3条的story属性 @4
+ - 第3条的product属性 @1
+- 将计划2，5，10，13下的需求关联到项目11，查看关联后的需求数 @8
+- 将计划2，5，10，13下的需求关联到项目11，查看关联后的需求ID/产品ID
+ - 第0条的story属性 @13
+ - 第0条的product属性 @4
+
*/
$project = new Project();
@@ -32,4 +43,4 @@ r($project->addPlansTest(13, $plan)) && p('3:story,product') && e('4,1'); // 将
$plan = array();
$plan[1] = array(2, 5, 10, 13);
r(count($project->addPlansTest(11, $plan))) && p('') && e('8'); // 将计划2，5，10，13下的需求关联到项目11，查看关联后的需求数
-r($project->addPlansTest(11, $plan)) && p('0:story,product') && e('13,4'); // 将计划2，5，10，13下的需求关联到项目11，查看关联后的需求ID/产品ID
+r($project->addPlansTest(11, $plan)) && p('0:story,product') && e('13,4'); // 将计划2，5，10，13下的需求关联到项目11，查看关联后的需求ID/产品ID
\ No newline at end of file
diff --git a/module/project/test/model/batchupdate.php b/module/project/test/model/batchupdate.php
index 91824daaf1..4ad7533a3a 100755
--- a/module/project/test/model/batchupdate.php
+++ b/module/project/test/model/batchupdate.php
@@ -29,6 +29,27 @@ title=测试taskModel->batchUpdate();
timeout=0
cid=1
+- 查看被编辑了的项目数量 @3
+- 查看被编辑了的项目11详情
+ - 第1条的name属性 @批量修改项目11
+ - 第1条的parent属性 @1
+ - 第1条的PM属性 @user10
+ - 第1条的begin属性 @2022-02-08
+ - 第1条的acl属性 @open
+- 查看被编辑了的项目12详情
+ - 第2条的name属性 @批量修改项目12
+ - 第2条的parent属性 @2
+ - 第2条的PM属性 @user11
+ - 第2条的begin属性 @2022-03-05
+ - 第2条的acl属性 @private
+- 查看被编辑了的项目13详情
+ - 第3条的name属性 @批量修改项目13
+ - 第3条的parent属性 @3
+ - 第3条的PM属性 @user13
+ - 第3条的begin属性 @2022-02-19
+ - 第3条的acl属性 @program
+- 异常情况第message[end]条的0属性 @ID4『计划完成』应当大于『2023-02-19』。
+
*/
$project = new Project();
@@ -40,7 +61,7 @@ $data[1]->parent = 1;
$data[1]->PM = 'user10';
$data[1]->begin = '2022-02-08';
$data[1]->end = '2022-04-13';
-$data[1]->day = 10;
+$data[1]->days = 10;
$data[1]->acl = 'open';
$data[2] = new stdClass();
@@ -49,7 +70,7 @@ $data[2]->parent = 2;
$data[2]->PM = 'user11';
$data[2]->begin = '2022-03-05';
$data[2]->end = '2022-04-13';
-$data[2]->day = 10;
+$data[2]->days = 10;
$data[2]->acl = 'private';
$data[3] = new stdClass();
@@ -58,7 +79,7 @@ $data[3]->parent = 3;
$data[3]->PM = 'user13';
$data[3]->begin = '2022-02-19';
$data[3]->end = '2022-04-13';
-$data[3]->day = 14;
+$data[3]->days = 14;
$data[3]->acl = 'program';
$projects = $project->batchUpdate($data);
@@ -79,4 +100,4 @@ $data[4]->day = 14;
$data[4]->acl = 'program';
$projects = $project->batchUpdate($data);
-r($projects) && p('message[end]:0') && e('ID4『计划完成』应当大于『2023-02-19』。'); // 异常情况
+r($projects) && p('message[end]:0') && e('ID4『计划完成』应当大于『2023-02-19』。'); // 异常情况
\ No newline at end of file
diff --git a/module/project/test/model/getdisabledproducts.php b/module/project/test/model/getdisabledproducts.php
index 2fd5c5cb4a..aa45dc5eb8 100644
--- a/module/project/test/model/getdisabledproducts.php
+++ b/module/project/test/model/getdisabledproducts.php
@@ -9,6 +9,13 @@ title=测试 projectModel->getDisabledProducts();
timeout=0
cid=1
+- 测试获取敏捷项目不可修改产品 @0
+- 测试获取以产品创建的瀑布项目不可修改产品属性2 @项目已经关联了该产品中的研发需求，不能取消关联，您可以取消关联研发需求后再操作。
+- 测试获取以产品创建的瀑布项目不可修改产品属性3 @该产品已经创建了阶段，如需解除与项目的关联，请删除已创建的阶段后再操作。
+- 测试获取以产品创建的瀑布项目不可修改产品属性4 @该产品已经创建了阶段并关联了研发需求，如需解除与项目的关联，请先解除研发需求的关联关系，然后删除已创建的阶段后再操作。
+- 测试获取以项目创建的瀑布项目不可修改产品属性5 @该产品的研发需求已经关联到了项目和执行中，请先解除研发需求与项目和执行的关联后再操作。
+- 测试获取以项目创建的瀑布项目不可修改产品属性6 @项目已经关联了该产品中的研发需求，不能取消关联，您可以取消关联研发需求后再操作。
+
*/
zenData('project')->loadYaml('project')->gen(10);
@@ -24,4 +31,4 @@ r($projectTester->getDisabledProductsTest($projectIdList[1])) && p('2') && e('
r($projectTester->getDisabledProductsTest($projectIdList[2])) && p('3') && e('该产品已经创建了阶段，如需解除与项目的关联，请删除已创建的阶段后再操作。'); // 测试获取以产品创建的瀑布项目不可修改产品
r($projectTester->getDisabledProductsTest($projectIdList[3])) && p('4') && e('该产品已经创建了阶段并关联了研发需求，如需解除与项目的关联，请先解除研发需求的关联关系，然后删除已创建的阶段后再操作。'); // 测试获取以产品创建的瀑布项目不可修改产品
r($projectTester->getDisabledProductsTest($projectIdList[4])) && p('5') && e('该产品的研发需求已经关联到了项目和执行中，请先解除研发需求与项目和执行的关联后再操作。'); // 测试获取以项目创建的瀑布项目不可修改产品
-r($projectTester->getDisabledProductsTest($projectIdList[5])) && p('6') && e('项目已经关联了该产品中的研发需求，不能取消关联，您可以取消关联研发需求后再操作。'); // 测试获取以项目创建的瀑布项目不可修改产品
+r($projectTester->getDisabledProductsTest($projectIdList[5])) && p('6') && e('项目已经关联了该产品中的研发需求，不能取消关联，您可以取消关联研发需求后再操作。'); // 测试获取以项目创建的瀑布项目不可修改产品
\ No newline at end of file
diff --git a/module/project/test/model/yaml/getdisabledproducts/project.yaml b/module/project/test/model/yaml/getdisabledproducts/project.yaml
index 2cf2a1d34d..f1aaef5293 100644
--- a/module/project/test/model/yaml/getdisabledproducts/project.yaml
+++ b/module/project/test/model/yaml/getdisabledproducts/project.yaml
@@ -7,7 +7,7 @@ fields:
- field: type
range: project{6},stage{6}
- field: stageBy
- range: "product{4},project{2},[]{6}"
+ range: "product{4},project{2}"
- field: project
range: '0{6},3{2},4,5'
- field: model
diff --git a/module/project/test/tao/setmenubymodel.php b/module/project/test/tao/setmenubymodel.php
index 37648e686f..391d2b8b4d 100644
--- a/module/project/test/tao/setmenubymodel.php
+++ b/module/project/test/tao/setmenubymodel.php
@@ -9,8 +9,16 @@ su('admin');
/**
title=测试 projectModel::setMenuByModel();
+timeout=0
cid=1
-pid=1
+
+- 项目不存在的情况 @迭代
+- 项目不存在的情况 @迭代
+- 敏捷项目 @迭代
+- 融合敏捷项目 @迭代
+- 融合瀑布项目 @阶段
+- 瀑布项目 @阶段
+- 看板项目 @项目看板
*/
@@ -22,4 +30,4 @@ r($projectTester->setMenuByModelTest('scrum')) && p() && e('迭代');
r($projectTester->setMenuByModelTest('agileplus')) && p() && e('迭代'); // 融合敏捷项目
r($projectTester->setMenuByModelTest('waterfall')) && p() && e('阶段'); // 融合瀑布项目
r($projectTester->setMenuByModelTest('waterfallplus')) && p() && e('阶段'); // 瀑布项目
-r($projectTester->setMenuByModelTest('kanban')) && p() && e('项目看板'); // 看板项目
+r($projectTester->setMenuByModelTest('kanban')) && p() && e('项目看板'); // 看板项目
\ No newline at end of file
diff --git a/module/project/ui/browsebycard.html.php b/module/project/ui/browsebycard.html.php
index 67456d5ae4..e2b28d4efa 100644
--- a/module/project/ui/browsebycard.html.php
+++ b/module/project/ui/browsebycard.html.php
@@ -44,7 +44,7 @@ featureBar
set::text($lang->project->mine),
set::checked($this->cookie->involved ? 'checked' : '')
),
- li(searchToggle(set::module('project')))
+ li(searchToggle(set::module('project'), set::open($browseType == 'bysearch')))
);
/* zin: Define the toolbar on main menu. */
diff --git a/module/project/ui/browsebylist.html.php b/module/project/ui/browsebylist.html.php
index f2ea2480d0..5d64b2314e 100644
--- a/module/project/ui/browsebylist.html.php
+++ b/module/project/ui/browsebylist.html.php
@@ -25,7 +25,7 @@ featureBar
set::text($lang->project->mine),
set::checked($this->cookie->involved ? 'checked' : '')
),
- li(searchToggle(set::module('project')))
+ li(searchToggle(set::module('project'), set::open($browseType == 'bysearch')))
);
/* zin: Define the toolbar on main menu. */
diff --git a/module/project/ui/view.html.php b/module/project/ui/view.html.php
index ee38c06624..e3e719c0ed 100644
--- a/module/project/ui/view.html.php
+++ b/module/project/ui/view.html.php
@@ -277,12 +277,12 @@ row
(
setClass('flex mt-4 program'),
$programDom ? div(setClass('clip programBox w-1/2'), $programDom) : null,
- $config->edition != 'open' && $project->workflowGroup ? div
+ $config->edition != 'open' && !empty($project->workflowGroup) ? div
(
setClass('clip w-1/2'),
set::title($lang->project->workflowGroup),
icon('flow', setClass('pr-1')),
- zget($workflowGroups, $project->workflowGroup)
+ $workflowGroup->name
) : null
),
div
diff --git a/module/project/zen.php b/module/project/zen.php
index ec118dcc37..2cd37c4278 100755
--- a/module/project/zen.php
+++ b/module/project/zen.php
@@ -330,7 +330,8 @@ class projectZen extends project
if($this->config->edition != 'open')
{
$workflowGroups = $this->loadModel('workflowgroup')->getPairs('project', $model, $hasProduct, 'normal', '0');
- $this->view->workflowGroups = $this->workflowgroup->appendBuildinLabel($workflowGroups);
+ $this->view->workflowGroupPairs = $workflowGroups;
+ $this->view->workflowGroups = $this->workflowgroup->appendBuildinLabel($workflowGroups);
}
/* Get copy projects. */
@@ -478,12 +479,18 @@ class projectZen extends project
$this->view->availableBudget = $parentProject ? $this->program->getBudgetLeft($parentProject) + (float)$project->budget : $project->budget;
$this->view->budgetUnitList = $this->project->getBudgetUnitList();
$this->view->model = $project->model;
- $this->view->disableModel = $this->project->checkCanChangeModel($projectID, $project->model) ? '' : 'disabled';
+ $this->view->disableModel = $this->project->checkCanChangeModel($projectID, $project->model) ? false : true;
$this->view->teamMembers = $this->user->getTeamMemberPairs($projectID, 'project');
$this->view->from = $from;
$this->view->programID = $programID;
$this->view->disableParent = $disableParent;
$this->view->groups = $this->loadModel('group')->getPairs();
+
+ if(in_array($this->config->edition, array('max', 'ipd')) && $this->project->checkUploadedDeliverable($project))
+ {
+ $this->view->disableModel = true;
+ }
+
$this->display();
}
@@ -1393,6 +1400,12 @@ class projectZen extends project
$project->estimate = helper::formatHours($project->estimate);
$project->consume = helper::formatHours($project->consume);
$project->left = helper::formatHours($project->left);
+
+ /* 交付物提交进度。 */
+ if(in_array($this->config->edition, array('max', 'ipd')))
+ {
+ $project->deliverable = $this->project->countDeliverable($project);
+ }
}
return array_values($projectList);
diff --git a/module/repo/css/ajaxgeteditorcontent.ui.css b/module/repo/css/ajaxgeteditorcontent.ui.css
index 7f49d6ba58..faf9fbd61a 100644
--- a/module/repo/css/ajaxgeteditorcontent.ui.css
+++ b/module/repo/css/ajaxgeteditorcontent.ui.css
@@ -37,8 +37,8 @@
#related .nav-item {gap: 0;}
.nav-tabs>li>a.active {font-weight: 700;color: #313c52!important}
#relationTabs .tab-content{overflow: auto;}
-.repoCode .view-line-icon {position: absolute; right: 50px; top: 2px; font-weight: bold; cursor: pointer;background-color: white;padding: 1px 8px}
-.repoCode .view-line-icon.add-bug {left: 5px;}
+.repoCode .view-line-icon {position: absolute; top: 2px; font-weight: bold; cursor: pointer;background-color: white;padding: 1px 8px}
+.repoCode .view-line-icon.add-bug {left: 10px;}
.repoCode .view-line-icon.add-bug .icon {font-weight: bold;}
.repoCode .view-line-icon .bug-count {vertical-align: middle; padding-left: 5px;}
.repoCode #bugForm {margin: 0; padding: 10px 20px 10px 0;}
diff --git a/module/search/ui/buildform.html.php b/module/search/ui/buildform.html.php
index f299dbe961..0c98e39247 100644
--- a/module/search/ui/buildform.html.php
+++ b/module/search/ui/buildform.html.php
@@ -16,8 +16,10 @@ foreach($fieldParams as $name => $param)
$condition->name = $name;
$condition->control = $param['control'];
$condition->defaultOperator = $param['operator'];
- if(isset($config->search->controlProps[$module][$name])) $condition->controlProps = $config->search->controlProps[$module][$name];
$condition->placeholder = '';
+ $condition->controlProps = isset($config->search->controlProps[$module][$name]) ? (array)$config->search->controlProps[$module][$name] : array();
+ if($condition->control == 'select' && !isset($condition->controlProps['maxItemsCount'])) $condition->controlProps['maxItemsCount'] = 200;
+
if(isset($param['class']) && in_array('date', explode(' ', $param['class'])))
{
diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php
index 799938d50d..26cb07e32e 100644
--- a/module/sonarqube/control.php
+++ b/module/sonarqube/control.php
@@ -376,7 +376,7 @@ class sonarqube extends control
*/
public function browseIssue(int $sonarqubeID, string $projectKey = '', bool $search = false, string $orderBy = 'severity_desc', int $recPerPage = 100, int $pageID = 1)
{
- $projectKey = str_replace('*', '-', $projectKey);
+ $projectKey = helper::safe64Decode(urldecode($projectKey));
if(isset($_POST['keyword']))
{
$keyword = htmlspecialchars(trim($_POST['keyword']));
diff --git a/module/sonarqube/js/browseproject.ui.js b/module/sonarqube/js/browseproject.ui.js
index 1e0c7d8fec..39030115b0 100644
--- a/module/sonarqube/js/browseproject.ui.js
+++ b/module/sonarqube/js/browseproject.ui.js
@@ -1,4 +1,4 @@
-function search()
+window.searchProject = function()
{
loadPage({method:'post', data: {keyword: $('#keyword').val()}, target: '#table-sonarqube-browseproject>*'});
}
diff --git a/module/sonarqube/ui/browseissue.html.php b/module/sonarqube/ui/browseissue.html.php
index d011155071..3b407efc18 100644
--- a/module/sonarqube/ui/browseissue.html.php
+++ b/module/sonarqube/ui/browseissue.html.php
@@ -12,7 +12,7 @@ declare(strict_types=1);
namespace zin;
-$replaceKey = str_replace('-', '*', $projectKey);
+$replaceKey = urlencode(helper::safe64Encode($projectKey));
$issueList = array();
foreach($sonarqubeIssueList as $issue)
{
diff --git a/module/sonarqube/ui/browseproject.html.php b/module/sonarqube/ui/browseproject.html.php
index 458a214338..eb5adfad10 100644
--- a/module/sonarqube/ui/browseproject.html.php
+++ b/module/sonarqube/ui/browseproject.html.php
@@ -38,6 +38,7 @@ featureBar
),
form
(
+ set::ajax(array('beforeSubmit' => jsRaw('() => {window.searchProject(); return false;}'))),
setID('searchForm'),
setClass('ml-4'),
set::actions(array()),
@@ -53,7 +54,7 @@ featureBar
(
setClass('primary'),
$lang->sonarqube->search,
- on::click('search')
+ on::click('searchProject')
)
)
)
diff --git a/module/sonarqube/ui/reportview.html.php b/module/sonarqube/ui/reportview.html.php
index 7e7fbf0a9a..43bf57dde8 100644
--- a/module/sonarqube/ui/reportview.html.php
+++ b/module/sonarqube/ui/reportview.html.php
@@ -30,7 +30,7 @@ div
setClass('text-md font-bold'),
set('data-close-modal', true),
$projectName,
- $qualitygate && hasPriv('instance', 'manage') ? set::href(createLink('sonarqube', 'browseIssue', "sonarqubeID={$sonarqubeID}&project=" . str_replace('-', '*', $projectKey))) : null
+ $qualitygate && hasPriv('instance', 'manage') ? set::href(createLink('sonarqube', 'browseIssue', "sonarqubeID={$sonarqubeID}&project=" . urlencode(helper::safe64Encode($projectKey)))) : null
),
label
(
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 4aae120834..715f1c7780 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -18,6 +18,7 @@ $lang->story->createStory = 'Create ' . $lang->story->story;
$lang->story->createRequirement = 'Create ' . $lang->story->requirement;
$lang->story->affectedStories = "Affected {$lang->story->story}";
+$lang->story->browse = "{$lang->SRCommon} List";
$lang->story->batchCreate = "Mehere hinzufügen";
$lang->story->change = "Ändern";
$lang->story->changed = 'Geändert';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 58e543813c..58c8f29eec 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -18,6 +18,7 @@ $lang->story->createStory = 'Create ' . $lang->story->story;
$lang->story->createRequirement = 'Create ' . $lang->story->requirement;
$lang->story->affectedStories = "Affected {$lang->story->story}";
+$lang->story->browse = "{$lang->SRCommon} List";
$lang->story->batchCreate = "Batch Create";
$lang->story->change = "Change";
$lang->story->changed = 'Change';
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index df707ddfde..664d5ad42b 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -18,6 +18,7 @@ $lang->story->createStory = 'Create ' . $lang->story->story;
$lang->story->createRequirement = 'Create ' . $lang->story->requirement;
$lang->story->affectedStories = "Affected {$lang->story->story}";
+$lang->story->browse = "{$lang->SRCommon} List";
$lang->story->batchCreate = "Créer par Lot";
$lang->story->change = "Changer";
$lang->story->changed = 'Changée';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 3727d87cd6..753bb04682 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -18,6 +18,7 @@ $lang->story->createStory = '添加' . $lang->story->story;
$lang->story->createRequirement = '添加' . $lang->story->requirement;
$lang->story->affectedStories = "影响的{$lang->story->story}";
+$lang->story->browse = "{$lang->SRCommon}列表";
$lang->story->batchCreate = "批量创建";
$lang->story->change = "变更";
$lang->story->changed = "{$lang->SRCommon}变更";
diff --git a/module/story/model.php b/module/story/model.php
index f8cfbda8f7..5d98009f0b 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -935,7 +935,19 @@ class storyModel extends model
$this->action->logHistory($actionID, $changes);
if(isset($story->finalResult))
{
- $action = $story->finalResult == 'clarify' ? 'ReviewClarified' : 'review' . $story->finalResult . 'ed';
+ if($story->finalResult == 'clarify')
+ {
+ $action = 'reviewclarified';
+ }
+ elseif($story->finalResult == 'active')
+ {
+ $action = 'reviewpassed';
+ }
+ else
+ {
+ $action = 'review' . $story->finalResult . 'ed';
+ }
+
$this->action->create('story', $storyID, $action, '', "{$story->finalResult}|$oldStatus");
}
}
@@ -1759,18 +1771,18 @@ class storyModel extends model
$allChanges[$storyID] = common::createChanges($oldStory, $story);
if($story->plan != $oldStory->plan and !empty($oldStory->plan) and $oldStory->type == 'story')
{
- foreach(explode(',', (string)$oldStory->plan) as $planID)
+ foreach(explode(',', (string)$oldStory->plan) as $oldPlanID)
{
- if(!$planID) continue;
- $unlinkPlans[$planID] = empty($unlinkPlans[$planID]) ? $storyID : "{$unlinkPlans[$planID]},$storyID";
+ if(!$oldPlanID) continue;
+ $unlinkPlans[$oldPlanID] = empty($unlinkPlans[$oldPlanID]) ? $storyID : "{$unlinkPlans[$oldPlanID]},$storyID";
}
}
if($story->plan != $oldStory->plan and !empty($story->plan))
{
- foreach(explode(',', (string)$story->plan) as $planID)
+ foreach(explode(',', (string)$story->plan) as $newPlanID)
{
- if(!$planID) continue;
- $link2Plans[$planID] = empty($link2Plans[$planID]) ? $storyID : "{$link2Plans[$planID]},$storyID";
+ if(!$newPlanID) continue;
+ $link2Plans[$newPlanID] = empty($link2Plans[$newPlanID]) ? $storyID : "{$link2Plans[$newPlanID]},$storyID";
}
}
}
diff --git a/module/story/test/model/batchchangeplan.php b/module/story/test/model/batchchangeplan.php
index fb1ad44615..772ec505ee 100755
--- a/module/story/test/model/batchchangeplan.php
+++ b/module/story/test/model/batchchangeplan.php
@@ -8,18 +8,18 @@ timeout=0
cid=0
- 批量修改6个需求的计划，查看被修改计划的需求数量 @4
-- 批量修改6个需求的计划，查看被修改计划的需求数量 @3
+- 批量修改6个需求的计划，查看被修改计划的需求数量 @4
- 批量修改6个需求的计划，查看需求1修改后的计划ID第1条的plan属性 @10
- 批量修改6个需求的计划，查看需求2修改后的计划ID第2条的plan属性 @10
- 批量修改6个需求的计划，查看需求4修改后的计划ID第4条的plan属性 @2,10
- 批量修改6个需求的计划，查看需求5修改后的计划ID第5条的plan属性 @10
- 批量修改6个需求的计划，查看需求1修改后的计划ID第1条的plan属性 @10,9
- 批量修改6个需求的计划，查看需求2修改后的计划ID第2条的plan属性 @9
-- 批量修改6个需求的计划，查看需求4修改后的计划ID第4条的plan属性 @2,10
+- 批量修改6个需求的计划，查看需求4修改后的计划ID第4条的plan属性 @2,9
- 批量修改6个需求的计划，查看需求1修改后的计划ID第1条的plan属性 @10,9,5
- 批量修改6个需求的计划，查看需求2修改后的计划ID第2条的plan属性 @5
-- 批量修改6个需求的计划，查看需求4修改后的计划ID第4条的plan属性 @2,10,5
-- 批量修改6个需求的计划，查看需求5修改后的计划ID第5条的plan属性 @10,5
+- 批量修改6个需求的计划，查看需求4修改后的计划ID第4条的plan属性 @2,5
+- 批量修改6个需求的计划，查看需求5修改后的计划ID第5条的plan属性 @10,9,5
*/
include dirname(__FILE__, 5) . '/test/lib/init.php';
@@ -51,15 +51,15 @@ $stories2 = $story->batchChangePlanTest($storyIdList, 9);
$stories3 = $story->batchChangePlanTest($storyIdList, 5, 9);
r(count($stories1)) && p() && e('4'); // 批量修改6个需求的计划，查看被修改计划的需求数量
-r(count($stories2)) && p() && e('3'); // 批量修改6个需求的计划，查看被修改计划的需求数量
+r(count($stories2)) && p() && e('4'); // 批量修改6个需求的计划，查看被修改计划的需求数量
r($stories1) && p('1:plan') && e('10'); // 批量修改6个需求的计划，查看需求1修改后的计划ID
r($stories1) && p('2:plan') && e('10'); // 批量修改6个需求的计划，查看需求2修改后的计划ID
r($stories1) && p('4:plan', '|') && e('2,10'); // 批量修改6个需求的计划，查看需求4修改后的计划ID
r($stories1) && p('5:plan') && e('10'); // 批量修改6个需求的计划，查看需求5修改后的计划ID
r($stories2) && p('1:plan', '|') && e('10,9'); // 批量修改6个需求的计划，查看需求1修改后的计划ID
r($stories2) && p('2:plan') && e('9'); // 批量修改6个需求的计划，查看需求2修改后的计划ID
-r($stories2) && p('4:plan', '|') && e('2,10'); // 批量修改6个需求的计划，查看需求4修改后的计划ID
+r($stories2) && p('4:plan', '|') && e('2,9'); // 批量修改6个需求的计划，查看需求4修改后的计划ID
r($stories3) && p('1:plan', '|') && e('10,9,5'); // 批量修改6个需求的计划，查看需求1修改后的计划ID
r($stories3) && p('2:plan') && e('5'); // 批量修改6个需求的计划，查看需求2修改后的计划ID
-r($stories3) && p('4:plan', '|') && e('2,10,5'); // 批量修改6个需求的计划，查看需求4修改后的计划ID
-r($stories3) && p('5:plan', '|') && e('10,5'); // 批量修改6个需求的计划，查看需求5修改后的计划ID
\ No newline at end of file
+r($stories3) && p('4:plan', '|') && e('2,5'); // 批量修改6个需求的计划，查看需求4修改后的计划ID
+r($stories3) && p('5:plan', '|') && e('10,9,5'); // 批量修改6个需求的计划，查看需求5修改后的计划ID
\ No newline at end of file
diff --git a/module/story/ui/batchtotask.html.php b/module/story/ui/batchtotask.html.php
index ec81bfdb5a..cb161d1421 100644
--- a/module/story/ui/batchtotask.html.php
+++ b/module/story/ui/batchtotask.html.php
@@ -28,10 +28,10 @@ $fields['story'] = array_merge(array('name' => 'story', 'label' => $la
$fields['name'] = array_merge(array('name' => 'name', 'label' => $lang->task->name, 'width' => '250px', 'ditto' => false, 'defaultDitto' => 'off', 'filter' => 'trim', 'control' => 'text'), $config->task->form->batchcreate['name']);
$fields['type'] = array_merge(array('name' => 'type', 'label' => $lang->typeAB, 'width' => '140px', 'ditto' => true, 'defaultDitto' => 'off', 'items' => $lang->task->typeList, 'control' => 'picker'), $config->task->form->batchcreate['type']);
$fields['assignedTo'] = array_merge(array('name' => 'assignedTo', 'label' => $lang->task->assignedTo, 'width' => '128px', 'ditto' => false, 'defaultDitto' => 'off', 'items' => $members, 'control' => array('control' => 'taskAssignedTo', 'manageLink' => ($manageLink ? $manageLink : ''))), $config->task->form->batchcreate['assignedTo']);
-$fields['estimate'] = array_merge(array('name' => 'estimate', 'label' => $lang->task->estimateAB, 'width' => '120px', 'ditto' => true, 'defaultDitto' => 'on', 'filter' => 'trim', 'control' => 'text'), $config->task->form->batchcreate['estimate']);
+$fields['estimate'] = array_merge(array('name' => 'estimate', 'label' => $lang->task->estimateAB, 'width' => '120px', 'ditto' => true, 'defaultDitto' => 'off', 'filter' => 'trim', 'control' => 'text'), $config->task->form->batchcreate['estimate']);
$fields['estStarted'] = array_merge(array('name' => 'estStarted', 'label' => $lang->task->estStarted, 'width' => '120px', 'ditto' => true, 'defaultDitto' => 'on', 'filter' => 'trim', 'control' => 'date'), $config->task->form->batchcreate['estStarted']);
$fields['deadline'] = array_merge(array('name' => 'deadline', 'label' => $lang->task->deadline, 'width' => '120px', 'ditto' => true, 'defaultDitto' => 'on', 'filter' => 'trim', 'control' => 'date'), $config->task->form->batchcreate['deadline']);
-$fields['pri'] = array_merge(array('name' => 'pri', 'label' => $lang->task->pri, 'width' => '110px', 'ditto' => true, 'defaultDitto' => 'on', 'items' => $lang->task->priList, 'control' => 'priPicker'), $config->task->form->batchcreate['pri']);
+$fields['pri'] = array_merge(array('name' => 'pri', 'label' => $lang->task->pri, 'width' => '110px', 'ditto' => true, 'defaultDitto' => 'off', 'items' => $lang->task->priList, 'control' => 'priPicker'), $config->task->form->batchcreate['pri']);
$data = array();
foreach($stories as $storyID => $story)
diff --git a/module/story/ui/change.html.php b/module/story/ui/change.html.php
index bb759547dc..c31db507f1 100644
--- a/module/story/ui/change.html.php
+++ b/module/story/ui/change.html.php
@@ -191,7 +191,7 @@ detailBody
(
array('text' => $lang->save, 'data-status' => 'active', 'class' => 'primary', 'btnType' => 'submit'),
array('text' => $lang->story->doNotSubmit, 'data-status' => 'draft', 'class' => 'secondary', 'btnType' => 'submit'),
- array('text' => $lang->goback, 'data-back' => 'APP', 'class' => 'open-url')
+ isInModal() ? null : array('text' => $lang->goback, 'data-back' => 'APP', 'class' => 'open-url')
)),
sectionList($formItems),
h::hr(),
diff --git a/module/story/ui/edit.html.php b/module/story/ui/edit.html.php
index ccf24c8f39..09f33d0351 100644
--- a/module/story/ui/edit.html.php
+++ b/module/story/ui/edit.html.php
@@ -197,6 +197,7 @@ detailBody
),
section
(
+ setID('comment'),
set::title($lang->story->comment),
formGroup(editor(set::name('comment'), set::uid($uid)))
)
diff --git a/module/system/control.php b/module/system/control.php
index d00c41dd94..703ff319b9 100644
--- a/module/system/control.php
+++ b/module/system/control.php
@@ -43,10 +43,11 @@ class system extends control
$actions = $this->loadModel('action')->getDynamic('all', 'today');
- $this->view->title = $this->lang->my->common;
- $this->view->instances = $instances;
- $this->view->actions = $actions;
- $this->view->pager = $pager;
+ $this->view->title = $this->lang->my->common;
+ $this->view->instances = $instances;
+ $this->view->actions = $actions;
+ $this->view->pager = $pager;
+ $this->view->instanceTotal = $this->instance->getInstanceCount();
$this->display();
}
@@ -715,10 +716,12 @@ class system extends control
{
$cneMetrics = $this->loadModel('cne')->cneMetrics();
$result = array(
- 'status' => $cneMetrics->status,
- 'node_count' => $cneMetrics->node_count,
- 'cpuInfo' => $this->systemZen->getCpuUsage($cneMetrics->metrics->cpu),
- 'memoryInfo' => $this->systemZen->getMemUsage($cneMetrics->metrics->memory)
+ 'status' => $cneMetrics->status,
+ 'node_count' => $cneMetrics->node_count,
+ 'ready_count' => zget($cneMetrics, 'ready_count', 0),
+ 'nodeError' => zget($cneMetrics, 'nodeError', ''),
+ 'cpuInfo' => $this->systemZen->getCpuUsage($cneMetrics->metrics->cpu),
+ 'memoryInfo' => $this->systemZen->getMemUsage($cneMetrics->metrics->memory)
);
return $this->send(array('result' => 'success', 'data' => $result));
}
diff --git a/module/system/js/dashboard.ui.js b/module/system/js/dashboard.ui.js
index 949a16a1fc..f5420df8ae 100644
--- a/module/system/js/dashboard.ui.js
+++ b/module/system/js/dashboard.ui.js
@@ -87,7 +87,17 @@ function loadCneStatistic()
memoryCircle = new zui.ProgressCircle('#memory-circle', {percent: 0, size: 160, circleColor: memoryInfo.color, circleWidth: 8, text: ''});
$('#status-icon').replaceWith('');
$('#cne-statistic .cne-status').text(statusList[res.data.status]);
- $('#cne-statistic .node-quantity').text(res.data.node_count);
+ const nodeQuantity = res.data.node_count == res.data.ready_count ? res.data.ready_count : res.data.ready_count + '/' + res.data.node_count;
+ $('#cne-statistic .node-quantity').text(nodeQuantity);
+ const nodeError = res.data.nodeError;
+ if(!nodeError)
+ {
+ $('#cne-statistic .node-quantity-help').addClass('hidden');
+ }
+ else
+ {
+ $('#cne-statistic .node-quantity-help').removeClass('hidden').attr('title', nodeError);
+ }
$('#cne-statistic .icon-cpu').css('color' , cpuInfo.color);
$('#cne-statistic .icon-memory').css('color' , memoryInfo.color);
$('.cpu-rate').html(cpuInfo.rate + '%');
diff --git a/module/system/lang/de.php b/module/system/lang/de.php
index 04a4a5b2cc..b5e089115c 100644
--- a/module/system/lang/de.php
+++ b/module/system/lang/de.php
@@ -304,3 +304,6 @@ $lang->system->platform->navs['ossview'] = 'OSS';
$lang->system->runningStatus['normal'] = 'Normal';
$lang->system->runningStatus['error'] = 'Error';
+
+$lang->system->serviceNotice = 'Only the store app are supported.';
+$lang->system->nodeNotice = 'Node(%s) exception reason: %s';
diff --git a/module/system/lang/en.php b/module/system/lang/en.php
index 04a4a5b2cc..b5e089115c 100644
--- a/module/system/lang/en.php
+++ b/module/system/lang/en.php
@@ -304,3 +304,6 @@ $lang->system->platform->navs['ossview'] = 'OSS';
$lang->system->runningStatus['normal'] = 'Normal';
$lang->system->runningStatus['error'] = 'Error';
+
+$lang->system->serviceNotice = 'Only the store app are supported.';
+$lang->system->nodeNotice = 'Node(%s) exception reason: %s';
diff --git a/module/system/lang/fr.php b/module/system/lang/fr.php
index 04a4a5b2cc..b5e089115c 100644
--- a/module/system/lang/fr.php
+++ b/module/system/lang/fr.php
@@ -304,3 +304,6 @@ $lang->system->platform->navs['ossview'] = 'OSS';
$lang->system->runningStatus['normal'] = 'Normal';
$lang->system->runningStatus['error'] = 'Error';
+
+$lang->system->serviceNotice = 'Only the store app are supported.';
+$lang->system->nodeNotice = 'Node(%s) exception reason: %s';
diff --git a/module/system/lang/zh-cn.php b/module/system/lang/zh-cn.php
index 61005056bc..fa3ec7821a 100644
--- a/module/system/lang/zh-cn.php
+++ b/module/system/lang/zh-cn.php
@@ -304,3 +304,6 @@ $lang->system->platform->navs['ossview'] = '对象存储';
$lang->system->runningStatus['normal'] = '正常';
$lang->system->runningStatus['error'] = '异常';
+
+$lang->system->serviceNotice = '仅统计应用市场安装的服务，手工配置的服务不在统计范围内。';
+$lang->system->nodeNotice = '节点(%s) 异常原因：%s';
diff --git a/module/system/ui/dashboard.html.php b/module/system/ui/dashboard.html.php
index 7ecebb1ab4..80998c2d13 100644
--- a/module/system/ui/dashboard.html.php
+++ b/module/system/ui/dashboard.html.php
@@ -59,13 +59,25 @@ div
(
setClass('flex col justify-between'),
div(setClass('text-4xl font-semibold text-primary node-quantity'), 0),
- $lang->system->nodeQuantity
+ span
+ (
+ $lang->system->nodeQuantity,
+ icon('help node-quantity-help ml-1 text-gray-500 cursor-pointer')
+ )
),
div
(
setClass('flex col justify-between'),
- div(setClass('text-4xl font-semibold text-primary'), zget($pageInfo, 'recTotal', 0)),
- $lang->system->serviceQuantity
+ div
+ (
+ setClass('text-4xl font-semibold text-primary'),
+ zget($pageInfo, 'recTotal', 0) == $instanceTotal ? $instanceTotal : zget($pageInfo, 'recTotal', 0) . '/' . $instanceTotal
+ ),
+ span
+ (
+ $lang->system->serviceQuantity,
+ icon('help ml-1 text-gray-500 cursor-pointer', set::title($lang->system->serviceNotice))
+ )
)
)
)
@@ -150,4 +162,4 @@ div
set::onRenderCell(jsRaw('window.renderInstanceList')),
set::footPager(usePager())
)
-);
\ No newline at end of file
+);
diff --git a/module/task/js/batchedit.ui.js b/module/task/js/batchedit.ui.js
index 8c08ad6d95..6074247c84 100644
--- a/module/task/js/batchedit.ui.js
+++ b/module/task/js/batchedit.ui.js
@@ -39,11 +39,21 @@ window.renderRowData = function($row, index, row)
const parentTask = parentTasks[row.parent];
$row.find('[id^="estStarted"]').on('inited', function(e, info)
{
- if(parentTask.estStarted == '') info[0].render({disabled: true});
+ if(parentTask.estStarted == '')
+ {
+ row.estStarted = '';
+ if(parentTasks[row.id] != undefined) parentTasks[row.id].estStarted = '';
+ info[0].render({readonly: true});
+ }
});
$row.find('[id^="deadline"]').on('inited', function(e, info)
{
- if(parentTask.deadline == '') info[0].render({disabled: true});
+ if(parentTask.deadline == '')
+ {
+ row.deadline = '';
+ if(parentTasks[row.id] != undefined) parentTasks[row.id].deadline = '';
+ info[0].render({readonly: true});
+ }
});
}
@@ -196,14 +206,16 @@ function checkBatchEstStartedAndDeadline(event)
$estStartedTd.find('.date-tip').remove();
const $childrenEstStarted = $(event.target).closest('tbody').find('tr[data-parent="' + taskID + '"]').find('[name^=estStarted]');
+
$childrenEstStarted.each(function()
{
let $childDatePicker = $(this).zui('datePicker');
- $childDatePicker.render({disabled: estStarted.length == 0});
+ $childDatePicker.render({readonly: estStarted.length == 0});
if(estStarted.length == 0) $childDatePicker.$.setValue('');
checkBatchEstStartedAndDeadline({target: this});
});
+
if(estStarted.length > 0)
{
let $datetip = $('');
@@ -233,11 +245,12 @@ function checkBatchEstStartedAndDeadline(event)
$childrenDeadline.each(function()
{
let $childDatePicker = $(this).zui('datePicker');
- $childDatePicker.render({disabled: deadline.length == 0});
+ $childDatePicker.render({readonly: deadline.length == 0});
if(deadline.length == 0) $childDatePicker.$.setValue('');
checkBatchEstStartedAndDeadline({target: this});
});
+
if(deadline.length > 0)
{
let $datetip = $('');
diff --git a/module/task/js/create.ui.js b/module/task/js/create.ui.js
index ea654a9118..ba757f59a4 100644
--- a/module/task/js/create.ui.js
+++ b/module/task/js/create.ui.js
@@ -17,6 +17,8 @@ function toggleTeam()
$assignedToBox.find('.picker-box').addClass('hidden');
$assignedToBox.find('.assignedToList').removeClass('hidden');
$('input[name=estimate]').attr('disabled', true);
+ $('[name=parent]').zui('picker').$.setValue('');
+ $('[name=parent]').zui('picker').render({disabled: true});
}
else
{
@@ -24,6 +26,7 @@ function toggleTeam()
$assignedToBox.find('.picker-box').removeClass('hidden');
$assignedToBox.find('.assignedToList').addClass('hidden');
$('input[name=estimate]').removeAttr('disabled');
+ $('[name=parent]').zui('picker').render({disabled: false});
}
}
diff --git a/module/task/js/edit.ui.js b/module/task/js/edit.ui.js
index cd7ae4ed1e..351accb6fa 100644
--- a/module/task/js/edit.ui.js
+++ b/module/task/js/edit.ui.js
@@ -125,9 +125,12 @@ window.changeMode = function()
$('.team-group').removeClass('hidden');
$('#estimate').attr('readonly', 'readonly');
$('#left').attr('readonly', 'readonly');
+ $('[name=parent]').zui('picker').$.setValue('');
+ $('[name=parent]').zui('picker').render({disabled: true});
}
else
{
+ $('[name=parent]').zui('picker').render({disabled: false});
$('#assignedTo').picker({disabled: false});
$('.team-group').addClass('hidden');
$('#estimate').removeAttr('readonly');
diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index 8feeb4a82b..e544b33c78 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -10,6 +10,7 @@
* @link https://www.zentao.net
*/
$lang->task->index = "Index";
+$lang->task->browse = "Aufgabenliste";
$lang->task->create = "Aufgabe erstellen";
$lang->task->batchCreate = "Mehere erstellen";
$lang->task->batchCreateChildren = "Mehere Teilaufgaben";
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index a9d6796b81..df27a2403d 100755
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -10,6 +10,7 @@
* @link https://www.zentao.net
*/
$lang->task->index = "Home";
+$lang->task->browse = "Task List";
$lang->task->create = "Create Task";
$lang->task->batchCreate = "Batch Create";
$lang->task->batchCreateChildren = "Batch Create Child Tasks";
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index a85ea8bcb5..f6909f442c 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -10,6 +10,7 @@
* @link https://www.zentao.net
*/
$lang->task->index = "Accueil";
+$lang->task->browse = "Liste des Tâches";
$lang->task->create = "Créer Tâche";
$lang->task->batchCreate = "Créer par Lots";
$lang->task->batchCreateChildren = "Créer sous-tâches par lots";
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 164a921461..26c167b100 100755
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -10,6 +10,7 @@
* @link https://www.zentao.net
*/
$lang->task->index = "任务一览";
+$lang->task->browse = "任务列表";
$lang->task->create = "建任务";
$lang->task->batchCreate = "批量创建";
$lang->task->batchCreateChildren = "批量建子任务";
diff --git a/module/task/ui/edit.html.php b/module/task/ui/edit.html.php
index 604bb54ed3..54f84a9d51 100644
--- a/module/task/ui/edit.html.php
+++ b/module/task/ui/edit.html.php
@@ -73,6 +73,9 @@ $closedReasonOptions = $lang->task->reasonList;
$teamOptions = $members;
$hiddenTeam = $task->mode != '' ? '' : 'hidden';
+$disabledEstStarted = $project && $project->taskDateLimit == 'limit' && !empty($parentTask) && helper::isZeroDate($parentTask->estStarted);
+$disabledDeadline = $project && $project->taskDateLimit == 'limit' && !empty($parentTask) && helper::isZeroDate($parentTask->deadline);
+
if($task->status == 'wait') unset($statusOptions['pause']);
if(!empty($task->team))
@@ -251,6 +254,7 @@ detailBody
set::name('parent'),
set::value($task->parent),
set::items($tasks),
+ set::disabled(!empty($task->mode)),
on::change('getParentEstStartedAndDeadline')
)
) : formHidden('parent', $task->parent),
@@ -467,9 +471,9 @@ detailBody
datePicker
(
set::name('estStarted'),
- set::disabled($project && $project->taskDateLimit == 'limit' && !empty($parentTask) && helper::isZeroDate($parentTask->estStarted) ? true : false),
+ set::disabled($disabledEstStarted),
on::change('checkEstStartedAndDeadline'),
- helper::isZeroDate($task->estStarted) ? null : set::value($task->estStarted)
+ set::value((helper::isZeroDate($task->estStarted) || $disabledEstStarted) ? null : $task->estStarted)
)
)
),
@@ -482,9 +486,9 @@ detailBody
datePicker
(
set::name('deadline'),
- set::disabled($project && $project->taskDateLimit == 'limit' && !empty($parentTask) && helper::isZeroDate($parentTask->deadline) ? true : false),
+ set::disabled($disabledDeadline),
on::change('checkEstStartedAndDeadline'),
- helper::isZeroDate($task->deadline) ? null : set::value($task->deadline)
+ set::value((helper::isZeroDate($task->deadline) || $disabledDeadline) ? null : $task->deadline)
)
)
),
diff --git a/module/task/zen.php b/module/task/zen.php
index 0e8fd1089b..d1e0b165aa 100644
--- a/module/task/zen.php
+++ b/module/task/zen.php
@@ -739,7 +739,7 @@ class taskZen extends task
$task->assignedDate = !empty($task->assignedTo) && $oldTask->assignedTo != $task->assignedTo ? $now : $oldTask->assignedDate;
$task->version = $oldTask->name != $task->name || $oldTask->estStarted != $task->estStarted || $oldTask->deadline != $task->deadline ? $oldTask->version + 1 : $oldTask->version;
$task->consumed = $task->consumed < 0 ? $task->consumed : $task->consumed + $oldTask->consumed;
- $task->storyVersion = ($task->story && $oldTask->story != $task->story) ? $this->loadModel('story')->getVersion((int)$task->story) : 1;
+ $task->storyVersion = ($task->story && $oldTask->story != $task->story) ? $this->loadModel('story')->getVersion((int)$task->story) : $oldTask->storyVersion;
if(empty($task->closedReason) && $task->status == 'closed')
{
@@ -1169,7 +1169,9 @@ class taskZen extends task
if($task->status == 'cancel') continue;
if($task->status == 'done' && !$task->consumed) dao::$errors["consumed[{$taskID}]"] = (array)sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime);
- $this->checkLegallyDate($task, $project->taskDateLimit == 'limit', isset($parents[$task->parent]) ? $parents[$task->parent] : null, $taskID);
+ $parentTask = isset($parents[$task->parent]) ? $parents[$task->parent] : null;
+ if(isset($tasks[$task->parent])) $parentTask = zget($tasks, $task->parent, null);
+ $this->checkLegallyDate($task, $project->taskDateLimit == 'limit', $parentTask, $taskID);
}
return !dao::isError();
}
diff --git a/module/todo/model.php b/module/todo/model.php
index 075283c99e..17bffc7f54 100755
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -391,7 +391,6 @@ class todoModel extends model
*/
public function activate(int $todoID): bool
{
- $oldTodo = $this->fetchByID($todoID);
$this->dao->update(TABLE_TODO)->set('status')->eq('wait')->where('id')->eq($todoID)->exec();
$todo = $this->fetchByID($todoID);
diff --git a/module/transfer/ui/import.html.php b/module/transfer/ui/import.html.php
index cbf556678e..5a29070e0f 100644
--- a/module/transfer/ui/import.html.php
+++ b/module/transfer/ui/import.html.php
@@ -22,6 +22,6 @@ formPanel
set::items($typeList)
) : null,
input(set::type('file'), set::name('file')),
- span(setClass('label secondary'), $lang->transfer->importNotice)
+ span(setClass('label secondary h-auto'), $lang->transfer->importNotice)
);
h::js('$.cookie.set("maxImport", 0, {expires:config.cookieLife, path:config.webRoot});');
diff --git a/module/tutorial/model.php b/module/tutorial/model.php
index 0bacf79939..a807b67dcb 100644
--- a/module/tutorial/model.php
+++ b/module/tutorial/model.php
@@ -186,6 +186,7 @@ class tutorialModel extends model
$project->charter = 0;
$project->market = 1;
$project->budgetUnit = 'CNY';
+ $project->deliverable = '';
list($guide, $guideTask, $guideStepIndex) = empty($_SERVER['HTTP_X_ZIN_TUTORIAL']) ? array('', '', '') : explode('-', $_SERVER['HTTP_X_ZIN_TUTORIAL']);
if($guide && strpos($guide, 'scrumProjectManage') !== false)
@@ -292,20 +293,21 @@ class tutorialModel extends model
{
$execution = $this->getExecution();
- $execution->progress = 0;
- $execution->estimate = 0;
- $execution->consumed = 0;
- $execution->left = 0;
- $execution->leftTasks = '—';
- $execution->teamMembers = array_keys($this->getTeamMembers());
- $execution->teamCount = count($execution->teamMembers);
- $execution->hasProduct = '1';
- $execution->multiple = '';
- $execution->order = 1;
- $execution->burns = array();
- $execution->type = 'sprint';
- $execution->projectName = '';
- $execution->projectModel = 'scrum';
+ $execution->progress = 0;
+ $execution->estimate = 0;
+ $execution->consumed = 0;
+ $execution->left = 0;
+ $execution->leftTasks = '—';
+ $execution->teamMembers = array_keys($this->getTeamMembers());
+ $execution->teamCount = count($execution->teamMembers);
+ $execution->hasProduct = '1';
+ $execution->multiple = '';
+ $execution->order = 1;
+ $execution->burns = array();
+ $execution->type = 'sprint';
+ $execution->projectName = '';
+ $execution->projectModel = 'scrum';
+ $execution->deliverable = '';
if($browseType && $browseType != 'all') $execution->name .= '-' . $browseType;
@@ -540,7 +542,7 @@ class tutorialModel extends model
*/
public function getExecutionPairs(): array
{
- return array(3 => 'Test execution');
+ return array(2 => 'Test Project', 3 => 'Test execution');
}
/**
@@ -637,6 +639,8 @@ class tutorialModel extends model
$execution->openedDate = helper::now();
$execution->closedDate = helper::now();
$execution->milestone = 0;
+ $execution->workflowGroup = 0;
+ $execution->deliverable = '';
list($guide, $guideTask, $guideStepIndex) = empty($_SERVER['HTTP_X_ZIN_TUTORIAL']) ? array('', '', '') : explode('-', $_SERVER['HTTP_X_ZIN_TUTORIAL']);
if($guide && strpos($guide, 'scrumProjectManage') !== false)
diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index e0021b04e8..8c60c4d1ba 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -67,7 +67,8 @@ $config->upgrade->maxVersion['max6_5'] = '21_5';
$config->upgrade->maxVersion['max6_6_beta'] = '21_6_beta';
$config->upgrade->maxVersion['max6_6'] = '21_6';
$config->upgrade->maxVersion['max6_6_1'] = '21_6_1';
-$config->upgrade->maxVersion['max6_7'] = '21_7'; // max insert position.
+$config->upgrade->maxVersion['max6_7'] = '21_7';
+$config->upgrade->maxVersion['max7_0'] = '21_7_1'; // max insert position.
$config->upgrade->bizVersion = array();
$config->upgrade->bizVersion['biz1_0'] = '9_5_1';
@@ -173,7 +174,8 @@ $config->upgrade->bizVersion['biz11_5'] = '21_5';
$config->upgrade->bizVersion['biz11_6_beta'] = '21_6_beta';
$config->upgrade->bizVersion['biz11_6'] = '21_6';
$config->upgrade->bizVersion['biz11_6_1'] = '21_6_1';
-$config->upgrade->bizVersion['biz11_7'] = '21_7'; // biz insert position.
+$config->upgrade->bizVersion['biz11_7'] = '21_7';
+$config->upgrade->bizVersion['biz12_0'] = '21_7_1'; // biz insert position.
$config->upgrade->proVersion = array();
$config->upgrade->proVersion['pro1_0'] = '3_1';
@@ -316,7 +318,8 @@ $config->upgrade->ipdVersion['ipd3_5'] = '21_5';
$config->upgrade->ipdVersion['ipd3_6_beta'] = '21_6_beta';
$config->upgrade->ipdVersion['ipd3_6'] = '21_6';
$config->upgrade->ipdVersion['ipd3_6_1'] = '21_6_1';
-$config->upgrade->ipdVersion['ipd3_7'] = '21_7'; // ipd insert position.
+$config->upgrade->ipdVersion['ipd3_7'] = '21_7';
+$config->upgrade->ipdVersion['ipd4_0'] = '21_7_1'; // ipd insert position.
$config->upgrade->lowerTables = array();
$config->upgrade->lowerTables[$config->db->prefix . 'caseStep'] = $config->db->prefix . 'casestep';
@@ -1312,10 +1315,6 @@ $config->delete['20_1'][] = 'execution/ipd/testcase/ext/ui/view.effort.html.hook
$config->delete['20_1_1'][] = 'extension/max/design/ext/ui/browse.zentamax.html.hook.php';
$config->delete['20_1_1'][] = 'extension/max/doc/ext/ui/create.zentamax.html.hook.php';
$config->delete['20_1_1'][] = 'extension/max/doc/ext/view/create.zentamax.html.hook.php';
-$config->delete['20_1_1'][] = 'extension/max/execution/ext/model/zentaomax.php';
-$config->delete['20_1_1'][] = 'extension/ipd/execution/ext/model/zentaomax.php';
-$config->delete['20_1_1'][] = 'extension/max/execution/ext/model/class/zentaomax.class.php';
-$config->delete['20_1_1'][] = 'extension/ipd/execution/ext/model/class/zentaomax.class.php';
$config->delete['20_3_0'][] = 'extension/ipd/story/ext/tao/class/ipd.class.php';
$config->delete['20_3_0'][] = 'extension/ipd/story/ext/tao/ipd.php';
@@ -1476,6 +1475,13 @@ $config->delete['21_6_beta'][] = 'extension/ipd/common/ext/lang/en/effort.php';
$config->delete['21_6_beta'][] = 'extension/ipd/common/ext/lang/fr/effort.php';
$config->delete['21_6_beta'][] = 'extension/ipd/common/ext/lang/zh-cn/effort.php';
+$config->delete['21_6_beta'][] = 'extension/ipd/project/ext/model/class/zentaoipd.class.php';
+$config->delete['21_6_beta'][] = 'extension/max/project/ext/model/class/zentaoipd.class.php';
+$config->delete['21_6_beta'][] = 'extension/biz/project/ext/model/class/zentaoipd.class.php';
+$config->delete['21_6_beta'][] = 'extension/ipd/project/ext/model/zentaoipd.php';
+$config->delete['21_6_beta'][] = 'extension/max/project/ext/model/zentaoipd.php';
+$config->delete['21_6_beta'][] = 'extension/biz/project/ext/model/zentaoipd.php';
+
$config->upgrade->openModules = array('action', 'admin', 'ai', 'bi', 'aiapp', 'api', 'automation', 'backup', 'block', 'branch', 'budget', 'bug', 'build', 'cache', 'caselib', 'chart', 'ci', 'client', 'common', 'company', 'compile', 'convert', 'cron', 'custom', 'datatable', 'dataview', 'dept', 'design', 'dev', 'dimension', 'doc', 'durationestimation', 'entry', 'execution', 'extension', 'file', 'git', 'gitlab', 'group', 'holiday', 'im', 'index', 'index.html', 'install', 'issue', 'jenkins', 'job', 'kanban', 'license', 'mail', 'message', 'metric', 'misc', 'mr', 'my', 'personnel', 'pipeline', 'product', 'productplan', 'productset', 'program', 'programplan', 'project', 'projectbuild', 'projectplan', 'projectrelease', 'projectstory', 'pivot', 'qa', 'release', 'repo', 'report', 'risk', 'score', 'screen', 'search', 'setting', 'sonarqube', 'sso', 'stage', 'stakeholder', 'story', 'subject', 'svn', 'task', 'testcase', 'testreport', 'testsuite', 'testtask', 'todo', 'tree', 'tutorial', 'upgrade', 'user', 'webhook', 'weekly', 'workestimation', 'gitea', 'gogs', 'transfer', 'zahost', 'zanode', 'editor', 'charter', 'roadmap', 'account', 'cne', 'host', 'instance', 'ops', 'serverroom', 'space', 'store', 'system', 'solution', 'demand', 'gitfox', 'epic', 'requirement', 'mark');
$config->upgrade->unsetModules = array('design', 'program', 'programplan', 'projectbuild', 'projectrelease', 'stage', 'stakeholder', 'product', 'branch', 'productplan', 'release', 'build', 'qa', 'bug', 'testcase', 'testtask', 'testreport', 'testsuite', 'caselib', 'automation', 'repo', 'ci', 'compile', 'jenkins', 'job', 'svn', 'gitlab', 'sonarqube', 'mr', 'git', 'report', 'sqlbuilder', 'feedback', 'faq', 'attend', 'holiday', 'leave', 'makeup', 'overtime', 'lieu', 'ops', 'host', 'serverroom', 'account', 'domain', 'service', 'deploy', 'conference', 'traincourse', 'pssp', 'baseline', 'classify', 'cm', 'cmcl', 'auditcl', 'reviewcl', 'process', 'activity', 'zoutput', 'auditplan', 'nc', 'subject', 'weekly', 'workestimation', 'issue', 'durationestimation', 'risk', 'opportunity', 'trainplan', 'gapanalysis', 'researchplan', 'researchreport', 'meeting', 'meetingroom', 'budget', 'reviewissue', 'reviewsetting', 'review', 'milestone', 'measurement', 'measrecord', 'assetlib', 'setting', 'im', 'client', 'ldap', 'dev', 'api', 'gitea', 'gogs', 'zanode', 'zahost');
diff --git a/module/upgrade/config/upgradeflow.php b/module/upgrade/config/upgradeflow.php
index 09d1ba509a..f755866ccf 100644
--- a/module/upgrade/config/upgradeflow.php
+++ b/module/upgrade/config/upgradeflow.php
@@ -110,6 +110,7 @@ $config->upgrade->execFlow['21_2'] = array('functions' => 'importBuildinW
$config->upgrade->execFlow['21_3'] = array('functions' => 'createDevOpsChartModule');
$config->upgrade->execFlow['21_6_beta'] = array('functions' => 'convertCharset,processCharterBranch');
$config->upgrade->execFlow['21_6_1'] = array('xxsqls' => "$appRoot/db/upgradexuanxuan9.1.2.sql");
+$config->upgrade->execFlow['21_7'] = array('functions' => 'fixWorkflowNameForExecution');
if(!empty($config->isINT))
{
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index d9ebf20c59..1600b67f61 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -212,7 +212,8 @@ $lang->upgrade->fromVersions['21_5'] = '21.5';
$lang->upgrade->fromVersions['21_6_beta'] = '21.6.beta';
$lang->upgrade->fromVersions['21_6'] = '21.6';
$lang->upgrade->fromVersions['21_6_1'] = '21.6.1';
-$lang->upgrade->fromVersions['21_7'] = '21.7'; // pms insert position.
+$lang->upgrade->fromVersions['21_7'] = '21.7';
+$lang->upgrade->fromVersions['21_7_1'] = '21.7.1'; // pms insert position.
global $config;
/* Lite. */
@@ -425,7 +426,8 @@ $lang->upgrade->fromVersions['biz11_5'] = 'Biz11.5';
$lang->upgrade->fromVersions['biz11_6_beta'] = 'Biz11.6.beta';
$lang->upgrade->fromVersions['biz11_6'] = 'Biz11.6';
$lang->upgrade->fromVersions['biz11_6_1'] = 'Biz11.6.1';
-$lang->upgrade->fromVersions['biz11_7'] = 'Biz11.7'; // biz insert position.
+$lang->upgrade->fromVersions['biz11_7'] = 'Biz11.7';
+$lang->upgrade->fromVersions['biz12_0'] = 'Biz12.0'; // biz insert position.
/* Max. */
$lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -496,7 +498,8 @@ $lang->upgrade->fromVersions['max6_5'] = 'Max6.5';
$lang->upgrade->fromVersions['max6_6_beta'] = 'Max6.6.beta';
$lang->upgrade->fromVersions['max6_6'] = 'Max6.6';
$lang->upgrade->fromVersions['max6_6_1'] = 'Max6.6.1';
-$lang->upgrade->fromVersions['max6_7'] = 'Max6.7'; // max insert position.
+$lang->upgrade->fromVersions['max6_7'] = 'Max6.7';
+$lang->upgrade->fromVersions['max7_0'] = 'Max7.0'; // max insert position.
/* Ipd */
$lang->upgrade->fromVersions['ipd1_0_beta1'] = 'Ipd1.0.beta1';
@@ -528,4 +531,5 @@ $lang->upgrade->fromVersions['ipd3_4'] = 'Ipd3.4';
$lang->upgrade->fromVersions['ipd3_5'] = 'Ipd3.5';
$lang->upgrade->fromVersions['ipd3_6_beta'] = 'Ipd3.6.beta';
$lang->upgrade->fromVersions['ipd3_6'] = 'Ipd3.6';
-$lang->upgrade->fromVersions['ipd3_6_1'] = 'Ipd3.6.1'; // ipd insert position.
+$lang->upgrade->fromVersions['ipd3_6_1'] = 'Ipd3.6.1';
+$lang->upgrade->fromVersions['ipd3_7'] = 'Ipd3.7'; // ipd insert position.
\ No newline at end of file
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 252d13935e..384df60d56 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -10664,6 +10664,7 @@ class upgradeModel extends model
->andWhere('t1.status')->ne('draft')
->andWhere('t2.rawContent')->in(null)
->andWhere('t1.templateType')->eq('')
+ ->andWhere('t1.template')->eq('')
->andWhere('t2.fromVersion')->eq(0)
->fetchAll('id', false);
@@ -10935,4 +10936,33 @@ class upgradeModel extends model
}
return true;
}
+
+ /**
+ * 修改执行模块工作流动作名称
+ * Fix workflow action and field name for execution.
+ *
+ * @access public
+ * @return bool
+ */
+ public function fixWorkflowNameForExecution()
+ {
+ $this->app->loadLang('execution');
+
+ $this->dao->update(TABLE_WORKFLOWACTION)->set('name')->eq($this->lang->execution->allExecutionAB)->where('module')->eq('execution')->andWhere('action')->eq('all')->exec();
+ $this->dao->update(TABLE_WORKFLOWACTION)->set('name')->eq($this->lang->execution->create)->where('module')->eq('execution')->andWhere('action')->eq('create')->exec();
+ $this->dao->update(TABLE_WORKFLOWACTION)->set('name')->eq($this->lang->execution->delete)->where('module')->eq('execution')->andWhere('action')->eq('delete')->exec();
+ $this->dao->update(TABLE_WORKFLOWACTION)->set('name')->eq($this->lang->execution->edit)->where('module')->eq('execution')->andWhere('action')->eq('edit')->exec();
+ $this->dao->update(TABLE_WORKFLOWACTION)->set('name')->eq($this->lang->execution->view)->where('module')->eq('execution')->andWhere('action')->eq('view')->exec();
+ $this->dao->update(TABLE_WORKFLOWACTION)->set('name')->eq($this->lang->execution->batchEdit)->where('module')->eq('execution')->andWhere('action')->eq('batchedit')->exec();
+
+ $this->dao->update(TABLE_WORKFLOWFIELD)->set('name')->eq($this->lang->execution->id)->where('module')->eq('execution')->andWhere('field')->eq('id')->exec();
+ $this->dao->update(TABLE_WORKFLOWFIELD)->set('name')->eq($this->lang->execution->type)->where('module')->eq('execution')->andWhere('field')->eq('type')->exec();
+ $this->dao->update(TABLE_WORKFLOWFIELD)->set('name')->eq($this->lang->execution->name)->where('module')->eq('execution')->andWhere('field')->eq('name')->exec();
+ $this->dao->update(TABLE_WORKFLOWFIELD)->set('name')->eq($this->lang->execution->code)->where('module')->eq('execution')->andWhere('field')->eq('code')->exec();
+ $this->dao->update(TABLE_WORKFLOWFIELD)->set('name')->eq($this->lang->execution->status)->where('module')->eq('execution')->andWhere('field')->eq('status')->exec();
+ $this->dao->update(TABLE_WORKFLOWFIELD)->set('name')->eq($this->lang->execution->desc)->where('module')->eq('execution')->andWhere('field')->eq('desc')->exec();
+ $this->dao->update(TABLE_WORKFLOWFIELD)->set('name')->eq($this->lang->execution->PM)->where('module')->eq('execution')->andWhere('field')->eq('PM')->exec();
+
+ return true;
+ }
}
diff --git a/module/user/model.php b/module/user/model.php
index 9893929b71..cba2cac97b 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -301,7 +301,7 @@ class userModel extends model
unset($this->config->user->moreLink);
if($maxCount && $maxCount == $userCount)
{
- if(is_array($usersToAppended)) $usersToAppended = join(',', $usersToAppended);
+ if(is_array($usersToAppended)) $usersToAppended = implode(',', $usersToAppended);
$moreLinkParams = "params={$params}&usersToAppended={$usersToAppended}";
$moreLink = helper::createLink('user', 'ajaxGetMore');
@@ -749,7 +749,7 @@ class userModel extends model
sort($oldGroups);
sort($newGroups);
- if(join(',', $oldGroups) == join(',', $newGroups)) return false;
+ if(implode(',', $oldGroups) == implode(',', $newGroups)) return false;
/* 如果权限组发生变化，则删除原有的权限组，重新创建并更新用户视图。*/
/* If the group changed, delete the old group, create new group and update user view. */
@@ -1298,6 +1298,7 @@ class userModel extends model
*/
public function getProjects(string $account, string $status = 'all', string $orderBy = 'id_desc', object $pager = null): array
{
+ $this->loadModel('project');
$projects = $this->userTao->fetchProjects($account, $status, $orderBy, $pager);
if(!$projects) return array();
@@ -1317,6 +1318,8 @@ class userModel extends model
$project->storyPoints = $projectStory ? round($projectStory->estimate, 1) : 0;
$project->storyCount = $projectStory ? $projectStory->count : 0;
$project->executionCount = zget($projectExecutionCount, $project->id, 0);
+
+ if(in_array($this->config->edition, array('max', 'ipd'))) $project->deliverable = $this->project->countDeliverable($project);
}
return $projects;
@@ -1708,7 +1711,7 @@ class userModel extends model
$programView = '';
if(!empty($manageObjects['programs']['isAdmin']))
{
- $programView = join(',', array_keys($allPrograms));
+ $programView = implode(',', array_keys($allPrograms));
}
else
{
@@ -1727,7 +1730,7 @@ class userModel extends model
/* 如果有某个项目集的管理权限，也可以访问该项目集。 */
if(strpos(",$managePrograms,", ",$programID,") !== false) $programs[$programID] = $programID;
}
- $programView = join(',', $programs);
+ $programView = implode(',', $programs);
}
return $programView;
@@ -1749,7 +1752,7 @@ class userModel extends model
$productView = '';
if(!empty($manageObjects['products']['isAdmin']))
{
- $productView = join(',', array_keys($allProducts));
+ $productView = implode(',', array_keys($allProducts));
}
else
{
@@ -1768,7 +1771,7 @@ class userModel extends model
/* 如果有某个产品的管理权限，也可以访问该产品。 */
if(strpos(",$manageProducts,", ",$productID,") !== false) $products[$productID] = $productID;
}
- $productView = join(',', $products);
+ $productView = implode(',', $products);
}
return $productView;
@@ -1793,7 +1796,7 @@ class userModel extends model
$projectView = '';
if(!empty($manageObjects['projects']['isAdmin']))
{
- $projectView = join(',', array_keys($allProjects));
+ $projectView = implode(',', array_keys($allProjects));
}
else
{
@@ -1811,7 +1814,7 @@ class userModel extends model
/* 如果有某个项目管理权限，也可以访问该项目。 */
if(strpos(",$manageProjects,", ",$projectID,") !== false) $projects[$projectID] = $projectID;
}
- $projectView = join(',', $projects);
+ $projectView = implode(',', $projects);
}
return $projectView;
@@ -1835,7 +1838,7 @@ class userModel extends model
$sprintView = '';
if(!empty($manageObjects['executions']['isAdmin']))
{
- $sprintView = join(',', array_keys($allSprints));
+ $sprintView = implode(',', array_keys($allSprints));
}
else
{
@@ -1852,7 +1855,7 @@ class userModel extends model
/* 如果有某个迭代管理权限，也可以访问该迭代。 */
if(strpos(",$manageExecutions,", ",$sprintID,") !== false) $sprints[$sprintID] = $sprintID;
}
- $sprintView = join(',', $sprints);
+ $sprintView = implode(',', $sprints);
}
return $sprintView;
@@ -1907,7 +1910,8 @@ class userModel extends model
if(empty($account)) return $userView;
$userView = $this->dao->select('*')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch();
- if(!empty($userView) && !$force) return $userView;
+ $isEmpty = empty($userView);
+ if(!$isEmpty && !$force) return $userView;
/* Init objects. */
list($allProducts, $allProjects, $allPrograms, $allSprints, $teams, $whiteList, $stakeholders) = $this->initViewObjects($force);
@@ -1919,10 +1923,10 @@ class userModel extends model
$isAdmin = strpos($this->app->company->admins, ',' . $account . ',') !== false;
if($isAdmin)
{
- $userView->programs = join(',', array_keys($allPrograms));
- $userView->products = join(',', array_keys($allProducts));
- $userView->projects = join(',', array_keys($allProjects));
- $userView->sprints = join(',', array_keys($allSprints));
+ $userView->programs = implode(',', array_keys($allPrograms));
+ $userView->products = implode(',', array_keys($allProducts));
+ $userView->projects = implode(',', array_keys($allProjects));
+ $userView->sprints = implode(',', array_keys($allSprints));
}
else
{
@@ -1942,7 +1946,14 @@ class userModel extends model
}
/* 更新访问权限表。 */
- $this->dao->replace(TABLE_USERVIEW)->data($userView)->exec();
+ if($isEmpty)
+ {
+ $this->dao->insert(TABLE_USERVIEW)->data($userView)->exec();
+ }
+ else
+ {
+ $this->dao->update(TABLE_USERVIEW)->data($userView)->where('account')->eq($account)->exec();
+ }
return $userView;
}
@@ -2070,16 +2081,16 @@ class userModel extends model
if(empty($acls) && !empty($this->session->user->rights['acls'])) $acls = $this->session->user->rights['acls'];
if(empty($projects) && !empty($this->session->user->rights['projects'])) $projects = $this->session->user->rights['projects'];
- $userView = $this->computeUserView($account, true);
+ $userView = $this->computeUserView($account);
/* Get opened projects, programs, products and set it to userview. */
$openedProducts = array_keys($this->loadModel('product')->getListByAcl('open'));
$openedPrograms = array_keys($this->loadModel('project')->getListByAclAndType('open', 'program'));
$openedProjects = array_keys($this->project->getListByAclAndType('open', 'project'));
- $userView->products = rtrim($userView->products, ',') . ',' . join(',', $openedProducts);
- $userView->programs = rtrim($userView->programs, ',') . ',' . join(',', $openedPrograms);
- $userView->projects = rtrim($userView->projects, ',') . ',' . join(',', $openedProjects);
+ $userView->products = rtrim($userView->products, ',') . ',' . implode(',', $openedProducts);
+ $userView->programs = rtrim($userView->programs, ',') . ',' . implode(',', $openedPrograms);
+ $userView->projects = rtrim($userView->projects, ',') . ',' . implode(',', $openedProjects);
/* 合并用户视图权限到用户访问权限。 */
$userView = $this->mergeAclsToUserView($account, $userView, $acls, $projects);
@@ -2125,10 +2136,10 @@ class userModel extends model
$openedSprints = $this->loadModel('project')->getListByAclAndType('open', 'sprint,stage,kanban');
$openedSprints = array_filter(array_map(function($sprint) use ($userView) { if(strpos(",{$userView->projects},", ",{$sprint->project},") !== false) return $sprint->id; }, $openedSprints));
- $userView->sprints = rtrim($userView->sprints, ',') . ',' . join(',', $openedSprints);
+ $userView->sprints = rtrim($userView->sprints, ',') . ',' . implode(',', $openedSprints);
$canViewSprints = $this->dao->select('executions')->from(TABLE_PROJECTADMIN)->where('account')->eq($account)->fetch('executions');
- if($canViewSprints) $userView->sprints .= ',' . $canViewSprints;
+ if($canViewSprints != 'all') $userView->sprints .= ',' . $canViewSprints;
return $userView;
}
diff --git a/test/data/deliverable.yaml b/test/data/deliverable.yaml
new file mode 100644
index 0000000000..ee40d120cc
--- /dev/null
+++ b/test/data/deliverable.yaml
@@ -0,0 +1,34 @@
+title: table zt_deliverable
+desc: "交付物"
+author: Sun Guangming
+version: "1.0"
+fields:
+ - field: id
+ note: "ID"
+ range: 1-1000
+ - field: name
+ fields:
+ - field: name1
+ range: '交付物'
+ - field: name2
+ range: 1-1000
+ - field: module
+ range: project,execution
+ - field: method
+ range: create,close
+ - field: model
+ fields:
+ - field: model1
+ range: product,project
+ postfix: "_"
+ - field: model2
+ range: waterfall,scrum
+ postfix: "_"
+ - field: model3
+ range: mix,request,design,dev,qa,release,review
+ - field: type
+ range: doc,file
+ - field: files
+ range: 1-10
+ - field: desc
+ range: '交付物描述'
\ No newline at end of file
diff --git a/test/data/instance.yaml b/test/data/instance.yaml
index e29d9c7645..faa3a11bb8 100644
--- a/test/data/instance.yaml
+++ b/test/data/instance.yaml
@@ -27,5 +27,7 @@ fields:
range: 'cloud'
- field: channel
range: 'stable'
+ - field: status
+ range: running{100},stopped,abnormal
- field: domain
range: 'rila.dops.corp.cc,7czx.dops.corp.cc,xqly.dops.corp.cc,ane3.dops.corp.cc,qphl.dops.corp.cc'
diff --git a/test/lib/coverage.php b/test/lib/coverage.php
index 453a788162..e1e37e6169 100644
--- a/test/lib/coverage.php
+++ b/test/lib/coverage.php
@@ -55,13 +55,22 @@ class coverage
/**
* Save traces and restart code coverage.
*
+ * @param string $rawModule
+ * @param string $rawMethod
* @access public
* @return void
*/
- public function saveAndRestartCodeCoverage(): void
+ public function saveAndRestartCodeCoverage(string $url = ''): void
{
$traces = xdebug_get_code_coverage();
- $this->saveTraces($traces);
+ if($url)
+ {
+ $this->saveTracesByIndex($traces, $url);
+ }
+ else
+ {
+ $this->saveTraces($traces);
+ }
xdebug_stop_code_coverage();
xdebug_start_code_coverage();
@@ -114,6 +123,32 @@ class coverage
return file_put_contents($this->traceFile, json_encode($log));
}
+ /**
+ * Save traces to file.
+ *
+ * @param array $traces
+ * @access private
+ * @return bool
+ */
+ private function saveTracesByIndex(array $traces, string $url): bool
+ {
+ $tracePath = $this->zentaoRoot . "/tmp/webcoverage";
+ if(!is_dir($tracePath)) mkdir($tracePath, 0777, true);
+
+ $traceFile = $tracePath . '/' . urlencode($url) . '.json';
+ $traces = $this->filterTraces($traces);
+ $traces = $this->groupTraceByIndex($traces);
+
+ $log = new stdclass;
+ $log->time = date('Y-m-d H:i:s');
+ $log->ztfPath = getenv('ZTF_REPORT_DIR');
+ $log->traces = $traces;
+ if(!$log->traces) return false;
+
+
+ return file_put_contents($traceFile, json_encode($log));
+ }
+
/**
* Compute the line coverage test method.
* @param array $traces
@@ -197,6 +232,61 @@ class coverage
return $methodCount;
}
+ /**
+ * 获取class方法行数。
+ * Get the total number of methods in class.
+ *
+ * @param string $moduleName
+ * @param string $type
+ * @access private
+ * @return int
+ */
+ private function getClassMethodLines(string $moduleName, string $type): int
+ {
+ if(file_exists($this->getClassFile($moduleName, $type)) === false) return 0;
+ $classFileContents = file_get_contents($this->getClassFile($moduleName, $type));
+ $lines = explode("\n", $classFileContents);
+
+ $inComment = false;
+ $lineCount = 0;
+
+ foreach($lines as $line)
+ {
+ $trimmed = trim($line);
+
+ // 跳过class定义行
+ if(preg_match('/^class\s+/i', $trimmed)) continue;
+
+ // 跳过function定义行
+ if(strpos($trimmed, 'function') !== false) continue;
+
+ // 跳过php定义行
+ if(strpos($trimmed, '') !== false) continue;
+
+ // 处理多行注释
+ if($inComment)
+ {
+ if(strpos($trimmed, '*/') !== false) $inComment = false;
+ continue;
+ }
+
+ if(strpos($trimmed, '/*') === 0)
+ {
+ $inComment = true;
+ if(strpos($trimmed, '*/') !== false) $inComment = false;
+ continue;
+ }
+
+ // 移除单行注释
+ $cleanLine = preg_replace('@//.*$@', '', $line);
+ $cleanLine = preg_replace('@#.*$@', '', $cleanLine);
+
+ if(!empty(trim($cleanLine))) $lineCount++;
+ }
+
+ return $lineCount;
+ }
+
/**
* Get test method file.
*
@@ -279,6 +369,31 @@ class coverage
return $groupedTraces;
}
+ /**
+ * Group traces by module.
+ *
+ * @param array $traces
+ * @access private
+ * @return array
+ */
+ private function groupTraceByIndex(array $traces): array
+ {
+ $groupedTraces = array();
+
+ foreach($traces as $filePath => $fileTrace)
+ {
+ $moduleName = $this->getModuleByFilePath($filePath);
+ if($moduleName == 'xuan') continue;
+ $fileName = basename($filePath, '.php');
+ $groupedTraces['module'] = $moduleName;
+ $groupedTraces['type'] = $fileName;
+
+ $groupedTraces['executeLines'] = $fileTrace;
+ }
+
+ return $groupedTraces;
+ }
+
/**
* Get current fileTrace belog to which module.
*
@@ -304,10 +419,11 @@ class coverage
* Generate module stats report.
*
* @param array $traces
+ * @param string $type
* @access public
* @return string
*/
- private function genModuleStatsReport(array $traces): string
+ private function genModuleStatsReport(array $traces, string $type = ''): string
{
$summaryTable = <<
@@ -333,7 +449,7 @@ EOT;
foreach($traces as $module => $moduleTraces)
{
- $summaryTable .= $this->genStatsTableByModule($module, $moduleTraces);
+ $summaryTable .= $this->genStatsTableByModule($module, $moduleTraces, $type);
}
$summaryTable .= '' . PHP_EOL;
@@ -345,10 +461,11 @@ EOT;
*
* @param string $module
* @param array $moduleTraces
+ * @param string $reportType
* @access private
* @return void
*/
- private function genStatsTableByModule(string $module, array $moduleTraces)
+ private function genStatsTableByModule(string $module, array $moduleTraces, string $reportType = '')
{
$modelMethodesCount = $this->getClassMethodCount($module, 'model');
$controlMethodesCount = $this->getClassMethodCount($module, 'control');
@@ -364,7 +481,11 @@ EOT;
foreach($moduleTraces as $type => $methods)
{
$moduleCoverageList[$type] = 0;
- foreach($methods as $methodCoverage) $moduleCoverageList[$type] += $methodCoverage['coverage'];
+ foreach($methods as $methodCoverage)
+ {
+ if(empty($methodCoverage['coverage'])) continue;
+ $moduleCoverageList[$type] += $methodCoverage['coverage'];
+ }
}
$summaryTable = '' . PHP_EOL;
@@ -381,9 +502,23 @@ EOT;
foreach($this->unfilteredTraces as $fileType)
{
$fileType = str_replace('.php', '', $fileType);
- $methodCount = $this->getClassMethodCount($module, $fileType);
-
- $summaryTable .= isset($moduleCoverageList[$fileType]) ? "| " . round($moduleCoverageList[$fileType] / $methodCount, 2) * 100 . '% | ' . PHP_EOL : '0% | ' . PHP_EOL;
+ if(empty($moduleTraces[$fileType]))
+ {
+ $summaryTable .= '0% | ' . PHP_EOL;
+ continue;
+ }
+ if($reportType == 'web')
+ {
+ $methodLines = $this->getClassMethodLines($module, $fileType);
+ $execLines = empty($moduleTraces[$fileType]['executeLines']) ? 0 : count($moduleTraces[$fileType]['executeLines']);
+ $coverage = $methodLines == 0 ? 0 : round($execLines / $methodLines, 2) * 100;
+ $summaryTable .= "" . $coverage . '% | ' . PHP_EOL;
+ }
+ else
+ {
+ $methodCount = $this->getClassMethodCount($module, $fileType);
+ $summaryTable .= "" . round($moduleCoverageList[$fileType] / $methodCount, 2) * 100 . '% | ' . PHP_EOL;
+ }
}
$summaryTable .= '
' . PHP_EOL;
@@ -396,10 +531,11 @@ EOT;
* @param string $module
* @param string $file
* @param array $fileTraces
+ * @param string $reportType
* @access private
* @return string
*/
- private function genCoverageTableByFile(string $module, string $file, array $fileTraces): string
+ private function genCoverageTableByFile(string $module, string $file, array $fileTraces, string $reportType = ''): string
{
$file = $this->getClassFile($module, $file);
$coverageTable = << $methodInfo)
+ foreach($fileTraces as $methodInfo)
{
- foreach($methodInfo['executeLines'] as $executeLine => $count) $coverageLineList[$executeLine] = $count;
+ $executeLine = $reportType == 'web' ? $methodInfo : $methodInfo['executeLines'];
+ foreach($executeLine as $executeLine => $count) $coverageLineList[$executeLine] = $count;
}
foreach($content as $line => $code)
@@ -444,10 +581,11 @@ EOT;
*
* @param string $filePath
* @param string $key
+ * @param string $type
* @return array|string|false
*
*/
- public function loadTraceFromFiles(string $filePath, string $key = ''): array|string|false
+ public function loadTraceFromFiles(string $filePath, string $key = '', $type = ''): array|string|false
{
$tracesFiles = glob("{$filePath}/*.json");
if(!$tracesFiles) return false ;
@@ -456,11 +594,25 @@ EOT;
foreach($tracesFiles as $file)
{
$tracesInfo = json_decode(file_get_contents($file), true);
- if(!isset($tracesInfo['traces'])) continue;
-
+ if(empty($tracesInfo['traces'])) continue;
$traces = $tracesInfo['traces'];
- $tracesList['traces'][$traces['module']][$traces['type']][$traces['method']]['executeLines'] = $traces['executeLines'];
- $tracesList['traces'][$traces['module']][$traces['type']][$traces['method']]['coverage'] = $traces['coverage'];
+
+ if($type == 'web')
+ {
+ if(empty($tracesList[$traces['module']][$traces['type']]['executeLines']))
+ {
+ $tracesList['traces'][$traces['module']][$traces['type']]['executeLines'] = $traces['executeLines'];
+ }
+ else
+ {
+ $tracesList['traces'][$traces['module']][$traces['type']]['executeLines'] = array_merge($tracesList[$traces['module']][$traces['type']]['executeLines'], $traces['executeLines']);
+ }
+ }
+ else
+ {
+ $tracesList['traces'][$traces['module']][$traces['type']][$traces['method']]['executeLines'] = $traces['executeLines'];
+ $tracesList['traces'][$traces['module']][$traces['type']][$traces['method']]['coverage'] = $traces['coverage'];
+ }
$tracesList['time'] = $tracesInfo['time'];
$tracesList['ztfPath'] = $tracesInfo['ztfPath'];
@@ -499,15 +651,44 @@ EOT;
return $reportHtml;
}
+ /**
+ * Generate web summary report.
+ *
+ * @param string $module
+ * @param string $file
+ * @return string
+ */
+ public function genWebSummaryReport(string $module='', string $file=''): string
+ {
+ /* Get trace from file. */
+ $tracesPath = $this->zentaoRoot . '/tmp/webcoverage';
+ $traces = $this->loadTraceFromFiles($tracesPath, 'traces', 'web');
+
+ /* Generate report. */
+ $reportHtml = empty($file) ? '' . PHP_EOL : '' . PHP_EOL;
+ if(empty($file))
+ {
+ $reportHtml .= $this->genModuleStatsReport($traces, 'web');
+ }
+ else
+ {
+ $reportHtml .= $this->genCoverageTableByFile($module, $file, $traces[$module][$file], 'web');
+ }
+ $reportHtml .= '