{$menuGroup['name']}" . (!empty($menuGroup['icon']) ? "" : "") . " {$menuGroup['name']}
"),
'text' => $menuGroup['name'],
'titleClass' => 'hidden',
'type' => 'item',
'disabled' => $menuGroup['disabled'],
- 'url' => $menuGroup['disabled'] || $currentMenuKey == $menuKey ? '' : $menuGroup['link'],
+ 'url' => $menuGroup['link'],
'active' => $currentMenuKey == $menuKey,
'rootClass' => 'admin-menu-item',
'attrs' => array('disabled' => $menuGroup['disabled'])
diff --git a/module/admin/css/index.ui.css b/module/admin/css/index.ui.css
index 3864e7af9b..3821dc283c 100644
--- a/module/admin/css/index.ui.css
+++ b/module/admin/css/index.ui.css
@@ -2,3 +2,5 @@
.border-hover:hover {border-color: var(--color-primary-500)}
div.setting-box[data-id=platform] div.text-md {white-space: nowrap;}
+
+.svg-icon {height: 24px; width: 24px; text-align: center;}
diff --git a/module/admin/js/setmodule.ui.js b/module/admin/js/setmodule.ui.js
index d62d87223d..28594734e8 100644
--- a/module/admin/js/setmodule.ui.js
+++ b/module/admin/js/setmodule.ui.js
@@ -1,33 +1,16 @@
-function changeModule($target)
+function changeModule($target, type = 'single')
{
const name = $target.attr('name');
if($target.prop('checked'))
{
$("input[type=hidden][name='" + name + "']").val('1').attr('disabled');
+ if(type == 'single') checkRelated(name, 'open');
}
else
{
- if(name == 'module[productUR]' || name == 'module[productER]')
- {
- zui.Modal.confirm(
- {
- message: confirmDisableStoryType,
- icon: 'icon-exclamation-sign',
- iconClass: 'warning-pale rounded-full icon-2x'
- }).then((res) =>
- {
- if(res)
- {
- $("input[type=hidden][name='" + name + "']").val('0').removeAttr('disabled');
- return false;
- }
-
- $target.prop('checked', true);
- });
- return false;
- }
-
+ $("input[type=hidden][name='" + name + "']").val('1').attr('disabled');
$("input[type=hidden][name='" + name + "']").val('0').removeAttr('disabled');
+ if(type == 'single') checkRelated(name, 'close');
}
};
@@ -42,7 +25,7 @@ function checkGroup()
$(this).closest('tr').find("input[type=checkbox][name^='module']").each(function()
{
$(this).prop('checked', checked);
- changeModule($(this));
+ changeModule($(this), 'all');
});
};
@@ -53,6 +36,229 @@ function checkAll()
$(this).closest('table').find("input[type=checkbox][name^='module']").each(function()
{
$(this).prop('checked', checked);
- changeModule($(this));
+ changeModule($(this), 'all');
});
};
+
+
+window.submitForm = function()
+{
+ const isCheckedUR = $('[name="module[productUR]"]').prop('checked');
+ const isCheckedER = $('[name="module[productER]"]').prop('checked');
+
+ let message = confirmDisableStoryType;
+ let storyType = '';
+
+ if(edition != 'ipd' && URAndSR && !isCheckedUR)
+ {
+ storyType += URCommon;
+ }
+
+ if(enableER && !isCheckedER)
+ {
+ if(storyType) storyType += ',';
+ storyType += ERCommon;
+ }
+
+ if(storyType)
+ {
+ zui.Modal.confirm(
+ {
+ message: message.replace(/{type}/g, storyType),
+ icon: 'icon-exclamation-sign',
+ iconClass: 'warning-pale rounded-full icon-2x'
+ }).then((res) =>
+ {
+ if(res)
+ {
+ realSubmitForm();
+ return false;
+ }
+
+ setModuleState('productUR', true);
+ setModuleState('productER', true);
+ });
+ return false;
+ }
+
+ realSubmitForm();
+ return false;
+}
+
+window.realSubmitForm = function()
+{
+ const formData = new FormData($('#setModuleForm form')[0]);
+ const url = $.createLink('admin', 'setmodule');
+ $.ajaxSubmit({url: url, data: formData});
+}
+
+/**
+ * 设置模块的checkbox和hidden input状态
+ * @param {string} moduleName - 模块名称（如 'productUR', 'productER'）
+ * @param {boolean} checked - 是否选中
+ */
+function setModuleState(moduleName, checked)
+{
+ const checkboxSelector = `[name="module[${moduleName}]"]`;
+ const hiddenSelector = `#module${moduleName}[type=hidden]`;
+ $(checkboxSelector).prop('checked', checked);
+ $(hiddenSelector).val(checked ? '1' : '0');
+}
+
+/**
+ * 检查模块是否已启用
+ * @param {string} moduleName - 模块名称
+ * @returns {boolean} 是否已启用
+ */
+function isModuleEnabled(moduleName)
+{
+ return $('[name="module[' + moduleName + ']"]').prop('checked');
+}
+
+/**
+ * 显示依赖关系确认对话框
+ * @param {string} message - 确认消息
+ * @param {Function} onConfirm - 确认回调
+ * @param {Function} onCancel - 取消回调
+ */
+function showDependencyConfirm(message, onConfirm, onCancel)
+{
+ zui.Modal.confirm(
+ {
+ message: message,
+ icon: 'icon-exclamation-sign',
+ iconClass: 'warning-pale rounded-full icon-2x'
+ }).then((res) =>
+ {
+ if(res)
+ {
+ if(onConfirm) onConfirm();
+ return false;
+ }
+ if(onCancel) onCancel();
+ });
+}
+
+window.checkRelated = function(name, type)
+{
+ if(type === 'open')
+ {
+ // 开启 业务需求 时，需要确保 用户需求 已开启
+ if(name.includes('productER') && edition !== 'ipd')
+ {
+ if(!isModuleEnabled('productUR'))
+ {
+ const message = openDependFeature.replace('{source}', ERCommon).replace('{target}', URCommon);
+ showDependencyConfirm(
+ message,
+ () => setModuleState('productUR', true),
+ () => setModuleState('productER', false)
+ );
+ return false;
+ }
+ }
+ // 开启 项目变更 时，需要确保 交付物 已开启
+ else if(name.includes('projectCm'))
+ {
+ if(!isModuleEnabled('projectDeliverable'))
+ {
+ const message = openDependFeature.replace('{source}', cmLang).replace('{target}', deliverableLang);
+ showDependencyConfirm(
+ message,
+ () => setModuleState('projectDeliverable', true),
+ () => setModuleState('projectCm', false)
+ );
+ return false;
+ }
+ }
+ // 开启 项目变更 时，需要确保 交付物 和 基线 都已开启
+ else if(name.includes('projectChange'))
+ {
+ const deliverableEnabled = isModuleEnabled('projectDeliverable');
+ const cmEnabled = isModuleEnabled('projectCm');
+
+ if(!deliverableEnabled || !cmEnabled)
+ {
+ let message = openDependFeature.replace('{source}', changeLang);
+ const missingLangs = [];
+
+ if(!deliverableEnabled) missingLangs.push(deliverableLang);
+ if(!cmEnabled) missingLangs.push(cmLang);
+
+ message = message.replace('{target}', missingLangs.join(','));
+
+ showDependencyConfirm(
+ message,
+ () =>
+ {
+ if(!deliverableEnabled) setModuleState('projectDeliverable', true);
+ if(!cmEnabled) setModuleState('projectCm', true);
+ },
+ () => setModuleState('projectChange', false)
+ );
+ return false;
+ }
+ }
+ }
+ else
+ {
+ // 关闭 用户需求 时，如果 业务需求 已开启，需要提示关闭 业务需求
+ if(name.includes('productUR') && edition !== 'ipd')
+ {
+ if(isModuleEnabled('productER'))
+ {
+ const message = closeDependFeature.replace('{source}', URCommon).replace('{target}', ERCommon);
+ showDependencyConfirm(
+ message,
+ () => setModuleState('productER', false),
+ () =>
+ {
+ setModuleState('productUR', true);
+ setModuleState('productER', true);
+ }
+ );
+ return false;
+ }
+ }
+ // 关闭 交付物 时，如果 项目变更 或 基线 已开启，需要提示关闭它们
+ else if(name.includes('projectDeliverable'))
+ {
+ const changeEnabled = isModuleEnabled('projectChange');
+ const cmEnabled = isModuleEnabled('projectCm');
+
+ if(changeEnabled || cmEnabled)
+ {
+ let message = closeDependFeature.replace('{source}', deliverableLang);
+ const activeLangs = [];
+
+ if(changeEnabled) activeLangs.push(changeLang);
+ if(cmEnabled) activeLangs.push(cmLang);
+
+ message = message.replace('{target}', activeLangs.join(','));
+
+ showDependencyConfirm(
+ message,
+ () =>
+ {
+ if(changeEnabled) setModuleState('projectChange', false);
+ if(cmEnabled) setModuleState('projectCm', false);
+ },
+ () => setModuleState('projectDeliverable', true)
+ );
+ }
+ }
+ // 关闭 基线 时，如果 项目变更 已开启，需要提示关闭 项目变更
+ else if(name.includes('projectCm'))
+ {
+ if(isModuleEnabled('projectChange'))
+ {
+ const message = closeDependFeature.replace('{source}', cmLang).replace('{target}', changeLang);
+ showDependencyConfirm(
+ message,
+ () => setModuleState('projectChange', false),
+ () => setModuleState('projectCm', true)
+ );
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index b67bfb2c32..b9632486a8 100755
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -34,6 +34,7 @@ $lang->admin->zentaoUsed = '';
$lang->admin->api = 'API';
$lang->admin->log = 'Log';
$lang->admin->setting = 'Einstellungen';
+$lang->admin->setFlow = 'Set Flow';
$lang->admin->pluginRecommendation = 'Recommended plug-ins';
$lang->admin->zentaoInfo = 'ZenTao information';
$lang->admin->officialAccount = 'WeChat Official Account';
@@ -60,10 +61,12 @@ $lang->admin->info->account = 'Ihr ZenTao Konto ist %s.';
$lang->admin->info->log = 'Logs die über die Gültigen Tage hinausgehen werden gelöscht. Aufgabenplanung muss laufen (cron).';
$lang->admin->notice = new stdclass();
-$lang->admin->notice->register = "Hinweiß: Sie haben sich nicht bei ZenTao (www.zentao.pm) registriert. %s um die aktuellen Updates und News zu erhalten.";
-$lang->admin->notice->ignore = "Ignorieren";
-$lang->admin->notice->int = "『%s』sollte eine positive Zahl sein.";
-$lang->admin->notice->openUR = "Please enable {$lang->URCommon} first before you can use {$lang->ERCommon}.";
+$lang->admin->notice->register = "Hinweiß: Sie haben sich nicht bei ZenTao (www.zentao.pm) registriert. %s um die aktuellen Updates und News zu erhalten.";
+$lang->admin->notice->ignore = "Ignorieren";
+$lang->admin->notice->int = "『%s』sollte eine positive Zahl sein.";
+$lang->admin->notice->confirmDisableStoryType = "‘{type}’ Funktion geschlossen, das System wird alle Geschichten entfernen, die mit dem Projekt und der Ausführung verknüpkt sind, die Operation ist irreversibel";
+$lang->admin->notice->openDependFeature = 'Using "{source}" function requires enabling "{target}" function synchronously.';
+$lang->admin->notice->closeDependFeature = 'Closing "{source}" function requires synchronously closing "{target}" function.';
$lang->admin->registerNotice = new stdclass();
$lang->admin->registerNotice->common = 'Register Account';
@@ -89,10 +92,7 @@ $lang->admin->setModule->closed = 'Closed';
$lang->admin->setModule->my = 'My';
$lang->admin->setModule->product = $lang->productCommon;
-$lang->admin->setModule->scrum = 'Scrum ' . $lang->projectCommon;
-$lang->admin->setModule->waterfall = 'Waterfall ' . $lang->projectCommon;
-$lang->admin->setModule->agileplus = 'Agile + ' . $lang->projectCommon;
-$lang->admin->setModule->waterfallplus = 'Waterfall + ' . $lang->projectCommon;
+$lang->admin->setModule->project = $lang->projectCommon;
$lang->admin->setModule->assetlib = 'Assetlib';
$lang->admin->setModule->other = 'Other';
@@ -108,6 +108,9 @@ $lang->admin->setModule->roadmap = 'Roadmap';
$lang->admin->setModule->track = 'Track';
$lang->admin->setModule->ER = $lang->ERCommon;
$lang->admin->setModule->UR = $lang->URCommon;
+$lang->admin->setModule->deliverable = 'Deliverable';
+$lang->admin->setModule->cm = 'Baseline';
+$lang->admin->setModule->change = 'Project Change';
$lang->admin->setModule->researchplan = 'Researchplan';
$lang->admin->setModule->gapanalysis = 'Gapanalysis';
$lang->admin->setModule->storylib = 'Story Lib';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index dc2c51c66e..bf5e419b27 100755
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -34,6 +34,7 @@ $lang->admin->zentaoUsed = 'You have been using ZenTao';
$lang->admin->api = 'API';
$lang->admin->log = 'Log';
$lang->admin->setting = 'Setting';
+$lang->admin->setFlow = 'Set Flow';
$lang->admin->pluginRecommendation = 'Recommended plug-ins';
$lang->admin->zentaoInfo = 'ZenTao information';
$lang->admin->officialAccount = 'WeChat Official Account';
@@ -60,10 +61,12 @@ $lang->admin->info->account = 'Your ZenTao account is %s.';
$lang->admin->info->log = 'Log that exceeds valid days will be deleted and you have to run cron.';
$lang->admin->notice = new stdclass();
-$lang->admin->notice->register = "Note: You haven't registered in ZenTao official website(www.zentao.pm). %s then get the Latest ZenTao Upgrades and News.";
-$lang->admin->notice->ignore = "Ignore";
-$lang->admin->notice->int = "『%s』should be a positive integer.";
-$lang->admin->notice->openUR = "Please enable {$lang->URCommon} first before you can use {$lang->ERCommon}.";
+$lang->admin->notice->register = "Note: You haven't registered in ZenTao official website(www.zentao.pm). %s then get the Latest ZenTao Upgrades and News.";
+$lang->admin->notice->ignore = "Ignore";
+$lang->admin->notice->int = "『%s』should be a positive integer.";
+$lang->admin->notice->confirmDisableStoryType = "‘{type}’ function closed, the system will remove all stories associated with the project and execution, the operation is irreversible";
+$lang->admin->notice->openDependFeature = 'Using "{source}" function requires enabling "{target}" function synchronously.';
+$lang->admin->notice->closeDependFeature = 'Closing "{source}" function requires synchronously closing "{target}" function.';
$lang->admin->registerNotice = new stdclass();
$lang->admin->registerNotice->common = 'Register Account';
@@ -89,10 +92,7 @@ $lang->admin->setModule->closed = 'Closed';
$lang->admin->setModule->my = 'My';
$lang->admin->setModule->product = $lang->productCommon;
-$lang->admin->setModule->scrum = 'Scrum ' . $lang->projectCommon;
-$lang->admin->setModule->waterfall = 'Waterfall ' . $lang->projectCommon;
-$lang->admin->setModule->agileplus = 'Agile + ' . $lang->projectCommon;
-$lang->admin->setModule->waterfallplus = 'Waterfall + ' . $lang->projectCommon;
+$lang->admin->setModule->project = $lang->projectCommon;
$lang->admin->setModule->assetlib = 'Assetlib';
$lang->admin->setModule->other = 'Other';
@@ -108,6 +108,9 @@ $lang->admin->setModule->roadmap = 'Roadmap';
$lang->admin->setModule->track = 'Track';
$lang->admin->setModule->ER = $lang->ERCommon;
$lang->admin->setModule->UR = $lang->URCommon;
+$lang->admin->setModule->deliverable = 'Deliverable';
+$lang->admin->setModule->cm = 'Baseline';
+$lang->admin->setModule->change = 'Project Change';
$lang->admin->setModule->researchplan = 'Researchplan';
$lang->admin->setModule->gapanalysis = 'Gapanalysis';
$lang->admin->setModule->storylib = 'Story Lib';
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index ce32ba4630..3e4f2bcc6f 100755
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -34,6 +34,7 @@ $lang->admin->zentaoUsed = '';
$lang->admin->api = 'API';
$lang->admin->log = 'Log';
$lang->admin->setting = 'Paramétrage';
+$lang->admin->setFlow = 'Set Flow';
$lang->admin->pluginRecommendation = 'Recommended plug-ins';
$lang->admin->zentaoInfo = 'ZenTao information';
$lang->admin->officialAccount = 'WeChat Official Account';
@@ -60,10 +61,12 @@ $lang->admin->info->account = 'Votre identifiant client ZenTao est %s.';
$lang->admin->info->log = 'Les logs qui dépassent la durée de conservation seront supprimés et vous devrez exécuter un cron.';
$lang->admin->notice = new stdclass();
-$lang->admin->notice->register = "Note: Vous n'êtes pas enregistré sur le site officiel de ZenTao (www.zentao.pm). %s vous pourrez ensuite obtenir les dernières Mises à Jour de ZenTao et des informations.";
-$lang->admin->notice->ignore = "Ignorer";
-$lang->admin->notice->int = "『 %s 』 devrait être un entier positif.";
-$lang->admin->notice->openUR = "Please enable {$lang->URCommon} first before you can use {$lang->ERCommon}.";
+$lang->admin->notice->register = "Note: Vous n'êtes pas enregistré sur le site officiel de ZenTao (www.zentao.pm). %s vous pourrez ensuite obtenir les dernières Mises à Jour de ZenTao et des informations.";
+$lang->admin->notice->ignore = "Ignorer";
+$lang->admin->notice->int = "『 %s 』 devrait être un entier positif.";
+$lang->admin->notice->confirmDisableStoryType = "‘{type}’ fonction fermée, le système supprimera toutes les histoires associées au projet et à l'exécution, l'opération est irréversible";
+$lang->admin->notice->openDependFeature = 'Using "{source}" function requires enabling "{target}" function synchronously.';
+$lang->admin->notice->closeDependFeature = 'Closing "{source}" function requires synchronously closing "{target}" function.';
$lang->admin->registerNotice = new stdclass();
$lang->admin->registerNotice->common = 'Register Account';
@@ -89,10 +92,7 @@ $lang->admin->setModule->closed = 'Closed';
$lang->admin->setModule->my = 'My';
$lang->admin->setModule->product = $lang->productCommon;
-$lang->admin->setModule->scrum = 'Scrum ' . $lang->projectCommon;
-$lang->admin->setModule->waterfall = 'Waterfall ' . $lang->projectCommon;
-$lang->admin->setModule->agileplus = 'Agile + ' . $lang->projectCommon;
-$lang->admin->setModule->waterfallplus = 'Waterfall + ' . $lang->projectCommon;
+$lang->admin->setModule->project = $lang->projectCommon;
$lang->admin->setModule->assetlib = 'Assetlib';
$lang->admin->setModule->other = 'Other';
@@ -108,6 +108,9 @@ $lang->admin->setModule->roadmap = 'Roadmap';
$lang->admin->setModule->track = 'Track';
$lang->admin->setModule->ER = $lang->ERCommon;
$lang->admin->setModule->UR = $lang->URCommon;
+$lang->admin->setModule->deliverable = 'Deliverable';
+$lang->admin->setModule->cm = 'Baseline';
+$lang->admin->setModule->change = 'Project Change';
$lang->admin->setModule->researchplan = 'Researchplan';
$lang->admin->setModule->gapanalysis = 'Gapanalysis';
$lang->admin->setModule->storylib = 'Story Lib';
diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 82d3ead24c..ed0e9f59a6 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -14,10 +14,6 @@ $lang->admin->menuList->company['name'] = $lang->admin->menuSetting['user']['na
$lang->admin->menuList->company['desc'] = $lang->admin->menuSetting['user']['desc'];
$lang->admin->menuList->company['order'] = 15;
-$lang->admin->menuList->model['name'] = $lang->admin->menuSetting['model']['name'];
-$lang->admin->menuList->model['desc'] = $lang->admin->menuSetting['model']['desc'];
-$lang->admin->menuList->model['order'] = 20;
-
$lang->admin->menuList->feature['name'] = $lang->admin->menuSetting['feature']['name'];
$lang->admin->menuList->feature['desc'] = $lang->admin->menuSetting['feature']['desc'];
$lang->admin->menuList->feature['order'] = 25;
@@ -71,44 +67,10 @@ $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,deliverable,baseline', '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' => 'baseline-templatetype,stage-settype,stage-plusbrowse');
-$lang->admin->menuList->model['subMenu']['agileplus'] = array('link' => "{$lang->agilePlusModel}|auditcl|agileplusbrowse|", 'subModule' => 'auditcl');
-$lang->admin->menuList->model['subMenu']['waterfallplus'] = array('link' => "{$lang->waterfallPlusModel}|stage|plusbrowse|", 'subModule' => 'stage', 'exclude' => 'baseline-templatetype,stage-settype,stage-browse');
-
-$lang->admin->menuList->model['menuOrder']['5'] = 'common';
-$lang->admin->menuList->model['menuOrder']['10'] = 'scrum';
-$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' => 'project', 'exclude' => 'custom-required,baseline-templatetype', '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|'));
-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';
-if(helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus')) $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['7'] = 'stage';
-$lang->admin->menuList->model['tabMenu']['menuOrder']['common']['10'] = 'build';
-$lang->admin->menuList->model['tabMenu']['menuOrder']['common']['35'] = 'flow';
-$lang->admin->menuList->model['tabMenu']['menuOrder']['common']['40'] = 'percent';
-$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');
-$lang->admin->menuList->feature['subMenu']['execution'] = array('link' => "{$lang->execution->common}|custom|required|module=execution", 'exclude' => 'required,set', 'alias' => 'execution,limittaskdate');
+$lang->admin->menuList->feature['subMenu']['project'] = array('link' => "{$lang->projectCommon}|custom|required|module=project", 'alias' => 'flow,percent,hours,estimate,project', 'subModule' => 'subject,holiday,baseline,design,reviewcl', 'exclude' => 'set,required');
+$lang->admin->menuList->feature['subMenu']['execution'] = array('link' => "{$lang->execution->common}|custom|required|module=execution", 'exclude' => 'required,set', 'alias' => 'execution,limittaskdate', 'subModule' => 'stage');
$lang->admin->menuList->feature['subMenu']['qa'] = array('link' => "{$lang->qa->common}|custom|required|module=bug", 'exclude' => 'set,required');
$lang->admin->menuList->feature['subMenu']['kanban'] = array('link' => "{$lang->kanban->common}|custom|kanban|");
$lang->admin->menuList->feature['subMenu']['user'] = array('link' => "{$lang->user->common}|custom|required|module=user", 'links' => array('custom|set|module=user&field=roleList'), 'exclude' => 'set,required');
@@ -116,14 +78,21 @@ $lang->admin->menuList->feature['subMenu']['user'] = array('link' => "{$l
$lang->admin->menuList->feature['tabMenu']['my']['todo'] = array('link' => "{$lang->todo->common}|custom|set|module=todo&field=priList", 'exclude' => 'custom-set');
$lang->admin->menuList->feature['tabMenu']['my']['block'] = array('link' => "{$lang->block->common}|custom|set|module=block&field=closed", 'exclude' => 'custom-set');
-$lang->admin->menuList->feature['tabMenu']['product']['product'] = array('link' => "{$lang->productCommon}|custom|required|module=product", 'links' => array("custom|browsestoryconcept|", 'custom|product|'), 'alias' => 'browsestoryconcept,product', 'exclude' => 'custom-required');
+$lang->admin->menuList->feature['tabMenu']['product']['product'] = array('link' => "{$lang->productCommon}|custom|required|module=product", 'links' => array("custom|browsestoryconcept|", 'custom|product|'), 'alias' => 'browsestoryconcept,product', 'exclude' => 'custom-required');
if($config->enableER) $lang->admin->menuList->feature['tabMenu']['product']['epic'] = array('link' => "{$lang->epic->common}|custom|required|module=epic", 'links' => array("custom|set|module=epic&field=categoryList"), 'exclude' => 'custom-required,custom-set');
if($config->URAndSR) $lang->admin->menuList->feature['tabMenu']['product']['requirement'] = array('link' => "{$lang->URCommon}|custom|required|module=requirement", 'links' => array("custom|set|module=requirement&field=categoryList"), 'exclude' => 'custom-required,custom-set');
$lang->admin->menuList->feature['tabMenu']['product']['story'] = array('link' => "{$lang->SRCommon}|custom|required|module=story", 'links' => array("custom|set|module=story&field=categoryList"), 'exclude' => 'custom-required,custom-set');
$lang->admin->menuList->feature['tabMenu']['product']['productplan'] = array('link' => "{$lang->productplan->shortCommon}|custom|required|module=productplan", 'exclude' => 'custom-required');
$lang->admin->menuList->feature['tabMenu']['product']['release'] = array('link' => "{$lang->release->common}|custom|required|module=release", 'exclude' => 'custom-required');
+$lang->admin->menuList->feature['tabMenu']['project']['project'] = array('link' => "{$lang->project->common}|custom|required|module=project", 'alias' => 'project', 'exclude' => 'custom-required');
+$lang->admin->menuList->feature['tabMenu']['project']['build'] = array('link' => "{$lang->build->common}|custom|required|module=build", 'exclude' => 'custom-required');
+$lang->admin->menuList->feature['tabMenu']['project']['flow'] = array('link' => "{$lang->custom->flow}|custom|flow|");
+$lang->admin->menuList->feature['tabMenu']['project']['percent'] = array('link' => "{$lang->stage->percent}|custom|percent|");
+$lang->admin->menuList->feature['tabMenu']['project']['hours'] = array('link' => "{$lang->workingHour}|custom|hours|", 'subModule' => 'holiday', 'links' => array('holiday|browse|', 'custom|hours|'));
+
$lang->admin->menuList->feature['tabMenu']['execution']['execution'] = array('link' => "{$lang->execution->common}|custom|required|module=execution", 'links' => array("custom|execution|"), 'alias' => 'execution', 'exclude' => 'custom-required');
+$lang->admin->menuList->feature['tabMenu']['execution']['stage'] = array('link' => "{$lang->stage->common}|stage|settype|", 'subModule' => 'stage', 'links' => array('stage|browse|'));
$lang->admin->menuList->feature['tabMenu']['execution']['task'] = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList', 'custom|limittaskdate|'), 'alias' => 'limittaskdate','exclude' => 'custom-required');
$lang->admin->menuList->feature['tabMenu']['qa']['bug'] = array('link' => "{$lang->bug->common}|custom|required|module=bug", 'links' => array("custom|set|module=bug&field=priList"), 'exclude' => 'custom-required,custom-set');
@@ -141,8 +110,16 @@ if($config->URAndSR) $lang->admin->menuList->feature['tabMenu']['menuOrder']['p
$lang->admin->menuList->feature['tabMenu']['menuOrder']['product']['20'] = 'story';
$lang->admin->menuList->feature['tabMenu']['menuOrder']['product']['25'] = 'productplan';
$lang->admin->menuList->feature['tabMenu']['menuOrder']['product']['30'] = 'release';
+
+$lang->admin->menuList->feature['tabMenu']['menuOrder']['project']['5'] = 'project';
+$lang->admin->menuList->feature['tabMenu']['menuOrder']['project']['10'] = 'build';
+$lang->admin->menuList->feature['tabMenu']['menuOrder']['project']['35'] = 'flow';
+$lang->admin->menuList->feature['tabMenu']['menuOrder']['project']['40'] = 'percent';
+$lang->admin->menuList->feature['tabMenu']['menuOrder']['project']['45'] = 'hours';
+
$lang->admin->menuList->feature['tabMenu']['menuOrder']['execution']['5'] = 'execution';
-$lang->admin->menuList->feature['tabMenu']['menuOrder']['execution']['10'] = 'task';
+$lang->admin->menuList->feature['tabMenu']['menuOrder']['execution']['10'] = 'stage';
+$lang->admin->menuList->feature['tabMenu']['menuOrder']['execution']['15'] = 'task';
$lang->admin->menuList->feature['tabMenu']['menuOrder']['qa']['5'] = 'bug';
$lang->admin->menuList->feature['tabMenu']['menuOrder']['qa']['10'] = 'testcase';
$lang->admin->menuList->feature['tabMenu']['menuOrder']['qa']['15'] = 'testsuite';
@@ -152,10 +129,12 @@ $lang->admin->menuList->feature['tabMenu']['menuOrder']['qa']['30'] = 'ca
$lang->admin->menuList->feature['menuOrder']['5'] = 'my';
$lang->admin->menuList->feature['menuOrder']['10'] = 'product';
-$lang->admin->menuList->feature['menuOrder']['15'] = 'execution';
-$lang->admin->menuList->feature['menuOrder']['20'] = 'qa';
-$lang->admin->menuList->feature['menuOrder']['25'] = 'kanban';
-$lang->admin->menuList->feature['menuOrder']['39'] = 'user';
+$lang->admin->menuList->feature['menuOrder']['15'] = 'project';
+$lang->admin->menuList->feature['menuOrder']['20'] = 'execution';
+$lang->admin->menuList->feature['menuOrder']['25'] = 'qa';
+$lang->admin->menuList->feature['menuOrder']['30'] = 'kanban';
+$lang->admin->menuList->feature['menuOrder']['35'] = 'doc';
+$lang->admin->menuList->feature['menuOrder']['40'] = 'user';
$lang->admin->menuList->feature['dividerMenu'] = ',user,';
@@ -186,29 +165,6 @@ $lang->admin->menuList->adminregister['desc'] = $lang->admin->menuSetting['admi
$lang->admin->menuList->adminregister['link'] = 'admin|register';
$lang->admin->menuList->adminregister['order'] = 61;
-if($config->edition != 'max' and $config->edition != 'ipd')
-{
- unset($lang->admin->menuList->model['subMenu']['scrum']);
- unset($lang->admin->menuList->model['subMenu']['agileplus']);
- unset($lang->admin->menuList->model['menuOrder']['10']);
- unset($lang->admin->menuList->model['menuOrder']['20']);
-}
-if(!helper::hasFeature('waterfall'))
-{
- unset($lang->admin->menuList->model['subMenu']['waterfall']);
- unset($lang->admin->menuList->model['menuOrder']['15']);
-}
-if(!helper::hasFeature('waterfallplus'))
-{
- unset($lang->admin->menuList->model['subMenu']['waterfallplus']);
- unset($lang->admin->menuList->model['menuOrder']['25']);
-}
-if($config->edition == 'max' or $config->edition == 'ipd')
-{
- if(!helper::hasFeature('scrum_auditplan') and !helper::hasFeature('scrum_process')) unset($lang->admin->menuList->model['subMenu']['scrum'], $lang->admin->menuList->model['menuOrder']['10']);
- if(!helper::hasFeature('agileplus_auditplan') and !helper::hasFeature('agileplus_process')) unset($lang->admin->menuList->model['subMenu']['agileplus'], $lang->admin->menuList->model['menuOrder']['20']);
-}
-
if($config->vision == 'lite')
{
unset($lang->admin->menuList->system['subMenu']['mode']);
@@ -218,15 +174,6 @@ if($config->vision == 'lite')
unset($lang->admin->menuList->system['menuOrder']['45']);
unset($lang->admin->menuList->system['menuOrder']['50']);
- unset($lang->admin->menuList->model['subMenu']['scrum']);
- unset($lang->admin->menuList->model['subMenu']['waterfall']);
- unset($lang->admin->menuList->model['subMenu']['agileplus']);
- unset($lang->admin->menuList->model['subMenu']['waterfallplus']);
- unset($lang->admin->menuList->model['menuOrder']['10']);
- unset($lang->admin->menuList->model['menuOrder']['15']);
- unset($lang->admin->menuList->model['menuOrder']['20']);
- unset($lang->admin->menuList->model['menuOrder']['25']);
-
unset($lang->admin->menuList->feature['subMenu']['product']);
unset($lang->admin->menuList->feature['subMenu']['execution']);
unset($lang->admin->menuList->feature['subMenu']['qa']);
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index 1eace6d069..99392928c9 100755
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -34,6 +34,7 @@ $lang->admin->zentaoUsed = '您已使用禅道';
$lang->admin->api = '接口';
$lang->admin->log = '日志';
$lang->admin->setting = '设置';
+$lang->admin->setFlow = '流程配置';
$lang->admin->pluginRecommendation = '插件推荐';
$lang->admin->zentaoInfo = '禅道信息';
$lang->admin->officialAccount = '官方公众号';
@@ -60,10 +61,12 @@ $lang->admin->info->account = "您的禅道社区账户为%s。";
$lang->admin->info->log = '超出存天数的日志会被删除，需要开启计划任务。';
$lang->admin->notice = new stdclass();
-$lang->admin->notice->register = "可%s禅道社区 www.zentao.net，及时获得禅道最新信息。";
-$lang->admin->notice->ignore = "不再提示";
-$lang->admin->notice->int = "『%s』应当是正整数。";
-$lang->admin->notice->openUR = "请先开启{$lang->URCommon}，才能使用{$lang->ERCommon}。";
+$lang->admin->notice->register = "可%s禅道社区 www.zentao.net，及时获得禅道最新信息。";
+$lang->admin->notice->ignore = "不再提示";
+$lang->admin->notice->int = "『%s』应当是正整数。";
+$lang->admin->notice->confirmDisableStoryType = "‘{type}’功能关闭后，系统会将项目和执行内已经关联的相应‘{type}’全部移除, 操作不可逆";
+$lang->admin->notice->openDependFeature = '使用“{source}”功能时需要同步开启“{target}”功能。';
+$lang->admin->notice->closeDependFeature = '关闭“{source}”功能时需要同步关闭“{target}”功能。';
$lang->admin->registerNotice = new stdclass();
$lang->admin->registerNotice->common = '注册新帐号';
@@ -89,12 +92,9 @@ $lang->admin->setModule->closed = '已关闭';
$lang->admin->setModule->my = '地盘';
$lang->admin->setModule->product = $lang->productCommon;
-$lang->admin->setModule->scrum = '敏捷' . $lang->projectCommon;
-$lang->admin->setModule->waterfall = '瀑布' . $lang->projectCommon;
-$lang->admin->setModule->agileplus = '融合敏捷' . $lang->projectCommon;
-$lang->admin->setModule->waterfallplus = '融合瀑布' . $lang->projectCommon;
+$lang->admin->setModule->project = $lang->projectCommon;
$lang->admin->setModule->assetlib = '资产库';
-$lang->admin->setModule->other = '通用功能';
+$lang->admin->setModule->other = '其他功能';
$lang->admin->setModule->score = '积分';
$lang->admin->setModule->repo = '代码';
@@ -108,6 +108,9 @@ $lang->admin->setModule->roadmap = '路线图';
$lang->admin->setModule->track = '矩阵';
$lang->admin->setModule->ER = $lang->ERCommon;
$lang->admin->setModule->UR = $lang->URCommon;
+$lang->admin->setModule->deliverable = '交付物';
+$lang->admin->setModule->cm = '基线';
+$lang->admin->setModule->change = '项目变更';
$lang->admin->setModule->researchplan = '调研';
$lang->admin->setModule->gapanalysis = '培训';
$lang->admin->setModule->storylib = '需求库';
@@ -171,8 +174,6 @@ $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']['desc'] = '不同项目管理模型和项目通用要素配置。';
$lang->admin->menuSetting['feature']['name'] = '功能配置';
$lang->admin->menuSetting['feature']['desc'] = '按照功能菜单进行系统的要素配置。';
$lang->admin->menuSetting['template']['name'] = '文档模板';
diff --git a/module/admin/model.php b/module/admin/model.php
index 701332ca59..d798f417d0 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -101,10 +101,11 @@ class adminModel extends model
* 设置后台二级导航。
* Set admin menu.
*
+ * @param int $groupID
* @access public
* @return void
*/
- public function setMenu(): void
+ public function setMenu(int $groupID = 0): void
{
$this->checkPrivMenu();
@@ -117,6 +118,7 @@ class adminModel extends model
$this->setSwitcher($menuKey);
if(isset($this->lang->admin->menuList->$menuKey))
{
+ if(in_array($menuKey, array('projectflow', 'productflow')) && $groupID) $this->lang->admin->menuList->{$menuKey}['subMenu'] = $this->lang->admin->menuList->{$menuKey}['childMenu'];
if(isset($this->lang->admin->menuList->{$menuKey}['subMenu']))
{
$moduleName = $this->app->rawModule;
@@ -132,6 +134,23 @@ class adminModel extends model
if($firstParam == $subMenuKey) $subModule = 'custom';
}
+ /* 针对项目流程和产品流程菜单做特殊处理。 */
+ if(in_array($menuKey, array('projectflow', 'productflow')) && $groupID)
+ {
+ $workflowGroup = $this->fetchByID($groupID, 'workflowgroup');
+ if($subMenuKey == 'review' && $workflowGroup->projectModel == 'kanban') continue;
+ if($subMenuKey == 'stage' && in_array($workflowGroup->projectModel, array('kanban', 'scrum', 'agileplus'))) continue;
+
+ $subMenu['link'] = sprintf($subMenu['link'], $groupID);
+ if(isset($subMenu['subMenu']))
+ {
+ foreach($subMenu['subMenu'] as $subSubMenuKey => $subSubMenu)
+ {
+ $subMenu['subMenu'][$subSubMenuKey]['link'] = sprintf($subSubMenu['link'], $groupID);
+ }
+ }
+ }
+
if(!empty($subModule)) $subMenu['subModule'] = $subModule;
if(isset($this->lang->admin->menuList->{$menuKey}['tabMenu'][$subMenuKey]))
{
@@ -192,12 +211,6 @@ class adminModel extends model
if($dept && common::hasPriv('company', 'browse')) $menu['link'] = helper::createLink('company', 'browse');
}
- /* Set links to authorized navigation. */
- if(isset($menu['subMenu']))
- {
- $menu = $this->setSubMenu($menuKey, $menu);
- }
-
if(!empty($menu['link']) && strpos($menu['link'], '|') !== false)
{
list($module, $method, $params) = explode('|', $menu['link'] . '|');
@@ -205,6 +218,12 @@ class adminModel extends model
if(($this->app->user->admin || $module . $method != 'adminregister') && common::hasPriv($module, $method)) $menu['disabled'] = false;
}
+ /* Set links to authorized navigation. */
+ if(!in_array($menuKey, array('productflow', 'projectflow')) && isset($menu['subMenu']))
+ {
+ $menu = $this->setSubMenu($menuKey, $menu);
+ }
+
$order = $menu['order'];
$orders[$order] = $menuKey;
@@ -235,7 +254,7 @@ class adminModel extends model
{
/* Reorder secondary navigation. */
$subMenuList = array();
- $subMenuOrders = $menu['menuOrder'];
+ $subMenuOrders = !empty($menu['menuOrder']) ? $menu['menuOrder'] : array();
if(empty($subMenuOrders)) return array();
ksort($subMenuOrders);
foreach($subMenuOrders as $value)
@@ -280,8 +299,11 @@ class adminModel extends model
$menu['subMenu'][$subMenuKey]['link'] = substr($subMenu['link'], 0, strpos($subMenu['link'], '|') + 1) . $module . '|' . $method . '|' . $params;
/* Update the level 1 navigation link. */
- if(empty($menu['link'])) $menu['link'] = helper::createLink($module, $method, $params);
- $menu['disabled'] = false;
+ if(!empty($menu['disabled']))
+ {
+ $menu['link'] = helper::createLink($module, $method, $params);
+ $menu['disabled'] = false;
+ }
}
}
@@ -371,6 +393,11 @@ class adminModel extends model
$moduleName = $this->app->rawModule;
$methodName = $this->app->rawMethod;
$firstParam = $this->app->rawParams ? reset($this->app->rawParams) : '';
+ if($this->config->edition == 'open')
+ {
+ $this->config->admin->menuGroup['feature'][] = 'stage|browse';
+ $this->config->admin->menuGroup['feature'][] = 'stage|batchcreate';
+ }
foreach($this->config->admin->menuGroup as $menuKey => $menuGroup)
{
@@ -384,6 +411,11 @@ class adminModel extends model
{
if(in_array($firstParam, $this->config->admin->menuModuleGroup[$menuKey]["custom|$methodName"])) return $menuKey;
}
+ elseif($moduleName == 'workflowgroup' && $firstParam && !in_array($methodName, array('project', 'product')))
+ {
+ $workflowgroup = $this->loadModel('workflowgroup')->fetchByID($firstParam);
+ return $workflowgroup->type == 'project' ? 'projectflow' : 'productflow';
+ }
else
{
return $menuKey;
@@ -460,8 +492,8 @@ class adminModel extends model
{
if($this->config->vision == 'lite' and !in_array($menuKey, $this->config->admin->liteMenuList)) continue;
$class = $menuKey == $currentMenuKey ? "active" : '';
- if($menuGroup['disabled']) $class .= ' disabled not-clear-menu';
- $output .= "") . " {$menuGroup['name']}
" . $menuGroup['name']) . "") . $menuGroup['name']) . "
MeshioT";
-$lang->misc->mobile = "Mobiler Zugriff";
-$lang->misc->noGDLib = "Bitte benutzen Sie den Browser Ihres Telefons um die Seite %s aufzurufen";
-$lang->misc->copyright = "© 2009 - " . date('Y') . " Nature Easy Soft Network Technology Co,LTD Email Max@easysoft.ltd";
-$lang->misc->checkTable = "Prüfe Datentabellen";
-$lang->misc->needRepair = "Repariere Datentabellen";
-$lang->misc->repairTable = "Datenbank íst beschädigt. Bitte brüfen und reparieren!";
-$lang->misc->repairFail = "Reparatur fehlgeschlagen. Bitte wechseln Sie in das Verzeichnis der Datenbank, und versuchen Sie folgenden Befehl myisamchk -r -f %s.MYI zum reparieren der DB.";
-$lang->misc->withoutCmd = 'Reparatur fehlgeschlagen.';
+$lang->misc->mobile = "Mobile Access";
+$lang->misc->noGDLib = "Please visit %s in the browser of your phone.";
+$lang->misc->copyright = "© 2009 - " . date('Y') . " ZenTao Software Email Renee@easycorp.ltd";
+$lang->misc->checkTable = "Check Data Table";
+$lang->misc->needRepair = "Repair Table";
+$lang->misc->repairTable = "Database table might be damaged due to power outage. Please check and repair!";
+$lang->misc->repairFail = "Failed to repair. Please go to the data directory of your database, and try to execute myisamchk -r -f %s.MYI repair.";
+$lang->misc->withoutCmd = 'Failed to repair.';
$lang->misc->connectFail = "Failed to connect to the database. Error: %s，Please check the MySQL error log and troubleshoot."; -$lang->misc->tableName = "Tabellenname"; +$lang->misc->tableName = "Table Name"; $lang->misc->tableStatus = "Status"; -$lang->misc->novice = "Erstes mal bei ZenTao? Möchten Sie den Beginner Modus starten?"; -$lang->misc->showAnnual = 'Add annual summary'; -$lang->misc->annualDesc = 'After version 12.0, the new annual report function can be viewed on the 『Report->Annual Summary』 page. See now.'; +$lang->misc->novice = "New to ZenTao? Do you want to start ZenTao Tutorial?"; +$lang->misc->showAnnual = 'Add Annual Summary'; +$lang->misc->annualDesc = 'After version 12.0, Annual Summary can be viewed on 『Report->Annual Summary』 page. See now.'; $lang->misc->remind = 'New feature reminders'; $lang->misc->expiredTipsTitle = 'Dear system administrator, hello:'; @@ -78,6 +78,7 @@ $lang->misc->expiredCountTips = 'There are System->Metric Library" page.'; $lang->misc->noticeRepair = "
If you are not Administrator, contact your ZenTao Administrator to repair tables.
If you are the Administrator, login your ZenTao host and create a file named %s.
@@ -88,8 +89,8 @@ $lang->misc->noticeRepair = "If you are not Administrator, contact your ZenT "; $lang->misc->feature = new stdclass(); -$lang->misc->feature->lastest = 'Letzte Version'; -$lang->misc->feature->detailed = 'Details'; +$lang->misc->feature->lastest = 'Latest Version'; +$lang->misc->feature->detailed = 'Detail'; $lang->misc->feature->introduction = 'Features'; $lang->misc->feature->tutorial = 'Tutorial'; $lang->misc->feature->tutorialImage = 'theme/default/images/main/tutorial_en.png'; @@ -114,7 +115,11 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +<<<<<<< HEAD $lang->misc->releaseDate['21.7.8'] = '2025-12-15'; +======= +$lang->misc->releaseDate['21.7.8'] = '2025-12-30'; +>>>>>>> feature/workflowgroup $lang->misc->releaseDate['21.7.7'] = '2025-10-29'; $lang->misc->releaseDate['21.7.6'] = '2025-09-29'; $lang->misc->releaseDate['21.7.5'] = '2025-09-11'; @@ -354,13 +359,13 @@ $lang->misc->feature->all['12.3.3'][] = array('title'=>'Fix Bug', 'desc' => ''); $lang->misc->feature->all['12.3.2'][] = array('title'=>'Fix workflow', 'desc' => ''); $lang->misc->feature->all['12.3.1'][] = array('title'=>'Fix bugs of high severity.', 'desc' => ''); $lang->misc->feature->all['12.3'][] = array('title'=>'Integrate unit test, open the continuous integration closed-loop.', 'desc' => ''); -$lang->misc->feature->all['12.2'][] = array('title'=>'Add parent-child story, compatible xuanxuan.', 'desc' => ''); +$lang->misc->feature->all['12.2'][] = array('title'=>'Add parent-child story, compatible Xuanxuan IM.', 'desc' => ''); $lang->misc->feature->all['12.1'][] = array('title'=>'Add Integration.', 'desc' => '
Add integration, and build in Jenkins
'); $lang->misc->feature->all['12.0.1'][] = array('title'=>'Fix Bug.', 'desc' => ''); $lang->misc->feature->all['12.0'][] = array('title'=>'Move repo function to zentao', 'desc' => ''); -$lang->misc->feature->all['12.0'][] = array('title'=>'Move repo function to zentao', 'desc' => ''); -$lang->misc->feature->all['12.0'][] = array('title'=>'Move repo function to zentao', 'desc' => ''); +$lang->misc->feature->all['12.0'][] = array('title'=>'Add annual summary', 'desc' => 'Show annual summary by role.'); +$lang->misc->feature->all['12.0'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); $lang->misc->feature->all['11.7'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Added choices for users to choose agile or not.
Added WeChat Enterprise to the types of webhook
Added the notifier of Dingding personal messages
'); $lang->misc->feature->all['11.6.5'][] = array('title'=>'Fix bug.', 'desc' => ''); @@ -370,18 +375,18 @@ $lang->misc->feature->all['11.6.2'][] = array('title'=>'Optimize details and fix $lang->misc->feature->all['11.6.1'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); $lang->misc->feature->all['11.6.stable'][] = array('title'=>'Improving the International Edition Interface', 'desc' => ''); -$lang->misc->feature->all['11.6.stable'][] = array('title'=>'Improving the International Edition Interface', 'desc' => ''); +$lang->misc->feature->all['11.6.stable'][] = array('title'=>'Add translate function', 'desc' => ''); $lang->misc->feature->all['11.5.2'][] = array('title'=>'Increase the security of ZenTao and increase the login password for weak password check', 'desc' => ''); $lang->misc->feature->all['11.5.1'][] = array('title'=>'Add a third-party authentication and fix bugs.', 'desc' => ''); $lang->misc->feature->all['11.5.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); -$lang->misc->feature->all['11.5.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); -$lang->misc->feature->all['11.5.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); +$lang->misc->feature->all['11.5.stable'][] = array('title'=>'Added filters to Dynamics', 'desc' => ''); +$lang->misc->feature->all['11.5.stable'][] = array('title'=>'Integrated the latest ZenTao Desktop', 'desc' => ''); $lang->misc->feature->all['11.4.1'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); -$lang->misc->feature->all["11.4.stable"][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Enhanced test management.
Optimized the UI of Plan, Release, and Build linked stories and bugs.
Customize the feature whether to display files in child category.
Optimize details and fix bug.
'); +$lang->misc->feature->all["11.4.stable"][] = array('title'=>'Optimize details and fix bug.', 'desc' => "Enhanced test management.
Optimized the UI of Plan, Release, and Build linked stories and bugs.
Customize the feature whether to display files in child category.
Optimize details and fix bug.
"); $lang->misc->feature->all['11.3.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Add Child Plan to a Plan
Optimize the chosen
Add Timezone settings
Optimize Document Library and Document modules
'); @@ -389,64 +394,64 @@ $lang->misc->feature->all['11.2.stable'][] = array('title'=>'Optimize details an $lang->misc->feature->all['11.1.stable'][] = array('title'=>'Fix Bug.', 'desc' => ''); -$lang->misc->feature->all['11.0.stable'][] = array('title'=>'ZenTao integrate Xuanxuan', 'desc' => ''); +$lang->misc->feature->all['11.0.stable'][] = array('title'=>'ZenTao integrated desktop.', 'desc' => ''); $lang->misc->feature->all['10.6.stable'][] = array('title'=>'Adjust backup mechanism', 'desc' => 'Increase backup settings and make backup more flexible
Show backup progress
Change the backup directory
'); -$lang->misc->feature->all['10.6.stable'][] = array('title'=>'Adjust backup mechanism', 'desc' => 'Increase backup settings and make backup more flexible
Show backup progress
Change the backup directory
'); +$lang->misc->feature->all['10.6.stable'][] = array('title'=>'Optimize and adjust menu', 'desc' => 'Adjust admin menu
Adjust the secondary menu of My and Project
'); $lang->misc->feature->all['10.5.stable'][] = array('title'=>'Adjust document layout', 'desc' => "Adjust the layout method on the left side of the document library.
Add filter conditions at the bottom of the document library menu.
"); -$lang->misc->feature->all['10.5.stable'][] = array('title'=>'Adjust document layout', 'desc' => "Adjust the layout method on the left side of the document library.
Add filter conditions at the bottom of the document library menu.
"); +$lang->misc->feature->all['10.5.stable'][] = array('title'=>'Adjust the child task logic and optimize the display of parent-child task.', 'desc' => ''); $lang->misc->feature->all['10.4.stable'][] = array('title'=>'Optimize and adjust new interface', 'desc' => 'Detail page restore to the previous layout.
Refactore forms to add user pages
When use cases are executed, do not update the use case stause if the user manually chooses to pass and write the results.
'); -$lang->misc->feature->all['10.4.stable'][] = array('title'=>'Optimize and adjust new interface', 'desc' => 'Detail page restore to the previous layout.
Refactore forms to add user pages
When use cases are executed, do not update the use case stause if the user manually chooses to pass and write the results.
'); -$lang->misc->feature->all['10.4.stable'][] = array('title'=>'Optimize and adjust new interface', 'desc' => 'Detail page restore to the previous layout.
Refactore forms to add user pages
When use cases are executed, do not update the use case stause if the user manually chooses to pass and write the results.
'); +$lang->misc->feature->all['10.4.stable'][] = array('title'=>'After the user machine hibernates and the login fails, the session will be refreshed again.', 'desc' => ''); +$lang->misc->feature->all['10.4.stable'][] = array('title'=>'Upgrade existing interface mechanisms', 'desc' => ''); $lang->misc->feature->all['10.3.stable'][] = array('title'=>'Fix Bug.', 'desc' => ''); -$lang->misc->feature->all['10.2.stable'][] = array('title'=>'Xuan.im is integrated!', 'desc' => ''); +$lang->misc->feature->all['10.2.stable'][] = array('title'=>'ZenTao desktop is integrated!', 'desc' => ''); -$lang->misc->feature->all['10.0.stable'][] = array('title'=>'New UI/UX and new experience', 'desc' => '- My Dashboard
- Dynamics
- Product Home
- Product Overview
- Roadmap
- Project Home
- Project overview
- QA Home
- Document Home
- Added work report on My Dashboard
- Add/Edit/Finish todos on My Dashboard
- Add prodcut report on Product Home
- Add prodcut overview on Product Home
- Add project report on Project Home
- Add project overview on Project Home
- Add Testing report on QA Home
- All Product/product Home/All Project/Project Home/QA Home is moved from the right of the secondary Navbar to the left.
- Kanban/Burndown/Tree/ByGroup of Project/Task has been moved from the third Navbar to the secondary one; Tree/ByGroup/Task List has been integrated to a drop-down.
- Bug/Build of Project on the secondary Navbar has been integrated to a drop-down.
- Display build and list by group, which is more reasonable.
- Added tree to display document on the left of the page.
- Added quick entry to document, including Last Update, My Doc and My Favorite
- Added My Favorite to Doc module.
- My Dashboard
- Dynamics
- Product Home
- Product Overview
- Roadmap
- Project Home
- Project overview
- Test Home
- Document Home
- Added work report on My Dashboard
- Add/Edit/Finish todos on My Dashboard
- Add prodcut report on Product Home
- Add prodcut overview on Product Home
- Add project report on Project Home
- Add project overview on Project Home
- Add Testing report on Test Home
- All Product/product Home/All Project/Project Home/Test Home is moved from the right of the secondary Navbar to the left.
- Kanban/Burndown/Tree/ByGroup of Project/Task has been moved from the third Navbar to the secondary one; Tree/ByGroup/Task List has been integrated to a drop-down.
- Bug/Build of Project on the secondary Navbar has been integrated to a drop-down.
- Display build and list by group, which is more reasonable.
- Added tree to display document on the left of the page.
- Added quick entry to document, including Last Update, My Doc and My Favorite
- Added My Favorite to Doc module.
Centring Mail，SMS，webhook into Message
'); -$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Message centralized management', 'desc' => 'Centring Mail，SMS，webhook into Message
'); -$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Message centralized management', 'desc' => 'Centring Mail，SMS，webhook into Message
'); -$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Message centralized management', 'desc' => 'Centring Mail，SMS，webhook into Message
'); +$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Message centralized management', 'desc' => 'Gather Mail，SMS，webhook into Message
'); +$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Add recurred Todo', 'desc' => ''); +$lang->misc->feature->all['9.8.stable'][] = array('title'=>"Add Block of 'AssignedToMe'", 'desc' => ''); +$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Support generating reports on Test Builds', 'desc' => ''); -$lang->misc->feature->all['9.7.stable'][] = array('title'=>'optimize International package，Added Demo data。', 'desc' => ''); +$lang->misc->feature->all['9.7.stable'][] = array('title'=>'Optimize International package. Added Demo data.', 'desc' => ''); -$lang->misc->feature->all['9.6.stable'][] = array('title'=>'added Webhook Interface feature', 'desc' => 'support communication with BearyChat,dingding'); -$lang->misc->feature->all['9.6.stable'][] = array('title'=>'added Webhook Interface feature', 'desc' => 'support communication with BearyChat,dingding'); -$lang->misc->feature->all['9.6.stable'][] = array('title'=>'added Webhook Interface feature', 'desc' => 'support communication with BearyChat,dingding'); -$lang->misc->feature->all['9.6.stable'][] = array('title'=>'added Webhook Interface feature', 'desc' => 'support communication with BearyChat,dingding'); +$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Webhook Interface feature', 'desc' => 'Support communication with BearyChat, Dingding'); +$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Point', 'desc' => 'More skilled application, more score'); +$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added multiple user task and child tasks to Project', 'desc' => ''); +$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Product line management to Product', 'desc' => ''); -$lang->misc->feature->all['9.5.1'][] = array('title'=>'added Restricted Operatio', 'desc' => ''); +$lang->misc->feature->all['9.5.1'][] = array('title'=>'Added restricted actions.', 'desc' => ''); -$lang->misc->feature->all['9.3.beta'][] = array('title'=>'upgraded framework，Enhanced security', 'desc' => ''); +$lang->misc->feature->all['9.3.beta'][] = array('title'=>'Upgraded ZenTao framework，enhanced security', 'desc' => ''); -$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => 'added TestSuite,CaseLib and Test Statements
'); -$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => 'added TestSuite,CaseLib and Test Statements
'); +$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => 'Added TestSuite, CaseLibrary and QA Report
'); +$lang->misc->feature->all['9.1.stable'][] = array('title'=>'Support Group steps of TestCase', 'desc' => ''); $lang->misc->feature->all['9.0.beta'][] = array('title'=>'ZenTao CloudMail has been added.', 'desc' => 'ZenTao CloudMail is a free Email service launched jointly with SendCloud. Once binded with ZenTao and passed verification, users can use this service.
'); -$lang->misc->feature->all['9.0.beta'][] = array('title'=>'ZenTao CloudMail has been added.', 'desc' => 'ZenTao CloudMail is a free Email service launched jointly with SendCloud. Once binded with ZenTao and passed verification, users can use this service.
'); +$lang->misc->feature->all['9.0.beta'][] = array('title'=>'Optimized Rich Text Editor and Markdown Editor.', 'desc' => ''); $lang->misc->feature->all['8.3.stable'][] = array('title'=>'Improved Documentation.', 'desc' => 'Added Document Home, restructured document library, and added privileges.
Markdown Editor is supported，and privilege and version managment is added.
'); $lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Navigation', 'desc' => 'You can decide which project show in navigation bar and the order of projects shown in the bar.
Hover on the navigation bar and a sign will show to its right. Click the sign and a dialog box "Custom Navigation" will show. Drag the block name to switch its order on navigation bar.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Batch Add/Edit Custom', 'desc' => 'You can batch add and edit fields on custom pages.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Story/Task/Bug/Case', 'desc' => 'You can custom fileds when add a Story/Task/Bug/Case.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Export', 'desc' => 'You can custom fileds when export a Story/Task/Bug/Case pages. You can also save it as template for next export.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Story/Task/Bug/Case Search ', 'desc' => 'On Story/Task/Bug/Case List page, you can do a combined search on Modules and Tabs.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>"ZenTao Tutorial", 'desc' => 'Tutorial for rookies is added for first-time users to know how to use ZenTao.
'); $lang->misc->feature->all['7.4.beta'][] = array('title'=>'Product branch feature is added.', 'desc' => 'Product branch/platform is added, and its related Story/Plan/Bug/Case/Module has Branch added too.
'); -$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Product branch feature is added.', 'desc' => 'Product branch/platform is added, and its related Story/Plan/Bug/Case/Module has Branch added too.
'); -$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Product branch feature is added.', 'desc' => 'Product branch/platform is added, and its related Story/Plan/Bug/Case/Module has Branch added too.
'); +$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Release Module is improved.', 'desc' => 'Stop action has been added. If Stop to manage it, the Release will not show when Report Bug.
Bugs that have been omitted in the Release will be related manually.
'); +$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Create pages of Story and Bug are improved.', 'desc' => ''); $lang->misc->feature->all['7.2.stable'][] = array('title'=>'Security Enhanced', 'desc' => 'Admin weak passwork check is enhanced.
ok file is required when code/upload an extension.
Sensitive action requires Admin password.
Do striptags, specialchars to content entered in ZenTao.
'); -$lang->misc->feature->all['7.2.stable'][] = array('title'=>'Security Enhanced', 'desc' => 'Admin weak passwork check is enhanced.
ok file is required when code/upload an extension.
Sensitive action requires Admin password.
Do striptags, specialchars to content entered in ZenTao.
'); +$lang->misc->feature->all['7.2.stable'][] = array('title'=>'Details Improved', 'desc' => ''); -$lang->misc->feature->all['7.1.stable'][] = array('title'=>'Framework of scheduled tasks is added.', 'desc' => 'Framework of scheduled tasks is added. Daily notification, Burndown Update, Backup, Send Email and so on have been added.'); -$lang->misc->feature->all['7.1.stable'][] = array('title'=>'Framework of scheduled tasks is added.', 'desc' => 'Framework of scheduled tasks is added. Daily notification, Burndown Update, Backup, Send Email and so on have been added.'); +$lang->misc->feature->all['7.1.stable'][] = array('title'=>'Framework of Cron is added.', 'desc' => 'Framework of Cron is added. Daily notification, Burndown Update, Backup, Send Email and so on have been added.'); +$lang->misc->feature->all['7.1.stable'][] = array('title'=>'rpm and deb packages are provided.', 'desc' => ''); $lang->misc->feature->all['6.3.stable'][] = array('title'=>'Data table is added.', 'desc' => 'Fields can be customized in data table and data will be displayed according to customized fields.
'); -$lang->misc->feature->all['6.3.stable'][] = array('title'=>'Data table is added.', 'desc' => 'Fields can be customized in data table and data will be displayed according to customized fields.
'); +$lang->misc->feature->all['6.3.stable'][] = array('title'=>'Continue improving details', 'desc' => ''); diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 6514603f2d..81f7c385c2 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -115,7 +115,11 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +<<<<<<< HEAD $lang->misc->releaseDate['21.7.8'] = '2025-12-15'; +======= +$lang->misc->releaseDate['21.7.8'] = '2025-12-30'; +>>>>>>> feature/workflowgroup $lang->misc->releaseDate['21.7.7'] = '2025-10-29'; $lang->misc->releaseDate['21.7.6'] = '2025-09-29'; $lang->misc->releaseDate['21.7.5'] = '2025-09-11'; diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php index 82f61e01c6..81f7c385c2 100644 --- a/module/misc/lang/fr.php +++ b/module/misc/lang/fr.php @@ -17,11 +17,11 @@ $lang->misc->cancel = 'Cancel'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'ALM Version %s'; -$lang->misc->zentao->labels['about'] = 'A Propos'; -$lang->misc->zentao->labels['support'] = 'Support Technique'; -$lang->misc->zentao->labels['cowin'] = 'Aider ZenTao'; -$lang->misc->zentao->labels['service'] = 'Services'; -$lang->misc->zentao->labels['others'] = 'Autres Produits'; +$lang->misc->zentao->labels['about'] = 'About ZenTao'; +$lang->misc->zentao->labels['support'] = 'Tech Support'; +$lang->misc->zentao->labels['cowin'] = 'Help Us'; +$lang->misc->zentao->labels['service'] = 'Service'; +$lang->misc->zentao->labels['others'] = 'From ZenTao Software'; $lang->misc->zentao->icons['about'] = 'group'; $lang->misc->zentao->icons['support'] = 'question-sign'; @@ -29,14 +29,14 @@ $lang->misc->zentao->icons['cowin'] = 'hand-right'; $lang->misc->zentao->icons['service'] = 'heart'; $lang->misc->zentao->about['bizversion'] = 'ZenTao Biz'; -$lang->misc->zentao->about['official'] = "Site Officiel"; -$lang->misc->zentao->about['changelog'] = "Change Log"; -$lang->misc->zentao->about['license'] = "Licence"; +$lang->misc->zentao->about['official'] = "Official Website"; +$lang->misc->zentao->about['changelog'] = "Revision Log"; +$lang->misc->zentao->about['license'] = "License"; $lang->misc->zentao->about['extension'] = "Plugin Platform"; $lang->misc->zentao->about['follow'] = "Follow Us"; -$lang->misc->zentao->support['vip'] = "Support VIP"; -$lang->misc->zentao->support['manual'] = "English User Manual"; +$lang->misc->zentao->support['vip'] = "VIP Support"; +$lang->misc->zentao->support['manual'] = "User Manual"; $lang->misc->zentao->support['faq'] = "Common Problem"; $lang->misc->zentao->support['ask'] = "Official Answer"; $lang->misc->zentao->support['video'] = "Use Video"; @@ -44,7 +44,7 @@ $lang->misc->zentao->support['qqgroup'] = "Official QQ Group"; $lang->misc->zentao->cowin['reportbug'] = "Report Bug"; $lang->misc->zentao->cowin['feedback'] = "Feedback"; -$lang->misc->zentao->cowin['recommend'] = "Plus..."; +$lang->misc->zentao->cowin['recommend'] = "More"; $lang->misc->zentao->service['zentaotrain'] = 'ZenTao Training'; $lang->misc->zentao->service['idc'] = 'ZenTao Cloud'; @@ -57,27 +57,28 @@ $lang->misc->zentao->others['zdoo'] = " MeshioT";
-$lang->misc->mobile = "Accès Mobile";
-$lang->misc->noGDLib = "SVP visitez %s via le navigateur de votre smartphone.";
-$lang->misc->copyright = "© 2009 - " . date('Y') . " Nature Easy Soft Email support@zentaoalm.com";
-$lang->misc->checkTable = "Vérifiez les Données de la Table";
-$lang->misc->needRepair = "Réparer la Table";
-$lang->misc->repairTable = "La Base de Données est peut-être endommagée. Elle a besoin d'être vérifiée et éventuellement réparée !";
-$lang->misc->repairFail = "La réparation a échoué. Allez dans le répertoire de données de votre table et essayez d'exécuter myisamchk -r -f %s.MYI pour la réparer. Mais on ne promet rien :-(";
-$lang->misc->withoutCmd = 'La réparation a échoué.';
-$lang->misc->connectFail = "Echec de connexion à la Base de données. Erreur: %s，Vérifiez la log des erreurs MySQL et des dysfonctionnements."; -$lang->misc->tableName = "Nom de la Table"; -$lang->misc->tableStatus = "Statut"; -$lang->misc->novice = "Nouveau dans ZenTao ? Voulez-vous commencer le Tutoriel ?"; -$lang->misc->showAnnual = 'Ajouter un résumé annuel'; -$lang->misc->annualDesc = 'A partir de la version 12.0, la nouvelle fonction de rapport annuel peut être consultée sur la page 『Report->Annual Summary』. Consulter Maintenant.'; -$lang->misc->remind = 'Rappels des nouvelles fonctionnalités'; +$lang->misc->mobile = "Mobile Access"; +$lang->misc->noGDLib = "Please visit %s in the browser of your phone."; +$lang->misc->copyright = "© 2009 - " . date('Y') . " ZenTao Software Email Renee@easycorp.ltd"; +$lang->misc->checkTable = "Check Data Table"; +$lang->misc->needRepair = "Repair Table"; +$lang->misc->repairTable = "Database table might be damaged due to power outage. Please check and repair!"; +$lang->misc->repairFail = "Failed to repair. Please go to the data directory of your database, and try to execute
myisamchk -r -f %s.MYI repair.";
+$lang->misc->withoutCmd = 'Failed to repair.';
+$lang->misc->connectFail = "Failed to connect to the database. Error: %s，Please check the MySQL error log and troubleshoot."; +$lang->misc->tableName = "Table Name"; +$lang->misc->tableStatus = "Status"; +$lang->misc->novice = "New to ZenTao? Do you want to start ZenTao Tutorial?"; +$lang->misc->showAnnual = 'Add Annual Summary'; +$lang->misc->annualDesc = 'After version 12.0, Annual Summary can be viewed on 『Report->Annual Summary』 page. See now.'; +$lang->misc->remind = 'New feature reminders'; $lang->misc->expiredTipsTitle = 'Dear system administrator, hello:'; $lang->misc->expiredCountTips = 'There are %s plug-ins in the system that will expire soon. To avoid affecting your regular use, please get in touch with the administrator to renew or uninstall them in time.'; $lang->misc->expiredPluginTips = 'Expired plugins are: %s. '; $lang->misc->expiringPluginTips = 'The plug-ins that will expire are: %s.'; $lang->misc->expiredTipsForAdmin = 'There are %s plug-ins in the current system that will expire soon. To avoid affecting the regular use of the function, please renew or uninstall them in the system background plug-in management as soon as possible.'; +$lang->misc->metriclibTips = 'Added a new metric library indexing function, which can significantly improve the query speed of related metrics after updating the index. You can update it on the "Admin->System->Metric Library" page.'; $lang->misc->noticeRepair = "
If you are not Administrator, contact your ZenTao Administrator to repair tables.
If you are the Administrator, login your ZenTao host and create a file named %s.
@@ -88,8 +89,8 @@ $lang->misc->noticeRepair = "If you are not Administrator, contact your ZenT "; $lang->misc->feature = new stdclass(); -$lang->misc->feature->lastest = 'Dernière Version'; -$lang->misc->feature->detailed = 'Détail'; +$lang->misc->feature->lastest = 'Latest Version'; +$lang->misc->feature->detailed = 'Detail'; $lang->misc->feature->introduction = 'Features'; $lang->misc->feature->tutorial = 'Tutorial'; $lang->misc->feature->tutorialImage = 'theme/default/images/main/tutorial_en.png'; @@ -114,7 +115,11 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +<<<<<<< HEAD $lang->misc->releaseDate['21.7.8'] = '2025-12-15'; +======= +$lang->misc->releaseDate['21.7.8'] = '2025-12-30'; +>>>>>>> feature/workflowgroup $lang->misc->releaseDate['21.7.7'] = '2025-10-29'; $lang->misc->releaseDate['21.7.6'] = '2025-09-29'; $lang->misc->releaseDate['21.7.5'] = '2025-09-11'; @@ -354,13 +359,13 @@ $lang->misc->feature->all['12.3.3'][] = array('title'=>'Fix Bug', 'desc' => ''); $lang->misc->feature->all['12.3.2'][] = array('title'=>'Fix workflow', 'desc' => ''); $lang->misc->feature->all['12.3.1'][] = array('title'=>'Fix bugs of high severity.', 'desc' => ''); $lang->misc->feature->all['12.3'][] = array('title'=>'Integrate unit test, open the continuous integration closed-loop.', 'desc' => ''); -$lang->misc->feature->all['12.2'][] = array('title'=>'Add parent-child story, compatible xuanxuan.', 'desc' => ''); +$lang->misc->feature->all['12.2'][] = array('title'=>'Add parent-child story, compatible Xuanxuan IM.', 'desc' => ''); $lang->misc->feature->all['12.1'][] = array('title'=>'Add Integration.', 'desc' => '
Add integration, and build in Jenkins
'); $lang->misc->feature->all['12.0.1'][] = array('title'=>'Fix Bug.', 'desc' => ''); $lang->misc->feature->all['12.0'][] = array('title'=>'Move repo function to zentao', 'desc' => ''); -$lang->misc->feature->all['12.0'][] = array('title'=>'Move repo function to zentao', 'desc' => ''); -$lang->misc->feature->all['12.0'][] = array('title'=>'Move repo function to zentao', 'desc' => ''); +$lang->misc->feature->all['12.0'][] = array('title'=>'Add annual summary', 'desc' => 'Show annual summary by role.'); +$lang->misc->feature->all['12.0'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); $lang->misc->feature->all['11.7'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Added choices for users to choose agile or not.
Added WeChat Enterprise to the types of webhook
Added the notifier of Dingding personal messages
'); $lang->misc->feature->all['11.6.5'][] = array('title'=>'Fix bug.', 'desc' => ''); @@ -370,14 +375,14 @@ $lang->misc->feature->all['11.6.2'][] = array('title'=>'Optimize details and fix $lang->misc->feature->all['11.6.1'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); $lang->misc->feature->all['11.6.stable'][] = array('title'=>'Improving the International Edition Interface', 'desc' => ''); -$lang->misc->feature->all['11.6.stable'][] = array('title'=>'Improving the International Edition Interface', 'desc' => ''); +$lang->misc->feature->all['11.6.stable'][] = array('title'=>'Add translate function', 'desc' => ''); $lang->misc->feature->all['11.5.2'][] = array('title'=>'Increase the security of ZenTao and increase the login password for weak password check', 'desc' => ''); $lang->misc->feature->all['11.5.1'][] = array('title'=>'Add a third-party authentication and fix bugs.', 'desc' => ''); $lang->misc->feature->all['11.5.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); -$lang->misc->feature->all['11.5.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); -$lang->misc->feature->all['11.5.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); +$lang->misc->feature->all['11.5.stable'][] = array('title'=>'Added filters to Dynamics', 'desc' => ''); +$lang->misc->feature->all['11.5.stable'][] = array('title'=>'Integrated the latest ZenTao Desktop', 'desc' => ''); $lang->misc->feature->all['11.4.1'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); @@ -392,61 +397,61 @@ $lang->misc->feature->all['11.1.stable'][] = array('title'=>'Fix Bug.', 'desc' = $lang->misc->feature->all['11.0.stable'][] = array('title'=>'ZenTao integrated desktop.', 'desc' => ''); $lang->misc->feature->all['10.6.stable'][] = array('title'=>'Adjust backup mechanism', 'desc' => 'Increase backup settings and make backup more flexible
Show backup progress
Change the backup directory
'); -$lang->misc->feature->all['10.6.stable'][] = array('title'=>'Adjust backup mechanism', 'desc' => 'Increase backup settings and make backup more flexible
Show backup progress
Change the backup directory
'); +$lang->misc->feature->all['10.6.stable'][] = array('title'=>'Optimize and adjust menu', 'desc' => 'Adjust admin menu
Adjust the secondary menu of My and Project
'); $lang->misc->feature->all['10.5.stable'][] = array('title'=>'Adjust document layout', 'desc' => "Adjust the layout method on the left side of the document library.
Add filter conditions at the bottom of the document library menu.
"); -$lang->misc->feature->all['10.5.stable'][] = array('title'=>'Adjust document layout', 'desc' => "Adjust the layout method on the left side of the document library.
Add filter conditions at the bottom of the document library menu.
"); +$lang->misc->feature->all['10.5.stable'][] = array('title'=>'Adjust the child task logic and optimize the display of parent-child task.', 'desc' => ''); $lang->misc->feature->all['10.4.stable'][] = array('title'=>'Optimize and adjust new interface', 'desc' => 'Detail page restore to the previous layout.
Refactore forms to add user pages
When use cases are executed, do not update the use case stause if the user manually chooses to pass and write the results.
'); -$lang->misc->feature->all['10.4.stable'][] = array('title'=>'Optimize and adjust new interface', 'desc' => 'Detail page restore to the previous layout.
Refactore forms to add user pages
When use cases are executed, do not update the use case stause if the user manually chooses to pass and write the results.
'); -$lang->misc->feature->all['10.4.stable'][] = array('title'=>'Optimize and adjust new interface', 'desc' => 'Detail page restore to the previous layout.
Refactore forms to add user pages
When use cases are executed, do not update the use case stause if the user manually chooses to pass and write the results.
'); +$lang->misc->feature->all['10.4.stable'][] = array('title'=>'After the user machine hibernates and the login fails, the session will be refreshed again.', 'desc' => ''); +$lang->misc->feature->all['10.4.stable'][] = array('title'=>'Upgrade existing interface mechanisms', 'desc' => ''); $lang->misc->feature->all['10.3.stable'][] = array('title'=>'Fix Bug.', 'desc' => ''); $lang->misc->feature->all['10.2.stable'][] = array('title'=>'ZenTao desktop is integrated!', 'desc' => ''); -$lang->misc->feature->all['10.0.stable'][] = array('title'=>'New UI/UX and new experience', 'desc' => '- My Dashboard
- Dynamics
- Product Home
- Product Overview
- Roadmap
- Project Home
- Project overview
- QA Home
- Document Home
- Added work report on My Dashboard
- Add/Edit/Finish todos on My Dashboard
- Add prodcut report on Product Home
- Add prodcut overview on Product Home
- Add project report on Project Home
- Add project overview on Project Home
- Add Testing report on QA Home
- All Product/product Home/All Project/Project Home/QA Home is moved from the right of the secondary Navbar to the left.
- Kanban/Burndown/Tree/ByGroup of Project/Task has been moved from the third Navbar to the secondary one; Tree/ByGroup/Task List has been integrated to a drop-down.
- Bug/Build of Project on the secondary Navbar has been integrated to a drop-down.
- Display build and list by group, which is more reasonable.
- Added tree to display document on the left of the page.
- Added quick entry to document, including Last Update, My Doc and My Favorite
- Added My Favorite to Doc module.
- My Dashboard
- Dynamics
- Product Home
- Product Overview
- Roadmap
- Project Home
- Project overview
- Test Home
- Document Home
- Added work report on My Dashboard
- Add/Edit/Finish todos on My Dashboard
- Add prodcut report on Product Home
- Add prodcut overview on Product Home
- Add project report on Project Home
- Add project overview on Project Home
- Add Testing report on Test Home
- All Product/product Home/All Project/Project Home/Test Home is moved from the right of the secondary Navbar to the left.
- Kanban/Burndown/Tree/ByGroup of Project/Task has been moved from the third Navbar to the secondary one; Tree/ByGroup/Task List has been integrated to a drop-down.
- Bug/Build of Project on the secondary Navbar has been integrated to a drop-down.
- Display build and list by group, which is more reasonable.
- Added tree to display document on the left of the page.
- Added quick entry to document, including Last Update, My Doc and My Favorite
- Added My Favorite to Doc module.
Gather Mail，SMS，webhook into Message
'); -$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Message centralized management', 'desc' => 'Gather Mail，SMS，webhook into Message
'); -$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Message centralized management', 'desc' => 'Gather Mail，SMS，webhook into Message
'); -$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Message centralized management', 'desc' => 'Gather Mail，SMS，webhook into Message
'); +$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Add recurred Todo', 'desc' => ''); +$lang->misc->feature->all['9.8.stable'][] = array('title'=>"Add Block of 'AssignedToMe'", 'desc' => ''); +$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Support generating reports on Test Builds', 'desc' => ''); $lang->misc->feature->all['9.7.stable'][] = array('title'=>'Optimize International package. Added Demo data.', 'desc' => ''); $lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Webhook Interface feature', 'desc' => 'Support communication with BearyChat, Dingding'); -$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Webhook Interface feature', 'desc' => 'Support communication with BearyChat, Dingding'); -$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Webhook Interface feature', 'desc' => 'Support communication with BearyChat, Dingding'); -$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Webhook Interface feature', 'desc' => 'Support communication with BearyChat, Dingding'); +$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Point', 'desc' => 'More skilled application, more score'); +$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added multiple user task and child tasks to Project', 'desc' => ''); +$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Product line management to Product', 'desc' => ''); $lang->misc->feature->all['9.5.1'][] = array('title'=>'Added restricted actions.', 'desc' => ''); $lang->misc->feature->all['9.3.beta'][] = array('title'=>'Upgraded ZenTao framework，enhanced security', 'desc' => ''); $lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => 'Added TestSuite, CaseLibrary and QA Report
'); -$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => 'Added TestSuite, CaseLibrary and QA Report
'); +$lang->misc->feature->all['9.1.stable'][] = array('title'=>'Support Group steps of TestCase', 'desc' => ''); $lang->misc->feature->all['9.0.beta'][] = array('title'=>'ZenTao CloudMail has been added.', 'desc' => 'ZenTao CloudMail is a free Email service launched jointly with SendCloud. Once binded with ZenTao and passed verification, users can use this service.
'); -$lang->misc->feature->all['9.0.beta'][] = array('title'=>'ZenTao CloudMail has been added.', 'desc' => 'ZenTao CloudMail is a free Email service launched jointly with SendCloud. Once binded with ZenTao and passed verification, users can use this service.
'); +$lang->misc->feature->all['9.0.beta'][] = array('title'=>'Optimized Rich Text Editor and Markdown Editor.', 'desc' => ''); $lang->misc->feature->all['8.3.stable'][] = array('title'=>'Improved Documentation.', 'desc' => 'Added Document Home, restructured document library, and added privileges.
Markdown Editor is supported，and privilege and version managment is added.
'); $lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and QA all support home custom mentioned before.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Navigation', 'desc' => 'You can decide which project show in navigation bar and the order of projects shown in the bar.
Hover on the navigation bar and a sign will show to its right. Click the sign and a dialog box "Custom Navigation" will show. Drag the block name to switch its order on navigation bar.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Batch Add/Edit Custom', 'desc' => 'You can batch add and edit fields on custom pages.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Story/Task/Bug/Case', 'desc' => 'You can custom fileds when add a Story/Task/Bug/Case.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Export', 'desc' => 'You can custom fileds when export a Story/Task/Bug/Case pages. You can also save it as template for next export.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Story/Task/Bug/Case Search ', 'desc' => 'On Story/Task/Bug/Case List page, you can do a combined search on Modules and Tabs.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>"ZenTao Tutorial", 'desc' => 'Tutorial for rookies is added for first-time users to know how to use ZenTao.
'); $lang->misc->feature->all['7.4.beta'][] = array('title'=>'Product branch feature is added.', 'desc' => 'Product branch/platform is added, and its related Story/Plan/Bug/Case/Module has Branch added too.
'); -$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Product branch feature is added.', 'desc' => 'Product branch/platform is added, and its related Story/Plan/Bug/Case/Module has Branch added too.
'); -$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Product branch feature is added.', 'desc' => 'Product branch/platform is added, and its related Story/Plan/Bug/Case/Module has Branch added too.
'); +$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Release Module is improved.', 'desc' => 'Stop action has been added. If Stop to manage it, the Release will not show when Report Bug.
Bugs that have been omitted in the Release will be related manually.
'); +$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Create pages of Story and Bug are improved.', 'desc' => ''); $lang->misc->feature->all['7.2.stable'][] = array('title'=>'Security Enhanced', 'desc' => 'Admin weak passwork check is enhanced.
ok file is required when code/upload an extension.
Sensitive action requires Admin password.
Do striptags, specialchars to content entered in ZenTao.
'); -$lang->misc->feature->all['7.2.stable'][] = array('title'=>'Security Enhanced', 'desc' => 'Admin weak passwork check is enhanced.
ok file is required when code/upload an extension.
Sensitive action requires Admin password.
Do striptags, specialchars to content entered in ZenTao.
'); +$lang->misc->feature->all['7.2.stable'][] = array('title'=>'Details Improved', 'desc' => ''); $lang->misc->feature->all['7.1.stable'][] = array('title'=>'Framework of Cron is added.', 'desc' => 'Framework of Cron is added. Daily notification, Burndown Update, Backup, Send Email and so on have been added.'); -$lang->misc->feature->all['7.1.stable'][] = array('title'=>'Framework of Cron is added.', 'desc' => 'Framework of Cron is added. Daily notification, Burndown Update, Backup, Send Email and so on have been added.'); +$lang->misc->feature->all['7.1.stable'][] = array('title'=>'rpm and deb packages are provided.', 'desc' => ''); $lang->misc->feature->all['6.3.stable'][] = array('title'=>'Data table is added.', 'desc' => 'Fields can be customized in data table and data will be displayed according to customized fields.
'); -$lang->misc->feature->all['6.3.stable'][] = array('title'=>'Data table is added.', 'desc' => 'Fields can be customized in data table and data will be displayed according to customized fields.
'); +$lang->misc->feature->all['6.3.stable'][] = array('title'=>'Continue improving details', 'desc' => ''); diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 40043a73f6..df2c1db97b 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -115,7 +115,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.8'] = '2025-12-15'; +$lang->misc->releaseDate['21.7.8'] = '2025-12-30'; $lang->misc->releaseDate['21.7.7'] = '2025-10-29'; $lang->misc->releaseDate['21.7.6'] = '2025-09-29'; $lang->misc->releaseDate['21.7.5'] = '2025-09-11'; diff --git a/module/mr/test/lib/mr.unittest.class.php b/module/mr/test/lib/mr.unittest.class.php index be271dbdd3..263aa3de3c 100755 --- a/module/mr/test/lib/mr.unittest.class.php +++ b/module/mr/test/lib/mr.unittest.class.php @@ -648,7 +648,7 @@ class mrTest { global $app; $originalRawModule = $app->rawModule ?? ''; - + try { $app->rawModule = $rawModule; $mrModel = new mrModel($appName); @@ -672,18 +672,18 @@ class mrTest { if(empty($repo) || !is_object($repo)) return array(); if(empty($repo->SCM)) return array(); - + $scm = strtolower($repo->SCM); $methodName = 'get' . ucfirst($scm) . 'Projects'; - + if(!in_array($scm, array('gitlab', 'gitea', 'gogs'))) return array(); - + if(isset($repo->serviceHost) && isset($repo->serviceProject)) { $projectList = array($repo->serviceProject => $repo->serviceProject); return $this->objectModel->{$methodName}((int)$repo->serviceHost, $projectList); } - + return array(); } @@ -698,24 +698,24 @@ class mrTest public function assignEditDataTest($MR, $scm) { if(!is_object($MR) || empty($scm)) return false; - + if(!isset($MR->hostID) || !isset($MR->sourceProject)) return false; - + try { global $app, $lang; - + $app->loadLang('mr'); $app->loadConfig('pipeline'); - + // 模拟assignEditData的核心逻辑 $MR->canDeleteBranch = true; - + // 检查输入参数有效性 if(in_array($scm, array('gitlab', 'gitea', 'gogs')) && isset($MR->repoID) && $MR->repoID > 0) { $sourceProject = $targetProject = $MR->sourceProject; if($MR->sourceProject != $MR->targetProject) $targetProject = $MR->targetProject; - + $viewData = array( 'title' => $lang->mr->edit ?? '编辑', 'MR' => $MR, @@ -726,7 +726,7 @@ class mrTest 'targetProject' => $targetProject, 'repo' => (object)array('id' => $MR->repoID, 'name' => 'test-repo') ); - + return $viewData; } else @@ -754,29 +754,29 @@ class mrTest if($MRID <= 0) return 'invalid_mrid'; if($repoID <= 0) return 'invalid_repoid'; if(empty($orderBy)) return 'empty_orderby'; - + try { global $tester, $config; - + // 模拟方法的核心逻辑进行测试 // 因为实际方法会进行复杂的配置操作，我们简化测试 - + // 模拟配置设置 if(!isset($config->product)) $config->product = new stdClass(); if(!isset($config->product->search)) $config->product->search = array(); - + // 模拟核心业务逻辑 $config->product->search['queryID'] = $queryID; $config->product->search['style'] = 'simple'; $config->product->search['actionURL'] = "mr-linkStory-MRID={$MRID}&repoID={$repoID}&browseType=bySearch¶m=myQueryID&orderBy={$orderBy}"; - + // 模拟移除字段 unset($config->product->search['fields']['plan']); unset($config->product->search['fields']['module']); unset($config->product->search['fields']['product']); unset($config->product->search['fields']['branch']); unset($config->product->search['fields']['grade']); - + // 返回配置结果验证 $result = array( 'queryID' => $config->product->search['queryID'], @@ -788,7 +788,7 @@ class mrTest 'product' => !isset($config->product->search['fields']['product']) ? 'removed' : 'exists' ) ); - + return $result; } catch (Exception $e) { return 'error: ' . $e->getMessage(); @@ -811,19 +811,19 @@ class mrTest if($MRID <= 0) return 'invalid_mrid'; if($repoID <= 0) return 'invalid_repoid'; if(empty($orderBy)) return 'empty_orderby'; - + try { global $tester, $config; - + // 模拟方法的核心逻辑进行测试 // 因为实际方法会进行复杂的配置操作，我们简化测试 - + // 模拟配置设置 if(!isset($config->bug)) $config->bug = new stdClass(); if(!isset($config->bug->search)) $config->bug->search = array(); if(!isset($config->bug->search['fields'])) $config->bug->search['fields'] = array(); if(!isset($config->bug->search['params'])) $config->bug->search['params'] = array(); - + // 初始化fields确保存在被移除的字段 $config->bug->search['fields']['product'] = 'product'; $config->bug->search['fields']['plan'] = 'plan'; @@ -832,12 +832,12 @@ class mrTest $config->bug->search['fields']['openedBuild'] = 'openedBuild'; $config->bug->search['fields']['resolvedBuild'] = 'resolvedBuild'; $config->bug->search['fields']['branch'] = 'branch'; - + // 模拟核心业务逻辑 $config->bug->search['queryID'] = $queryID; $config->bug->search['style'] = 'simple'; $config->bug->search['actionURL'] = "mr-linkBug-MRID={$MRID}&repoID={$repoID}&browseType=bySearch¶m=myQueryID&orderBy={$orderBy}"; - + // 模拟移除字段 unset($config->bug->search['fields']['product']); unset($config->bug->search['params']['product']); @@ -853,7 +853,7 @@ class mrTest unset($config->bug->search['params']['resolvedBuild']); unset($config->bug->search['fields']['branch']); unset($config->bug->search['params']['branch']); - + // 返回配置结果验证 $result = array( 'queryID' => $config->bug->search['queryID'], @@ -869,7 +869,7 @@ class mrTest 'branch' => !isset($config->bug->search['fields']['branch']) ? 'removed' : 'exists' ) ); - + return $result; } catch (Exception $e) { return 'error: ' . $e->getMessage(); @@ -894,32 +894,32 @@ class mrTest if($repoID <= 0) return 'invalid_repoid'; if(empty($orderBy)) return 'empty_orderby'; if(!is_array($productExecutions)) return 'invalid_executions'; - + try { global $tester, $config; - + // 模拟方法的核心逻辑进行测试 // 因为实际方法会进行复杂的配置操作，我们简化测试 - + // 模拟配置设置 if(!isset($config->execution)) $config->execution = new stdClass(); if(!isset($config->execution->search)) $config->execution->search = array(); if(!isset($config->execution->search['fields'])) $config->execution->search['fields'] = array(); if(!isset($config->execution->search['params'])) $config->execution->search['params'] = array(); - + // 初始化fields确保存在被移除的字段 $config->execution->search['fields']['module'] = 'module'; $config->execution->search['params']['module'] = array(); - + // 模拟核心业务逻辑 $config->execution->search['actionURL'] = "mr-linkTask-MRID={$MRID}&repoID={$repoID}&browseType=bySearch¶m=myQueryID&orderBy={$orderBy}"; $config->execution->search['queryID'] = $queryID; $config->execution->search['params']['execution']['values'] = array_filter($productExecutions); - + // 模拟移除字段 unset($config->execution->search['fields']['module']); unset($config->execution->search['params']['module']); - + // 返回配置结果验证 $result = array( 'queryID' => $config->execution->search['queryID'], @@ -929,7 +929,7 @@ class mrTest 'module' => !isset($config->execution->search['fields']['module']) ? 'removed' : 'exists' ) ); - + return $result; } catch (Exception $e) { return 'error: ' . $e->getMessage(); @@ -953,24 +953,24 @@ class mrTest if($recPerPage <= 0) return 'invalid_recperpage'; if($pageID <= 0) return 'invalid_pageid'; if(!is_array($allTasks)) return 'invalid_alltasks'; - + try { global $app; - + // 模拟分页器的基本功能 $originalTaskCount = count($allTasks); $pageTotal = $originalTaskCount > 0 ? ceil($originalTaskCount / $recPerPage) : 1; - + // 如果当前页超过总页数，设置为最后一页 if($pageID > $pageTotal && $pageTotal > 0) { $pageID = $pageTotal; } - + // 计算分页范围 $count = 1; $limitMin = ($pageID - 1) * $recPerPage; $limitMax = $pageID * $recPerPage; - + // 过滤任务数组 $filteredTasks = array(); foreach($allTasks as $key => $task) { @@ -979,7 +979,7 @@ class mrTest } $count++; } - + // 返回测试结果 return array( 'original_task_count' => $originalTaskCount, @@ -992,7 +992,7 @@ class mrTest 'limit_max' => $limitMax, 'filtered_tasks' => $filteredTasks ); - + } catch (Exception $e) { return 'error: ' . $e->getMessage(); } @@ -1013,44 +1013,44 @@ class mrTest if(!is_string($hostType) || empty($hostType)) return 'invalid_hosttype'; if(!is_object($sourceProject)) return 'invalid_sourceproject'; if(!is_object($MR)) return 'invalid_mr'; - + try { global $tester, $app; - + // 模拟checkProjectEdit方法的权限检查逻辑 switch($hostType) { case 'gitlab': // 模拟gitlab权限检查 if(!isset($MR->hostID) || !isset($sourceProject->id)) return 'missing_required_fields'; - + // 模拟检查用户是否为开发者权限 $mockGitUsers = array('admin' => 'admin', 'developer' => 'developer'); $currentUser = $app->user->account ?? 'admin'; $isDeveloper = true; // 模拟开发者权限检查结果 - + if(isset($mockGitUsers[$currentUser]) && $isDeveloper) { return true; } break; - + case 'gitea': // 模拟gitea权限检查 if(!isset($sourceProject->allow_merge_commits)) return 'missing_merge_permission_field'; return (bool)$sourceProject->allow_merge_commits; - + case 'gogs': // 模拟gogs权限检查 if(!isset($sourceProject->permissions) || !isset($sourceProject->permissions->push)) { return 'missing_push_permission_field'; } return (bool)$sourceProject->permissions->push; - + default: return 'unsupported_hosttype'; } - + return false; - + } catch (Exception $e) { return 'error: ' . $e->getMessage(); } @@ -1071,16 +1071,16 @@ class mrTest if(!is_object($host)) return 'invalid_host'; if(empty($projectID)) return 'empty_project_id'; if(empty($branch) || !is_string($branch)) return 'invalid_branch'; - + try { global $tester; - + // 模拟getBranchUrl方法的逻辑 if(!isset($host->type) || !isset($host->id)) return 'missing_host_fields'; - + // 检查主机类型是否支持 if(!in_array($host->type, array('gitlab', 'gitea', 'gogs'))) return 'unsupported_host_type'; - + // 模拟apiGetSingleBranch的返回值 $mockBranchData = array( 'gitlab' => array( @@ -1102,21 +1102,21 @@ class mrTest 'nonexistent' => null ) ); - + // 获取模拟分支数据 if(isset($mockBranchData[$host->type][$branch])) { $branchData = $mockBranchData[$host->type][$branch]; } else { $branchData = null; } - + // 模拟原方法的返回逻辑 if($branchData && isset($branchData['web_url'])) { return $branchData['web_url']; } - + return ''; - + } catch (Exception $e) { return 'error: ' . $e->getMessage(); } @@ -1141,14 +1141,14 @@ class mrTest if(!is_string($projectID) || empty($projectID)) return 'invalid_projectid'; if(!is_int($mriid) || $mriid <= 0) return 'invalid_mriid'; if(!is_string($lastTime) || empty($lastTime)) return 'invalid_lasttime'; - + try { global $tester; - + // 模拟checkNewCommit方法的逻辑 // 检查主机类型是否支持 if(!in_array($hostType, array('gitlab', 'gitea', 'gogs'))) return 'unsupported_hosttype'; - + // 模拟apiGetMRCommits的返回值 $mockCommitLogs = array( 'gitlab' => array( @@ -1216,30 +1216,30 @@ class mrTest 999 => array() // 空提交记录 ) ); - + // 获取模拟提交记录 $commitLogs = null; if(isset($mockCommitLogs[$hostType][$mriid])) { $commitLogs = $mockCommitLogs[$hostType][$mriid]; } - + // 模拟原方法的逻辑 if($commitLogs && count($commitLogs) > 0) { $lastCommit = ''; - + if($hostType == 'gitlab') { $lastCommit = isset($commitLogs[0]['committed_date']) ? $commitLogs[0]['committed_date'] : ''; } elseif(in_array($hostType, array('gitea', 'gogs'))) { $lastCommit = isset($commitLogs[0]->author->committer->date) ? $commitLogs[0]->author->committer->date : ''; } - + if($lastCommit && $lastCommit > $lastTime) { return true; } } - + return false; - + } catch (Exception $e) { return 'error: ' . $e->getMessage(); } diff --git a/module/my/config.php b/module/my/config.php index 3da7c0d587..7e041fee47 100644 --- a/module/my/config.php +++ b/module/my/config.php @@ -20,10 +20,12 @@ $config->mobile->storyBar = array('assignedTo', 'openedBy', 'reviewedBy'); $config->my->notFlowModules = array(); -$config->my->openedDateField['product'] = 'createdDate'; -$config->my->openedDateField['productplan'] = 'createdDate'; -$config->my->openedDateField['release'] = 'createdDate'; -$config->my->openedDateField['build'] = 'createdDate'; -$config->my->openedDateField['testtask'] = 'createdDate'; -$config->my->openedDateField['testsuite'] = 'addedDate'; -$config->my->openedDateField['caselib'] = 'addedDate'; +$config->my->openedDateField['product'] = 'createdDate'; +$config->my->openedDateField['productplan'] = 'createdDate'; +$config->my->openedDateField['release'] = 'createdDate'; +$config->my->openedDateField['build'] = 'createdDate'; +$config->my->openedDateField['testtask'] = 'createdDate'; +$config->my->openedDateField['testsuite'] = 'addedDate'; +$config->my->openedDateField['caselib'] = 'addedDate'; +$config->my->openedDateField['baseline'] = 'createdDate'; +$config->my->openedDateField['projectchange'] = 'createdDate'; diff --git a/module/my/control.php b/module/my/control.php index c456324326..21dadbfdb3 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -111,7 +111,7 @@ class my extends control */ public function contribute(string $mode = 'task', string $type = 'openedBy', int $param = 0, string $orderBy = 'id_desc', int $recTotal = 0, int $recPerPage = 20, int $pageID = 1) { - if(($mode == 'issue' || $mode == 'risk') && $type == 'openedBy') $type = 'createdBy'; + if((in_array($mode, array('issue', 'risk', 'reviewissue'))) && $type == 'openedBy') $type = 'createdBy'; if($mode == 'testtask' && $type == 'openedBy') $type = 'done'; if(($mode == 'doc' || $mode == 'testcase') && $type == 'openedBy') $type = 'openedbyme'; $this->lang->my->featureBar[$this->app->rawMethod] = $this->lang->my->featureBar[$this->app->rawMethod][strtolower($mode)]; @@ -878,6 +878,61 @@ class my extends control $this->display(); } + /** + * 评审意见列表。 + * My reviewissues. + * + * @param string $type + * @param int $param + * @param string $orderBy + * @param int $recTotal + * @param int $recPerPage + * @param int $pageID + * @access public + * @return void + */ + public function reviewissue(string $type = 'assignedTo', int $param = 0, string $orderBy = 'id_desc', int $recTotal = 0, int $recPerPage = 20, int $pageID = 1) + { + $this->loadModel('reviewissue'); + + /* Set the pager. */ + $this->app->loadClass('pager', true); + $pager = new pager($recTotal, $recPerPage, $pageID); + + /* Build the search form. */ + $currentMethod = $this->app->rawMethod; + $queryID = $type == 'bysearch' ? (int)$param : 0; + $actionURL = $this->createLink('my', $currentMethod, "mode=reviewissue&type=bysearch¶m=myQueryID"); + $this->my->buildReviewissueSearchForm($queryID, $actionURL); + + /* Get reviewissues by type*/ + if($type == 'assignedBy') + { + $reviewissues = $this->my->getAssignedByMe($this->app->user->account, $pager, $orderBy, 'reviewissue'); + } + elseif($type == 'bysearch') + { + $reviewissues = $this->my->getReviewissuesBySearch($queryID, $currentMethod, $orderBy, $pager); + } + else + { + $reviewissues = $this->reviewissue->getUserReviewissues($type, $this->app->user->account, $orderBy, $pager); + } + + $this->myZen->showWorkCount($recTotal, $recPerPage, $pageID); + + $this->view->title = $this->lang->my->reviewissue; + $this->view->reviewissues = $reviewissues; + $this->view->users = $this->user->getPairs('noclosed|noletter'); + $this->view->orderBy = $orderBy; + $this->view->pager = $pager; + $this->view->type = $type; + $this->view->param = $param; + $this->view->mode = 'reviewissue'; + $this->view->projectList = array(0 => '') + $this->loadModel('project')->getPairsByProgram(); + $this->display(); + } + /** * 评审列表。 * My audits. @@ -962,26 +1017,23 @@ class my extends control if($this->app->getViewType() == 'mhtml') $recPerPage = 10; $pager = pager::init($recTotal, $recPerPage, $pageID); - $auditplans = $this->loadModel('auditplan')->getList(0, 'my', $browseType, $param, $orderBy, $pager); + $auditplans = $this->loadModel('auditplan')->getList(0, $browseType, $param, $orderBy, $pager); $this->myZen->showWorkCount($recTotal, $recPerPage, $pageID); - $this->app->loadLang('process'); - $this->view->executions = $this->loadModel('execution')->getPairs(); - $this->view->projects = $this->loadModel('project')->getPairs(); - $this->view->processTypeList = $this->lang->process->classify; - $this->view->processes = $this->loadModel('pssp')->getProcesses(); - $this->view->activities = $this->pssp->getActivityPairs(); - $this->view->outputs = $this->pssp->getOutputPairs(); - - $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->auditplan; - $this->view->browseType = $browseType; - $this->view->auditplans = $auditplans; - $this->view->users = $this->user->getPairs('noclosed|noletter'); - $this->view->pager = $pager; - $this->view->orderBy = $orderBy; - $this->view->param = $param; - $this->view->mode = 'auditplan'; + $this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->auditplan; + $this->view->browseType = $browseType; + $this->view->param = $param; + $this->view->orderBy = $orderBy; + $this->view->pager = $pager; + $this->view->mode = 'auditplan'; + $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); + $this->view->executions = $this->loadModel('execution')->getPairs(); + $this->view->processList = $this->loadModel('pssp')->getProcessPairs(); + $this->view->activityList = $this->pssp->getActivityPairs(); + $this->view->outputList = $this->pssp->getOutputPairs(); + $this->view->auditplans = $auditplans; + $this->view->projects = $this->loadModel('project')->getPairs(); $this->display(); } diff --git a/module/my/lang/de.php b/module/my/lang/de.php index dae4943c6b..977712c8f1 100644 --- a/module/my/lang/de.php +++ b/module/my/lang/de.php @@ -21,6 +21,7 @@ $lang->my->execution = "My {$lang->execution->common}s"; $lang->my->audit = 'Review'; $lang->my->issue = 'My Issues'; $lang->my->risk = 'My Risks'; +$lang->my->reviewissue = 'My Review Issue'; $lang->my->profile = 'My Profile'; $lang->my->dynamic = 'My Dynamics'; $lang->my->team = 'My Team'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index dae4943c6b..977712c8f1 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -21,6 +21,7 @@ $lang->my->execution = "My {$lang->execution->common}s"; $lang->my->audit = 'Review'; $lang->my->issue = 'My Issues'; $lang->my->risk = 'My Risks'; +$lang->my->reviewissue = 'My Review Issue'; $lang->my->profile = 'My Profile'; $lang->my->dynamic = 'My Dynamics'; $lang->my->team = 'My Team'; diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php index dae4943c6b..977712c8f1 100644 --- a/module/my/lang/fr.php +++ b/module/my/lang/fr.php @@ -21,6 +21,7 @@ $lang->my->execution = "My {$lang->execution->common}s"; $lang->my->audit = 'Review'; $lang->my->issue = 'My Issues'; $lang->my->risk = 'My Risks'; +$lang->my->reviewissue = 'My Review Issue'; $lang->my->profile = 'My Profile'; $lang->my->dynamic = 'My Dynamics'; $lang->my->team = 'My Team'; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index d416a78baa..b35573fddf 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -21,6 +21,7 @@ $lang->my->execution = "我的{$lang->execution->common}"; $lang->my->audit = '审批'; $lang->my->issue = '我的问题'; $lang->my->risk = '我的风险'; +$lang->my->reviewissue = '我的评审意见'; $lang->my->profile = '我的档案'; $lang->my->dynamic = '我的动态'; $lang->my->team = '团队'; diff --git a/module/my/model.php b/module/my/model.php index f732eb5848..24fa46216e 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -274,7 +274,7 @@ class myModel extends model if($objectType == 'task') return $this->getTaskAssignedByMe($pager, $orderBy, $objectIdList); if($objectType == 'requirement' || $objectType == 'story' || $objectType == 'bug') return $this->myTao->getProductRelatedAssignedByMe($objectIdList, $objectType, $module, $orderBy, $pager); - if($objectType == 'risk' || $objectType == 'issue' || $objectType == 'nc') + if(in_array($objectType, array('risk', 'issue', 'nc'))) { return $this->dao->select('t1.*')->from($this->config->objectTables[$module])->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') @@ -297,6 +297,16 @@ class myModel extends model ->page($pager) ->fetchAll('id'); } + if($objectType == 'reviewissue') + { + return $this->dao->select('t1.*, t2.type')->from($this->config->objectTables[$module])->alias('t1') + ->leftJoin(TABLE_REVIEW)->alias('t2')->on('t1.review = t2.id') + ->where('t1.deleted')->eq(0) + ->andWhere('t1.id')->in($objectIdList) + ->orderBy('t1.' . $orderBy) + ->page($pager) + ->fetchAll('id'); + } return $this->dao->select('*')->from($this->config->objectTables[$module]) ->where('deleted')->eq(0) ->andWhere('id')->in($objectIdList) @@ -588,7 +598,6 @@ class myModel extends model * * @param int $queryID * @param string $actionURL - * @param string $type risk|contribute * @access public * @return void */ @@ -617,6 +626,40 @@ class myModel extends model $this->loadModel('search')->setSearchParams($this->config->risk->search); } + /* + * 构建评审意见搜索表单。 + * Build reviewissue search form. + * + * @param int $queryID + * @param string $actionURL + * @access public + * @return void + */ + public function buildReviewissueSearchForm(int $queryID, string $actionURL): void + { + $projects = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('type')->eq('project') + ->andWhere('deleted')->eq('0') + ->andWhere('vision')->eq($this->config->vision) + ->andWhere('model')->ne('kanban') + ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi() + ->orderBy('order_asc') + ->fetchPairs(); + $queryName = $this->app->rawMethod . 'Reviewissue'; + + $this->app->loadConfig('reviewissue'); + $this->config->reviewissue->search['module'] = $queryName; + $this->config->reviewissue->search['actionURL'] = $actionURL; + $this->config->reviewissue->search['queryID'] = $queryID; + + $this->config->reviewissue->search['params']['project']['values'] = array('') + $projects; + $this->config->reviewissue->search['params']['type']['values'] = arrayUnion(array('' => ''), $this->lang->reviewissue->issueType); + + if(!isset($this->config->reviewissue->search['fields'])) $this->config->reviewissue->search['fields'] = array(); + unset($this->config->reviewissue->search['fields']['module']); + + $this->loadModel('search')->setSearchParams($this->config->reviewissue->search); + } + /** * 通过搜索获取风险。 * Get risks by search. @@ -678,6 +721,70 @@ class myModel extends model return $risks; } + /** + * 通过搜索获取评审问题。 + * Get review issues by search. + * + * @param int $queryID + * @param string $type + * @param string $orderBy + * @param object $pager + * @access public + * @return array + */ + public function getReviewissuesBySearch(int $queryID, string $type, string $orderBy, ?object $pager = null): array + { + $queryName = $type == 'contribute' ? 'contributeReviewissueQuery' : 'workReviewissueQuery'; + if($queryID && $queryID != 'myQueryID') + { + $query = $this->loadModel('search')->getQuery($queryID); + if($query) + { + $this->session->set($queryName, $query->sql); + $this->session->set($queryName . 'Form', $query->form); + } + else + { + $this->session->set($queryName, ' 1 = 1'); + } + } + else + { + if($this->session->{$queryName} == false) $this->session->set($queryName, ' 1 = 1'); + } + + $reviewissueQuery = preg_replace('/`([^`]+)`/', 't1.$0', $this->session->{$queryName}); + if(strpos($reviewissueQuery, 't1.`review`') !== false) $reviewissueQuery = str_replace('t1.`review`', 't2.`object`', $reviewissueQuery); + if(strpos($reviewissueQuery, 't1.`type`') !== false) $reviewissueQuery = str_replace('t1.`type`', 't2.`type`', $reviewissueQuery); + + if($type == 'contribute') + { + $assignedByMe = $this->getAssignedByMe($this->app->user->account, null, 'id_desc', 'reviewissue'); + $reviewissues = $this->dao->select('t1.*, t2.type')->from(TABLE_REVIEWISSUE)->alias('t1') + ->leftJoin(TABLE_REVIEW)->alias('t2')->on('t1.review = t2.id') + ->where($reviewissueQuery) + ->andWhere('t1.deleted')->eq('0') + ->andWhere('t1.createdBy',1)->eq($this->app->user->account) + ->orWhere('t1.id')->in(array_keys($assignedByMe)) + ->markRight(1) + ->orderBy("t1.$orderBy") + ->page($pager) + ->fetchAll('id', false); + } + elseif($type == 'work') + { + $reviewissues = $this->dao->select('t1.*, t2.type')->from(TABLE_REVIEWISSUE)->alias('t1') + ->leftJoin(TABLE_REVIEW)->alias('t2')->on('t1.review = t2.id') + ->where($reviewissueQuery) + ->andWhere('t1.deleted')->eq('0') + ->andWhere('t1.assignedTo')->eq($this->app->user->account) + ->orderBy("t1.$orderBy") + ->page($pager) + ->fetchAll('id', false); + } + return $reviewissues; + } + /** * 构建需求搜索表单。 * Build Story search form. @@ -1209,6 +1316,11 @@ class myModel extends model ->andWhere('t1.account')->eq($this->app->user->account) ->andWhere('t1.status')->eq('doing') ->andWhere('t1.type')->eq('review') + ->beginIF(!helper::hasFeature('project_cm'))->andWhere('objectType')->ne('baseline')->fi() + ->beginIF(!helper::hasFeature('project_change'))->andWhere('objectType')->ne('projectchange')->fi() + ->beginIF(!helper::hasFeature('project_risk'))->andWhere('objectType')->ne('risk')->fi() + ->beginIF(!helper::hasFeature('project_issue'))->andWhere('objectType')->ne('issue')->fi() + ->beginIF(!helper::hasFeature('project_opportunity'))->andWhere('objectType')->ne('opportunity')->fi() ->orderBy("t2.{$orderBy}") ->beginIF($checkExists)->limit(1)->fi() ->fetchAll(); diff --git a/module/my/test/lib/my.unittest.class.php b/module/my/test/lib/my.unittest.class.php index 9c368628f0..5f9a830610 100644 --- a/module/my/test/lib/my.unittest.class.php +++ b/module/my/test/lib/my.unittest.class.php @@ -328,6 +328,24 @@ class myTest return $tester->config->risk->search; } + /** + * 测试构建评审意见搜索表单。 + * Test build reviewissue search form. + * + * @param int $queryID + * @param string $actionURL + * @access public + * @return array + */ + public function buildReviewissueSearchFormTest(int $queryID, string $actionURL): array + { + $this->objectModel->buildReviewissueSearchForm($queryID, $actionURL); + + if(dao::isError()) return dao::getError(); + global $tester; + return $tester->config->reviewissue->search; + } + /** * 通过搜索获取风险。 * Get risks by search. @@ -347,6 +365,25 @@ class myTest return array_keys($objects); } + /** + * 通过搜索获取评审意见。 + * Get reviewissues by search. + * + * @param int $queryID + * @param string $type + * @param string $orderBy + * @access public + * @return array + */ + public function getReviewissuesBySearchTest(int $queryID, string $type, string $orderBy): array + { + $objects = $this->objectModel->getReviewissuesBySearch($queryID, $type, $orderBy , null); + + if(dao::isError()) return dao::getError(); + + return array_keys($objects); + } + /** * 测试构建需求搜索表单。 * Test build story search form. @@ -662,7 +699,7 @@ class myTest $reflection = new ReflectionClass($this->objectModel); $method = $reflection->getMethod('getProductRelatedData'); $method->setAccessible(true); - + $result = $method->invokeArgs($this->objectModel, [$productKeys]); if(dao::isError()) return dao::getError(); @@ -684,7 +721,7 @@ class myTest $reflection = new ReflectionClass($this->objectModel); $method = $reflection->getMethod('getTaskAssignedByMe'); $method->setAccessible(true); - + $result = $method->invokeArgs($this->objectModel, [$pager, $orderBy, $objectIdList]); if(dao::isError()) return dao::getError(); @@ -705,7 +742,7 @@ class myTest $reflection = new ReflectionClass($this->objectModel); $method = $reflection->getMethod('buildReviewedList'); $method->setAccessible(true); - + $result = $method->invokeArgs($this->objectModel, [$objectGroup, $actions, $flows]); if(dao::isError()) return dao::getError(); @@ -728,7 +765,7 @@ class myTest $reflection = new ReflectionClass($this->objectTao); $method = $reflection->getMethod('getProductRelatedAssignedByMe'); $method->setAccessible(true); - + $result = $method->invokeArgs($this->objectTao, [$objectIdList, $objectType, $module, $orderBy, $pager]); if(dao::isError()) return dao::getError(); @@ -781,7 +818,7 @@ class myTest $reflection = new ReflectionClass($this->objectTao); $method = $reflection->getMethod('fetchStoriesBySearch'); $method->setAccessible(true); - + $result = $method->invokeArgs($this->objectTao, [$myStoryQuery, $type, $orderBy, $pager, $storiesAssignedByMe]); if(dao::isError()) return dao::getError(); @@ -804,7 +841,7 @@ class myTest $reflection = new ReflectionClass($this->objectTao); $method = $reflection->getMethod('fetchEpicsBySearch'); $method->setAccessible(true); - + $result = $method->invokeArgs($this->objectTao, [$myEpicQuery, $type, $orderBy, $pager, $epicIDList]); if(dao::isError()) return dao::getError(); @@ -827,7 +864,7 @@ class myTest $reflection = new ReflectionClass($this->objectTao); $method = $reflection->getMethod('fetchRequirementsBySearch'); $method->setAccessible(true); - + $result = $method->invokeArgs($this->objectTao, [$myRequirementQuery, $type, $orderBy, $pager, $requirementIDList]); if(dao::isError()) return dao::getError(); @@ -848,7 +885,7 @@ class myTest $reflection = new ReflectionClass($this->objectTao); $method = $reflection->getMethod('buildReviewingFlows'); $method->setAccessible(true); - + $result = $method->invokeArgs($this->objectTao, [$objectGroup, $flows, $objectNameFields]); if(dao::isError()) return dao::getError(); @@ -865,7 +902,7 @@ class myTest public function buildTaskDataTest(array $tasks) { if(empty($tasks)) return array(); - + // 直接模拟buildTaskData方法的核心逻辑，避免复杂的依赖 foreach($tasks as $task) { @@ -873,17 +910,17 @@ class myTest $task->estimateLabel = $task->estimate . '工时'; $task->consumedLabel = $task->consumed . '工时'; $task->leftLabel = $task->left . '工时'; - + // 状态检查：如果需求状态为active且版本不一致，则设为changed $task->status = !empty($task->storyStatus) && $task->storyStatus == 'active' && $task->latestStoryVersion > $task->storyVersion && !in_array($task->status, array('cancel', 'closed')) ? 'changed' : $task->status; - + // 设置其他属性 $task->canBeChanged = true; // 简化处理 $task->isChild = false; $task->parentName = ''; if($task->status == 'changed') $task->rawStatus = 'changed'; - + // 处理父子关系 if($task->parent > 0) { @@ -912,22 +949,22 @@ class myTest public function buildCaseDataTest(array $cases, string $type) { if(empty($cases)) return $cases; - + global $tester; - + // 模拟buildCaseData方法的核心逻辑，避免复杂的类依赖 $failCount = 0; foreach($cases as $case) { // 模拟story模块的checkNeedConfirm处理 if(isset($case->needconfirm)) $case->needconfirm = $case->needconfirm; - + // 模拟testcase模块的appendData处理 // 这里简化处理，直接保持原有属性 - + // 统计失败数量 if(isset($case->lastRunResult) && $case->lastRunResult && $case->lastRunResult != 'pass') $failCount++; - + // 处理需要确认的状态 if(isset($case->needconfirm) && $case->needconfirm) { @@ -938,17 +975,17 @@ class myTest { $case->status = $tester->lang->testcase->changed ?? '用例已变更'; } - + // 处理空的执行结果 - if(!isset($case->lastRunResult) || !$case->lastRunResult) + if(!isset($case->lastRunResult) || !$case->lastRunResult) { $case->lastRunResult = $tester->lang->testcase->unexecuted ?? '未执行'; } } - + // 模拟设置视图变量 if(isset($tester->view)) $tester->view->failCount = $failCount; - + if(dao::isError()) return dao::getError(); return $cases; @@ -964,7 +1001,7 @@ class myTest public function assignRelatedDataTest(array $feedbacks): array { if(empty($feedbacks)) return array(); - + // 模拟assignRelatedData方法的核心逻辑 $storyIdList = $bugIdList = $todoIdList = $taskIdList = $ticketIdList = array(); foreach($feedbacks as $feedback) @@ -975,7 +1012,7 @@ class myTest if($feedback->solution == 'totask') $taskIdList[] = $feedback->result; if($feedback->solution == 'ticket') $ticketIdList[] = $feedback->result; } - + // 模拟获取关联数据（简化实现，只统计ID数量） $result = array(); $result['bugs'] = count($bugIdList); @@ -983,7 +1020,7 @@ class myTest $result['todos'] = count($todoIdList); $result['tasks'] = count($taskIdList); $result['tickets'] = count($ticketIdList); - + return $result; } @@ -999,39 +1036,39 @@ class myTest public function buildSearchFormForFeedbackTest(int $queryID, string $orderBy, string $rawMethod = 'feedback'): array { global $tester; - + // 保存原始rawMethod并设置新值 $originalRawMethod = $tester->app->rawMethod ?? ''; $tester->app->rawMethod = $rawMethod; - + // 模拟buildSearchFormForFeedback方法的核心逻辑 // 由于直接调用zen层方法比较复杂，我们模拟其主要功能 - + // 初始化feedback搜索配置 if(!isset($tester->config->feedback)) $tester->config->feedback = new stdclass(); if(!isset($tester->config->feedback->search)) $tester->config->feedback->search = array(); - + // 设置搜索模块名 $tester->config->feedback->search['module'] = $rawMethod . 'Feedback'; - + // 设置搜索动作URL $tester->config->feedback->search['actionURL'] = "inlink({$rawMethod}, 'mode=feedback&browseType=bysearch¶m=myQueryID&orderBy={$orderBy}')"; - + // 设置queryID $tester->config->feedback->search['queryID'] = $queryID; - + // 设置搜索参数（模拟从其他模块获取数据） if(!isset($tester->config->feedback->search['params'])) $tester->config->feedback->search['params'] = array(); - + // 模拟产品数据 $tester->config->feedback->search['params']['product']['values'] = array(1 => 'Product 1', 2 => 'Product 2'); - - // 模拟模块数据 + + // 模拟模块数据 $tester->config->feedback->search['params']['module']['values'] = array(1 => 'Module 1', 2 => 'Module 2'); - + // 模拟处理人数据 $tester->config->feedback->search['params']['processedBy']['values'] = array('admin' => 'Admin', 'user1' => 'User1'); - + // 如果是work方法，需要移除某些字段 if($rawMethod == 'work') { @@ -1043,12 +1080,12 @@ class myTest unset($tester->config->feedback->search['fields'][$field]); } } - + // 恢复原始rawMethod $tester->app->rawMethod = $originalRawMethod; - + if(dao::isError()) return dao::getError(); - + // 返回搜索配置信息用于验证 return array( 'module' => $tester->config->feedback->search['module'] ?? '', @@ -1072,11 +1109,11 @@ class myTest public function showWorkCountTest(int $recTotal = 0, int $recPerPage = 20, int $pageID = 1): array { global $tester; - + // 模拟showWorkCount方法的核心功能 // 初始化计数数组 $count = array('task' => 0, 'story' => 0, 'bug' => 0, 'case' => 0, 'testtask' => 0, 'requirement' => 0, 'issue' => 0, 'risk' => 0, 'qa' => 0, 'meeting' => 0, 'ticket' => 0, 'feedback' => 0); - + // 模拟pager初始化 if(!class_exists('pager')) { @@ -1091,9 +1128,9 @@ class myTest } '); } - + $pager = pager::init($recTotal, $recPerPage, $pageID); - + // 模拟获取当前用户分配的任务数量 $tasks = $tester->dao->select('*')->from(TABLE_TASK) ->where('assignedTo')->eq($tester->app->user->account ?? 'admin') @@ -1101,7 +1138,7 @@ class myTest ->andWhere('status')->in('wait,doing') ->fetchAll(); $count['task'] = count($tasks); - + // 模拟获取当前用户分配的需求数量 $stories = $tester->dao->select('*')->from(TABLE_STORY) ->where('assignedTo')->eq($tester->app->user->account ?? 'admin') @@ -1109,7 +1146,7 @@ class myTest ->andWhere('status')->in('active,reviewing') ->fetchAll(); $count['story'] = count($stories); - + // 模拟获取当前用户分配的bug数量 $bugs = $tester->dao->select('*')->from(TABLE_BUG) ->where('assignedTo')->eq($tester->app->user->account ?? 'admin') @@ -1117,7 +1154,7 @@ class myTest ->andWhere('status')->in('active,confirmed') ->fetchAll(); $count['bug'] = count($bugs); - + // 其他工作项默认为0（在测试数据中没有） $count['case'] = 0; $count['testtask'] = 0; @@ -1128,14 +1165,14 @@ class myTest $count['meeting'] = 0; $count['ticket'] = 0; $count['feedback'] = 0; - + if(dao::isError()) return dao::getError(); - + // 模拟设置视图变量 if(!isset($tester->view)) $tester->view = new stdclass(); $tester->view->todoCount = $count; $tester->view->isOpenedURAndSR = false; - + return $count; } @@ -1152,37 +1189,37 @@ class myTest public function showWorkCountNotInOpenTest(array $count, object $pager, string $edition = 'open', string $vision = 'rnd'): array { global $tester; - + // 保存原始配置并设置测试配置 $originalEdition = $tester->config->edition ?? 'open'; $originalVision = $tester->config->vision ?? 'rnd'; $tester->config->edition = $edition; $tester->config->vision = $vision; - + // 创建测试用的pager对象，如果传入的不是有效对象 if(!is_object($pager) || !property_exists($pager, 'recTotal')) { $pager = new stdclass(); $pager->recTotal = 0; } - + // 确定版本标志 $isBiz = $edition == 'biz' ? 1 : 0; $isMax = $edition == 'max' ? 1 : 0; $isIPD = $edition == 'ipd' ? 1 : 0; - + // 如果不是开源版，统计反馈和工单 if($edition != 'open') { // 模拟反馈和工单数量（避免查询不存在的表） $count['feedback'] = 0; // 测试环境中默认为0 $count['ticket'] = 0; // 测试环境中默认为0 - + // 模拟从session设置ticketBrowseType if(!isset($tester->session)) $tester->session = new stdclass(); $tester->session->ticketBrowseType = 'assignedtome'; } - + // 如果是MAX或IPD版本 if($isMax || $isIPD) { @@ -1191,15 +1228,15 @@ class myTest // 模拟获取问题、风险、质量检查、会议数量（避免查询不存在的表） $count['issue'] = 0; // 测试环境中默认为0 $count['risk'] = 0; // 测试环境中默认为0 - + // 模拟质量检查数量(NC + 审计计划) $ncCount = 2; // 模拟数据 $auditplanCount = 1; // 模拟数据 $count['qa'] = $ncCount + $auditplanCount; - + $count['meeting'] = 0; // 测试环境中默认为0 } - + // IPD版本且是OR视野的需求处理 if($isIPD && $vision == 'or') { @@ -1209,19 +1246,19 @@ class myTest $count['demand'] = $assignedToDemandCount + $reviewByDemandCount; } } - + // 恢复原始配置 $tester->config->edition = $originalEdition; $tester->config->vision = $originalVision; - + // 模拟设置视图变量 if(!isset($tester->view)) $tester->view = new stdclass(); $tester->view->isBiz = $isBiz; $tester->view->isMax = $isMax; $tester->view->isIPD = $isIPD; - + if(dao::isError()) return dao::getError(); - + return $count; } } diff --git a/module/my/test/lib/myzen.unittest.class.php b/module/my/test/lib/myzen.unittest.class.php new file mode 100644 index 0000000000..72128ef548 --- /dev/null +++ b/module/my/test/lib/myzen.unittest.class.php @@ -0,0 +1,69 @@ +tester = $tester; + $tester->app->setModuleName('my'); + $this->objectModel = $tester->loadModel('my'); + + $this->myZenTest = initReference('my'); + } + + /** + * 获取待处理各项数据。 + * Get work count. + * + * @param int $recTotal + * @param string $recPerPage + * @param string $pageID + * @access public + * @return array + */ + public function showWorkCountTest(int $recTotal = 0, int $recPerPage = 20, int $pageID = 1): array + { + global $tester; + $tester->app->rawModule = 'my'; + $tester->app->rawMethod = 'work'; + + $method = $this->myZenTest->getMethod('showWorkCount'); + $method->setAccessible(true); + + $count = $method->invokeArgs($this->myZenTest->newInstance(), [$recTotal, $recPerPage, $pageID]); + + if(dao::isError()) return dao::getError(); + return $count; + } + + /** + * 获取收费版待处理各项数据。 + * Get work count not in open edition. + * + * @param array $count + * @param int $recTotal + * @param string $recPerPage + * @param string $pageID + * @access public + * @return array + */ + public function showWorkCountNotInOpenTest(array $count = [], int $recTotal = 0, int $recPerPage = 20, int $pageID = 1): array + { + global $tester; + $tester->app->rawModule = 'my'; + $tester->app->rawMethod = 'work'; + + $tester->app->loadClass('pager', true); + $pager = pager::init($recTotal, $recPerPage, $pageID); + + $method = $this->myZenTest->getMethod('showWorkCountNotInOpen'); + $method->setAccessible(true); + + $count = $method->invokeArgs($this->myZenTest->newInstance(), [$count, $pager]); + + if(dao::isError()) return dao::getError(); + return $count; + } +} diff --git a/module/my/test/model/buildreviewissuesearchform.php b/module/my/test/model/buildreviewissuesearchform.php new file mode 100755 index 0000000000..302c6e1d14 --- /dev/null +++ b/module/my/test/model/buildreviewissuesearchform.php @@ -0,0 +1,35 @@ +#!/usr/bin/env php +gen('1'); + +su('admin'); + +/** + +title=测试 myModel->buildReviewIssueSearchForm(); +timeout=0 +cid=1 + +- 测试获取queryID 1 actionURL actionURL1 的搜索表单 + - 属性module @Reviewissue + - 属性queryID @0 + - 属性actionURL @actionURL1 +- 测试获取queryID 0 actionURL actionURL2 的搜索表单 + - 属性module @Reviewissue + - 属性queryID @1 + - 属性actionURL @actionURL2 + +*/ + +$my = new myTest(); + +$queryID = array(0, 1); +$actionURL = array('actionURL1', 'actionURL2'); +$config1 = $my->buildReviewissueSearchFormTest($queryID[0], $actionURL[0]); +$config2 = $my->buildReviewissueSearchFormTest($queryID[1], $actionURL[1]); +r($config1) && p('module,queryID,actionURL') && e('Reviewissue,0,actionURL1'); // 测试获取queryID 1 actionURL actionURL1 的搜索表单 +r($config2) && p('module,queryID,actionURL') && e('Reviewissue,1,actionURL2'); // 测试获取queryID 0 actionURL actionURL2 的搜索表单 \ No newline at end of file diff --git a/module/my/test/model/getassignedbyme.php b/module/my/test/model/getassignedbyme.php index 5c8a54da97..dd8b9f23f2 100755 --- a/module/my/test/model/getassignedbyme.php +++ b/module/my/test/model/getassignedbyme.php @@ -49,4 +49,4 @@ r($myTest->getAssignedByMeTest('nonexist', null, 'id_desc', 'task')) && p() && e r($myTest->getAssignedByMeTest('admin', null, 'id_desc', 'story')) && p() && e('2'); // 步骤4：获取admin用户指派的story r($myTest->getAssignedByMeTest('admin', null, 'id_asc', 'bug')) && p() && e('4'); // 步骤5：测试排序功能 r($myTest->getAssignedByMeTest('user1', null, 'id_desc', 'task')) && p() && e('0'); // 步骤6：测试其他用户指派的记录 -r($myTest->getAssignedByMeTest('admin', null, 'id_desc', '')) && p() && e('0'); // 步骤7：测试空类型默认行为 \ No newline at end of file +r($myTest->getAssignedByMeTest('admin', null, 'id_desc', '')) && p() && e('0'); // 步骤7：测试空类型默认行为 diff --git a/module/my/test/model/getreviewissuesbysearch.php b/module/my/test/model/getreviewissuesbysearch.php new file mode 100755 index 0000000000..979e0816a1 --- /dev/null +++ b/module/my/test/model/getreviewissuesbysearch.php @@ -0,0 +1,58 @@ +#!/usr/bin/env php +project->range('1'); +$reviewissue->review->range('1-5'); +$reviewissue->type->range('review'); +$reviewissue->opinionDate->range('`2025-01-01`'); +$reviewissue->resolutionDate->range('`2025-01-01`'); +$reviewissue->createdDate->range('`2025-01-01`'); +$reviewissue->assignedTo->range('admin,user1,user2'); +$reviewissue->gen(20); +zenData('userquery')->loadYaml('userquery')->gen('1'); +zenData('user')->gen('1'); + +su('admin'); + +/** + +title=测试 myModel->getReviewissuesBySearch(); +cid=1 + +- 测试通过搜索获取 query id 0 类型 work id_desc 评审意见id @19,16,13,10,7,4,1 +- 测试通过搜索获取 query id 0 类型 work id_desc 评审意见数量 @7 +- 测试通过搜索获取 query id 0 类型 work id_asc 评审意见id @1,4,7,10,13,16,19 +- 测试通过搜索获取 query id 0 类型 work id_asc 评审意见数量 @7 +- 测试通过搜索获取 query id 5 类型 work id_desc 评审意见id @19,16,13,10,7,4,1 +- 测试通过搜索获取 query id 5 类型 work id_desc 评审意见数量 @7 +- 测试通过搜索获取 query id 5 类型 work id_asc 评审意见id @1,4,7,10,13,16,19 +- 测试通过搜索获取 query id 5 类型 work id_asc 评审意见数量 @7 + +*/ + +$my = new myTest(); +$queryID = array(0, 1); +$type = array('work', 'contribute'); +$orderBy = array('id_desc', 'id_asc'); + +global $tester; +$tester->session->set('workReviewissueQuery', "`title` like '%问题%'"); +$tester->session->set('contributeReviewissueQuery', "`title` like '%问题%'"); + +$tasks1 = $my->getReviewissuesBySearchTest($queryID[0], $type[0], $orderBy[0]); +$tasks2 = $my->getReviewissuesBySearchTest($queryID[0], $type[0], $orderBy[1]); +$tasks3 = $my->getReviewissuesBySearchTest($queryID[0], $type[0], $orderBy[0]); +$tasks4 = $my->getReviewissuesBySearchTest($queryID[0], $type[0], $orderBy[1]); + +r(implode(',', $tasks1)) && p() && e('19,16,13,10,7,4,1'); // 测试通过搜索获取 query id 0 类型 work id_desc 评审意见id +r(count($tasks1)) && p() && e('7'); // 测试通过搜索获取 query id 0 类型 work id_desc 评审意见数量 +r(implode(',', $tasks2)) && p() && e('1,4,7,10,13,16,19'); // 测试通过搜索获取 query id 0 类型 work id_asc 评审意见id +r(count($tasks2)) && p() && e('7'); // 测试通过搜索获取 query id 0 类型 work id_asc 评审意见数量 +r(implode(',', $tasks3)) && p() && e('19,16,13,10,7,4,1'); // 测试通过搜索获取 query id 5 类型 work id_desc 评审意见id +r(count($tasks3)) && p() && e('7'); // 测试通过搜索获取 query id 5 类型 work id_desc 评审意见数量 +r(implode(',', $tasks4)) && p() && e('1,4,7,10,13,16,19'); // 测试通过搜索获取 query id 5 类型 work id_asc 评审意见id +r(count($tasks4)) && p() && e('7'); // 测试通过搜索获取 query id 5 类型 work id_asc 评审意见数量 diff --git a/module/my/test/tao/yaml/product_fetchrequirementsbysearch.yaml b/module/my/test/tao/yaml/product_fetchrequirementsbysearch.yaml index 660d6c76f3..6be155c746 100644 --- a/module/my/test/tao/yaml/product_fetchrequirementsbysearch.yaml +++ b/module/my/test/tao/yaml/product_fetchrequirementsbysearch.yaml @@ -7,18 +7,18 @@ version: "1.0" fields: - field: id range: 1-3 - + - field: name range: '产品A,产品B,产品C' - + - field: code range: 'PROD-A,PROD-B,PROD-C' - + - field: type range: normal{3} - + - field: status range: normal{3} - + - field: deleted range: 0{3} \ No newline at end of file diff --git a/module/my/test/tao/yaml/story_fetchrequirementsbysearch.yaml b/module/my/test/tao/yaml/story_fetchrequirementsbysearch.yaml index f45adc7e02..033438a90a 100644 --- a/module/my/test/tao/yaml/story_fetchrequirementsbysearch.yaml +++ b/module/my/test/tao/yaml/story_fetchrequirementsbysearch.yaml @@ -7,60 +7,60 @@ version: "1.0" fields: - field: id range: 1-10 - + - field: vision range: rnd{10} - + - field: parent range: 0{10} - + - field: isParent range: 0{10} - + - field: root range: 0{10} - + - field: product range: 1-3 - + - field: branch range: 0{10} - + - field: module range: 0{10} - + - field: title range: '用户需求{1-10}' - + - field: type range: requirement{10} - + - field: category range: feature{10} - + - field: pri range: 1-4 - + - field: estimate range: 1-10 - + - field: status range: active{3},reviewing{2},draft{2},closed{3} - + - field: assignedTo range: admin{3},user1{3},user2{3},user3{1} - + - field: openedBy range: admin{4},user1{3},user2{3} - + - field: openedDate range: '2024-01-01 10:00:00{5},2024-02-01 10:00:00{5}' - + - field: closedBy range: ''{7},admin{2},user1{1} - + - field: closedDate range: '0000-00-00 00:00:00'{7},'2024-03-01 10:00:00'{3} - + - field: deleted range: 0{10} \ No newline at end of file diff --git a/module/my/test/tao/yaml/storyreview_fetchrequirementsbysearch.yaml b/module/my/test/tao/yaml/storyreview_fetchrequirementsbysearch.yaml index 9194ddc378..bf5b4beb30 100644 --- a/module/my/test/tao/yaml/storyreview_fetchrequirementsbysearch.yaml +++ b/module/my/test/tao/yaml/storyreview_fetchrequirementsbysearch.yaml @@ -7,15 +7,15 @@ version: "1.0" fields: - field: story range: 1-10 - + - field: version range: 1{10} - + - field: reviewer range: admin{4},user1{3},user2{3} - + - field: result range: ''{8},pass{2} - + - field: reviewDate range: '0000-00-00 00:00:00'{8},'2024-01-15 10:00:00'{2} \ No newline at end of file diff --git a/module/my/test/zen/showworkcount.php b/module/my/test/zen/showworkcount.php old mode 100755 new mode 100644 index 7bd34a9ccd..efda49a362 --- a/module/my/test/zen/showworkcount.php +++ b/module/my/test/zen/showworkcount.php @@ -1,6 +1,5 @@ #!/usr/bin/env php showWorkCountTest(0, 20, 1)) && p('bugCount') && e('0'); // 测试默 r($myTest->showWorkCountTest(0, 20, 1)) && p('caseCount') && e('0'); // 测试默认参数时caseCount初始化为0 r($myTest->showWorkCountTest(100, 20, 1)) && p('hasTodoCount') && e('1'); // 测试recTotal为100时 r($myTest->showWorkCountTest(0, 50, 1)) && p('hasTodoCount') && e('1'); // 测试recPerPage为50时 -r($myTest->showWorkCountTest(0, 20, 2)) && p('hasTodoCount') && e('1'); // 测试pageID为2时 \ No newline at end of file +r($myTest->showWorkCountTest(0, 20, 2)) && p('hasTodoCount') && e('1'); // 测试pageID为2时 diff --git a/module/my/test/zen/showworkcountnotinopen.php b/module/my/test/zen/showworkcountnotinopen.php new file mode 100755 index 0000000000..5cdd1ea556 --- /dev/null +++ b/module/my/test/zen/showworkcountnotinopen.php @@ -0,0 +1,47 @@ +#!/usr/bin/env php +gen(0); +zenData('ticket')->gen(0); +zenData('issue')->gen(0); +zenData('risk')->gen(0); +zenData('nc')->gen(0); +zenData('auditplan')->gen(0); +zenData('meeting')->gen(0); +zenData('demand')->gen(0); +zenData('user')->gen(10); +zenData('product')->gen(5); + +su('admin'); + +$myTest = new myZenTest(); + +$emptyCount = array('task' => 0, 'story' => 0, 'bug' => 0, 'case' => 0, 'testtask' => 0, 'requirement' => 0, 'issue' => 0, 'risk' => 0, 'qa' => 0, 'meeting' => 0, 'ticket' => 0, 'feedback' => 0); +$nonEmptyCount = array('task' => 5, 'story' => 3, 'bug' => 2); + +r($myTest->showWorkCountNotInOpenTest($emptyCount)) && p('isBiz') && e('0'); // 测试开源版(open)下空count数组 +r($myTest->showWorkCountNotInOpenTest($emptyCount)) && p('isMax') && e('0'); // 测试开源版(open)下空count数组的isMax +r($myTest->showWorkCountNotInOpenTest($emptyCount)) && p('isIPD') && e('0'); // 测试开源版(open)下空count数组的isIPD +r($myTest->showWorkCountNotInOpenTest($emptyCount)) && p('feedback') && e('0'); // 测试开源版(open)下feedback计数为0 +r($myTest->showWorkCountNotInOpenTest($nonEmptyCount)) && p('task') && e('5'); // 测试非空count数组保留原有task计数 +r($myTest->showWorkCountNotInOpenTest($nonEmptyCount)) && p('story') && e('3'); // 测试非空count数组保留原有story计数 +r($myTest->showWorkCountNotInOpenTest($nonEmptyCount)) && p('bug') && e('2'); // 测试非空count数组保留原有bug计数 diff --git a/module/my/ui/doc.html.php b/module/my/ui/doc.html.php index 4e9953e557..361ac1792a 100644 --- a/module/my/ui/doc.html.php +++ b/module/my/ui/doc.html.php @@ -27,6 +27,17 @@ if($type == 'editedbyme') unset($config->my->doc->dtable->fieldList['editedBy']) $docs = initTableData($docs, $config->my->doc->dtable->fieldList, $this->doc); $cols = array_values($config->my->doc->dtable->fieldList); $data = array_values($docs); + +foreach($data as $doc) +{ + if(!isset($doc->actions)) continue; + foreach($doc->actions as &$action) + { + $actionName = $action['name']; + if(!empty($doc->frozen) && in_array($actionName, array('edit', 'delete'))) $action['hint'] = sprintf($this->lang->doc->frozenTips, $this->lang->doc->{$actionName}); + } +} + dtable ( set::cols($cols), diff --git a/module/my/ui/epic.html.php b/module/my/ui/epic.html.php index 12e428bc64..22e37f11c3 100644 --- a/module/my/ui/epic.html.php +++ b/module/my/ui/epic.html.php @@ -95,6 +95,14 @@ $footToolbar = array('items' => array if($canBatchAction) $config->my->epic->dtable->fieldList['id']['type'] = 'checkID'; $stories = initTableData($stories, $config->my->epic->dtable->fieldList, $this->story); +foreach($stories as $id => $story) +{ + if(!isset($story->actions)) continue; + foreach($story->actions as $key => $action) + { + if(!empty($story->frozen) && in_array($action['name'], array('edit', 'change'))) $stories[$id]->actions[$key]['hint'] = sprintf($lang->story->frozenTip, $lang->story->{$action['name']}); + } +} if($viewType == 'tiled') $config->my->epic->dtable->fieldList['title']['nestedToggle'] = false; $cols = array_values($config->my->epic->dtable->fieldList); diff --git a/module/my/ui/header.html.php b/module/my/ui/header.html.php index 2a9defd62e..02acc92adc 100644 --- a/module/my/ui/header.html.php +++ b/module/my/ui/header.html.php @@ -18,7 +18,7 @@ if($app->rawMethod == 'work') if($isOpenedURAndSR !== 0) $nameMap = array_merge($nameMap, array('requirement' => 'requirement')); if($config->enableER) $nameMap = array_merge($nameMap, array('epic' => 'epic')); if($isBiz !== 0 || $isMax !== 0 || $isIPD !== 0) $nameMap = array_merge($nameMap, array('feedback' => 'feedback', 'ticket' => 'ticket')); - if($isMax !== 0 || $isIPD !== 0) $nameMap = array_merge($nameMap, array('issue' => 'issue', 'risk' => 'risk', 'nc' => 'qa', 'myMeeting' => 'meeting')); + if($isMax !== 0 || $isIPD !== 0) $nameMap = array_merge($nameMap, array('issue' => 'issue', 'risk' => 'risk', 'nc' => 'qa', 'reviewissue' => 'reviewissue', 'myMeeting' => 'meeting')); if($isIPD !== 0) $nameMap = array_merge($nameMap, array('demand' => 'demand')); foreach($nameMap as $name => $countKey) diff --git a/module/my/ui/requirement.html.php b/module/my/ui/requirement.html.php index 813b259dc4..06a36ce218 100644 --- a/module/my/ui/requirement.html.php +++ b/module/my/ui/requirement.html.php @@ -98,6 +98,14 @@ $footToolbar = array('items' => array if($canBatchAction) $config->my->requirement->dtable->fieldList['id']['type'] = 'checkID'; $stories = initTableData($stories, $config->my->requirement->dtable->fieldList, $this->story); +foreach($stories as $id => $story) +{ + if(!isset($story->actions)) continue; + foreach($story->actions as $key => $action) + { + if(!empty($story->frozen) && in_array($action['name'], array('edit', 'change'))) $stories[$id]->actions[$key]['hint'] = sprintf($lang->story->frozenTip, $lang->story->{$action['name']}); + } +} if($viewType == 'tiled') $config->my->requirement->dtable->fieldList['title']['nestedToggle'] = false; $cols = array_values($config->my->requirement->dtable->fieldList); diff --git a/module/my/ui/story.html.php b/module/my/ui/story.html.php index 7acf76b61d..5ad2aed2f4 100644 --- a/module/my/ui/story.html.php +++ b/module/my/ui/story.html.php @@ -107,6 +107,7 @@ foreach($stories as $id => $story) foreach($story->actions as $key => $action) { if($action['name'] == 'create' && $story->isParent == '1') $stories[$id]->actions[$key]['disabled'] = 1; + if(!empty($story->frozen) && in_array($action['name'], array('edit', 'change'))) $stories[$id]->actions[$key]['hint'] = sprintf($lang->story->frozenTip, $lang->story->{$action['name']}); } } $story->estimate = helper::formatHours($story->estimate); diff --git a/module/my/zen.php b/module/my/zen.php index fd3b8793f0..970f13a2fd 100644 --- a/module/my/zen.php +++ b/module/my/zen.php @@ -162,16 +162,16 @@ class myZen extends my * @param int $recPerPage * @param int $pageID * @access public - * @return void + * @return array */ - public function showWorkCount(int $recTotal = 0, int $recPerPage = 20, int $pageID = 1): void + public function showWorkCount(int $recTotal = 0, int $recPerPage = 20, int $pageID = 1): array { /* Load pager. */ $this->app->loadClass('pager', true); if($this->app->getViewType() == 'mhtml') $recPerPage = 10; $pager = pager::init($recTotal, $recPerPage, $pageID); - $count = array('task' => 0, 'story' => 0, 'bug' => 0, 'case' => 0, 'testtask' => 0, 'requirement' => 0, 'issue' => 0, 'risk' => 0, 'qa' => 0, 'meeting' => 0, 'ticket' => 0, 'feedback' => 0); + $count = array('task' => 0, 'story' => 0, 'bug' => 0, 'case' => 0, 'testtask' => 0, 'requirement' => 0, 'epic' => 0, 'issue' => 0, 'risk' => 0, 'reviewissue' => 0, 'qa' => 0, 'meeting' => 0, 'ticket' => 0, 'feedback' => 0); /* Get the number of tasks assigned to me. */ $this->loadModel('task')->getUserTasks($this->app->user->account, 'assignedTo', 0, $pager); @@ -233,6 +233,7 @@ class myZen extends my $this->view->todoCount = $count; $this->view->isOpenedURAndSR = $isOpenedURAndSR; + return $count; } /** @@ -275,6 +276,11 @@ class myZen extends my $this->loadModel('risk')->getUserRisks('assignedTo', $this->app->user->account, 'id_desc', $pager); $count['risk'] = $pager->recTotal; + /* Get the number of reviewissues assigned to me. */ + $pager->recTotal = 0; + $this->loadModel('reviewissue')->getUserReviewissues('assignedTo', $this->app->user->account, 'id_desc', $pager); + $count['reviewissue'] = $pager->recTotal; + /* Get the number of nc assigned to me. */ $pager->recTotal = 0; $this->my->getNcList('assignedToMe', 'id_desc', $pager, 'active'); @@ -282,7 +288,7 @@ class myZen extends my /* Get the number of nc assigned to me. */ $pager->recTotal = 0; - $this->loadModel('auditplan')->getList(0, 'my', 'mychecking', '', 'id_desc', $pager); + $this->loadModel('auditplan')->getList(0, 'myChecking', '', 'id_desc', $pager); $auditplanCount = $pager->recTotal; $count['qa'] = $ncCount + $auditplanCount; diff --git a/module/personnel/test/lib/personnel.unittest.class.php b/module/personnel/test/lib/personnel.unittest.class.php index 68d98aa6e0..0de7c84a97 100644 --- a/module/personnel/test/lib/personnel.unittest.class.php +++ b/module/personnel/test/lib/personnel.unittest.class.php @@ -513,7 +513,7 @@ class personnelTest $reflection = new ReflectionClass($this->objectModel); $method = $reflection->getMethod('updateParentWhitelist'); $method->setAccessible(true); - + $result = $method->invoke($this->objectModel, $objectType, $objectID, $accounts, $source, $updateType, $deletedAccounts, $objectTable); if(dao::isError()) return dao::getError(); @@ -530,7 +530,7 @@ class personnelTest { $parentWhitelist = $tester->dao->select('whitelist')->from(TABLE_PROJECT)->where('id')->eq($product->program)->fetch('whitelist'); $return .= "parent_whitelist:{$parentWhitelist};"; - + $acls = $tester->dao->select('account,source')->from(TABLE_ACL) ->where('objectID')->eq($product->program) ->andWhere('objectType')->eq('program') @@ -551,7 +551,7 @@ class personnelTest { $parentWhitelist = $tester->dao->select('whitelist')->from(TABLE_PROJECT)->where('id')->eq($sprint->project)->fetch('whitelist'); $return .= "parent_whitelist:{$parentWhitelist};"; - + $acls = $tester->dao->select('account,source')->from(TABLE_ACL) ->where('objectID')->eq($sprint->project) ->andWhere('objectType')->eq('project') @@ -581,29 +581,29 @@ class personnelTest public function setSelectObjectTipsTest(int $objectID, string $objectType, string $module): array { global $tester; - + $tester->app->loadLang('personnel'); $tester->app->loadLang('execution'); $tester->app->loadLang('product'); $tester->app->loadLang('program'); $tester->app->loadLang('project'); - + $tester->lang->personnel->selectObjectTips = '请选择一个%s白名单'; - + $objectName = $tester->lang->projectCommon . $tester->lang->execution->or . $tester->lang->execution->common; if($objectType == 'program') $objectName = $tester->lang->program->common; if($objectType == 'product') $objectName = $tester->lang->productCommon; if($objectType == 'project') $objectName = $tester->lang->projectCommon; $tip = sprintf($tester->lang->personnel->selectObjectTips, $objectName); - + if($objectType == 'sprint' && $module == 'execution') { $execution = $this->objectModel->dao->select('*')->from(TABLE_EXECUTION)->where('id')->eq($objectID)->fetch(); $tip = !empty($execution) && $execution->type == 'kanban' ? str_replace($tester->lang->execution->common, $tester->lang->execution->kanban, $tip) : $tip; } - + if(dao::isError()) return dao::getError(); - + return array( 'tips' => $tip, 'objectName' => $objectName diff --git a/module/pivot/test/model/yaml/pivotspec_isversionchange.yaml b/module/pivot/test/model/yaml/pivotspec_isversionchange.yaml index aa658a8d1e..76f9968876 100644 --- a/module/pivot/test/model/yaml/pivotspec_isversionchange.yaml +++ b/module/pivot/test/model/yaml/pivotspec_isversionchange.yaml @@ -6,15 +6,15 @@ fields: - field: pivot note: 关联的pivot ID range: '1{3},2{4},3{3}' - + - field: version note: 版本号 range: '1.0,1.1,1.5,2.0{4},2.1{3}' - + - field: name note: 版本名称 range: '测试透视表版本{1-10}' - + - field: createdDate note: 创建时间 range: 'YYYY-MM-DD hh:mm:ss' diff --git a/module/pivot/test/tao/yaml/bug_getassignbuggroup.yaml b/module/pivot/test/tao/yaml/bug_getassignbuggroup.yaml index a8353c5e83..815eb6e4a7 100644 --- a/module/pivot/test/tao/yaml/bug_getassignbuggroup.yaml +++ b/module/pivot/test/tao/yaml/bug_getassignbuggroup.yaml @@ -7,40 +7,40 @@ fields: - field: id note: Bug ID range: 1-20 - + - field: product note: 产品ID range: 1{5},2{7},3{8} - + - field: assignedTo note: 指派给用户 range: user1{4},user2{5},user3{3},{2},closed{2},user4{4} - + - field: status note: Bug状态 range: active{15},resolved{3},closed{2} - + - field: deleted note: 是否删除 range: 0{18},1{2} - + - field: openedBy note: 由谁创建 range: admin{10},user1{5},user2{5} - + - field: openedDate note: 开启日期 range: '2024-01-01 00:00:00'{5},'2024-06-01 12:00:00'{10},'2024-09-01 18:00:00'{5} - + - field: title note: Bug标题 range: 'Bug Title %d' format: "%02d" - + - field: severity note: 严重程度 range: 1{5},2{7},3{5},4{3} - + - field: resolution note: 解决方案 range: ''{12},fixed{3},bydesign{2},duplicate{3} \ No newline at end of file diff --git a/module/pivot/test/tao/yaml/project_getprojectandexecutionnamequery.yaml b/module/pivot/test/tao/yaml/project_getprojectandexecutionnamequery.yaml index 7dd44367fc..cad5b8ef63 100644 --- a/module/pivot/test/tao/yaml/project_getprojectandexecutionnamequery.yaml +++ b/module/pivot/test/tao/yaml/project_getprojectandexecutionnamequery.yaml @@ -6,7 +6,7 @@ fields: - field: id note: 项目ID range: 1-15 - + - field: name note: 项目名称 range: '执行1,执行2,执行3,项目1,项目2,执行4,执行5,项目3,执行6,执行7,删除执行1,删除执行2,项目执行1,项目执行2,项目执行3' @@ -14,19 +14,19 @@ fields: - field: type note: 项目类型 range: 'stage{5},sprint{5},project{5}' - -- field: status + +- field: status note: 项目状态 range: 'wait{8},doing{4},closed{3}' - field: deleted note: 删除状态 range: '0{12},1{3}' - + - field: multiple note: 多执行标识 range: '1{10},0{5}' - field: project - note: 父项目ID + note: 父项目ID range: '0{5},1,1,2,2,3,3,3,4,4,5' \ No newline at end of file diff --git a/module/product/model.php b/module/product/model.php index 8d44f68f93..507bcaac27 100755 --- a/module/product/model.php +++ b/module/product/model.php @@ -2033,7 +2033,7 @@ class productModel extends model if($this->config->edition != 'open') { $flow = $this->loadModel('workflow')->getByModule($module); - if($flow && in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project'; + if($flow && in_array($flow->app, array('scrum', 'waterfall', 'kanbanProject'))) $flow->app = 'project'; if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=%s&moduleName=$module") . "#app=$flow->app"; } diff --git a/module/product/test/zen/yaml/product_assignbrowsedata.yaml b/module/product/test/zen/yaml/product_assignbrowsedata.yaml index 9aa462438a..d13242f873 100644 --- a/module/product/test/zen/yaml/product_assignbrowsedata.yaml +++ b/module/product/test/zen/yaml/product_assignbrowsedata.yaml @@ -8,27 +8,27 @@ fields: - field: id note: 产品ID range: 1-10 - + - field: name note: 产品名称 range: 产品A,产品B,产品C,产品D,产品E - + - field: status note: 产品状态 range: normal{8},closed{2} - + - field: type note: 产品类型 range: normal{6},branch{4} - + - field: PO note: 产品负责人 range: admin,user1,user2,user3 - + - field: program note: 项目集ID range: 0{5},1{3},2{2} - + - field: acl note: 访问控制 range: open{7},private{2},custom{1} \ No newline at end of file diff --git a/module/product/test/zen/yaml/product_getproducts4dropmenu.yaml b/module/product/test/zen/yaml/product_getproducts4dropmenu.yaml index c0afbd6ad4..2534cde2bd 100644 --- a/module/product/test/zen/yaml/product_getproducts4dropmenu.yaml +++ b/module/product/test/zen/yaml/product_getproducts4dropmenu.yaml @@ -6,129 +6,129 @@ fields: - field: id note: 产品ID range: 1-10 - + - field: program note: 项目集ID range: 1-3 - + - field: name note: 产品名称 range: "产品A,产品B,产品C,产品D,产品E,Shadow产品,Workflow产品,Feedback产品,Project产品,Normal产品" - + - field: code note: 产品代码 range: "PRODA,PRODB,PRODC,PRODD,PRODE,SHADOWS,WORKFLOW,FEEDBACK,PROJECT,NORMAL" - + - field: shadow note: 影子产品标识 range: 0{8},1{2} - + - field: bind note: 绑定标识 range: "0" - + - field: line note: 产品线ID range: 0-2 - + - field: type note: 产品类型 range: "normal{8},branch{2}" - + - field: status note: 产品状态 range: "normal{7},closed{3}" - + - field: subStatus note: 子状态 range: "" - + - field: desc note: 产品描述 range: "这是产品A的描述,这是产品B的描述,这是产品C的描述,这是产品D的描述,这是产品E的描述,这是Shadow产品的描述,这是Workflow产品的描述,这是Feedback产品的描述,这是Project产品的描述,这是Normal产品的描述" - + - field: PO note: 产品负责人 range: "admin,user1,user2,user3" - + - field: QD note: 测试负责人 range: "admin,user1,user2" - + - field: RD note: 发布负责人 range: "admin,user1,user2" - + - field: feedback note: 反馈负责人 range: "admin,user1" - + - field: ticket note: 工单负责人 range: "admin" - + - field: workflowGroup note: 工作流组 range: 0{8},1{2} - + - field: acl note: 访问控制 range: "open{6},private{2},custom{2}" - + - field: groups note: 用户组 range: "1,2,3,1,2,2,3,1,2,3" - + - field: whitelist note: 白名单 range: "admin,user1,admin,user2,admin,user1,user2,admin,user1,admin" - + - field: reviewer note: 评审人员 range: "admin,user1,admin,user2,admin,user1,user2,admin,user1,admin" - + - field: PMT note: PMT成员 range: "admin,user1,admin,user2,admin,user1,user2,admin,user1,admin" - + - field: draftEpics note: 草稿史诗数量 range: 0-5 - + - field: activeEpics note: 激活史诗数量 range: 0-8 - + - field: changingEpics note: 变更史诗数量 range: 0-3 - + - field: order note: 排序 range: 10-50:5 - + - field: vision note: 视角 range: "rnd" - + - field: createdBy note: 创建者 range: "admin,user1,user2" - + - field: createdDate note: 创建时间 range: "(-1M)-(0D):1D" format: "YYYY-MM-DD hh:mm:ss" - + - field: editedBy note: 编辑者 range: "admin,user1,user2" - + - field: editedDate note: 编辑时间 range: "(-1w)-(0D):1D" format: "YYYY-MM-DD hh:mm:ss" - + - field: deleted note: 是否删除 range: "0" \ No newline at end of file diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php index 367dfcc277..88a155f9bd 100644 --- a/module/product/ui/browse.html.php +++ b/module/product/ui/browse.html.php @@ -70,7 +70,7 @@ $fnGenerateSideBar = function() use ($moduleTree, $moduleID, $productID, $branch }; /* Build create story button. */ -$fnBuildCreateStoryButton = function() use ($lang, $product, $isProjectStory, $storyType, $productID, $branch, $moduleID, $projectID, $project, $projectProducts) +$fnBuildCreateStoryButton = function() use ($lang, $product, $isProjectStory, $storyType, $productID, $branch, $moduleID, $projectID, $project, $projectProducts, $hasFrozenStories) { if(!common::canModify('product', $product)) return null; if(!empty($project) && !common::canModify('project', $project)) return null; @@ -142,11 +142,13 @@ $fnBuildCreateStoryButton = function() use ($lang, $product, $isProjectStory, $s btn ( setClass(($app->tab != 'product' ? 'secondary' : 'primary') . ' create-story-btn'), + $isProjectStory && $hasFrozenStories ? setClass('disabled') : null, + $isProjectStory && $hasFrozenStories ? set::hint(sprintf($lang->story->frozenTip, $createBtnTitle)) : null, set::icon('plus'), set::text($createBtnTitle), set::url($createBtnLink) ), - empty($items) ? null : dropdown + empty($items) || ($isProjectStory && $hasFrozenStories) ? null : dropdown ( btn(setClass('dropdown-toggle'), setClass($app->tab != 'product' ? 'secondary' : 'primary'), setStyle(array('padding' => '6px', 'border-radius' => '0 2px 2px 0'))), set::placement('bottom-end'), @@ -165,7 +167,7 @@ $fnBuildCreateStoryButton = function() use ($lang, $product, $isProjectStory, $s }; /* Build link story button. */ -$fnBuildLinkStoryButton = function() use($lang, $app, $product, $projectHasProduct, $project, $storyType) +$fnBuildLinkStoryButton = function() use($lang, $app, $product, $projectHasProduct, $project, $storyType, $isProjectStory, $hasFrozenStories) { if(!common::canModify('product', $product)) return null; if(!empty($project) && !common::canModify('project', $project)) return null; @@ -187,20 +189,22 @@ $fnBuildLinkStoryButton = function() use($lang, $app, $product, $projectHasProdu $canLinkStory = common::hasPriv('projectstory', 'linkStory'); $canlinkPlanStory = !empty($product) && common::hasPriv('projectstory', 'importPlanStories') && $storyType == 'story' && !$project->charter; $linkStoryUrl = $this->createLink('projectstory', 'linkStory', "project=$project->id&browseType=¶m=0&orderBy=id_desc&recPerPage=50&pageID=1&extra=&storyType=$storyType"); - $linkItem = array('text' => $lang->execution->linkStory, 'url' => $linkStoryUrl); - $linkPlanItem = array('text' => $lang->execution->linkStoryByPlan, 'url' => '#linkStoryByPlan', 'data-toggle' => 'modal', 'data-size' => 'sm'); + $linkItem = array('text' => $lang->execution->linkStory, 'url' => $linkStoryUrl, 'hint' => $isProjectStory && $hasFrozenStories ? sprintf($lang->story->frozenTip, $lang->execution->linkStory) : ''); + $linkPlanItem = array('text' => $lang->execution->linkStoryByPlan, 'url' => '#linkStoryByPlan', 'data-toggle' => 'modal', 'data-size' => 'sm', 'hint' => $isProjectStory && $hasFrozenStories ? sprintf($lang->story->frozenTip, $lang->execution->linkStoryByPlan) : ''); if($canLinkStory && $canlinkPlanStory) { return btngroup ( btn( setClass('btn primary'), + $isProjectStory && $hasFrozenStories ? setClass('disabled') : null, + $isProjectStory && $hasFrozenStories ? set::hint(sprintf($lang->story->frozenTip, $lang->execution->linkStory)) : null, set::icon('link'), set::url($linkStoryUrl), setData('app', $app->tab), $lang->execution->linkStory ), - dropdown + $isProjectStory && $hasFrozenStories ? null : dropdown ( btn(setClass('btn primary dropdown-toggle'), setStyle(array('padding' => '6px', 'border-radius' => '0 2px 2px 0'))), @@ -210,8 +214,8 @@ $fnBuildLinkStoryButton = function() use($lang, $app, $product, $projectHasProdu ); } - if($canLinkStory && !$canlinkPlanStory) return item(set($linkItem + array('class' => 'btn primary link-story-btn', 'icon' => 'link'))); - if($canlinkPlanStory && !$canLinkStory) return item(set($linkPlanItem + array('class' => 'btn primary', 'icon' => 'link'))); + if($canLinkStory && !$canlinkPlanStory) return item(set($linkItem + array('class' => 'btn primary link-story-btn' . ($isProjectStory && $hasFrozenStories ? ' disabled' : ''), 'icon' => 'link'))); + if($canlinkPlanStory && !$canLinkStory) return item(set($linkPlanItem + array('class' => 'btn primary' . ($isProjectStory && $hasFrozenStories ? ' disabled' : ''), 'icon' => 'link'))); }; /* DataTable columns. */ @@ -253,7 +257,7 @@ foreach($stories as $story) } /* Generate toolbar of DataTable footer. */ -$fnGenerateFootToolbar = function() use ($lang, $app, $product, $productID, $project, $storyType, $browseType, $isProjectStory, $projectHasProduct, $storyProductID, $projectID, $branch, $users, $branchTagOption, $modules, $plans, $branchID, $gradePairs, $config,$noclosedRoadmaps, $gradeGroup) +$fnGenerateFootToolbar = function() use ($lang, $app, $product, $productID, $project, $storyType, $browseType, $isProjectStory, $projectHasProduct, $storyProductID, $projectID, $branch, $users, $branchTagOption, $modules, $plans, $branchID, $gradePairs, $config,$noclosedRoadmaps, $gradeGroup, $hasFrozenStories) { /* Flag variables of permissions. */ $canBeChanged = common::canModify('product', $product); @@ -280,7 +284,7 @@ $fnGenerateFootToolbar = function() use ($lang, $app, $product, $productID, $pro $canBatchChangeBranch = $canBeChanged && hasPriv($storyType, 'batchChangeBranch') && $product && $product->type != 'normal' && $productID; $canBatchChangeModule = $canBeChanged && hasPriv($storyType, 'batchChangeModule') && $productID && (($product->type != 'normal' && $branchID != 'all') || $product->type == 'normal') && !$isProjectStory; $canBatchChangeParent = $canBeChanged && hasPriv($storyType, 'batchChangeParent') && !($storyType == 'epic' && count($gradeGroup['epic']) < 2) && $app->tab == 'product'; - $canBatchUnlink = $canBeChanged && $projectHasProduct && hasPriv('projectstory', 'batchUnlinkStory'); + $canBatchUnlink = empty($hasFrozenStories) && $canBeChanged && $projectHasProduct && hasPriv('projectstory', 'batchUnlinkStory'); $canBatchImportToLib = $canBeChanged && $isProjectStory && in_array($this->config->edition, array('max', 'ipd')) && hasPriv('story', 'batchImportToLib') && helper::hasFeature('storylib'); $canBatchChangeRoadmap = $canBeChanged && hasPriv($storyType, 'batchChangeRoadmap') && $config->vision == 'or' && ($storyType == 'requirement' || $storyType == 'epic'); $canBatchAction = $canBatchEdit || $canBatchClose || $canBatchReview || $canBatchChangeGrade || $canBatchChangeStage || $canBatchChangeModule || $canBatchChangePlan || $canBatchChangeParent || $canBatchAssignTo || $canBatchUnlink || $canBatchImportToLib || $canBatchChangeBranch || $canBatchChangeRoadmap; @@ -559,7 +563,7 @@ dtable ($isFromDoc || $isFromAI) ? null : set::sortLink($sortLink), ($isFromDoc || $isFromAI) ? null : set::checkInfo(jsRaw("function(checkedIdList){return window.setStatistics(this, checkedIdList, '{$summary}');}")), ($isFromDoc || $isFromAI) ? null : set::createTip($lang->story->create), - ($isFromDoc || $isFromAI) ? null : set::createLink($createStoryLink) + ($isFromDoc || $isFromAI || ($isProjectStory && $hasFrozenStories)) ? null : set::createLink($createStoryLink) ); modal(set::id('#batchUnlinkStoryBox')); diff --git a/module/product/zen.php b/module/product/zen.php index 1352103e03..ee01528e34 100644 --- a/module/product/zen.php +++ b/module/product/zen.php @@ -1492,6 +1492,7 @@ class productZen extends product $this->view->roadmaps = ($this->config->edition == 'ipd' && $storyType != 'story') ? array(0 => '') + $this->loadModel('roadmap')->getPairs($productID) : array(); $this->view->noclosedRoadmaps = ($this->config->edition == 'ipd' && $storyType != 'story') ? array(0 => '') + $this->loadModel('roadmap')->getPairs($productID, '', 'noclosed') : array(); + $this->view->hasFrozenStories = $isProjectStory ? $this->loadModel('project')->hasFrozenObject($projectID, 'SRS') : false; $this->display(); } diff --git a/module/productplan/test/lib/productplanzen.unittest.class.php b/module/productplan/test/lib/productplanzen.unittest.class.php index 6ca1c8bde3..7c4d651757 100644 --- a/module/productplan/test/lib/productplanzen.unittest.class.php +++ b/module/productplan/test/lib/productplanzen.unittest.class.php @@ -12,7 +12,7 @@ class productplanZenTest $this->objectModel = $tester->loadModel('productplan'); } - + /** * 模拟buildActionsList方法的逻辑 * Simulate buildActionsList method logic. @@ -70,7 +70,7 @@ class productplanZenTest $result->product = $product; $result->branchID = $branchID; $result->orderBy = $orderBy; - + // 模拟assignKanbanData方法的核心逻辑 if($product->type == 'normal') { @@ -82,7 +82,7 @@ class productplanZenTest $result->type = 'branch'; $result->branches = array(); // 简化返回 } - + return $result; } @@ -169,11 +169,11 @@ class productplanZenTest public function setSessionForViewPageTest(int $planID, string $type, string $orderBy, int $pageID, int $recPerPage): array { global $app; - + $result = array(); $beforeStoryList = isset($_SESSION['storyList']) ? $_SESSION['storyList'] : null; $beforeBugList = isset($_SESSION['bugList']) ? $_SESSION['bugList'] : null; - + // 模拟setSessionForViewPage的逻辑 if(in_array($type, array('story', 'bug')) && ($orderBy != 'order_desc' || $pageID != 1 || $recPerPage != 100)) { @@ -186,13 +186,13 @@ class productplanZenTest $_SESSION['bugList'] = $app->getURI(true); } } - + $result['beforeStoryList'] = $beforeStoryList; $result['beforeBugList'] = $beforeBugList; $result['afterStoryList'] = isset($_SESSION['storyList']) ? $_SESSION['storyList'] : null; $result['afterBugList'] = isset($_SESSION['bugList']) ? $_SESSION['bugList'] : null; $result['sessionChanged'] = ($beforeStoryList != $result['afterStoryList']) || ($beforeBugList != $result['afterBugList']); - + return $result; } @@ -209,9 +209,9 @@ class productplanZenTest $method = $reflection->getMethod('assignViewData'); $method->setAccessible(true); $method->invoke($this->objectZen, $plan); - + if(dao::isError()) return dao::getError(); - + $result = array(); $result['parentPlan'] = isset($this->objectZen->view->parentPlan) ? $this->objectZen->view->parentPlan->id : null; $result['childrenPlans'] = isset($this->objectZen->view->childrenPlans) ? count($this->objectZen->view->childrenPlans) : 0; @@ -221,7 +221,7 @@ class productplanZenTest $result['usersSet'] = isset($this->objectZen->view->users) ? 'set' : 'not_set'; $result['plansSet'] = isset($this->objectZen->view->plans) ? 'set' : 'not_set'; $result['modulesSet'] = isset($this->objectZen->view->modules) ? 'set' : 'not_set'; - + return $result; } @@ -237,18 +237,18 @@ class productplanZenTest public function buildBugSearchFormTest(object $plan, int $queryID, string $orderBy): array { global $config; - + $beforeActionURL = isset($config->bug->search['actionURL']) ? $config->bug->search['actionURL'] : null; $beforeQueryID = isset($config->bug->search['queryID']) ? $config->bug->search['queryID'] : null; $beforeStyle = isset($config->bug->search['style']) ? $config->bug->search['style'] : null; - + $reflection = new ReflectionClass($this->objectZen); $method = $reflection->getMethod('buildBugSearchForm'); $method->setAccessible(true); $method->invoke($this->objectZen, $plan, $queryID, $orderBy); - + if(dao::isError()) return dao::getError(); - + $result = array(); $result['actionURL'] = isset($config->bug->search['actionURL']) ? $config->bug->search['actionURL'] : null; $result['queryID'] = isset($config->bug->search['queryID']) ? $config->bug->search['queryID'] : null; @@ -258,7 +258,7 @@ class productplanZenTest $result['moduleValues'] = isset($config->bug->search['params']['module']['values']) ? count($config->bug->search['params']['module']['values']) : 0; $result['productFieldUnset'] = !isset($config->bug->search['fields']['product']); $result['branchHandled'] = true; - + return $result; } diff --git a/module/productplan/test/zen/buildbugsearchform.php b/module/productplan/test/zen/buildbugsearchform.php index a930a19824..37efada609 100755 --- a/module/productplan/test/zen/buildbugsearchform.php +++ b/module/productplan/test/zen/buildbugsearchform.php @@ -106,4 +106,4 @@ r($productplanTest->buildBugSearchFormTest($platformPlan, 0, 'pri_desc')) && p(' r($productplanTest->buildBugSearchFormTest($normalPlan, 0, 'status_desc')) && p('queryID,style,hasProductField') && e('0,simple,0'); r($productplanTest->buildBugSearchFormTest($normalPlan, 5, 'title_asc')) && p('queryID,hasPlanParam,hasModuleParam') && e('5,1,1'); r($productplanTest->buildBugSearchFormTest($branchPlan, 3, 'id_desc')) && p('queryID,hasPlanParam,hasModuleParam,hasBranchField') && e('3,1,1,1'); -r($productplanTest->buildBugSearchFormTest($platformPlan, 1, 'pri_asc')) && p('style,hasProductField,hasBranchField') && e('simple,0,1'); \ No newline at end of file +r($productplanTest->buildBugSearchFormTest($platformPlan, 1, 'pri_asc')) && p('style,hasProductField,hasBranchField') && e('simple,0,1'); diff --git a/module/productplan/test/zen/yaml/zt_productplan_builddataforbrowse.yaml b/module/productplan/test/zen/yaml/zt_productplan_builddataforbrowse.yaml index c599040c79..606118756d 100644 --- a/module/productplan/test/zen/yaml/zt_productplan_builddataforbrowse.yaml +++ b/module/productplan/test/zen/yaml/zt_productplan_builddataforbrowse.yaml @@ -10,64 +10,64 @@ fields: range: 1-10 prefix: "" postfix: "" - + - field: product note: 产品ID range: 1-3 - + - field: branch note: 分支ID range: 0{3},1{2},2{2},'1,2'{1},'2,3'{1},'0,1'{1} - + - field: parent note: 父计划ID range: 0{8},-1{1},1{1} - + - field: title note: 计划标题 range: 计划{3},版本{2},里程碑{2},迭代{2},发布{1} format: "%s%d" - + - field: status note: 计划状态 range: wait{4},doing{3},done{2},closed{1} - + - field: desc note: 计划描述 range: 简单描述{3},'包含HTML标签的描述
'{2},'多行\n描述内容'{2},'{3} - + - field: begin note: 开始时间 range: 2024-01-01{3},2024-02-01{2},2024-03-01{2},2030-01-01{2},''{1} - + - field: end note: 结束时间 range: 2024-12-31{3},2024-11-30{2},2024-10-31{2},2030-01-01{2},''{1} - + - field: finishedDate note: 完成时间 range: 2024-12-31 23:59:59{2},''{8} - + - field: closedDate note: 关闭时间 range: 2024-12-31 23:59:59{1},''{9} - + - field: order note: 排序 range: 1{3},2{2},3{2},4{2},5{1} - + - field: closedReason note: 关闭原因 range: ''{9},done{1} - + - field: createdBy note: 创建者 range: admin{5},user1{3},user2{2} - + - field: createdDate note: 创建时间 range: 2024-01-01 10:00:00{3},2024-02-01 10:00:00{2},2024-03-01 10:00:00{2},2024-04-01 10:00:00{2},2024-05-01 10:00:00{1} - + - field: deleted note: 是否删除 range: '0'{10} \ No newline at end of file diff --git a/module/program/zen.php b/module/program/zen.php index 9d75b17226..64f931b808 100644 --- a/module/program/zen.php +++ b/module/program/zen.php @@ -361,7 +361,7 @@ class programZen extends program if($this->config->edition != 'open') { $flow = $this->loadModel('workflow')->getByModule($moduleName); - if($flow && in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project'; + if($flow && in_array($flow->app, array('scrum', 'waterfall', 'kanbanProject'))) $flow->app = 'project'; if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=$programID&moduleName=$moduleName") . "#app=$flow->app"; } if($moduleName == 'project') diff --git a/module/programplan/config/form.php b/module/programplan/config/form.php index 1f0f691d53..cf8a7975e2 100644 --- a/module/programplan/config/form.php +++ b/module/programplan/config/form.php @@ -11,28 +11,29 @@ $config->programplan->form->create['order'] = array('label' => '', $config->programplan->form->create['name'] = array('label' => $lang->nameAB, 'type' => 'string', 'control' => 'text', 'required' => true, 'default' => '', 'base' => true, 'filter' => 'trim'); $config->programplan->form->create['code'] = array('label' => $lang->code, 'type' => 'string', 'control' => 'text', 'required' => false, 'default' => '', 'filter' => 'trim'); $config->programplan->form->create['PM'] = array('label' => $lang->programplan->PMAB, 'type' => 'string', 'control' => 'picker', 'required' => false, 'default' => '', 'options' => ''); -if(!empty($config->setPercent)) $config->programplan->form->create['percent'] = array('label' => $lang->programplan->percent, 'type' => 'float', 'control' => 'text', 'required' => false, 'default' => 0); -$config->programplan->form->create['attribute'] = array('label' => $lang->programplan->attribute, 'type' => 'string', 'control' => 'picker', 'required' => false, 'default' => 0, 'options' => $lang->stage->typeList); -$config->programplan->form->create['type'] = array('label' => $lang->execution->method, 'type' => 'string', 'control' => 'picker', 'required' => true, 'default' => 'stage', 'options' => $lang->execution->typeList); -$config->programplan->form->create['point'] = array('label' => $lang->programplan->point, 'type' => 'array', 'control' => 'picker', 'required' => false, 'default' => '', 'options' => array(''), 'multiple' => true); -$config->programplan->form->create['parallel'] = array('label' => '', 'type' => 'int', 'control' => 'hidden', 'required' => false, 'default' => 0); -$config->programplan->form->create['acl'] = array('label' => $lang->programplan->acl, 'type' => 'string', 'control' => 'picker', 'required' => false, 'default' => 'open', 'options' => $lang->execution->aclList); -$config->programplan->form->create['begin'] = array('label' => $lang->programplan->begin, 'type' => 'date', 'control' => 'date', 'required' => true, 'default' => null, 'skipRequired' => array('enabled' => 'off')); -$config->programplan->form->create['end'] = array('label' => $lang->programplan->end, 'type' => 'date', 'control' => 'date', 'required' => true, 'default' => null, 'skipRequired' => array('enabled' => 'off')); -$config->programplan->form->create['realBegan'] = array('label' => $lang->programplan->realBegan, 'type' => 'date', 'control' => 'date', 'required' => false, 'default' => null); -$config->programplan->form->create['realEnd'] = array('label' => $lang->programplan->realEnd, 'type' => 'date', 'control' => 'date', 'required' => false, 'default' => null); -$config->programplan->form->create['milestone'] = array('label' => $lang->programplan->milestone, 'type' => 'int', 'control' => 'radioList','required' => false, 'default' => 0, 'options' => $lang->programplan->milestoneList); -$config->programplan->form->create['desc'] = array('label' => $lang->programplan->desc, 'type' => 'string', 'control' => 'textarea', 'required' => false, 'default' => '', 'filter' => 'trim'); -$config->programplan->form->create['output'] = array('label' => '', 'type' => 'string', 'control' => 'text', 'required' => false, 'default' => ''); -$config->programplan->form->create['level'] = array('label' => '', 'type' => 'string', 'control' => 'text', 'required' => false, 'default' => 0); -$config->programplan->form->create['syncData'] = array('label' => '', 'type' => 'string', 'control' => 'text', 'required' => false, 'default' => 0); +if(!empty($config->setPercent)) $config->programplan->form->create['percent'] = array('label' => $lang->programplan->percent, 'type' => 'string', 'control' => 'text', 'required' => false, 'default' => ''); +$config->programplan->form->create['attribute'] = array('label' => $lang->programplan->attribute, 'type' => 'string', 'control' => 'picker', 'required' => false, 'default' => 0, 'options' => $lang->stage->typeList); +$config->programplan->form->create['type'] = array('label' => $lang->execution->method, 'type' => 'string', 'control' => 'picker', 'required' => true, 'default' => 'stage', 'options' => $lang->execution->typeList); +$config->programplan->form->create['point'] = array('label' => $lang->programplan->point, 'type' => 'array', 'control' => 'picker', 'required' => false, 'default' => '', 'options' => array(''), 'multiple' => true); +$config->programplan->form->create['parallel'] = array('label' => '', 'type' => 'int', 'control' => 'hidden', 'required' => false, 'default' => 0); +$config->programplan->form->create['acl'] = array('label' => $lang->programplan->acl, 'type' => 'string', 'control' => 'picker', 'required' => false, 'default' => 'open', 'options' => $lang->execution->aclList); +$config->programplan->form->create['begin'] = array('label' => $lang->programplan->begin, 'type' => 'date', 'control' => 'date', 'required' => true, 'default' => null, 'skipRequired' => array('enabled' => 'off')); +$config->programplan->form->create['end'] = array('label' => $lang->programplan->end, 'type' => 'date', 'control' => 'date', 'required' => true, 'default' => null, 'skipRequired' => array('enabled' => 'off')); +$config->programplan->form->create['realBegan'] = array('label' => $lang->programplan->realBegan, 'type' => 'date', 'control' => 'date', 'required' => false, 'default' => null); +$config->programplan->form->create['realEnd'] = array('label' => $lang->programplan->realEnd, 'type' => 'date', 'control' => 'date', 'required' => false, 'default' => null); +$config->programplan->form->create['milestone'] = array('label' => $lang->programplan->milestone, 'type' => 'int', 'control' => 'radioList','required' => false, 'default' => 0, 'options' => $lang->programplan->milestoneList); +$config->programplan->form->create['desc'] = array('label' => $lang->programplan->desc, 'type' => 'string', 'control' => 'textarea', 'required' => false, 'default' => '', 'filter' => 'trim'); +$config->programplan->form->create['output'] = array('label' => '', 'type' => 'string', 'control' => 'text', 'required' => false, 'default' => ''); +$config->programplan->form->create['level'] = array('label' => '', 'type' => 'string', 'control' => 'text', 'required' => false, 'default' => 0); +$config->programplan->form->create['syncData'] = array('label' => '', 'type' => 'string', 'control' => 'text', 'required' => false, 'default' => 0); +$config->programplan->form->create['defaultPoint'] = array('label' => '', 'type' => 'array', 'control' => 'picker', 'required' => false, 'default' => '', 'options' => array(''), 'multiple' => true); $config->programplan->form->edit = array(); $config->programplan->form->edit['parent'] = array('required' => false, 'type' => 'int', 'default' => 0); $config->programplan->form->edit['name'] = array('required' => true, 'type' => 'string', 'default' => ''); $config->programplan->form->edit['code'] = array('required' => false, 'type' => 'string', 'default' => ''); $config->programplan->form->edit['PM'] = array('required' => false, 'type' => 'string', 'default' => ''); -$config->programplan->form->edit['percent'] = array('required' => false, 'type' => 'float', 'default' => 0); +$config->programplan->form->edit['percent'] = array('required' => false, 'type' => 'string', 'default' => ''); $config->programplan->form->edit['attribute'] = array('required' => false, 'type' => 'string', 'default' => ''); $config->programplan->form->edit['acl'] = array('required' => false, 'type' => 'string', 'default' => ''); $config->programplan->form->edit['begin'] = array('required' => true, 'type' => 'string', 'default' => null); diff --git a/module/programplan/control.php b/module/programplan/control.php index 7312954196..617b7cefd4 100644 --- a/module/programplan/control.php +++ b/module/programplan/control.php @@ -150,6 +150,7 @@ class programplan extends control $viewData->syncData = $syncData; $this->programplanZen->buildCreateView($viewData); + $this->display(); } /** @@ -187,6 +188,7 @@ class programplan extends control if(empty($plan->realBegan)) $plan->realBegan = null; if(empty($plan->realEnd)) $plan->realEnd = null; + if(empty($plan->percent)) $plan->percent = 0; $plan = $this->programplanZen->prepareEditPlan($planID, $projectID, $plan, isset($parentStage) ? $parentStage : null); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); diff --git a/module/programplan/js/create.ui.js b/module/programplan/js/create.ui.js index 4ce4548a08..53cb882992 100644 --- a/module/programplan/js/create.ui.js +++ b/module/programplan/js/create.ui.js @@ -243,7 +243,7 @@ window.handleRenderRow = function($row, index, data) $row.find('[data-name="attribute"]').find('.picker-box').on('inited', function(e, info){ info[0].render({disabled: true}); }); - const $point = $row.find('[data-name="point"]'); + const $point = $row.find('[data-name="point"],[data-name="defaultPoint"]'); $point.find('.picker-box').on('inited', function(e, info) { let items = [{text: '', value: ''}]; @@ -251,21 +251,21 @@ window.handleRenderRow = function($row, index, data) if(typeof data != 'undefined' && typeof data.attribute != 'undefined' && !disabled) { - const attribute = data.attribute; - for(let point in ipdStagePoint[attribute]) + const stageID = data.stageID; + for(let point in ipdStagePoint[stageID]) { let disabled = false - let value = ipdStagePoint[attribute][point]; - let hint = value; + let text = ipdStagePoint[stageID][point]; + let hint = text; /* 如果已经评审过，则置灰不能选。*/ - if(reviewedPoints[value] !== undefined && reviewedPoints[value].disabled) + if(reviewedPoints[point] !== undefined && reviewedPoints[point].disabled) { disabled = true; hint = reviewedPointTip; } - items.push({text: value, value: value, disabled: disabled, hint: hint}); + items.push({text: text, value: point, disabled: disabled, hint: hint}); } } @@ -296,11 +296,11 @@ window.handleRenderRow = function($row, index, data) { let selection = $row.find('div.picker-multi-selection'); selection.each(function(index, element) { - /* 获取title。*/ - let $title = $(element).attr('title'); + /* 获取评审点ID。*/ + let pointID = $(element).find('div.picker-deselect-btn').data('value'); /* 如果该评审点以提交评审，则不能取消选择。*/ - if(reviewedPoints[$title] !== undefined && reviewedPoints[$title].disabled) + if(reviewedPoints[pointID] !== undefined && reviewedPoints[pointID].disabled) { $(element).attr('title', reviewedPointTip); // 修改title $(element).find(".picker-deselect-btn").remove(); // 禁用点击事件 diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php index 681c466a76..04fd962629 100644 --- a/module/programplan/lang/de.php +++ b/module/programplan/lang/de.php @@ -117,6 +117,7 @@ $lang->programplan->confirmDelete = 'Do you want to delete the current plan? $lang->programplan->confirmChangeAttr = 'The type of the sub-stage will be adjusted to "%s" synchronously according to the type of the parent stage after modification. Do you want to save?'; $lang->programplan->noticeChangeAttr = 'The type of the sub-stage will be adjusted to "%s" synchronously according to the type of the parent stage after modification'; $lang->programplan->workloadTips = 'The proportion of the sub stage workload is divided by 100%.'; +$lang->programplan->emptyStageTip = 'Please contact the administrator to set up the IPD stage list in the "Project Process Configuration" in the backend.'; $lang->programplan->stageCustom['date'] = 'Show Date'; $lang->programplan->stageCustom['task'] = 'Show Task'; @@ -134,7 +135,7 @@ $lang->programplan->ganttCustom['delay'] = 'Delay'; $lang->programplan->ganttCustom['delayDays'] = 'Delay days'; $lang->programplan->error = new stdclass(); -$lang->programplan->error->percentNumber = '"Workload %" must be digits.'; +$lang->programplan->error->percentNumber = '"Workload %" must be non-negative'; $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.'; $lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100% of one stage.'; $lang->programplan->error->createdTask = 'The task has been decomposed. Sub phases cannot be added.'; diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php index d5151508cd..3a044306f2 100644 --- a/module/programplan/lang/en.php +++ b/module/programplan/lang/en.php @@ -117,6 +117,7 @@ $lang->programplan->confirmDelete = 'Do you want to delete the current plan? $lang->programplan->confirmChangeAttr = 'The type of the sub-stage will be adjusted to "%s" synchronously according to the type of the parent stage after modification. Do you want to save?'; $lang->programplan->noticeChangeAttr = 'The type of the sub-stage will be adjusted to "%s" synchronously according to the type of the parent stage after modification.'; $lang->programplan->workloadTips = 'The workload of the sub stage is divided by 100%.'; +$lang->programplan->emptyStageTip = 'Please contact the administrator to set up the IPD stage list in the "Project Process Configuration" in the backend.'; $lang->programplan->stageCustom['date'] = 'Show Date'; $lang->programplan->stageCustom['task'] = 'Show Task'; @@ -134,7 +135,7 @@ $lang->programplan->ganttCustom['delay'] = 'Delay'; $lang->programplan->ganttCustom['delayDays'] = 'Delay days'; $lang->programplan->error = new stdclass(); -$lang->programplan->error->percentNumber = '"Workload %" must be digits.'; +$lang->programplan->error->percentNumber = '"Workload %" must be non-negative'; $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.'; $lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100% of one stage.'; $lang->programplan->error->createdTask = 'The task is decomposed. Sub stages cannot be added.'; diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php index cb7976fe87..5bb906fa28 100644 --- a/module/programplan/lang/fr.php +++ b/module/programplan/lang/fr.php @@ -117,6 +117,7 @@ $lang->programplan->confirmDelete = 'Do you want to delete the current plan? $lang->programplan->confirmChangeAttr = 'The type of the sub-stage will be adjusted to "%s" synchronously according to the type of the parent stage after modification. Do you want to save?'; $lang->programplan->noticeChangeAttr = 'The type of the sub-stage will be adjusted to "%s" synchronously according to the type of the parent stage after modification.'; $lang->programplan->workloadTips = 'The proportion of the sub stage workload is divided by 100%.'; +$lang->programplan->emptyStageTip = 'Please contact the administrator to set up the IPD stage list in the "Project Process Configuration" in the backend.'; $lang->programplan->stageCustom['date'] = 'Show Date'; $lang->programplan->stageCustom['task'] = 'Show Task'; @@ -134,7 +135,7 @@ $lang->programplan->ganttCustom['delay'] = 'Delay'; $lang->programplan->ganttCustom['delayDays'] = 'Delay days'; $lang->programplan->error = new stdclass(); -$lang->programplan->error->percentNumber = '"Workload %" must be digits.'; +$lang->programplan->error->percentNumber = '"Workload %" must be non-negative'; $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.'; $lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100% of one stage.'; $lang->programplan->error->createdTask = 'The task has been decomposed. Sub phases cannot be added.'; diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php index 8076fb682f..6f1dc72612 100644 --- a/module/programplan/lang/zh-cn.php +++ b/module/programplan/lang/zh-cn.php @@ -117,6 +117,7 @@ $lang->programplan->confirmDelete = '确定要删除当前计划吗？'; $lang->programplan->confirmChangeAttr = '修改后子阶段的类型将根据父阶段类型同步调整为“%s”，是否保存？'; $lang->programplan->noticeChangeAttr = '修改后子阶段的类型将根据父阶段类型同步调整为“%s”'; $lang->programplan->workloadTips = '子阶段工作量占比按百分百的比例进行拆分'; +$lang->programplan->emptyStageTip = '请联系管理员，在后台的“项目流程配置”中设置IPD阶段列表。'; $lang->programplan->stageCustom['date'] = '显示日期'; $lang->programplan->stageCustom['task'] = '显示任务'; @@ -134,7 +135,7 @@ $lang->programplan->ganttCustom['delay'] = '是否延期'; $lang->programplan->ganttCustom['delayDays'] = '延期天数'; $lang->programplan->error = new stdclass(); -$lang->programplan->error->percentNumber = '"工作量占比"必须为数字'; +$lang->programplan->error->percentNumber = '"工作量占比"必须为非负数'; $lang->programplan->error->planFinishSmall = '"计划完成时间"必须大于"计划开始时间"'; $lang->programplan->error->percentOver = '相同父阶段的子阶段工作量占比之和不超过100%'; $lang->programplan->error->createdTask = '已分解任务，不可添加子阶段'; diff --git a/module/programplan/model.php b/module/programplan/model.php index 369b89a4f6..ba5d3923bb 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -399,8 +399,6 @@ 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; @@ -418,22 +416,6 @@ 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; diff --git a/module/programplan/tao.php b/module/programplan/tao.php index 9135d02929..22555a4541 100644 --- a/module/programplan/tao.php +++ b/module/programplan/tao.php @@ -26,7 +26,7 @@ class programplanTao extends programplanModel if(empty($executionID)) return array(); $projectModel = $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($executionID)->fetch('model'); - return $this->dao->select('t1.*')->from(TABLE_EXECUTION)->alias('t1') + $stageList = $this->dao->select('t1.*')->from(TABLE_EXECUTION)->alias('t1') ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.project') ->where('1 = 1') ->beginIF(!in_array($projectModel, array('waterfallplus', 'ipd')))->andWhere('t1.type')->eq('stage')->fi() @@ -45,6 +45,24 @@ class programplanTao extends programplanModel ->markRight(1) ->orderBy($orderBy) ->fetchAll('id', false); + + if($projectModel == 'ipd') + { + $stagePointGroup = $this->dao->select('execution,category,categoryTitle')->from(TABLE_OBJECT) + ->where('execution')->in(array_keys($stageList)) + ->andWhere('type')->eq('decision') + ->andWhere('enabled')->eq('1') + ->fetchGroup('execution', 'category'); + foreach($stageList as $stage) + { + $stage->enabledPoints = array(); + if(isset($stagePointGroup[$stage->id])) + { + foreach($stagePointGroup[$stage->id] as $point) $stage->enabledPoints[$point->category] = $point->categoryTitle; + } + } + } + return $stageList; } /** @@ -75,7 +93,7 @@ class programplanTao extends programplanModel $this->lang->project->name = $this->lang->programplan->name; $this->lang->project->code = $this->lang->execution->code; - $this->dao->update(TABLE_PROJECT)->data($plan, 'point')->autoCheck() + $this->dao->update(TABLE_PROJECT)->data($plan, 'point,defaultPoint')->autoCheck() ->checkIF(!empty($plan->name) && $getName, 'name', 'unique', "id in ({$relatedIdList}) and type in ('sprint','stage') and `project` = {$oldPlan->project} and `deleted` = '0' and `parent` = {$oldPlan->parent}") ->checkIF(!empty($plan->code) && $setCode, 'code', 'unique', "id != {$planID} and type in ('sprint','stage','kanban') and `project` = {$oldPlan->project} and `deleted` = '0' and `parent` = {$oldPlan->parent}") ->where('id')->eq($planID) @@ -435,11 +453,12 @@ class programplanTao extends programplanModel { if($point->end and !helper::isZeroDate($point->end)) return $point->end; - $end = $reviewDeadline[$planID]['stageEnd']; - $begin = $reviewDeadline[$planID]['stageBegin']; + $end = $reviewDeadline[$planID]['stageEnd']; + $begin = $reviewDeadline[$planID]['stageBegin']; - if(strpos($point->category, "DCP") !== false) $end = $this->getReviewDeadline($end, 2); - if(strpos($point->category, "TR") !== false) + $pointType = $this->dao->select('type')->from(TABLE_DECISION)->where('id')->eq($point->id)->fetch('type'); + if($pointType == 'DCP') $end = $this->getReviewDeadline($end, 2); + if($pointType == 'TR') { if(isset($reviewDeadline[$planID]['taskEnd']) and !helper::isZeroDate($reviewDeadline[$planID]['taskEnd'])) return $reviewDeadline[$planID]['taskEnd']; $end = $this->getReviewDeadline($end); @@ -477,13 +496,10 @@ class programplanTao extends programplanModel foreach($reviewPoints as $point) { - if(!isset($this->config->review->ipdReviewPoint->{$plan->attribute})) continue; + if($point->execution != $plan->id) continue; if(!isset($point->status)) $point->status = ''; - $categories = $this->config->review->ipdReviewPoint->{$plan->attribute}; - if(!in_array($point->category, $categories)) continue; - - $dataID = "{$plan->id}-{$point->category}-{$point->id}"; + $dataID = "{$plan->id}-point{$point->category}-{$point->id}"; if($selectCustom && strpos($selectCustom, "point") !== false && !$plan->parent) $datas['data'][$dataID] = $this->buildPointDataForGantt($plan->id, $point, $reviewDeadline); } } @@ -550,7 +566,7 @@ class programplanTao extends programplanModel $plan->openedDate = helper::now(); $plan->openedVersion = $this->config->version; if(!isset($plan->acl)) $plan->acl = $this->dao->findByID($plan->parent)->from(TABLE_PROJECT)->fetch('acl'); - $this->dao->insert(TABLE_PROJECT)->data($plan, 'point')->exec(); + $this->dao->insert(TABLE_PROJECT)->data($plan, 'point,defaultPoint')->exec(); if(dao::isError()) return false; @@ -558,7 +574,7 @@ class programplanTao extends programplanModel $this->insertProjectSpec($stageID, $plan); /* Ipd project create default review points. */ - if($project && $project->model == 'ipd' && $this->config->edition == 'ipd' && !$parentID) $this->loadModel('review')->createDefaultPoint($project->id, $productID, $plan->attribute); + if($project && $project->model == 'ipd' && $this->config->edition == 'ipd' && !$parentID) $this->loadModel('review')->createDefaultPoint($project->id, $stageID, $plan->defaultPoint); if($plan->type == 'kanban') { @@ -672,6 +688,7 @@ class programplanTao extends programplanModel /* Set default progress from database. */ $data->progress = $plan->progress / 100; $data->taskProgress = $plan->progress . '%'; + $data->frozen = $plan->frozen; if($data->endDate > $data->start_date) $data->duration = helper::diffDate($data->endDate, $data->start_date) + 1; if(empty($data->start_date) || empty($data->endDate)) $data->duration = 1; @@ -698,7 +715,7 @@ class programplanTao extends programplanModel $end = $this->getPointEndDate($planID, $point, $reviewDeadline); $data = new stdclass(); - $data->id = $planID . '-' . $point->category . '-' . $point->id; + $data->id = $planID . '-point' . $point->category . '-' . $point->id; $data->reviewID = $point->reviewID; $data->type = 'point'; $data->text = " " . $point->title; @@ -785,7 +802,8 @@ class programplanTao extends programplanModel $taskPri = "%s "; $pri = zget($this->lang->task->priList, $task->pri); $priIcon = sprintf($taskPri, $task->pri, $pri, $pri); - $progress = $task->consumed ? round($task->consumed / ($task->left + $task->consumed), 3) : 0; + $total = $task->left + $task->consumed; + $progress = $total ? round($task->consumed / $total, 3) : 0; $data = new stdclass(); $data->id = $task->id; diff --git a/module/programplan/test/tao/buildganttdata4ipd.php b/module/programplan/test/tao/buildganttdata4ipd.php index fe72a62b94..137981ebca 100644 --- a/module/programplan/test/tao/buildganttdata4ipd.php +++ b/module/programplan/test/tao/buildganttdata4ipd.php @@ -7,9 +7,9 @@ title=测试 loadModel->buildGanttData4IPD() cid=17760 - 禅道版本为开源版。 @0 -- gantt数据数。 @20 +- gantt数据数。 @11 - 禅道版本为IPD。 - - 属性id @1-PP-1 + - 属性id @1-pointPP-1 - 属性reviewID @1 - 属性type @point - 属性text @ 这个是评审或基线的标题1 @@ -21,7 +21,6 @@ include dirname(__FILE__, 5). '/test/lib/init.php'; su('admin'); zenData('review')->gen(20); -zenData('object')->gen(20); $project = zenData('project'); $project->type->range('stage'); $project->attribute->range('devel'); @@ -29,13 +28,13 @@ $project->begin->range('`2023-09-28`'); $project->end->range('`2024-04-02`'); $project->gen(10); +$object = zenData('object'); +$object->execution->range('1-20'); +$object->gen(20); + global $tester; $tester->loadModel('programplan'); -$tester->programplan->app->loadConfig('review'); -$tester->programplan->config->review->ipdReviewPoint = new stdclass(); -$tester->programplan->config->review->ipdReviewPoint->devel = array('PP'); - $plans = $tester->programplan->dao->select('*')->from(TABLE_PROJECT)->where('type')->eq('stage')->fetchAll('id'); $plans = $tester->programplan->processPlans($plans); @@ -47,8 +46,8 @@ r(isset($datas['data']['1-PP-1'])) && p() && e("0"); //禅道版本为开源版 $tester->programplan->config->edition = 'ipd'; $datas = $tester->programplan->buildGanttData4IPD($normalResult['datas'], 1, 1, 'point', $normalResult['reviewDeadline']); -r(count($datas['data'])) && p() && e('20'); //gantt数据数。 -r($datas['data']['1-PP-1']) && p('id,reviewID,type,text') && e("1-PP-1,1,point, 这个是评审或基线的标题1"); //禅道版本为IPD。 +r(count($datas['data'])) && p() && e('11'); //gantt数据数。 +r($datas['data']['1-pointPP-1']) && p('id,reviewID,type,text') && e("1-pointPP-1,1,point, 这个是评审或基线的标题1"); //禅道版本为IPD。 $datas = $tester->programplan->buildGanttData4IPD($normalResult['datas'], 1, 1, '', $normalResult['reviewDeadline']); -r(isset($datas['data']['1-PP-1'])) && p() && e("0"); //selectCustom 不包含 point。 +r(isset($datas['data']['1-pointPP-1'])) && p() && e("0"); //selectCustom 不包含 point。 diff --git a/module/programplan/test/tao/buildpointdataforgantt.php b/module/programplan/test/tao/buildpointdataforgantt.php index 048c4fe1e7..c80bc6523c 100755 --- a/module/programplan/test/tao/buildpointdataforgantt.php +++ b/module/programplan/test/tao/buildpointdataforgantt.php @@ -7,11 +7,11 @@ title=测试 programplanTao::buildPointDataForGantt(); timeout=0 cid=17764 -- 步骤1：正常评审点数据构建属性id @1-PP-1 +- 步骤1：正常评审点数据构建属性id @1-pointPP-1 - 步骤2：验证数据类型属性type @point - 步骤3：验证评审状态属性rawStatus @pass -- 步骤4：DCP类别评审点处理属性id @2-DCP-2 -- 步骤5：TR类别评审点处理属性id @3-TR4-3 +- 步骤4：DCP类别评审点处理属性id @2-pointDCP-2 +- 步骤5：TR类别评审点处理属性id @3-pointTR4-3 */ @@ -84,8 +84,8 @@ $reviewDeadline = array( ); // 6. 执行测试步骤 -r($programplanTest->buildPointDataForGanttTest(1, $normalPoint, $reviewDeadline)) && p('id') && e('1-PP-1'); // 步骤1：正常评审点数据构建 +r($programplanTest->buildPointDataForGanttTest(1, $normalPoint, $reviewDeadline)) && p('id') && e('1-pointPP-1'); // 步骤1：正常评审点数据构建 r($programplanTest->buildPointDataForGanttTest(1, $normalPoint, $reviewDeadline)) && p('type') && e('point'); // 步骤2：验证数据类型 r($programplanTest->buildPointDataForGanttTest(1, $normalPoint, $reviewDeadline)) && p('rawStatus') && e('pass'); // 步骤3：验证评审状态 -r($programplanTest->buildPointDataForGanttTest(2, $pointWithoutEnd, $reviewDeadline)) && p('id') && e('2-DCP-2'); // 步骤4：DCP类别评审点处理 -r($programplanTest->buildPointDataForGanttTest(3, $trPoint, $reviewDeadline)) && p('id') && e('3-TR4-3'); // 步骤5：TR类别评审点处理 \ No newline at end of file +r($programplanTest->buildPointDataForGanttTest(2, $pointWithoutEnd, $reviewDeadline)) && p('id') && e('2-pointDCP-2'); // 步骤4：DCP类别评审点处理 +r($programplanTest->buildPointDataForGanttTest(3, $trPoint, $reviewDeadline)) && p('id') && e('3-pointTR4-3'); // 步骤5：TR类别评审点处理 diff --git a/module/programplan/test/tao/getpointenddate.php b/module/programplan/test/tao/getpointenddate.php index 84d1534cf3..df0413dd05 100644 --- a/module/programplan/test/tao/getpointenddate.php +++ b/module/programplan/test/tao/getpointenddate.php @@ -7,7 +7,7 @@ title=测试 loadModel->getPointEndDate() cid=17770 - 传入point->end不为空 @2023-09-28 -- 传入point->end为空 @2023-12-28 +- 传入point->end为空 @2023-12-21 - 传入point->category为DCP @2023-12-26 - 传入point->category为TR @2023-12-21 - 传入reviewDeadline含有taskEnd数据 @2023-12-18 @@ -23,6 +23,11 @@ $project->type->range('project,stage{100}'); $project->milestone->range('0{3},1{100}'); $project->gen(5); +$decision = zenData('decision'); +$decision->id->range('1-2'); +$decision->type->range('TR,DCP'); +$decision->gen(2); + global $tester; $tester->loadModel('programplan'); @@ -39,12 +44,13 @@ $reviewDeadline[1]['stageEnd'] = '2023-12-28'; r($tester->programplan->getPointEndDate($planID, $point, array())) && p() && e('2023-09-28'); //传入point->end不为空 $point->end = null; -r($tester->programplan->getPointEndDate($planID, $point, $reviewDeadline)) && p() && e('2023-12-28'); //传入point->end为空 +$point->id = 1; +r($tester->programplan->getPointEndDate($planID, $point, $reviewDeadline)) && p() && e('2023-12-21'); //传入point->end为空 -$point->category = 'DCP'; +$point->id = 2; r($tester->programplan->getPointEndDate($planID, $point, $reviewDeadline)) && p() && e('2023-12-26'); //传入point->category为DCP -$point->category = 'TR'; +$point->id = 1; r($tester->programplan->getPointEndDate($planID, $point, $reviewDeadline)) && p() && e('2023-12-21'); //传入point->category为TR $reviewDeadline[1]['taskEnd'] = '2023-12-18'; diff --git a/module/programplan/test/zen/buildcreateview.php b/module/programplan/test/zen/buildcreateview.php index 40c3807a94..953308660f 100755 --- a/module/programplan/test/zen/buildcreateview.php +++ b/module/programplan/test/zen/buildcreateview.php @@ -30,4 +30,4 @@ r($programplanTest->buildCreateViewTest(1, 'normal')) && p('success') && e('1'); r($programplanTest->buildCreateViewTest(2, 'ipd')) && p('success') && e('1'); r($programplanTest->buildCreateViewTest(3, 'withProduct')) && p('success') && e('1'); r($programplanTest->buildCreateViewTest(4, 'withPlan')) && p('success') && e('1'); -r($programplanTest->buildCreateViewTest(5, 'stageType')) && p('success') && e('1'); \ No newline at end of file +r($programplanTest->buildCreateViewTest(5, 'stageType')) && p('success') && e('1'); diff --git a/module/programplan/test/zen/prepareeditplan.php b/module/programplan/test/zen/prepareeditplan.php index 58d0c167f7..83c1e2bd71 100755 --- a/module/programplan/test/zen/prepareeditplan.php +++ b/module/programplan/test/zen/prepareeditplan.php @@ -163,4 +163,4 @@ $plan7->percent = 15; $plan7->product = 0; $result7 = $func->invokeArgs($instance, [5, 1, $plan7, $parentStage1]); -r($result7) && p('begin,end') && e('2024-03-01,2024-05-31'); // 步骤7: 无效项目ID,但日期合法 \ No newline at end of file +r($result7) && p('begin,end') && e('2024-03-01,2024-05-31'); // 步骤7: 无效项目ID,但日期合法 diff --git a/module/programplan/ui/create.html.php b/module/programplan/ui/create.html.php index 432d47ec5f..895af18ee6 100644 --- a/module/programplan/ui/create.html.php +++ b/module/programplan/ui/create.html.php @@ -15,7 +15,6 @@ namespace zin; include($this->app->getModuleRoot() . 'ai/ui/inputinject.html.php'); $fields = $this->config->programplan->form->create; -$enabledPoints = isset($enabledPoints) ? $enabledPoints : new stdclass(); $reviewedPoints = isset($reviewedPoints) ? $reviewedPoints : array(); $canParallel = isset($canParallel) ? $canParallel : false; $customKey = 'createFields'; @@ -181,6 +180,7 @@ $fnGenerateFields = function() use ($lang, $requiredFields, $showFields, $fields 'data-class-name' => 'text-gray border border-gray-300' ); } + if($name == 'defaultPoint') $field['hidden'] = true; if($name == 'name') $field['width'] = '240px'; if(!isset($field['width'])) $field['width'] = '120px'; @@ -192,7 +192,7 @@ $fnGenerateFields = function() use ($lang, $requiredFields, $showFields, $fields }; /* Generate default rendering data. */ -$fnGenerateDefaultData = function() use ($config, $plans, $planID, $stages, $executionType, $enabledPoints, $project) +$fnGenerateDefaultData = function() use ($config, $plans, $planID, $stages, $executionType, $project) { $items = array(); @@ -201,17 +201,21 @@ $fnGenerateDefaultData = function() use ($config, $plans, $planID, $stages, $exe { foreach($stages as $stage) { - $points = !empty($enabledPoints->{$stage->type}) ? $enabledPoints->{$stage->type} : array(); + $TRpoints = isset($stage->pointList['TR']) ? array_keys($stage->pointList['TR']) : array(); + $DCPpoints = isset($stage->pointList['DCP']) ? array_keys($stage->pointList['DCP']) : array(); + $points = array_merge($TRpoints, $DCPpoints); - $item = new stdClass(); - $item->name = $stage->name; - $item->code = isset($stage->code) ? $stage->code : ''; - $item->percent = $stage->percent; - $item->attribute = $stage->type; - $item->acl = 'open'; - $item->milestone = 0; - $item->point = implode(',', $points); - $item->parallel = 0; + $item = new stdClass(); + $item->name = $stage->name; + $item->code = isset($stage->code) ? $stage->code : ''; + $item->percent = $stage->percent ?: 0; + $item->attribute = $stage->type; + $item->acl = 'open'; + $item->milestone = 0; + $item->point = implode(',', $points); + $item->defaultPoint = implode(',', $points); + $item->parallel = 0; + $item->stageID = $stage->id; $items[] = $item; } @@ -220,7 +224,7 @@ $fnGenerateDefaultData = function() use ($config, $plans, $planID, $stages, $exe /* Create stages for exist project. */ foreach($plans as $plan) { - $points = !empty($enabledPoints->{$plan->attribute}) ? $enabledPoints->{$plan->attribute} : array(); + $points = isset($plan->enabledPoints) ? array_keys($plan->enabledPoints) : array(); $item = new stdClass(); $item->disabled = $plan->type != 'stage'; @@ -231,7 +235,7 @@ $fnGenerateDefaultData = function() use ($config, $plans, $planID, $stages, $exe $item->code = $plan->code; $item->PM = $plan->PM; $item->status = $plan->status; - $item->percent = $plan->percent; + $item->percent = $plan->percent ?: 0; $item->attribute = $plan->attribute; $item->acl = $plan->acl; $item->milestone = $plan->milestone; @@ -244,6 +248,7 @@ $fnGenerateDefaultData = function() use ($config, $plans, $planID, $stages, $exe $item->order = $plan->order; $item->parallel = $plan->parallel; $item->point = implode(',', $points); + $plan->stageID = $plan->id; $plan->disabled = !isset($plan->setMilestone); $plan->setMilestone = isset($plan->setMilestone) ? $plan->setMilestone : false; $plan->point = implode(',', $points); @@ -273,7 +278,7 @@ jsVar('childEnabledTip', $lang->programplan->childEnabledTip); jsVar('typeList', $lang->execution->typeList); jsVar('confirmCreateTip', $lang->project->confirmCreateStage); jsVar('errorLang', $lang->programplan->error); -jsVar('ipdStagePoint', $project->model == 'ipd' ? $config->review->ipdReviewPoint : array()); +jsVar('ipdStagePoint', $project->model == 'ipd' ? $ipdStagePoint : array()); jsVar('attributeList', $project->model == 'ipd' ? $lang->stage->ipdTypeList : $lang->stage->typeList); jsVar('reviewedPoints', $project->model == 'ipd' ? $reviewedPoints : array()); jsVar('reviewedPointTip', $project->model == 'ipd' ? $lang->programplan->reviewedPointTip : ''); @@ -293,6 +298,24 @@ toolbar backBtn(set::icon('back'), setClass('primary'), $lang->goback), ); +if($project->model == 'ipd' && empty($stages) && empty($plans) && empty($planID)) +{ + div + ( + setClass('dtable-empty-tip bg-white'), + div + ( + setClass('row gap-4 items-center'), + div + ( + setClass('text-gray'), + $lang->programplan->emptyStageTip + ) + ) + ); + return; +} + $batchFormOptions = array(); $batchFormOptions['fixedActions'] = true; // 滚动时固定操作列。 $batchFormOptions['actions'] = array('sort', array('type' => 'addSibling', 'icon' => 'icon-plus', 'text' => $lang->task->addSibling), array('type' => 'addSub', 'icon' => 'icon-split', 'text' => $lang->task->addSub), 'delete'); diff --git a/module/programplan/ui/edit.html.php b/module/programplan/ui/edit.html.php index 0feb463d57..db1543f1d1 100644 --- a/module/programplan/ui/edit.html.php +++ b/module/programplan/ui/edit.html.php @@ -75,13 +75,13 @@ formPanel set::value($plan->PM), ) ), - isset($config->setPercent) && $config->setPercent == 1 && $project->model != 'research' ? formGroup + isset($config->setPercent) && $config->setPercent == 1 && !in_array($project->model, array('research', 'ipd')) ? formGroup ( set::label($lang->programplan->percent), set::width('2/3'), inputControl ( - input(set::name('percent'), set::value($plan->percent)), + input(set::name('percent'), set::value((string)$plan->percent)), to::suffix('%'), set::suffixWidth('lg') ) diff --git a/module/programplan/zen.php b/module/programplan/zen.php index 765d7694eb..5e092e7a8d 100644 --- a/module/programplan/zen.php +++ b/module/programplan/zen.php @@ -89,7 +89,7 @@ class programplanZen extends programplan $plan->parent = $parentID ? $parentID : $projectID; $plan->isTpl = $project->isTpl; if($plan->id && isset($oldPlans[$plan->id])) $plan->parent = $oldPlans[$plan->id]->parent; - if(!empty($plan->percent) && $plan->type != 'stage') $plan->percent = 0; // 非阶段类型，工作量占比为0 + if($plan->type != 'stage' || empty($plan->percent)) $plan->percent = 0; // 非阶段类型，工作量占比为0 if(empty($plan->days)) $plan->days = helper::diffDate($plan->end, $plan->begin) + 1; if(!empty($parentID) && !empty($parentStage) && $parentStage->attribute != 'mix') $plan->attribute = $parentStage->attribute;; @@ -112,8 +112,10 @@ class programplanZen extends programplan if(!empty($this->config->setCode) && empty($plan->code) && strpos(",{$this->config->execution->create->requiredFields},", ',code,') !== false) dao::$errors["code[{$rowID}]"] = sprintf($this->lang->error->notempty, $plan->type == 'stage' ? $this->lang->execution->code : $this->lang->code); } + if(!is_numeric($plan->percent) || $plan->percent < 0) dao::$errors["percent[$rowID]"] = $this->lang->programplan->error->percentNumber; + $customKey = 'create' . ucfirst($project->model) . 'Fields'; - if(strpos(",{$this->config->programplan->custom->$customKey},", ',percent,') !== false && isset($plan->percent)) + if(strpos(",{$this->config->programplan->custom->$customKey},", ',percent,') !== false && isset($plan->percent) && !dao::isError()) { if($plan->level == 0) { @@ -178,7 +180,7 @@ class programplanZen extends programplan $this->view->productList = $viewData->productList; $this->view->project = $viewData->project; $this->view->productID = $viewData->productID ?: key($viewData->productList); - $this->view->stages = empty($viewData->planID) ? $this->loadModel('stage')->getStages('id_asc', 0, $viewData->project->model) : array(); + $this->view->stages = empty($viewData->planID) ? $this->loadModel('stage')->getStages('order_asc', 0, $viewData->project->workflowGroup) : array(); $this->view->programPlan = $viewData->programPlan; $this->view->plans = $viewData->plans; $this->view->planID = $viewData->planID; @@ -194,8 +196,6 @@ class programplanZen extends programplan $this->view->defaultFields = $defaultFields; $this->view->colspan = count($visibleFields) + 3; $this->view->enableOptionalAttr = empty($viewData->programPlan) || (!empty($viewData->programPlan) && $viewData->programPlan->attribute == 'mix'); - - $this->display(); } /** @@ -221,6 +221,8 @@ class programplanZen extends programplan if(dao::isError()) return false; } + if(!is_numeric($plan->percent) || $plan->percent < 0) dao::$errors['percent'] = $this->lang->programplan->error->percentNumber; + if($projectID) $this->loadModel('execution')->checkBeginAndEndDate($projectID, $plan->begin, $plan->end, $plan->parent); if(dao::isError()) return false; diff --git a/module/project/config.php b/module/project/config.php index 5969938a2b..685250bb19 100755 --- a/module/project/config.php +++ b/module/project/config.php @@ -12,15 +12,15 @@ $config->project->editor->activate = array('id' => 'comment', 'tools' => 'simple $config->project->editor->view = array('id' => 'lastComment', 'tools' => 'simpleTools'); $config->project->list = new stdclass(); -$config->project->list->exportFields = 'id,name,code,status,hasProduct,PM,storyPoints,storyCount,executionCount,budget,teamCount,invested,begin,end,realBegan,realEnd,estimate,consumed,progress'; +$config->project->list->exportFields = 'id,name,code,status,PM,storyPoints,storyCount,executionCount,budget,teamCount,invested,begin,end,realBegan,realEnd,estimate,consumed,progress'; if($config->systemMode == 'ALM') $config->project->list->exportFields = substr_replace($config->project->list->exportFields, ',parent', 2, 0); $config->project->list->customCreateFields = 'budget,acl,auth'; $config->project->create = new stdclass(); $config->project->edit = new stdclass(); $config->project->batchedit = new stdclass(); -$config->project->create->requiredFields = 'name,begin,end'; -$config->project->edit->requiredFields = 'name,begin,end'; +$config->project->create->requiredFields = 'name,begin,end,workflowGroup'; +$config->project->edit->requiredFields = 'name,begin,end,workflowGroup'; $config->project->start = new stdclass(); $config->project->start->requiredFields = 'realBegan'; @@ -41,7 +41,7 @@ $config->project->labelClass['kanban'] = 'secondary-outline'; $config->project->labelClass['agileplus'] = 'secondary-outline'; $config->project->labelClass['waterfallplus'] = 'secondary-outline'; -$config->project->multiple['project'] = ',qa,devops,doc,build,release,dynamic,settings,'; +$config->project->multiple['project'] = ',qa,devops,review,doc,build,release,dynamic,settings,'; $config->project->multiple['execution'] = ',task,kanban,burn,view,story,CFD,'; $config->project->checkList = new stdclass(); @@ -68,7 +68,6 @@ $config->project->search['fields']['name'] = $lang->project->name; $config->project->search['fields']['code'] = $lang->project->code; $config->project->search['fields']['id'] = $lang->project->id; $config->project->search['fields']['model'] = $lang->project->model; -$config->project->search['fields']['hasProduct'] = $lang->project->type; $config->project->search['fields']['parent'] = $lang->project->parent; $config->project->search['fields']['status'] = $lang->project->status; $config->project->search['fields']['desc'] = $lang->project->desc; @@ -87,7 +86,6 @@ $config->project->search['params']['name'] = array('operator' => 'incl $config->project->search['params']['code'] = array('operator' => '=' , 'control' => 'input' , 'values' => ''); $config->project->search['params']['id'] = array('operator' => '=' , 'control' => 'input' , 'values' => ''); $config->project->search['params']['model'] = array('operator' => '=' , 'control' => 'select', 'values' => $lang->project->modelList); -$config->project->search['params']['hasProduct'] = array('operator' => '=' , 'control' => 'select', 'values' => $lang->project->projectTypeList); $config->project->search['params']['parent'] = array('operator' => '=' , 'control' => 'select', 'values' => ''); $config->project->search['params']['status'] = array('operator' => '=' , 'control' => 'select', 'values' => $lang->project->statusList); $config->project->search['params']['desc'] = array('operator' => 'include', 'control' => 'input' , 'values' => ''); @@ -311,6 +309,9 @@ $config->project->linkMap->budget['summary'] = array('budget', 'summary', 'proje $config->project->linkMap->programplan = array(); $config->project->linkMap->programplan[''] = array('project', 'execution', 'type=all&projectID=%s', ''); +$config->project->linkMap->auditplan = array(); +$config->project->linkMap->auditplan[''] = array('project', 'index', 'projectID=%s', ''); + $config->project->budget = new stdclass(); $config->project->budget->precision = 2; $config->project->budget->tenThousand = 10000; @@ -331,6 +332,7 @@ $config->project->actionList['close']['icon'] = 'off'; $config->project->actionList['close']['hint'] = $lang->project->close; $config->project->actionList['close']['url'] = helper::createLink('project', 'close', 'projectID={id}'); $config->project->actionList['close']['data-toggle'] = 'modal'; +$config->project->actionList['close']['data-size'] = '60rem'; $config->project->actionList['activate']['icon'] = 'magic'; $config->project->actionList['activate']['hint'] = $lang->project->activate; @@ -376,3 +378,9 @@ $config->project->statusLabelList['doing'] = 'doing primary-pale'; $config->project->statusLabelList['suspended'] = 'suspended gray text-white'; $config->project->statusLabelList['closed'] = 'closed success-pale'; $config->project->statusLabelList['delay'] = 'delay danger-pale'; + +$config->project->categoryStages['waterfall'] = array('request', 'design', 'dev', 'qa', 'release', 'review'); +$config->project->categoryStages['IPD'] = array('concept', 'plan', 'develop', 'qualify', 'launch'); +$config->project->categoryStages['TPD'] = array('concept', 'plan', 'develop', 'qualify'); +$config->project->categoryStages['CBB'] = array('concept', 'plan', 'develop', 'qualify'); +$config->project->categoryStages['CPD'] = array('plan', 'develop', 'qualify', 'launch'); diff --git a/module/project/config/dtable.php b/module/project/config/dtable.php index 67590dd67a..a6856e55f4 100755 --- a/module/project/config/dtable.php +++ b/module/project/config/dtable.php @@ -40,13 +40,6 @@ $config->project->dtable->fieldList['status']['statusMap'] = $lang->project->sta $config->project->dtable->fieldList['status']['group'] = 2; $config->project->dtable->fieldList['status']['show'] = true; -$config->project->dtable->fieldList['hasProduct']['title'] = $lang->project->type; -$config->project->dtable->fieldList['hasProduct']['name'] = 'hasProduct'; -$config->project->dtable->fieldList['hasProduct']['type'] = 'category'; -$config->project->dtable->fieldList['hasProduct']['sortType'] = true; -$config->project->dtable->fieldList['hasProduct']['map'] = $lang->project->projectTypeList; -$config->project->dtable->fieldList['hasProduct']['group'] = 2; - $config->project->dtable->fieldList['PM']['title'] = $lang->project->PM; $config->project->dtable->fieldList['PM']['name'] = 'PM'; $config->project->dtable->fieldList['PM']['type'] = 'avatarBtn'; diff --git a/module/project/control.php b/module/project/control.php index c166a66c8d..49ce4cd3bd 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -500,6 +500,8 @@ class project extends control } $this->projectZen->buildCreateForm((string)$model, (int)$programID, (int)$copyProjectID, (string)$extra); + + $this->display('project', 'create'); } /** @@ -526,7 +528,7 @@ class project extends control $extra = str_replace(array(',', ' '), array('&', ''), $extra); parse_str($extra, $output); - $workflowGroup = isset($output['workflowGroup']) ? (int)$output['workflowGroup'] : 0; + $workflowGroup = !empty($output['workflowGroup']) ? (int)$output['workflowGroup'] : 0; if($_POST) { @@ -885,21 +887,22 @@ class project extends control $this->execution->buildTaskSearchForm($projectID, $executions, $queryID, $actionURL, 'projectTask'); } - $this->view->title = $this->lang->execution->allExecutions; - $this->view->executionStats = $this->projectZen->getExecutionStats($status, $projectID, isset($executions) ? array_keys($executions) : array(), $productID, $queryID, $sort, $pager); - $this->view->productList = array(0 => $this->lang->product->all) + $this->product->getProductPairsByProject($projectID, 'all', '', false); - $this->view->productID = $productID; - $this->view->product = $this->product->getByID($productID); - $this->view->projectID = $projectID; - $this->view->project = $project; - $this->view->projects = $projects; - $this->view->pager = $pager; - $this->view->orderBy = $orderBy; - $this->view->status = $status; - $this->view->users = $this->loadModel('user')->getPairs('noletter'); - $this->view->isStage = isset($project->model) && (in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))); - $this->view->avatarList = $this->user->getAvatarPairs(''); - $this->view->queryID = $queryID; + $this->view->title = $this->lang->execution->allExecutions; + $this->view->executionStats = $this->projectZen->getExecutionStats($status, $projectID, isset($executions) ? array_keys($executions) : array(), $productID, $queryID, $sort, $pager); + $this->view->productList = array(0 => $this->lang->product->all) + $this->product->getProductPairsByProject($projectID, 'all', '', false); + $this->view->productID = $productID; + $this->view->product = $this->product->getByID($productID); + $this->view->projectID = $projectID; + $this->view->project = $project; + $this->view->projects = $projects; + $this->view->pager = $pager; + $this->view->orderBy = $orderBy; + $this->view->status = $status; + $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $this->view->isStage = isset($project->model) && (in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))); + $this->view->avatarList = $this->user->getAvatarPairs(''); + $this->view->queryID = $queryID; + $this->view->hasFrozenExecutions = $this->project->hasFrozenObject($project->id, 'PP'); $this->display(); } @@ -1138,7 +1141,7 @@ class project extends control $project = $this->project->getByID((int)$projectID); $this->projectZen->processGroupPrivs($project); - $this->lang->resource = $this->project->getPrivsByModel($project->multiple ? $project->model : 'noSprint'); + $this->lang->resource = $this->project->getPrivsByModel($project->multiple ? $project->model : 'noSprint', $projectID); $getPrivs = $this->group->getPrivs($groupID); foreach($getPrivs as $moduleName => $actions) @@ -1780,25 +1783,6 @@ class project extends control $this->display(); } - /** - * Ajax get workflow group items. - * - * @param string $model - * @param int $hasProduct - * @param string $category - * @access public - * @return void - */ - public function ajaxGetWorkflowGroups(string $model, int $hasProduct, string $category) - { - if($this->config->edition == 'open') return false; - - $workflowGroups = $this->loadModel('workflowgroup')->getPairs('project', $model, $hasProduct, 'normal', '0', $category); - - $items = $this->workflowgroup->appendBuildinLabel($workflowGroups); - return $this->send(array('items' => array_values($items), 'defaultValue' => key($workflowGroups))); - } - /** * 检查是否同步阶段数据。 * AJAX: check whether stage data is sync. diff --git a/module/project/model.php b/module/project/model.php index 3137cf6e06..a82d5dac5d 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -185,12 +185,12 @@ class projectModel extends model */ public static function isClickable(object $project, string $action) { - if(empty($project) || !isset($project->type)) return true; - + global $config; $action = strtolower($action); - if($action == 'publishtemplate') return $project->status == 'wait' || $project->status == 'closed'; - if($action == 'disabletemplate') return $project->status == 'doing'; + if($action == 'publishtemplate') return $project->status == 'wait' || $project->status == 'closed'; + if($action == 'disabletemplate') return $project->status == 'doing'; + if($action == 'deletedeliverable') return !$project->review && empty($project->systemList) && $project->status == 'draft'; if($action == 'close') return $project->status != 'closed'; if($action == 'group') return $project->model != 'kanban'; @@ -642,7 +642,7 @@ class projectModel extends model if($this->config->edition != 'open') { $flow = $this->loadModel('workflow')->getByModule($module); - if(!empty($flow->app) && in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project'; + if(!empty($flow->app) && in_array($flow->app, array('scrum', 'waterfall', 'kanbanProject'))) $flow->app = 'project'; if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=%s&moduleName=$module") . "#app=$flow->app"; } @@ -956,15 +956,31 @@ class projectModel extends model * Get project priv data according by the project type. * * @param string $model scrum|waterfall|noSprint|agileplus|waterfallplus + * @param int $projectID * @access public * @return object|false */ - public function getPrivsByModel(string $model = 'waterfall'): object|false + public function getPrivsByModel(string $model = 'waterfall', int $projectID = 0): object|false { if(!isset($this->config->programPriv->$model)) return false; if($model == 'noSprint') $this->config->project->includedPriv = $this->config->project->noSprintPriv; + $hasBaseline = true; + $hasAuditplan = true; + $hasProcess = true; + $hasDeliverable = true; + $hasChange = true; + if($this->config->edition != 'open' && $projectID) + { + $project = $this->fetchByID($projectID); + $hasBaseline = $this->loadModel('workflowgroup')->hasFeature((int)$project->workflowGroup, 'cm'); + $hasDeliverable = $this->workflowgroup->hasFeature((int)$project->workflowGroup, 'deliverable'); + $hasChange = $this->workflowgroup->hasFeature((int)$project->workflowGroup, 'change'); + $hasAuditplan = $this->workflowgroup->hasFeature((int)$project->workflowGroup, 'auditplan'); + $hasProcess = $this->workflowgroup->hasFeature((int)$project->workflowGroup, 'process'); + } + $this->app->loadLang('group'); $privs = new stdclass(); foreach($this->lang->resource as $module => $methods) @@ -973,6 +989,17 @@ class projectModel extends model if(!in_array($module, $this->config->programPriv->$model)) continue; + if($module == 'cm' && !$hasBaseline) continue; + if($module == 'auditplan' && !$hasAuditplan) continue; + if($module == 'pssp' && !$hasProcess) continue; + + if($module == 'review') + { + if(!$hasDeliverable) unset($methods->submitDeliverable); + if(!$hasChange) unset($methods->submitProjectchange); + if(!$hasBaseline) unset($methods->submitBaseline); + } + foreach($methods as $method => $label) { if(isset($this->config->project->includedPriv[$module]) and !in_array($method, $this->config->project->includedPriv[$module])) continue; @@ -1528,6 +1555,7 @@ class projectModel extends model if($unlinkType) $this->unlinkStoryByType($projectID, $unlinkType); } if(empty($oldProject->multiple) and !in_array($oldProject->model, array('waterfall', 'waterfallplus'))) $this->loadModel('execution')->syncNoMultipleSprint($projectID); // 无迭代的非瀑布项目需要更新。 + if(in_array($this->config->edition, array('max', 'ipd')) && $oldProject->workflowGroup != $project->workflowGroup) $this->modifyWorkflowGroup($projectID, $oldProject->workflowGroup, $project->workflowGroup); // 更新项目流程。 if($oldProject->model != $project->model && !in_array($oldProject->model, array('waterfall', 'waterfallplus', 'ipd')) && in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))) { @@ -2907,4 +2935,26 @@ class projectModel extends model } return $disabledProducts; } + + /** + * 查找项目下是否有冻结的对象。 + * Has frozen object. + * + * @param int $projectID + * @param string $category SRS|PP + * @return bool + */ + public function hasFrozenObject(int $projectID, string $category): bool + { + if(empty($projectID) || empty($category)) return false; + + $frozenObject = $this->dao->select('1')->from(TABLE_PROJECTDELIVERABLE)->alias('t1') + ->leftJoin(TABLE_DELIVERABLE)->alias('t2')->on('t1.deliverable = t2.id') + ->where('t1.project')->eq($projectID) + ->andWhere('t1.frozen')->ne('') + ->andWhere('t2.category')->eq($category) + ->limit(1) + ->fetch('1'); + return !empty($frozenObject); + } } diff --git a/module/project/tao.php b/module/project/tao.php index c1709d612b..93e272b93c 100755 --- a/module/project/tao.php +++ b/module/project/tao.php @@ -1055,7 +1055,6 @@ 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; if($app->rawModule == 'project' && $app->rawMethod == 'executionreport') $lang->waterfall->menu->execution['subModule'] .= ',project'; diff --git a/module/project/test/lib/projectzen.unittest.class.php b/module/project/test/lib/projectzen.unittest.class.php index 8876b898b8..3a7d7da0f8 100644 --- a/module/project/test/lib/projectzen.unittest.class.php +++ b/module/project/test/lib/projectzen.unittest.class.php @@ -1057,4 +1057,4 @@ class projectzenTest return 'success'; } -} \ No newline at end of file +} diff --git a/module/project/test/lib/zen.class.php b/module/project/test/lib/zen.class.php index c4fd45640f..eaddfe305a 100644 --- a/module/project/test/lib/zen.class.php +++ b/module/project/test/lib/zen.class.php @@ -303,4 +303,21 @@ class projectZenTest extends baseTest if(dao::isError()) return dao::getError(); return $result; } + + /** + * Send variables to create page. + * + * @param string $model + * @param int $programID + * @param int $copyProjectID + * @param string $extra + * @access public + * @return void + */ + public function buildCreateFormTest(string $model, int $programID, int $copyProjectID, string $extra) + { + $this->invokeArgs('buildCreateForm', [$model, $programID, $copyProjectID, $extra]); + if(dao::isError()) return dao::getError(); + return $this->getProperty('view'); + } } diff --git a/module/project/test/model/getdisabledproducts.php b/module/project/test/model/getdisabledproducts.php index 8f0fb4cb46..a6d6ebe4db 100755 --- a/module/project/test/model/getdisabledproducts.php +++ b/module/project/test/model/getdisabledproducts.php @@ -7,14 +7,14 @@ include dirname(__FILE__, 2) . '/lib/project.unittest.class.php'; title=测试 projectModel->getDisabledProducts(); timeout=0 -cid=17823 +cid=0 - 测试获取敏捷项目不可修改产品 @0 -- 测试获取以产品创建的瀑布项目不可修改产品属性2 @项目已经关联了该产品中的，不能取消关联，您可以取消关联后再操作。 +- 测试获取以产品创建的瀑布项目不可修改产品属性2 @项目已经关联了该产品中的研发需求，不能取消关联，您可以取消关联研发需求后再操作。 - 测试获取以产品创建的瀑布项目不可修改产品属性3 @该产品已经创建了阶段，如需解除与项目的关联，请删除已创建的阶段后再操作。 -- 测试获取以产品创建的瀑布项目不可修改产品属性4 @该产品已经创建了阶段并关联了，如需解除与项目的关联，请先解除的关联关系，然后删除已创建的阶段后再操作。 -- 测试获取以项目创建的瀑布项目不可修改产品属性5 @该产品的已经关联到了项目和执行中，请先解除与项目和执行的关联后再操作。 -- 测试获取以项目创建的瀑布项目不可修改产品属性6 @项目已经关联了该产品中的，不能取消关联，您可以取消关联后再操作。 +- 测试获取以产品创建的瀑布项目不可修改产品属性4 @该产品已经创建了阶段并关联了研发需求，如需解除与项目的关联，请先解除研发需求的关联关系，然后删除已创建的阶段后再操作。 +- 测试获取以项目创建的瀑布项目不可修改产品属性5 @该产品的研发需求已经关联到了项目和执行中，请先解除研发需求与项目和执行的关联后再操作。 +- 测试获取以项目创建的瀑布项目不可修改产品属性6 @项目已经关联了该产品中的研发需求，不能取消关联，您可以取消关联研发需求后再操作。 */ @@ -26,9 +26,9 @@ zenData('projectstory')->loadYaml('projectstory')->gen(20); $projectIdList = range(1, 6); $projectTester = new projectTest(); -r($projectTester->getDisabledProductsTest($projectIdList[0])) && p() && e('0'); // 测试获取敏捷项目不可修改产品 -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[0])) && p() && e('0'); // 测试获取敏捷项目不可修改产品 +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('项目已经关联了该产品中的研发需求，不能取消关联，您可以取消关联研发需求后再操作。'); // 测试获取以项目创建的瀑布项目不可修改产品 diff --git a/module/project/test/model/getprojectlink.php b/module/project/test/model/getprojectlink.php index 1bdde48af5..6f24d67332 100644 --- a/module/project/test/model/getprojectlink.php +++ b/module/project/test/model/getprojectlink.php @@ -12,6 +12,53 @@ title=测试 projectModel->getProjectLink(); timeout=0 cid=17846 +- test project->multiple=0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'execution' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'test' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'bug' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'testcase' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'testtask' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'testreport' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'build' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'dynamic' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'view' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'manageproducts', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'team' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'managemembers' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'whitelist' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'addwhitelist' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'group' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'project', 'managePriv' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'product', 'showerrornone', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'projectstory', 'story' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'projectstory', 'linkstory', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'projectstory', 'track' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'bug', 'create', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'bug', 'edit' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'story', 'change' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'story', 'create' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'story', 'zerocase', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'testcase', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'testtask', 'browseunits' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'testtask', 'browse' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'testreport', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'repo', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'doc', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'api', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'build', 'create', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'build', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'build', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'projectrelease', 'create', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'projectrelease', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'stakeholder', 'create', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'stakeholder', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'issue', 'projectsummary', 11)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'issue', 'browse' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'zahost', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'design', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'reviewissue', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法，参数是'programplan', 'execution', 12)) > 0 @1 + */ global $tester; diff --git a/module/project/test/model/hasfrozenobject.php b/module/project/test/model/hasfrozenobject.php new file mode 100755 index 0000000000..7f6d3bb36c --- /dev/null +++ b/module/project/test/model/hasfrozenobject.php @@ -0,0 +1,45 @@ +#!/usr/bin/env php +id->range('1-5'); +$projectDeliverable->name->range('p1,p2,p3,p4,p5'); +$projectDeliverable->project->range('1-5'); +$projectDeliverable->deliverable->range('1-5'); +$projectDeliverable->doc->range('1-5'); +$projectDeliverable->docVersion->range('1'); +$projectDeliverable->review->range('1-5'); +$projectDeliverable->frozen->range('yes'); +$projectDeliverable->gen(5); + +$deliverable = zenData('deliverable'); +$deliverable->id->range('1-5'); +$deliverable->category->range('SRS,PP,HLDS,DDS,DBDS'); +$deliverable->gen(5); + +su('admin'); + +global $tester; +$projectModel = $tester->loadModel('project'); +r($projectModel->hasFrozenObject(0, '')) && p() && e('0'); // 检查传空值 +r($projectModel->hasFrozenObject(1, 'SRS')) && p() && e('1'); // 检查是否有冻结的需求 +r($projectModel->hasFrozenObject(2, 'PP')) && p() && e('1'); // 检查是否有冻结的阶段 +r($projectModel->hasFrozenObject(3, 'HLDS')) && p() && e('1'); // 检查是否有冻结的概要设计 +r($projectModel->hasFrozenObject(4, 'DDS')) && p() && e('1'); // 检查是否有冻结的详细设计 +r($projectModel->hasFrozenObject(5, 'DBDS')) && p() && e('1'); // 检查是否有冻结的数据库设计 diff --git a/module/project/test/zen/buildcreateform.php b/module/project/test/zen/buildcreateform.php new file mode 100644 index 0000000000..6f23510620 --- /dev/null +++ b/module/project/test/zen/buildcreateform.php @@ -0,0 +1,51 @@ +#!/usr/bin/env php +id->range('1-10'); +$table->name->range('项目1,项目2,项目3,项目4,项目5,项目6,项目7,项目8,项目9,项目10'); +$table->type->range('project'); +$table->status->range('doing'); +$table->multiple->range('0,1'); +$table->gen(10); + +zenData('user')->gen(5); +su('admin'); + +$projectTest = new projectzenTest(); +$result1 = $projectTest->buildCreateFormTest('scrum', 0, 0, ''); +r($result1) && p('title,model,programID,copyProjectID') && e('创建项目,scrum,0,0'); // 创建敏捷项目 + +$result2 = $projectTest->buildCreateFormTest('waterfall', 1, 0, ''); +r($result2) && p('model,programID,copyProjectID') && e('waterfall,1,0'); // 创建瀑布项目 + +$result3 = $projectTest->buildCreateFormTest('ipd', 1, 1, ''); +r($result3) && p('model,programID,copyProjectID') && e('ipd,1,1'); // 复制IPD项目进行创建 + +$result4 = $projectTest->buildCreateFormTest('scrum', 0, 0, 'productID=1,branchID=0'); +r($result4) && p('productID') && e('1'); // 创建时关联产品1 diff --git a/module/project/ui/close.html.php b/module/project/ui/close.html.php index bac2aa3438..e357869f8c 100644 --- a/module/project/ui/close.html.php +++ b/module/project/ui/close.html.php @@ -10,11 +10,20 @@ declare(strict_types=1); */ namespace zin; +jsVar('window.confirmShown', false); modalHeader(); formPanel ( set::formID("zin_project_close_{$project->id}_form"), - !empty($confirmTip) ? set::ajax(array('beforeSubmit' => jsRaw("() => zui.Modal.confirm('{$confirmTip}')"))) : null, + /* 确认弹窗只展示一次，表单可能会被必填项拦截。*/ + !empty($confirmTip) ? set::ajax(array('beforeSubmit' => jsRaw("() => { + if(window.confirmShown) return true; + window.confirmShown = true; + return zui.Modal.confirm('$confirmTip').then((confirmed) => { + if(!confirmed) window.confirmShown = false; + return confirmed; + }); + }"))) : null, formGroup ( set::width('1/2'), diff --git a/module/project/ui/create.html.php b/module/project/ui/create.html.php index 9f51983f2f..6f943d9e48 100644 --- a/module/project/ui/create.html.php +++ b/module/project/ui/create.html.php @@ -90,7 +90,6 @@ formGridPanel on::change('[name=longTime]', $handleLongTimeChange), on::change('[name=future]', 'toggleBudget'), on::change('[name=begin], [name=end]', 'computeWorkDays'), - on::change('[name="category"]', 'changeCategory'), on::change('[name^=products]', 'toggleStageBy'), on::change('[name=parent], [name=budget]', 'checkBudget'), on::change('[name^=storyType]', 'toggleStoryType'), diff --git a/module/project/ui/execution.html.php b/module/project/ui/execution.html.php index 16cb76f598..c69b515623 100644 --- a/module/project/ui/execution.html.php +++ b/module/project/ui/execution.html.php @@ -32,7 +32,7 @@ $canBatchChangeStatus = hasPriv('execution', 'batchChangeStatus'); $canBatchAction = $canModify && ($canBatchEdit || $canBatchChangeStatus); if($canBatchAction) { - if($canBatchEdit) + if($canBatchEdit && empty($hasFrozenExecutions)) { $footToolbar['items'][] = array ( @@ -201,7 +201,7 @@ dtable set::footPager(usePager(array('linkCreator' => createLink('project', 'execution', "status={$status}&projectID=$projectID&orderBy={$orderBy}&productID={$productID}&recTotal={recTotal}&recPerPage={recPerPage}&page={page}")))), set::emptyTip(!$searchTask ? $lang->execution->noExecution : $lang->task->noTask), set::createTip($isStage ? $lang->programplan->create : $lang->execution->create), - set::createLink($canCreateExecution && !$searchTask ? $createLink : ''), + set::createLink($canCreateExecution && !$searchTask && !$hasFrozenExecutions ? $createLink : ''), set::createAttr($isStage ? 'data-app="project"' : 'data-app="execution"') ); diff --git a/module/project/ui/view.html.php b/module/project/ui/view.html.php index 06219dab09..471bcc60ec 100644 --- a/module/project/ui/view.html.php +++ b/module/project/ui/view.html.php @@ -235,7 +235,7 @@ row set::title($project->code), $project->code ) : null, - label + $config->edition != 'open' ? null : label ( setClass('label warning-pale ring-warning rounded-full ml-2 flex-none projectType'), $lang->project->projectTypeList[$project->hasProduct] diff --git a/module/project/zen.php b/module/project/zen.php index 2e6832bc5e..c435bd8f99 100755 --- a/module/project/zen.php +++ b/module/project/zen.php @@ -338,7 +338,6 @@ class projectZen extends project $this->view->programID = $programID; $this->view->productID = isset($output['productID']) ? $output['productID'] : 0; $this->view->branchID = isset($output['branchID']) ? $output['branchID'] : 0; - $this->view->category = isset($output['category']) ? $output['category'] : ''; $this->view->allProducts = $allProducts; $this->view->multiBranchProducts = $this->product->getMultiBranchPairs((int)$topProgramID); $this->view->copyProjects = $copyProjects; @@ -355,8 +354,6 @@ class projectZen extends project if(!isset($this->view->linkedProducts)) $this->view->linkedProducts = $linkedProducts; if(!isset($this->view->linkedBranches)) $this->view->linkedBranches = $linkedBranches; - - $this->display('project', 'create'); } /** @@ -479,7 +476,7 @@ class projectZen extends project $this->view->disableParent = $disableParent; $this->view->groups = $this->loadModel('group')->getPairs(); - if(in_array($this->config->edition, array('max', 'ipd')) && $this->project->checkUploadedDeliverable($project)) + if(in_array($this->config->edition, array('max', 'ipd')) && $this->project->checkUploadedDeliverable($projectID)) { $this->view->disableModel = true; } @@ -1395,13 +1392,11 @@ class projectZen extends project $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); - } } + /* 交付物提交进度。 */ + if(in_array($this->config->edition, array('max', 'ipd'))) $projectList = $this->project->countDeliverable($projectList, 'project'); + return array_values($projectList); } diff --git a/module/release/test/lib/release.unittest.class.php b/module/release/test/lib/release.unittest.class.php index d80f2ad286..92a01651fc 100644 --- a/module/release/test/lib/release.unittest.class.php +++ b/module/release/test/lib/release.unittest.class.php @@ -645,21 +645,21 @@ class releaseTest $beforeCount = $this->objectModel->dao->select('COUNT(*) as count')->from(TABLE_RELEASERELATED) ->where('release')->eq($releaseID) ->fetch('count'); - + $this->objectModel->processRelated($releaseID, $release); - + if(dao::isError()) return dao::getError(); - + // 记录操作后的关联数据数量 $afterCount = $this->objectModel->dao->select('COUNT(*) as count')->from(TABLE_RELEASERELATED) ->where('release')->eq($releaseID) ->fetch('count'); - + // 获取所有关联数据 $relatedData = $this->objectModel->dao->select('*')->from(TABLE_RELEASERELATED) ->where('release')->eq($releaseID) ->fetchAll(); - + return array( 'beforeCount' => $beforeCount, 'afterCount' => $afterCount, diff --git a/module/screen/test/lib/screen.unittest.class.php b/module/screen/test/lib/screen.unittest.class.php index dfccf636a5..3df1433e9b 100755 --- a/module/screen/test/lib/screen.unittest.class.php +++ b/module/screen/test/lib/screen.unittest.class.php @@ -771,27 +771,27 @@ class screenTest public function __constructTest(): array { global $tester; - + // Create a new instance to test constructor $screenModel = $tester->loadModel('screen'); - + $result = array(); - + // Check if object type is correct $result['objectType'] = get_class($screenModel) === 'screenModel' ? 1 : 0; - + // Check parent initialization $result['parentInit'] = property_exists($screenModel, 'app') && property_exists($screenModel, 'dao') ? 1 : 0; - + // Check if BI DAO is loaded (dao property should exist after loadBIDAO) $result['biDAOLoaded'] = property_exists($screenModel, 'dao') ? 1 : 0; - - // Check if bi model is loaded + + // Check if bi model is loaded $result['biModelLoaded'] = property_exists($screenModel, 'bi') && is_object($screenModel->bi) ? 1 : 0; - + // Check if filter object is initialized $result['filterExists'] = property_exists($screenModel, 'filter') && is_object($screenModel->filter) ? 1 : 0; - + // Check filter properties initialization if($result['filterExists']) { @@ -811,7 +811,7 @@ class screenTest $result['filterAccount'] = 0; $result['filterCharts'] = 0; } - + return $result; } @@ -992,7 +992,7 @@ class screenTest $testResult['hasNotFoundText'] = isset($result->option->title->notFoundText) ? 1 : 0; $testResult['isDeleted'] = isset($result->option->isDeleted) && $result->option->isDeleted ? 1 : 0; $testResult['notFoundText'] = isset($result->option->title->notFoundText) ? $result->option->title->notFoundText : ''; - + return $testResult; } @@ -1023,14 +1023,14 @@ class screenTest public function genMetricComponentTest($metricID, $component = null, $filterParams = array()) { global $tester; - + // 从数据库获取metric对象 $metric = $tester->dao->select('*')->from(TABLE_METRIC)->where('id')->eq($metricID)->fetch(); if(empty($metric)) { return array('hasComponent' => 0, 'isDeleted' => 0, 'isWaiting' => 0); } - + $result = $this->objectModel->genMetricComponent($metric, $component, $filterParams); if(dao::isError()) return dao::getError(); @@ -1039,7 +1039,7 @@ class screenTest $testResult['hasComponent'] = isset($result) && is_object($result) ? 1 : 0; $testResult['isDeleted'] = (isset($result->option->isDeleted) && $result->option->isDeleted) ? 1 : 0; $testResult['isWaiting'] = ($metric->stage == 'wait') ? 1 : 0; - + return $testResult; } @@ -1114,9 +1114,9 @@ class screenTest { $component = new stdclass(); $component->chartConfig = new stdclass(); - + $latestFilters = array('status' => 'enabled', 'filter1' => 'value1'); - + $result = $this->objectModel->updateMetricFilters($component, $latestFilters); if(dao::isError()) return dao::getError(); @@ -1124,7 +1124,7 @@ class screenTest $testResult['chartConfig'] = isset($result->chartConfig) ? 'present' : 'missing'; $testResult['filters'] = isset($result->chartConfig->filters) ? $result->chartConfig->filters : array(); $testResult['status'] = isset($result->chartConfig->filters['status']) ? $result->chartConfig->filters['status'] : 'missing'; - + return $testResult; } @@ -1139,9 +1139,9 @@ class screenTest $component = new stdclass(); $component->chartConfig = new stdclass(); $component->chartConfig->filters = array('existing' => 'existingFilter', 'preserved' => true); - + $latestFilters = array('new' => 'newFilter'); - + $result = $this->objectModel->updateMetricFilters($component, $latestFilters); if(dao::isError()) return dao::getError(); @@ -1149,7 +1149,7 @@ class screenTest $testResult['chartConfig'] = isset($result->chartConfig) ? 'present' : 'missing'; $testResult['filters'] = isset($result->chartConfig->filters) ? $result->chartConfig->filters : array(); $testResult['existing'] = isset($result->chartConfig->filters['existing']) ? $result->chartConfig->filters['existing'] : 'missing'; - + return $testResult; } @@ -1163,16 +1163,16 @@ class screenTest { $component = new stdclass(); $component->chartConfig = new stdclass(); - + $latestFilters = array(); - + $result = $this->objectModel->updateMetricFilters($component, $latestFilters); if(dao::isError()) return dao::getError(); $testResult = array(); $testResult['chartConfig'] = isset($result->chartConfig) ? 'present' : 'missing'; $testResult['filters'] = isset($result->chartConfig->filters) ? count($result->chartConfig->filters) : -1; - + return $testResult; } @@ -1186,13 +1186,13 @@ class screenTest { $component = new stdclass(); $component->chartConfig = new stdclass(); - + $latestFilters = array( 'field1' => 'value1', 'field2' => 'value2', 'nested' => array('subfield' => 'subvalue') ); - + $result = $this->objectModel->updateMetricFilters($component, $latestFilters); if(dao::isError()) return dao::getError(); @@ -1201,7 +1201,7 @@ class screenTest $testResult['filters'] = isset($result->chartConfig->filters) ? $result->chartConfig->filters : array(); $testResult['field1'] = isset($result->chartConfig->filters['field1']) ? $result->chartConfig->filters['field1'] : 'missing'; $testResult['field2'] = isset($result->chartConfig->filters['field2']) ? $result->chartConfig->filters['field2'] : 'missing'; - + return $testResult; } @@ -1216,9 +1216,9 @@ class screenTest $component = new stdclass(); $component->chartConfig = new stdclass(); // chartConfig exists but no filters property - + $latestFilters = array('newField' => 'newValue'); - + $result = $this->objectModel->updateMetricFilters($component, $latestFilters); if(dao::isError()) return dao::getError(); @@ -1226,7 +1226,7 @@ class screenTest $testResult['chartConfig'] = isset($result->chartConfig) ? 'present' : 'missing'; $testResult['filters'] = isset($result->chartConfig->filters) ? $result->chartConfig->filters : array(); $testResult['newField'] = isset($result->chartConfig->filters['newField']) ? $result->chartConfig->filters['newField'] : 'missing'; - + return $testResult; } @@ -1376,7 +1376,7 @@ class screenTest if(!isset($config->screen->chartOption['WaterPolo'])) { $config->screen->chartOption['WaterPolo'] = '{"type":"nomal","series":[{"type":"liquidFill","radius":"90%"}],"backgroundColor":"rgba(0,0,0,0)"}'; } - + $result = $this->objectModel->getWaterPoloOption($component, $chart, $filters); if(dao::isError()) return dao::getError(); @@ -1387,7 +1387,7 @@ class screenTest $testResult['datasetValue'] = (isset($result->option) && isset($result->option->dataset)) ? $result->option->dataset : 'null'; $testResult['hasStyles'] = isset($result->styles) ? 1 : 0; $testResult['componentType'] = is_object($result) ? 'object' : gettype($result); - + return $testResult; } catch (Exception $e) { return array('error' => $e->getMessage()); @@ -1440,14 +1440,14 @@ class screenTest public function getMetricCardOptionTest($metricId, $resultData, $component = null) { global $tester; - + // 从数据库获取metric对象 $metric = $tester->dao->select('*')->from(TABLE_METRIC)->where('id')->eq($metricId)->fetch(); if(empty($metric)) { return new stdclass(); } - + $result = $this->objectModel->getMetricCardOption($metric, $resultData, $component); if(dao::isError()) return dao::getError(); diff --git a/module/screen/test/model/getmetricpagination.php b/module/screen/test/model/getmetricpagination.php index 0605a58c21..42c7f36f76 100755 --- a/module/screen/test/model/getmetricpagination.php +++ b/module/screen/test/model/getmetricpagination.php @@ -7,27 +7,27 @@ title=测试 screenModel::getMetricPagination(); timeout=0 cid=18248 -- 执行screenTest模块的getMetricPaginationTest方法，参数是null +- 执行screenTest模块的getMetricPaginationTest方法，参数是null - 属性index @1 - 属性size @5 - 属性total @0 - 属性pageTotal @1 -- 执行screenTest模块的getMetricPaginationTest方法 +- 执行screenTest模块的getMetricPaginationTest方法 - 属性index @1 - 属性size @5 - 属性total @0 - 属性pageTotal @1 -- 执行screenTest模块的getMetricPaginationTest方法 +- 执行screenTest模块的getMetricPaginationTest方法 - 属性index @1 - 属性size @12 - 属性total @0 - 属性pageTotal @1 -- 执行screenTest模块的getMetricPaginationTest方法 +- 执行screenTest模块的getMetricPaginationTest方法 - 属性index @1 - 属性size @10 - 属性total @0 - 属性pageTotal @1 -- 执行screenTest模块的getMetricPaginationTest方法 +- 执行screenTest模块的getMetricPaginationTest方法 - 属性index @1 - 属性size @12 - 属性total @0 diff --git a/module/screen/test/model/getmetrictableoption.php b/module/screen/test/model/getmetrictableoption.php index 560da2aaa1..340613e737 100755 --- a/module/screen/test/model/getmetrictableoption.php +++ b/module/screen/test/model/getmetrictableoption.php @@ -34,7 +34,7 @@ class SimpleMockMetric { public function isObjectMetric($header) { return true; } - + public function getGroupTable($header, $data, $dateType, $flag) { $groupHeader = 'Test Header'; $groupData = array(array('Item1', 100), array('Item2', 200)); diff --git a/module/screen/test/model/getoptionsfromsql.php b/module/screen/test/model/getoptionsfromsql.php index b139106c94..d569c653d5 100755 --- a/module/screen/test/model/getoptionsfromsql.php +++ b/module/screen/test/model/getoptionsfromsql.php @@ -7,14 +7,14 @@ title=测试 screenModel::getOptionsFromSql(); timeout=0 cid=18250 -- 执行screenTest模块的getOptionsFromSqlTest方法，参数是"SELECT id, account FROM " . TABLE_USER . " WHERE deleted='0' ORDER BY id LIMIT 3", 'id', 'account' +- 执行screenTest模块的getOptionsFromSqlTest方法，参数是"SELECT id, account FROM " . TABLE_USER . " WHERE deleted='0' ORDER BY id LIMIT 3", 'id', 'account' - 属性1 @admin - 属性2 @test1 - 属性3 @test2 - 执行screenTest模块的getOptionsFromSqlTest方法，参数是"SELECT id, account FROM " . TABLE_USER . " WHERE id > 999", 'id', 'account' @0 - 执行screenTest模块的getOptionsFromSqlTest方法，参数是"SELECT id, account FROM " . TABLE_USER . " WHERE deleted='0' ORDER BY id LIMIT 2", 'nonexistent', 'account' @0 - 执行screenTest模块的getOptionsFromSqlTest方法，参数是"SELECT id, account FROM " . TABLE_USER . " WHERE deleted='0' ORDER BY id LIMIT 2", 'id', 'nonexistent' @0 -- 执行screenTest模块的getOptionsFromSqlTest方法，参数是"SELECT id, realname FROM " . TABLE_USER . " WHERE deleted='0' ORDER BY id", 'id', 'realname' +- 执行screenTest模块的getOptionsFromSqlTest方法，参数是"SELECT id, realname FROM " . TABLE_USER . " WHERE deleted='0' ORDER BY id", 'id', 'realname' - 属性1 @管理员 - 属性2 @测试用户1 - 属性3 @测试用户2 diff --git a/module/screen/test/model/yaml/action_getactiveusertable.yaml b/module/screen/test/model/yaml/action_getactiveusertable.yaml index cd960e7382..d7bbc28189 100644 --- a/module/screen/test/model/yaml/action_getactiveusertable.yaml +++ b/module/screen/test/model/yaml/action_getactiveusertable.yaml @@ -25,7 +25,7 @@ fields: note: 项目ID range: 1-3 - field: execution - note: 执行ID + note: 执行ID range: 1-3 - field: actor note: 操作者账号 diff --git a/module/stage/config.php b/module/stage/config.php index 4319c64885..e98c302177 100644 --- a/module/stage/config.php +++ b/module/stage/config.php @@ -26,3 +26,11 @@ $config->stage->actionList['delete']['hint'] = $lang->stage->delete; $config->stage->actionList['delete']['data-confirm'] = array('message' => $lang->stage->confirmDelete, 'icon' => 'icon-exclamation-sign', 'iconClass' => 'warning-pale rounded-full icon-2x'); $config->stage->actionList['delete']['url'] = helper::createLink('stage', 'delete', 'stageID={id}'); $config->stage->actionList['delete']['ajaxSubmit'] = true; + +$config->stage->ipdReviewPoint = new stdclass(); +$config->stage->ipdReviewPoint->concept = array('TR1', 'CDCP'); +$config->stage->ipdReviewPoint->plan = array('TR2', 'TR3', 'PDCP'); +$config->stage->ipdReviewPoint->develop = array('TR4', 'TR4A', 'TR5'); +$config->stage->ipdReviewPoint->qualify = array('TR6', 'ADCP'); +$config->stage->ipdReviewPoint->launch = array(); +$config->stage->ipdReviewPoint->lifecycle = array('LDCP'); diff --git a/module/stage/config/dtable.php b/module/stage/config/dtable.php index 1f74a78ced..3199246175 100644 --- a/module/stage/config/dtable.php +++ b/module/stage/config/dtable.php @@ -3,10 +3,16 @@ global $lang; $config->stage->dtable = new stdclass(); $config->stage->dtable->fieldList['id']['type'] = 'id'; -$config->stage->dtable->fieldList['name']['type'] = 'name'; +$config->stage->dtable->fieldList['sort']['title'] = $lang->stage->order; +$config->stage->dtable->fieldList['sort']['fixed'] = 'left'; +$config->stage->dtable->fieldList['sort']['align'] = 'center'; +$config->stage->dtable->fieldList['sort']['group'] = 1; + +$config->stage->dtable->fieldList['name']['type'] = 'title'; $config->stage->dtable->fieldList['type']['type'] = 'status'; $config->stage->dtable->fieldList['type']['statusMap'] = $lang->stage->typeList; +$config->stage->dtable->fieldList['type']['group'] = 2; $config->stage->dtable->fieldList['actions']['type'] = 'actions'; $config->stage->dtable->fieldList['actions']['menu'] = array('edit', 'delete'); diff --git a/module/stage/config/form.php b/module/stage/config/form.php index 82a42e0740..f4a795e302 100644 --- a/module/stage/config/form.php +++ b/module/stage/config/form.php @@ -1,30 +1,30 @@ stage->form = new stdclass(); $config->stage->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->stage->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => ''); -$config->stage->form->create['projectType'] = array('type' => 'string', 'required' => false, 'default' => ''); -$config->stage->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account); -$config->stage->form->create['createdDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now); +$config->stage->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => ''); +$config->stage->form->create['createdDate'] = array('type' => 'datetime', 'required' => false, 'default' => ''); if(isset($config->setPercent) && $config->setPercent == 1) $config->stage->form->create['percent'] = array('type' => 'float', 'required' => true, 'default' => 0); -$config->stage->form->batchcreate['name'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim', 'base' => true); -$config->stage->form->batchcreate['type'] = array('type' => 'string', 'required' => false, 'default' => ''); -$config->stage->form->batchcreate['projectType'] = array('type' => 'string', 'required' => false, 'default' => ''); -$config->stage->form->batchcreate['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account); -$config->stage->form->batchcreate['createdDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now); +$config->stage->form->batchcreate['name'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim', 'base' => true); +$config->stage->form->batchcreate['type'] = array('type' => 'string', 'required' => false, 'default' => ''); if(isset($config->setPercent) && $config->setPercent == 1) $config->stage->form->batchcreate['percent'] = array('type' => 'float', 'required' => true, 'default' => 0); -$config->stage->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); -$config->stage->form->edit['type'] = array('type' => 'string', 'required' => true, 'default' => ''); -$config->stage->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account); -$config->stage->form->edit['editedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now); +$config->stage->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); +$config->stage->form->edit['type'] = array('type' => 'string', 'required' => true, 'default' => ''); if(isset($config->setPercent) && $config->setPercent == 1) $config->stage->form->edit['percent'] = array('type' => 'float', 'required' => true, 'default' => 0); $config->stage->form->settype['lang'] = array('type' => 'string', 'required' => false, 'default' => ''); $config->stage->form->settype['keys'] = array('type' => 'array', 'required' => false, 'default' => array()); $config->stage->form->settype['values'] = array('type' => 'array', 'required' => false, 'default' => array()); + +$config->stage->form->settrpoint['id'] = array('type' => 'int', 'required' => false, 'default' => 0); +$config->stage->form->settrpoint['title'] = array('type' => 'string', 'required' => true, 'default' => '', 'base' => true, 'filter' => 'trim'); +$config->stage->form->settrpoint['flow'] = array('type' => 'int', 'required' => true, 'default' => 1); + +$config->stage->form->setdcppoint['id'] = array('type' => 'int', 'required' => false, 'default' => 0); +$config->stage->form->setdcppoint['title'] = array('type' => 'string', 'required' => true, 'default' => '', 'base' => true, 'filter' => 'trim'); +$config->stage->form->setdcppoint['flow'] = array('type' => 'int', 'required' => true, 'default' => 1); diff --git a/module/stage/control.php b/module/stage/control.php index fe91a07cec..de2438a32c 100644 --- a/module/stage/control.php +++ b/module/stage/control.php @@ -16,69 +16,91 @@ class stage extends control * 瀑布模型阶段列表页。 * Waterfall model stage list page. * + * @param int $groupID * @param string $orderBy - * @param string $type waterfall|waterfallplus * @access public * @return void */ - public function browse(string $orderBy = "id_asc", string $type = 'waterfall') + public function browse(int $groupID = 0, string $orderBy = "order_asc") { - if($type == 'waterfallplus') $this->locate($this->createLink('stage', 'plusBrowse', "orderBy={$orderBy}&type=waterfallplus")); + if($this->config->edition != 'open') + { + $workflowGroup = $this->loadModel('workflowgroup')->getByID($groupID); + if($workflowGroup->projectModel == 'ipd') + { + $this->config->stage->dtable->fieldList['type']['statusMap'] = $this->lang->stage->ipdTypeList; - $this->stage->setMenu($type); + $this->config->stage->dtable->fieldList['TRpoint']['title'] = $this->lang->stage->TRpoint; + $this->config->stage->dtable->fieldList['TRpoint']['type'] = 'desc'; + $this->config->stage->dtable->fieldList['TRpoint']['width'] = 100; + $this->config->stage->dtable->fieldList['TRpoint']['flex'] = false; + $this->config->stage->dtable->fieldList['TRpoint']['group'] = 3; - $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->browse; - $this->view->stages = $this->stage->getStages($orderBy, 0, $type); + $this->config->stage->dtable->fieldList['DCPpoint']['title'] = $this->lang->stage->DCPpoint; + $this->config->stage->dtable->fieldList['DCPpoint']['type'] = 'desc'; + $this->config->stage->dtable->fieldList['DCPpoint']['width'] = 100; + $this->config->stage->dtable->fieldList['DCPpoint']['flex'] = false; + $this->config->stage->dtable->fieldList['DCPpoint']['group'] = 4; + + if(common::hasPriv('stage', 'edit')) + { + $this->config->stage->actionList['setTRpoint']['icon'] = 'tr-box'; + $this->config->stage->actionList['setTRpoint']['hint'] = $this->lang->stage->setTRpoint; + $this->config->stage->actionList['setTRpoint']['url'] = array('module' => 'stage', 'method' => 'setTRpoint', 'params' => 'stageID={id}'); + $this->config->stage->actionList['setTRpoint']['data-toggle'] = 'modal'; + + $this->config->stage->actionList['setDCPpoint']['icon'] = 'dcp-box'; + $this->config->stage->actionList['setDCPpoint']['hint'] = $this->lang->stage->setDCPpoint; + $this->config->stage->actionList['setDCPpoint']['url'] = array('module' => 'stage', 'method' => 'setDCPpoint', 'params' => 'stageID={id}'); + $this->config->stage->actionList['setDCPpoint']['data-toggle'] = 'modal'; + + $this->config->stage->dtable->fieldList['actions']['menu'] = array('setTRpoint', 'setDCPpoint', 'edit', 'delete'); + $this->config->stage->dtable->fieldList['actions']['list'] = $this->config->stage->actionList; + } + } + } + + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->browseAB; + $this->view->stages = $this->stage->getStages($orderBy, 0, $groupID); $this->view->orderBy = $orderBy; - $this->view->type = $type; + $this->view->groupID = $groupID; $this->display(); } - /** - * 融合瀑布模型阶段列表页。 - * Waterfall plus model stage list page. - * - * @param string $orderBy - * @param string $type waterfall|waterfallplus - * @access public - * @return void - */ - public function plusBrowse($orderBy = "id_asc", $type = 'waterfallplus') - { - if($type == 'waterfall') $this->locate($this->createLink('stage', 'browse', "orderBy={$orderBy}&type=waterfall")); - - $this->stage->setMenu($type); - - $this->view->stages = $this->stage->getStages($orderBy, 0, $type); - $this->view->orderBy = $orderBy; - $this->view->type = $type; - $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->browse; - - $this->display('stage', 'browse'); - } - /** * 创建一个阶段。 * Create a stage. * - * @param string $type waterfall|waterfallplus + * @param int $groupID * @access public * @return void */ - public function create(string $type = 'waterfall') + public function create(int $groupID = 0) { + $flow = $this->config->edition == 'open' ? new stdClass() : $this->loadModel('workflowgroup')->getByID($groupID); if($_POST) { - $stageData = form::data()->setDefault('projectType', $type)->get(); - $stageID = $this->stage->create($stageData, $type); + if(isset($flow->projectModel) && $flow->projectModel == 'ipd') $this->config->stage->create->requiredFields = 'name,type'; + + $stageData = form::data() + ->setDefault('workflowGroup', $groupID) + ->setDefault('createdBy', $this->app->user->account) + ->setDefault('createdDate', helper::now()) + ->get(); + + $stageID = $this->stage->create($stageData); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->loadModel('action')->create('stage', $stageID, 'Opened'); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true)); } - $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->create; + unset($this->lang->stage->ipdTypeList['lifecycle']); + + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->create; + $this->view->groupID = $groupID; + $this->view->flow = $flow; $this->display(); } @@ -87,23 +109,33 @@ class stage extends control * 批量创建阶段。 * Batch create stages. * - * @param string $type waterfall|waterfallplus + * @param int $groupID * @access public * @return void */ - public function batchCreate(string $type = 'waterfall') + public function batchCreate(int $groupID = 0) { - $this->stage->setMenu($type); + $flow = $this->config->edition == 'open' ? new stdClass() : $this->loadModel('workflowgroup')->getByID($groupID); if($_POST) { - $stages = form::batchData()->setDefault('projectType', $type)->get(); - $this->stage->batchCreate($type, $stages); + if(isset($flow->projectModel) && $flow->projectModel == 'ipd') + { + $this->config->stage->create->requiredFields = 'name,type'; + if(isset($this->config->setPercent) && $this->config->setPercent == 1) $this->config->stage->form->batchcreate['percent']['required'] = false; + } + + $stages = form::batchData()->get(); + $this->stage->batchCreate($groupID, $stages); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => inlink($type == 'waterfall' ? 'browse' : 'plusBrowse', "orderBy=id_asc&type=$type"))); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => inlink('browse', "groupID={$groupID}"))); } - $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->batchCreate; + unset($this->lang->stage->ipdTypeList['lifecycle']); + + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->batchCreate; + $this->view->groupID = $groupID; + $this->view->flow = $flow; $this->display(); } @@ -119,10 +151,16 @@ class stage extends control public function edit(int $stageID = 0) { $stage = $this->stage->getByID($stageID); - $this->stage->setMenu($stage->projectType); + $flow = $this->config->edition == 'open' ? new stdClass() : $this->loadModel('workflowgroup')->getByID($stage->workflowGroup); + if($_POST) { - $stageData = form::data()->get(); + if(isset($flow->projectModel) && $flow->projectModel == 'ipd') $this->config->stage->edit->requiredFields = 'name,type'; + + $stageData = form::data() + ->setDefault('editedBy', $this->app->user->account) + ->setDefault('editedDate', helper::now()) + ->get(); $changes = $this->stage->update($stageID, $stageData); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); @@ -132,8 +170,11 @@ class stage extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true)); } + unset($this->lang->stage->ipdTypeList['lifecycle']); + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->edit; $this->view->stage = $stage; + $this->view->flow = $flow; $this->display(); } @@ -213,4 +254,71 @@ class stage extends control if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); return $this->sendSuccess(array('closeModal' => true, 'load' => true)); } + + /** + * 设置TR评审点。 + * Set TR point of stage. + * + * @param int $stageID + * @access public + * @return void + */ + public function setTRpoint(int $stageID) + { + $this->app->loadLang('review'); + + if(!empty($_POST)) + { + $this->lang->stage->title = $this->lang->stage->TRname; + $points = form::batchData()->get(); + $this->stage->setPoint('TR', $stageID, $points); + if(dao::isError()) return $this->sendError(dao::getError()); + return $this->sendSuccess(array('closeModal' => true, 'load' => true)); + } + + $this->view->type = 'TR'; + $this->view->approvals = $this->loadModel('approvalflow')->getPairs('project'); + $this->view->stagePoints = $this->stage->getStagePoints('TR', $stageID); + $this->display('stage', 'setPoint'); + } + + /** + * 设置DCP评审点。 + * Set point of stage. + * + * @param int $stageID + * @access public + * @return void + */ + public function setDCPpoint(int $stageID) + { + $this->app->loadLang('review'); + + if(!empty($_POST)) + { + $this->lang->stage->title = $this->lang->stage->DCPname; + $points = form::batchData()->get(); + $this->stage->setPoint('DCP', $stageID, $points); + if(dao::isError()) return $this->sendError(dao::getError()); + return $this->sendSuccess(array('closeModal' => true, 'load' => true)); + } + + $this->view->type = 'DCP'; + $this->view->approvals = $this->loadModel('approvalflow')->getPairs('project'); + $this->view->stagePoints = $this->stage->getStagePoints('DCP', $stageID); + $this->display('stage', 'setPoint'); + } + + /** + * 更新排序。 + * Update order. + * + * @access public + * @return void + */ + public function updateOrder() + { + $sortedIdList = json_decode($this->post->sortedIdList, true); + $this->stage->updateOrder($sortedIdList); + } } diff --git a/module/stage/js/browse.ui.js b/module/stage/js/browse.ui.js new file mode 100644 index 0000000000..237e6b3d91 --- /dev/null +++ b/module/stage/js/browse.ui.js @@ -0,0 +1,20 @@ +window.renderCell = function(result, info) +{ + if(info.col.name == 'sort') + { + result[0] = {html: "", className: 'text-gray cursor-move move-stage'}; + } + return result; +} + +window.onSortEnd = function(from, to, type) +{ + if(!from || !to) return false; + + const url = $.createLink('stage', 'updateOrder'); + const form = new FormData(); + form.append('sortedIdList', JSON.stringify(this.state.rowOrders)); + + $.ajaxSubmit({url, data: form}); + return true; +} diff --git a/module/stage/js/setpoint.ui.js b/module/stage/js/setpoint.ui.js new file mode 100644 index 0000000000..6c4d500bda --- /dev/null +++ b/module/stage/js/setpoint.ui.js @@ -0,0 +1,10 @@ +window.refreshApproval = function() +{ + $.getJSON($.createLink('review', 'ajaxGetApproval'), function(data) + { + $('[name^=flow]').each(function() + { + $(this).zui('picker').render({items: data}); + }); + }); +} diff --git a/module/stage/lang/de.php b/module/stage/lang/de.php index 16ed0dd9d9..93913a5327 100644 --- a/module/stage/lang/de.php +++ b/module/stage/lang/de.php @@ -10,20 +10,29 @@ * @link https://www.zentao.net */ /* Actions. */ -$lang->stage->browse = 'Waterfall Stage List'; +$lang->stage->browse = 'Stage List'; +$lang->stage->browseAB = 'Stage List'; $lang->stage->create = 'Create Stage'; -$lang->stage->batchCreate = 'Batch Create'; -$lang->stage->edit = 'Edit'; -$lang->stage->delete = 'Delete'; +$lang->stage->batchCreate = 'Batch Create Stage'; +$lang->stage->edit = 'Edit Stage'; +$lang->stage->delete = 'Delete Stage'; $lang->stage->view = 'Details'; $lang->stage->plusBrowse = 'Waterfall Plus Stage List'; +$lang->stage->setTRpoint = 'Set TR Point'; +$lang->stage->setDCPpoint = 'Set DCP Point'; /* Fields. */ -$lang->stage->id = 'ID'; -$lang->stage->name = 'Name'; -$lang->stage->type = 'Type'; -$lang->stage->percent = 'Workload %'; -$lang->stage->setType = 'Set Type'; +$lang->stage->id = 'ID'; +$lang->stage->name = 'Name'; +$lang->stage->type = 'Type'; +$lang->stage->percent = 'Workload %'; +$lang->stage->setType = 'Stage Type'; +$lang->stage->TRpoint = 'TR Point'; +$lang->stage->DCPpoint = 'DCP Point'; +$lang->stage->TRname = 'TR Point Name'; +$lang->stage->DCPname = 'DCP Point Name'; +$lang->stage->pointFlow = 'Approval Flow'; +$lang->stage->order = 'Order'; $lang->stage->typeList['mix'] = 'Mix'; $lang->stage->typeList['request'] = 'Story'; diff --git a/module/stage/lang/en.php b/module/stage/lang/en.php index 16ed0dd9d9..93913a5327 100644 --- a/module/stage/lang/en.php +++ b/module/stage/lang/en.php @@ -10,20 +10,29 @@ * @link https://www.zentao.net */ /* Actions. */ -$lang->stage->browse = 'Waterfall Stage List'; +$lang->stage->browse = 'Stage List'; +$lang->stage->browseAB = 'Stage List'; $lang->stage->create = 'Create Stage'; -$lang->stage->batchCreate = 'Batch Create'; -$lang->stage->edit = 'Edit'; -$lang->stage->delete = 'Delete'; +$lang->stage->batchCreate = 'Batch Create Stage'; +$lang->stage->edit = 'Edit Stage'; +$lang->stage->delete = 'Delete Stage'; $lang->stage->view = 'Details'; $lang->stage->plusBrowse = 'Waterfall Plus Stage List'; +$lang->stage->setTRpoint = 'Set TR Point'; +$lang->stage->setDCPpoint = 'Set DCP Point'; /* Fields. */ -$lang->stage->id = 'ID'; -$lang->stage->name = 'Name'; -$lang->stage->type = 'Type'; -$lang->stage->percent = 'Workload %'; -$lang->stage->setType = 'Set Type'; +$lang->stage->id = 'ID'; +$lang->stage->name = 'Name'; +$lang->stage->type = 'Type'; +$lang->stage->percent = 'Workload %'; +$lang->stage->setType = 'Stage Type'; +$lang->stage->TRpoint = 'TR Point'; +$lang->stage->DCPpoint = 'DCP Point'; +$lang->stage->TRname = 'TR Point Name'; +$lang->stage->DCPname = 'DCP Point Name'; +$lang->stage->pointFlow = 'Approval Flow'; +$lang->stage->order = 'Order'; $lang->stage->typeList['mix'] = 'Mix'; $lang->stage->typeList['request'] = 'Story'; diff --git a/module/stage/lang/fr.php b/module/stage/lang/fr.php index 16ed0dd9d9..93913a5327 100644 --- a/module/stage/lang/fr.php +++ b/module/stage/lang/fr.php @@ -10,20 +10,29 @@ * @link https://www.zentao.net */ /* Actions. */ -$lang->stage->browse = 'Waterfall Stage List'; +$lang->stage->browse = 'Stage List'; +$lang->stage->browseAB = 'Stage List'; $lang->stage->create = 'Create Stage'; -$lang->stage->batchCreate = 'Batch Create'; -$lang->stage->edit = 'Edit'; -$lang->stage->delete = 'Delete'; +$lang->stage->batchCreate = 'Batch Create Stage'; +$lang->stage->edit = 'Edit Stage'; +$lang->stage->delete = 'Delete Stage'; $lang->stage->view = 'Details'; $lang->stage->plusBrowse = 'Waterfall Plus Stage List'; +$lang->stage->setTRpoint = 'Set TR Point'; +$lang->stage->setDCPpoint = 'Set DCP Point'; /* Fields. */ -$lang->stage->id = 'ID'; -$lang->stage->name = 'Name'; -$lang->stage->type = 'Type'; -$lang->stage->percent = 'Workload %'; -$lang->stage->setType = 'Set Type'; +$lang->stage->id = 'ID'; +$lang->stage->name = 'Name'; +$lang->stage->type = 'Type'; +$lang->stage->percent = 'Workload %'; +$lang->stage->setType = 'Stage Type'; +$lang->stage->TRpoint = 'TR Point'; +$lang->stage->DCPpoint = 'DCP Point'; +$lang->stage->TRname = 'TR Point Name'; +$lang->stage->DCPname = 'DCP Point Name'; +$lang->stage->pointFlow = 'Approval Flow'; +$lang->stage->order = 'Order'; $lang->stage->typeList['mix'] = 'Mix'; $lang->stage->typeList['request'] = 'Story'; diff --git a/module/stage/lang/zh-cn.php b/module/stage/lang/zh-cn.php index 5055a90742..b4e16c3259 100644 --- a/module/stage/lang/zh-cn.php +++ b/module/stage/lang/zh-cn.php @@ -10,20 +10,29 @@ * @link https://www.zentao.net */ /* Actions. */ -$lang->stage->browse = '瀑布阶段列表'; -$lang->stage->create = '新建'; -$lang->stage->batchCreate = '批量新建'; -$lang->stage->edit = '编辑'; -$lang->stage->delete = '删除'; +$lang->stage->browse = '浏览阶段列表'; +$lang->stage->browseAB = '阶段列表'; +$lang->stage->create = '新建阶段'; +$lang->stage->batchCreate = '批量新建阶段'; +$lang->stage->edit = '编辑阶段'; +$lang->stage->delete = '删除阶段'; $lang->stage->view = '阶段详情'; $lang->stage->plusBrowse = '融合瀑布阶段列表'; +$lang->stage->setTRpoint = 'TR评审点配置'; +$lang->stage->setDCPpoint = 'DCP评审点配置'; /* Fields. */ -$lang->stage->id = 'ID'; -$lang->stage->name = '阶段名称'; -$lang->stage->type = '阶段类型'; -$lang->stage->percent = '工作量占比'; -$lang->stage->setType = '阶段类型'; +$lang->stage->id = 'ID'; +$lang->stage->name = '阶段名称'; +$lang->stage->type = '阶段类型'; +$lang->stage->percent = '工作量占比'; +$lang->stage->setType = '阶段类型'; +$lang->stage->TRpoint = 'TR评审点'; +$lang->stage->DCPpoint = 'DCP评审点'; +$lang->stage->TRname = 'TR评审点名称'; +$lang->stage->DCPname = 'DCP评审点名称'; +$lang->stage->pointFlow = '审批流'; +$lang->stage->order = '排序'; $lang->stage->typeList['mix'] = '综合'; $lang->stage->typeList['request'] = '需求'; diff --git a/module/stage/model.php b/module/stage/model.php index 1c2e8fd79b..a78995f69f 100644 --- a/module/stage/model.php +++ b/module/stage/model.php @@ -18,16 +18,15 @@ class stageModel extends model * 创建一个阶段。 * Create a stage. * - * @param object $stage - * @param string $type waterfall|waterfallplus + * @param object $stage * @access public * @return int|bool */ - public function create(object $stage, string $type = 'waterfall'): int|bool + public function create(object $stage): int|bool { if(isset($this->config->setPercent) && $this->config->setPercent == 1) { - $totalPercent = $this->getTotalPercent($type); + $totalPercent = $this->getTotalPercent($stage->workflowGroup); if(!is_numeric($stage->percent)) { @@ -41,12 +40,18 @@ class stageModel extends model } } + $this->lang->error->unique = $this->lang->error->repeat; if(!empty($stage->percent)) $stage->percent = (float)$stage->percent; $this->dao->insert(TABLE_STAGE) ->data($stage) ->autoCheck() ->batchCheck($this->config->stage->create->requiredFields, 'notempty') + ->checkIF(!empty($stage->name), 'name', 'unique', "`workflowGroup` = '$stage->workflowGroup' AND `deleted` = '0'") ->exec(); + $stageID = $this->dao->lastInsertID(); + + $maxOrder = $this->dao->select('MAX(`order`) AS maxOrder')->from(TABLE_STAGE)->where('workflowGroup')->eq($stage->workflowGroup)->andWhere('deleted')->eq('0')->fetch('maxOrder'); + $this->dao->update(TABLE_STAGE)->set('order')->eq((int)$maxOrder + 1)->where('id')->eq($stageID)->exec(); if(dao::isError()) return false; return $this->dao->lastInsertID(); @@ -56,17 +61,17 @@ class stageModel extends model * 批量创建阶段。 * Batch create stages. * - * @param string $type waterfall|waterfallplus + * @param int $groupID * @param array $stages * @access public * @return bool */ - public function batchCreate($type = 'waterfall', array $stages = array()): bool + public function batchCreate(int $groupID = 0, array $stages = array()): bool { $setPercent = (isset($this->config->setPercent) && $this->config->setPercent == 1) ? true : false; if($setPercent) { - $oldTotalPercent = $this->getTotalPercent($type); + $oldTotalPercent = $this->getTotalPercent($groupID); $totalPercent = 0; foreach($stages as $stage) { @@ -81,10 +86,26 @@ class stageModel extends model } } - $this->loadModel('action'); + $stageNames = $this->dao->select('id,name')->from(TABLE_STAGE)->where('workflowGroup')->eq($groupID)->andWhere('deleted')->eq('0')->fetchPairs('name'); foreach($stages as $rowID => $stage) { - $stage->projectType = $type; + if(in_array($stage->name, $stageNames)) + { + dao::$errors["name[$rowID]"] = sprintf($this->lang->error->repeat, $this->lang->stage->name, $stage->name); + return false; + } + $stageNames[] = $stage->name; + } + + $maxOrder = $this->dao->select('MAX(`order`) AS maxOrder')->from(TABLE_STAGE)->where('workflowGroup')->eq($groupID)->andWhere('deleted')->eq('0')->fetch('maxOrder'); + + $this->loadModel('action'); + $now = helper::now(); + foreach($stages as $rowID => $stage) + { + $stage->workflowGroup = $groupID; + $stage->createdBy = $this->app->user->account; + $stage->createdDate = $now; if(!empty($stage->percent)) $stage->percent = (float)$stage->percent; $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck() ->batchCheck($this->config->stage->create->requiredFields, 'notempty') @@ -98,6 +119,9 @@ class stageModel extends model $stageID = $this->dao->lastInsertID(); $this->action->create('stage', $stageID, 'Opened'); + + $stageOrder = empty($maxOrder) ? 1 : ++ $maxOrder; + $this->dao->update(TABLE_STAGE)->set('order')->eq($stageOrder)->where('id')->eq($stageID)->exec(); } return true; @@ -119,19 +143,21 @@ class stageModel extends model if(isset($this->config->setPercent) && $this->config->setPercent == 1) { - $totalPercent = $this->getTotalPercent($oldStage->projectType); - if(round($totalPercent + (float)$stage->percent - $oldStage->percent) > 100) + $totalPercent = $this->getTotalPercent($oldStage->workflowGroup); + if(round($totalPercent + (float)$stage->percent - (float)$oldStage->percent) > 100) { dao::$errors['percent'] = $this->lang->stage->error->percentOver; return false; } } + $this->lang->error->unique = $this->lang->error->repeat; $this->dao->update(TABLE_STAGE) ->data($stage) ->autoCheck() ->batchCheck($this->config->stage->edit->requiredFields, 'notempty') ->checkIF(isset($stage->percent) && $stage->percent != '', 'percent', 'float')->where('id')->eq((int)$stageID) + ->checkIF(!empty($stage->name), 'name', 'unique', "`id` != '$stageID' AND `workflowGroup` = '$oldStage->workflowGroup' AND `deleted` = '0'") ->exec(); if(dao::isError()) return false; @@ -144,12 +170,12 @@ class stageModel extends model * * @param string $orderBy * @param int $projectID - * @param string $type - * @param string $grade + * @param int $groupID + * @param int $grade * @access public * @return array */ - public function getStages(string $orderBy = 'id_desc', int $projectID = 0, string $type = '', int $grade = 0): array + public function getStages(string $orderBy = 'order_desc', int $projectID = 0, int $groupID = 0, int $grade = 0): array { if(common::isTutorialMode()) return $this->loadModel('tutorial')->getStages(); @@ -167,19 +193,32 @@ class stageModel extends model ->fetchAll('id'); } - $stageType = ''; - if($this->config->systemMode == 'PLM' && $this->app->rawMethod == 'create' && $this->app->rawModule == 'programplan' && $type == 'ipd') - { - $project = $this->loadModel('project')->fetchByID($this->session->project); - $stageType = zget($this->config->project->categoryStages, $project->category, ''); - } - - return $this->dao->select('*')->from(TABLE_STAGE) + $stages = $this->dao->select('*')->from(TABLE_STAGE) ->where('deleted')->eq(0) - ->andWhere('projectType')->eq($type) - ->beginIF(!empty($stageType))->andWhere('type')->in($stageType)->fi() + ->andWhere('workflowGroup')->eq($groupID) + ->beginIF($this->config->edition != 'ipd')->andWhere('projectType')->ne('ipd')->fi() + ->andWhere('type')->ne('lifecycle') ->orderBy($orderBy) ->fetchAll('id'); + + $stagePoints = $this->dao->select('*')->from(TABLE_DECISION)->where('stage')->in(array_keys($stages))->andWhere('deleted')->eq('0')->orderBy('order_asc')->fetchGroup('stage'); + $pointList = array(); + foreach($stagePoints as $stageID => $points) + { + if(!isset($pointList[$stageID])) $pointList[$stageID] = array(); + foreach($points as $point) + { + if(!isset($pointList[$stageID][$point->type])) $pointList[$stageID][$point->type] = array(); + $pointList[$stageID][$point->type][$point->id] = $point->title; + } + } + foreach($stages as $stage) + { + $stage->TRpoint = isset($pointList[$stage->id]['TR']) ? implode(', ', $pointList[$stage->id]['TR']) : ''; + $stage->DCPpoint = isset($pointList[$stage->id]['DCP']) ? implode(', ', $pointList[$stage->id]['DCP']) : ''; + $stage->pointList = zget($pointList, $stage->id, array()); + } + return $stages; } /** @@ -202,40 +241,207 @@ class stageModel extends model * @param string $type waterfall|waterfallplus * @return float */ - public function getTotalPercent(string $type): float + public function getTotalPercent(int $groupID): float { - return (float)$this->dao->select('sum(percent) as total')->from(TABLE_STAGE)->where('deleted')->eq('0')->andWhere('projectType')->eq($type)->fetch('total'); + return (float)$this->dao->select('sum(percent) as total')->from(TABLE_STAGE)->where('deleted')->eq('0')->andWhere('workflowGroup')->eq($groupID)->fetch('total'); } /** - * 设置阶段导航。 - * Set menu. + * 添加内置评审点。 + * Add the builtin point. * - * @param string $type waterfall|waterfallplus + * @param int $groupID + * @return void + */ + public function addBuiltinPoint(int $groupID) + { + $workflowGroup = $this->dao->select('*')->from(TABLE_WORKFLOWGROUP)->where('id')->eq($groupID)->fetch(); + + $this->app->loadConfig('project'); + $stageList = $this->dao->select('*')->from(TABLE_STAGE)->where('workflowGroup')->eq($groupID)->fetchAll('id'); + if(empty($stageList)) + { + $stageTypeList = array(); + if($workflowGroup->projectModel == 'ipd') + { + if($workflowGroup->projectType == 'ipd') $stageTypeList = $this->config->project->categoryStages['IPD']; + if($workflowGroup->projectType == 'tpd') $stageTypeList = $this->config->project->categoryStages['TPD']; + if($workflowGroup->projectType == 'cbb') $stageTypeList = $this->config->project->categoryStages['CBB']; + if(in_array($workflowGroup->projectType, array('cpdproduct', 'cpdproject'))) $stageTypeList = $this->config->project->categoryStages['CPD']; + } + if(in_array($workflowGroup->projectModel, array('waterfall', 'waterfallplus'))) $stageTypeList = $this->config->project->categoryStages['waterfall']; + + foreach($stageTypeList as $stageType) + { + $builtinStage = new stdClass(); + $builtinStage->workflowGroup = $groupID; + $builtinStage->createdBy = 'system'; + $builtinStage->createdDate = helper::now(); + $builtinStage->name = in_array($workflowGroup->projectModel, array('waterfall', 'waterfallplus')) ? zget($this->lang->stage->typeList, $stageType, '') : zget($this->lang->stage->ipdTypeList, $stageType, ''); + $builtinStage->type = $stageType; + $builtinStage->projectType = $workflowGroup->projectModel; + $this->dao->insert(TABLE_STAGE)->data($builtinStage)->exec(); + + $stageID = $this->dao->lastInsertID(); + $stageList[$stageID] = $builtinStage; + } + } + if($workflowGroup->projectModel != 'ipd') return; + + $builtinPoints = $this->dao->select('*')->from(TABLE_DECISION)->where('workflowGroup')->eq($groupID)->andWhere('builtin')->eq('1')->fetchAll(); + if(!empty($builtinPoints)) return; + + $decision = new stdClass(); + $decision->builtin = '1'; + $decision->createdBy = 'system'; + $decision->createdDate = helper::now(); + $decision->workflowGroup = $groupID; + + $decisionFlow = new stdClass(); + $decisionFlow->flow = 1; + $decisionFlow->objectType = 'decision'; + $decisionFlow->relatedBy = 'system'; + $decisionFlow->relatedDate = helper::now(); + foreach($stageList as $id => $stage) + { + foreach($this->config->stage->ipdReviewPoint->{$stage->type} as $index => $point) + { + $decision->stage = $id; + $decision->order = $index + 1; + $decision->title = $point; + $decision->type = strpos($point, 'TR') !== false ? 'TR' : 'DCP'; + $decision->category = $point; + $this->dao->insert(TABLE_DECISION)->data($decision)->exec(); + $decisionID = $this->dao->lastInsertID(); + + $decisionFlow->root = $stage->workflowGroup; + $decisionFlow->objectID = $decisionID; + $this->dao->insert(TABLE_APPROVALFLOWOBJECT)->data($decisionFlow)->exec(); + } + } + } + + /** + * 获取阶段的评审点。 + * Get points of stage. + * + * @param string $type TR|DCP + * @param int $stageID + * @access public + * @return bool + */ + public function getStagePoints(string $type, int $stageID) + { + $stage = $this->dao->select('*')->from(TABLE_STAGE)->where('id')->eq($stageID)->fetch(); + return $this->dao->select('t1.*,t2.flow')->from(TABLE_DECISION)->alias('t1') + ->leftJoin(TABLE_APPROVALFLOWOBJECT)->alias('t2')->on("t1.id = t2.objectID AND t2.objectType = 'decision'") + ->where('t1.deleted')->eq('0') + ->andWhere('t1.stage')->eq($stageID) + ->andWhere('t1.type')->eq($type) + ->andWhere('t2.root')->eq($stage->workflowGroup) + ->orderBy('order_asc') + ->fetchAll('id'); + } + + /** + * 设置阶段的评审点。 + * Set point of stage. + * + * @param string $type TR|DCP + * @param int $stageID + * @param array $stageID + * @access public + * @return bool + */ + public function setPoint(string $type, int $stageID, array $points): bool + { + $stage = $this->getByID($stageID); + $oldStagePoints = $this->getStagePoints($type, $stageID); + + foreach($points as $index => $point) + { + if(!empty($point->id) && isset($oldStagePoints[$point->id])) + { + $oldPoint = $oldStagePoints[$point->id]; + if($oldPoint->title != $point->title || $oldPoint->order != $index) + { + $this->dao->update(TABLE_DECISION) + ->set('title')->eq($point->title) + ->set('order')->eq($index) + ->set('editedBy')->eq($this->app->user->account) + ->set('editedDate')->eq(helper::now()) + ->where('id')->eq($point->id) + ->exec(); + if(dao::isError()) return false; + } + if($oldPoint->flow != $point->flow) + { + $this->dao->update(TABLE_APPROVALFLOWOBJECT) + ->set('flow')->eq($point->flow) + ->where('objectID')->eq($point->id) + ->andWhere('objectType')->eq('decision') + ->andWhere('root')->eq($stage->workflowGroup) + ->exec(); + if(dao::isError()) return false; + } + unset($oldStagePoints[$point->id]); + } + else + { + $newPoint = new stdClass(); + $newPoint->workflowGroup = $stage->workflowGroup; + $newPoint->stage = $stageID; + $newPoint->title = $point->title; + $newPoint->type = $type; + $newPoint->builtin = '0'; + $newPoint->createdBy = $this->app->user->account; + $newPoint->createdDate = helper::now(); + $newPoint->order = $index; + $this->dao->insert(TABLE_DECISION)->data($newPoint)->exec(); + $newPointID = $this->dao->lastInsertID(); + if(dao::isError()) return false; + + $approvalFlowObject = new stdClass(); + $approvalFlowObject->root = $stage->workflowGroup; + $approvalFlowObject->flow = $point->flow; + $approvalFlowObject->objectType = 'decision'; + $approvalFlowObject->objectID = $newPointID; + $approvalFlowObject->relatedBy = $this->app->user->account; + $approvalFlowObject->relatedDate = helper::now(); + $approvalFlowObject->extra = $type; + $this->dao->insert(TABLE_APPROVALFLOWOBJECT)->data($approvalFlowObject)->exec(); + if(dao::isError()) return false; + } + } + + if(!empty($oldStagePoints)) + { + $this->dao->update(TABLE_DECISION)->set('deleted')->eq('1')->where('id')->in(array_keys($oldStagePoints))->exec(); + $approvalFlowObjectIDList = $this->dao->select('id')->from(TABLE_APPROVALFLOWOBJECT) + ->where('objectID')->in(array_keys($oldStagePoints)) + ->andWhere('objectType')->eq('decision') + ->andWhere('root')->eq($stage->workflowGroup) + ->fetchPairs(); + + $this->dao->delete()->from(TABLE_APPROVALFLOWOBJECT)->where('id')->in($approvalFlowObjectIDList)->exec(); // 删除评审流程 + $this->dao->delete()->from(TABLE_REVIEWCL)->where('object')->in($approvalFlowObjectIDList)->exec(); // 删除检查清单 + } + return true; + } + + /** + * 更新排序。 + * Update order. + * + * @param array $sortedIdList * @access public * @return void */ - public function setMenu(string $type): void + public function updateOrder(array $sortedIdList) { - $this->app->loadLang('admin'); - $moduleName = $this->app->rawModule; - $methodName = $this->app->rawMethod; - - if(!isset($this->lang->admin->menuList->model['subMenu']['waterfall']['exclude'])) $this->lang->admin->menuList->model['subMenu']['waterfall']['exclude'] = ''; - if(!isset($this->lang->admin->menuList->model['subMenu']['waterfallplus']['exclude'])) $this->lang->admin->menuList->model['subMenu']['waterfallplus']['exclude'] = ''; - if($type == 'waterfall') + foreach($sortedIdList as $stageID => $order) { - $this->lang->admin->menuList->model['subMenu']['waterfallplus']['exclude'] .= ",{$moduleName}-{$methodName}"; - unset($this->lang->admin->menuList->model['subMenu']['scrum']['subModule']); - unset($this->lang->admin->menuList->model['subMenu']['scrumplus']['subModule']); - unset($this->lang->admin->menuList->model['subMenu']['waterfallplus']['subModule']); - } - if($type == 'waterfallplus') - { - $this->lang->admin->menuList->model['subMenu']['waterfall']['exclude'] .= ",{$moduleName}-{$methodName}"; - unset($this->lang->admin->menuList->model['subMenu']['scrum']['subModule']); - unset($this->lang->admin->menuList->model['subMenu']['waterfall']['subModule']); - unset($this->lang->admin->menuList->model['subMenu']['scrumplus']['subModule']); + $this->dao->update(TABLE_STAGE)->set('order')->eq($order + 1)->where('id')->eq($stageID)->exec(); } } } diff --git a/module/stage/test/lib/stage.unittest.class.php b/module/stage/test/lib/stage.unittest.class.php index 8fcdae474e..99f9f7869a 100644 --- a/module/stage/test/lib/stage.unittest.class.php +++ b/module/stage/test/lib/stage.unittest.class.php @@ -27,7 +27,9 @@ class stageTest { $this->objectModel->config->setPercent = 1; $this->objectModel->config->stage->create->requiredFields = 'type,name,percent'; - $stageID = $this->objectModel->create($stage, $type); + if($type == 'waterfall') $stage->workflowGroup = 4; + if($type == 'waterfallplus') $stage->workflowGroup = 8; + $stageID = $this->objectModel->create($stage); if(dao::isError()) return dao::getError(); return $this->objectModel->dao->select('*')->from(TABLE_STAGE)->where('id')->eq($stageID)->fetch(); @@ -38,11 +40,11 @@ class stageTest * Batch create stages. * * @param array $data - * @param string $type waterfall|waterfallplus + * @param int $groupID * @access public * @return int|string|array */ - public function batchCreateTest(array $data, string $type = 'waterfall'): int|string|array + public function batchCreateTest(array $data, int $groupID = 0): int|string|array { $this->objectModel->config->setPercent = 1; $this->objectModel->config->stage->create->requiredFields = 'type,name,percent'; @@ -58,10 +60,10 @@ class stageTest $stages[] = $stage; } - $this->objectModel->batchCreate($type, $stages); + $this->objectModel->batchCreate($groupID, $stages); if(dao::isError()) return current(dao::getError()); - $objects = $this->objectModel->getStages('id_desc', 0, $type); + $objects = $this->objectModel->getStages('id_desc', 0, $groupID); return count($objects); } @@ -133,13 +135,13 @@ class stageTest * 获取给定模型下的阶段总百分比。 * Get total percent of the type. * - * @param string $projectType waterfall|waterfallplus + * @param int $groupID * @access public * @return int|array */ - public function getTotalPercentTest(string $projectType): int|array + public function getTotalPercentTest(int $groupID): int|array { - $totalPercent = $this->objectModel->getTotalPercent($projectType); + $totalPercent = $this->objectModel->getTotalPercent($groupID); if(dao::isError()) return dao::getError(); return $totalPercent; diff --git a/module/stage/test/model/addbuiltinpoint.php b/module/stage/test/model/addbuiltinpoint.php new file mode 100755 index 0000000000..3711d530f0 --- /dev/null +++ b/module/stage/test/model/addbuiltinpoint.php @@ -0,0 +1,80 @@ +#!/usr/bin/env php +addBuiltinPoint(); +cid=1 + +- 获取TR1评审点 + - 第1条的title属性 @TR1 + - 第1条的type属性 @TR + - 第1条的category属性 @TR1 +- 获取CDCP评审点 + - 第2条的title属性 @CDCP + - 第2条的type属性 @DCP + - 第2条的category属性 @CDCP +- 获取TR2评审点 + - 第3条的title属性 @TR2 + - 第3条的type属性 @TR + - 第3条的category属性 @TR2 +- 获取TR3评审点 + - 第4条的title属性 @TR3 + - 第4条的type属性 @TR + - 第4条的category属性 @TR3 +- 获取PDCP评审点 + - 第5条的title属性 @PDCP + - 第5条的type属性 @DCP + - 第5条的category属性 @PDCP +- 获取TR4评审点 + - 第6条的title属性 @TR4 + - 第6条的type属性 @TR + - 第6条的category属性 @TR4 +- 获取TR4A评审点 + - 第7条的title属性 @TR4A + - 第7条的type属性 @TR + - 第7条的category属性 @TR4A +- 获取TR5评审点 + - 第8条的title属性 @TR5 + - 第8条的type属性 @TR + - 第8条的category属性 @TR5 +- 获取TR6评审点 + - 第9条的title属性 @TR6 + - 第9条的type属性 @TR + - 第9条的category属性 @TR6 +- 获取ADCP评审点 + - 第10条的title属性 @ADCP + - 第10条的type属性 @DCP + - 第10条的category属性 @ADCP + +*/ + +include dirname(__FILE__, 5) . '/test/lib/init.php'; + +zenData('user')->gen(5); +zenData('decision')->gen(0); + +$workflowGroup = zenData('workflowgroup'); +$workflowGroup->id->range('1-5'); +$workflowGroup->type->range('project'); +$workflowGroup->projectModel->range('ipd'); +$workflowGroup->projectType->range('ipd,tpd,cbb,cpdproduct,cpdproject'); +$workflowGroup->name->range('IPD集成产品研发,IPD预研产品研发,IPD平台产品研发,IPD定制产品研发,IPD定制项目研发'); +$workflowGroup->code->range('ipdproduct,tpdproduct,cbbproduct,cpdproduct,cpdproject'); +$workflowGroup->status->range('normal'); +$workflowGroup->main->range('1'); +$workflowGroup->gen(5); + +global $tester; +$stageTester = $tester->loadModel('stage'); +$stageTester->addBuiltinPoint(1); +$IPDpoint = $stageTester->dao->select('*')->from(TABLE_DECISION)->where('workflowGroup')->eq(1)->fetchAll('id'); +r($IPDpoint) && p('1:title,type,category') && e('TR1,TR,TR1'); //获取TR1评审点 +r($IPDpoint) && p('2:title,type,category') && e('CDCP,DCP,CDCP'); //获取CDCP评审点 +r($IPDpoint) && p('3:title,type,category') && e('TR2,TR,TR2'); //获取TR2评审点 +r($IPDpoint) && p('4:title,type,category') && e('TR3,TR,TR3'); //获取TR3评审点 +r($IPDpoint) && p('5:title,type,category') && e('PDCP,DCP,PDCP'); //获取PDCP评审点 +r($IPDpoint) && p('6:title,type,category') && e('TR4,TR,TR4'); //获取TR4评审点 +r($IPDpoint) && p('7:title,type,category') && e('TR4A,TR,TR4A'); //获取TR4A评审点 +r($IPDpoint) && p('8:title,type,category') && e('TR5,TR,TR5'); //获取TR5评审点 +r($IPDpoint) && p('9:title,type,category') && e('TR6,TR,TR6'); //获取TR6评审点 +r($IPDpoint) && p('10:title,type,category') && e('ADCP,DCP,ADCP'); //获取ADCP评审点 diff --git a/module/stage/test/model/batchcreate.php b/module/stage/test/model/batchcreate.php index 747ca11d49..91a92298d1 100755 --- a/module/stage/test/model/batchcreate.php +++ b/module/stage/test/model/batchcreate.php @@ -42,7 +42,7 @@ $name3 = array(1 => '批量创建的发布', 2 => '批量创建的总结评 $percent3 = array(1 => 5, 2 => 6); $type3 = array(1 => 'release', 2 => 'review'); -$name4 = array(1 => '批量创建的需求', 2 => '批量创建的其他'); +$name4 = array(1 => '批量创建的验证', 2 => '批量创建的其他'); $percent4 = array(1 => 1, 2 => 7); $type4 = array(1 => 'request', 2 => 'other'); @@ -68,6 +68,8 @@ r($stageTester->batchCreateTest($param2)) && p() && e('4'); // 测试批量创 r($stageTester->batchCreateTest($param3)) && p() && e('6'); // 测试批量创建瀑布项目的阶段 3 r($stageTester->batchCreateTest($param4)) && p() && e('8'); // 测试批量创建瀑布项目的阶段 4 +zenData('stage')->gen(0); + /* Error condition. */ r($stageTester->batchCreateTest($param5)) && p('0') && e('『工作量占比』不能为空。'); // 测试批量创建瀑布项目的百分比为空的阶段 r($stageTester->batchCreateTest($param6)) && p('0') && e('『阶段类型』不能为空。'); // 测试批量创建瀑布项目的类型为空的阶段 @@ -75,13 +77,13 @@ r($stageTester->batchCreateTest($param7)) && p('0') && e('『工作量占比』 r($stageTester->batchCreateTest($param8)) && p('0') && e('工作量占比累计不应当超过100%'); // 测试批量创建瀑布项目的百分比超出100的阶段 /* Normal condition. */ -r($stageTester->batchCreateTest($param1, 'waterfallplus')) && p() && e('2'); // 测试批量创建融合瀑布项目的阶段 1 -r($stageTester->batchCreateTest($param2, 'waterfallplus')) && p() && e('4'); // 测试批量创建融合瀑布项目的阶段 2 -r($stageTester->batchCreateTest($param3, 'waterfallplus')) && p() && e('6'); // 测试批量创建融合瀑布项目的阶段 3 -r($stageTester->batchCreateTest($param4, 'waterfallplus')) && p() && e('8'); // 测试批量创建融合瀑布项目的阶段 4 +r($stageTester->batchCreateTest($param1, 8)) && p() && e('2'); // 测试批量创建融合瀑布项目的阶段 1 +r($stageTester->batchCreateTest($param2, 8)) && p() && e('4'); // 测试批量创建融合瀑布项目的阶段 2 +r($stageTester->batchCreateTest($param3, 8)) && p() && e('6'); // 测试批量创建融合瀑布项目的阶段 3 +r($stageTester->batchCreateTest($param4, 8)) && p() && e('8'); // 测试批量创建融合瀑布项目的阶段 4 /* Error condition. */ -r($stageTester->batchCreateTest($param5, 'waterfallplus')) && p('0') && e('『工作量占比』不能为空。'); // 测试批量创建融合瀑布项目的百分比为空的阶段 -r($stageTester->batchCreateTest($param6, 'waterfallplus')) && p('0') && e('『阶段类型』不能为空。'); // 测试批量创建融合瀑布项目的类型为空的阶段 -r($stageTester->batchCreateTest($param7, 'waterfallplus')) && p('0') && e('『工作量占比』不能为空。'); // 测试批量创建融合瀑布项目的百分比非法的阶段 -r($stageTester->batchCreateTest($param8, 'waterfallplus')) && p('0') && e('工作量占比累计不应当超过100%'); // 测试批量创建融合瀑布项目的百分比超出100的阶段 +r($stageTester->batchCreateTest($param5, 9)) && p('0') && e('『工作量占比』不能为空。'); // 测试批量创建融合瀑布项目的百分比为空的阶段 +r($stageTester->batchCreateTest($param6, 9)) && p('0') && e('『阶段类型』不能为空。'); // 测试批量创建融合瀑布项目的类型为空的阶段 +r($stageTester->batchCreateTest($param7, 9)) && p('0') && e('『工作量占比』不能为空。'); // 测试批量创建融合瀑布项目的百分比非法的阶段 +r($stageTester->batchCreateTest($param8, 9)) && p('0') && e('工作量占比累计不应当超过100%'); // 测试批量创建融合瀑布项目的百分比超出100的阶段 diff --git a/module/stage/test/model/getstagepoints.php b/module/stage/test/model/getstagepoints.php new file mode 100755 index 0000000000..1a6f9a4d70 --- /dev/null +++ b/module/stage/test/model/getstagepoints.php @@ -0,0 +1,56 @@ +#!/usr/bin/env php +getStagePoints(); +timeout=0 +cid=1 + +- 获取阶段1的TR评审点 + - 第1条的stage属性 @1 + - 第1条的title属性 @TR1 +- 获取阶段2的TR评审点 + - 第2条的stage属性 @2 + - 第2条的title属性 @TR2 +- 获取阶段2的TR评审点 + - 第3条的stage属性 @3 + - 第3条的title属性 @TR3 +- 获取阶段4的DCP评审点 + - 第4条的stage属性 @4 + - 第4条的title属性 @CDCP +- 获取阶段5的DCP评审点 + - 第5条的stage属性 @5 + - 第5条的title属性 @PDCP + +*/ + +include dirname(__FILE__, 5) . '/test/lib/init.php'; +include dirname(__FILE__, 2) . '/lib/stage.unittest.class.php'; + +zenData('stage')->loadYaml('stage')->gen(5); +zenData('user')->gen(5); + +$decision = zenData('decision'); +$decision->id->range('1-5'); +$decision->workflowGroup->range('1-5'); +$decision->stage->range('1-5'); +$decision->title->range('TR1,TR2,TR3,CDCP,PDCP'); +$decision->type->range('TR{3},DCP{2}'); +$decision->gen(5); + +$approvalFlowObject = zenData('approvalflowobject'); +$approvalFlowObject->id->range('1-5'); +$approvalFlowObject->root->range('4'); +$approvalFlowObject->objectID->range('1-5'); +$approvalFlowObject->objectType->range('decision'); +$approvalFlowObject->extra->range('review'); +$approvalFlowObject->gen(5); + +global $tester; +$stageTester = $tester->loadModel('stage'); +r($stageTester->getStagePoints('TR', 1)) && p('1:stage,title') && e('1,TR1'); //获取阶段1的TR评审点 +r($stageTester->getStagePoints('TR', 2)) && p('2:stage,title') && e('2,TR2'); //获取阶段2的TR评审点 +r($stageTester->getStagePoints('TR', 3)) && p('3:stage,title') && e('3,TR3'); //获取阶段2的TR评审点 +r($stageTester->getStagePoints('DCP', 4)) && p('4:stage,title') && e('4,CDCP'); //获取阶段4的DCP评审点 +r($stageTester->getStagePoints('DCP', 5)) && p('5:stage,title') && e('5,PDCP'); //获取阶段5的DCP评审点 diff --git a/module/stage/test/model/getstages.php b/module/stage/test/model/getstages.php index db389b582f..d4279033dc 100755 --- a/module/stage/test/model/getstages.php +++ b/module/stage/test/model/getstages.php @@ -24,21 +24,11 @@ cid=18421 - 获取敏捷模型下按照id倒序排列的所有阶段 @0 - 获取瀑布模型下按照id正序排列的所有阶段 @0 - 获取瀑布模型下按照id倒序排列的所有阶段 - - 第1条的projectType属性 @waterfall - 第1条的type属性 @request - 第1条的name属性 @需求1 - 获取瀑布模型下按照id正序排列的所有阶段 - - 第1条的projectType属性 @waterfall - 第1条的type属性 @request - 第1条的name属性 @需求1 -- 获取融合瀑布模型下按照id倒序排列的所有阶段 - - 第7条的projectType属性 @waterfallplus - - 第7条的type属性 @request - - 第7条的name属性 @需求2 -- 获取融合瀑布模型下按照id正序排列的所有阶段 - - 第7条的projectType属性 @waterfallplus - - 第7条的type属性 @request - - 第7条的name属性 @需求2 */ include dirname(__FILE__, 5) . '/test/lib/init.php'; @@ -50,20 +40,18 @@ zenData('stage')->loadYaml('stage')->gen(12); $sorts = array('id_desc', 'id_asc'); $projectIds = array(0, 11, 60, 100); -$types = array('scrum', 'waterfall', 'waterfallplus'); +$types = array(2, 4); $stageTester = new stageTest(); -r($stageTester->getStagesTest($sorts[0], $projectIds[0], $types[0])) && p() && e('0'); // 获取敏捷模型下按照id倒序排列的所有阶段 -r($stageTester->getStagesTest($sorts[1], $projectIds[0], $types[0])) && p() && e('0'); // 获取瀑布模型下按照id正序排列的所有阶段 -r($stageTester->getStagesTest($sorts[0], $projectIds[1], $types[0])) && p('101:type,name') && e('sprint,迭代5'); // 获取敏捷项目下按照id倒序排列的所有阶段 -r($stageTester->getStagesTest($sorts[1], $projectIds[1], $types[0])) && p('105:type,name') && e('sprint,迭代9'); // 获取敏捷项目下按照id正序排列的所有阶段 -r($stageTester->getStagesTest($sorts[0], $projectIds[2], $types[0])) && p('106:type,name') && e('stage,阶段10'); // 获取瀑布项目下按照id倒序排列的所有阶段 -r($stageTester->getStagesTest($sorts[1], $projectIds[2], $types[0])) && p('106:type,name') && e('stage,阶段10'); // 获取瀑布项目下按照id正序排列的所有阶段 -r($stageTester->getStagesTest($sorts[0], $projectIds[3], $types[0])) && p() && e('0'); // 获取看板项目下按照id倒序排列的所有阶段 -r($stageTester->getStagesTest($sorts[1], $projectIds[3], $types[0])) && p() && e('0'); // 获取看板项目下按照id正序排列的所有阶段 -r($stageTester->getStagesTest($sorts[0], $projectIds[0], $types[0])) && p() && e('0'); // 获取敏捷模型下按照id倒序排列的所有阶段 -r($stageTester->getStagesTest($sorts[1], $projectIds[0], $types[0])) && p() && e('0'); // 获取瀑布模型下按照id正序排列的所有阶段 -r($stageTester->getStagesTest($sorts[0], $projectIds[0], $types[1])) && p('1:projectType,type,name') && e('waterfall,request,需求1'); // 获取瀑布模型下按照id倒序排列的所有阶段 -r($stageTester->getStagesTest($sorts[1], $projectIds[0], $types[1])) && p('1:projectType,type,name') && e('waterfall,request,需求1'); // 获取瀑布模型下按照id正序排列的所有阶段 -r($stageTester->getStagesTest($sorts[0], $projectIds[0], $types[2])) && p('7:projectType,type,name') && e('waterfallplus,request,需求2'); // 获取融合瀑布模型下按照id倒序排列的所有阶段 -r($stageTester->getStagesTest($sorts[1], $projectIds[0], $types[2])) && p('7:projectType,type,name') && e('waterfallplus,request,需求2'); // 获取融合瀑布模型下按照id正序排列的所有阶段 +r($stageTester->getStagesTest($sorts[0], $projectIds[0], $types[0])) && p() && e('0'); // 获取敏捷模型下按照id倒序排列的所有阶段 +r($stageTester->getStagesTest($sorts[1], $projectIds[0], $types[0])) && p() && e('0'); // 获取瀑布模型下按照id正序排列的所有阶段 +r($stageTester->getStagesTest($sorts[0], $projectIds[1], $types[0])) && p('101:type,name') && e('sprint,迭代5'); // 获取敏捷项目下按照id倒序排列的所有阶段 +r($stageTester->getStagesTest($sorts[1], $projectIds[1], $types[0])) && p('105:type,name') && e('sprint,迭代9'); // 获取敏捷项目下按照id正序排列的所有阶段 +r($stageTester->getStagesTest($sorts[0], $projectIds[2], $types[0])) && p('106:type,name') && e('stage,阶段10'); // 获取瀑布项目下按照id倒序排列的所有阶段 +r($stageTester->getStagesTest($sorts[1], $projectIds[2], $types[0])) && p('106:type,name') && e('stage,阶段10'); // 获取瀑布项目下按照id正序排列的所有阶段 +r($stageTester->getStagesTest($sorts[0], $projectIds[3], $types[0])) && p() && e('0'); // 获取看板项目下按照id倒序排列的所有阶段 +r($stageTester->getStagesTest($sorts[1], $projectIds[3], $types[0])) && p() && e('0'); // 获取看板项目下按照id正序排列的所有阶段 +r($stageTester->getStagesTest($sorts[0], $projectIds[0], $types[0])) && p() && e('0'); // 获取敏捷模型下按照id倒序排列的所有阶段 +r($stageTester->getStagesTest($sorts[1], $projectIds[0], $types[0])) && p() && e('0'); // 获取瀑布模型下按照id正序排列的所有阶段 +r($stageTester->getStagesTest($sorts[0], $projectIds[0], $types[1])) && p('1:type,name') && e('request,需求1'); // 获取瀑布模型下按照id倒序排列的所有阶段 +r($stageTester->getStagesTest($sorts[1], $projectIds[0], $types[1])) && p('1:type,name') && e('request,需求1'); // 获取瀑布模型下按照id正序排列的所有阶段 diff --git a/module/stage/test/model/gettotalpercent.php b/module/stage/test/model/gettotalpercent.php index 6bc2e37c97..d88148244c 100755 --- a/module/stage/test/model/gettotalpercent.php +++ b/module/stage/test/model/gettotalpercent.php @@ -12,8 +12,7 @@ cid=18422 - 测试获取有stage数据的waterfallplus类型总百分比 @60 - 测试获取不存在的项目类型总百分比 @0 - 测试获取scrum类型的总百分比 @0 -- 测试获取空字符串类型的总百分比 @0 -- 测试已删除stage的百分比不被计算 @60 +- 测试已删除stage的百分比不被计算 @0 */ @@ -24,22 +23,19 @@ $stageTester = new stageTest(); // 步骤1：测试空数据库情况 zenData('stage')->gen(0); -r($stageTester->getTotalPercentTest('waterfall')) && p() && e('0'); // 测试空数据库中waterfall类型的总百分比 +r($stageTester->getTotalPercentTest(4)) && p() && e('0'); // 测试空数据库中waterfall类型的总百分比 // 步骤2和3：准备测试数据，测试有数据情况 zenData('user')->gen(5); zenData('stage')->loadYaml('stage')->gen(12); -r($stageTester->getTotalPercentTest('waterfall')) && p() && e('60'); // 测试获取有stage数据的waterfall类型总百分比 -r($stageTester->getTotalPercentTest('waterfallplus')) && p() && e('60'); // 测试获取有stage数据的waterfallplus类型总百分比 +r($stageTester->getTotalPercentTest(4)) && p() && e('60'); // 测试获取有stage数据的waterfall类型总百分比 +r($stageTester->getTotalPercentTest(8)) && p() && e('60'); // 测试获取有stage数据的waterfallplus类型总百分比 // 步骤4：测试不存在的项目类型 -r($stageTester->getTotalPercentTest('nonexistent')) && p() && e('0'); // 测试获取不存在的项目类型总百分比 +r($stageTester->getTotalPercentTest(0)) && p() && e('0'); // 测试获取不存在的项目类型总百分比 // 步骤5：测试scrum类型（应该没有数据） -r($stageTester->getTotalPercentTest('scrum')) && p() && e('0'); // 测试获取scrum类型的总百分比 - -// 步骤6：测试空字符串类型 -r($stageTester->getTotalPercentTest('')) && p() && e('0'); // 测试获取空字符串类型的总百分比 +r($stageTester->getTotalPercentTest(2)) && p() && e('0'); // 测试获取scrum类型的总百分比 // 步骤7：测试已删除的stage不被计算（需要准备包含已删除数据的测试数据） $table = zenData('stage'); @@ -50,4 +46,4 @@ $table->type->range('request,design'); $table->percent->range('15,25'); $table->deleted->range('1{2}'); $table->gen(2); -r($stageTester->getTotalPercentTest('waterfall')) && p() && e('60'); // 测试已删除stage的百分比不被计算 \ No newline at end of file +r($stageTester->getTotalPercentTest(2)) && p() && e('0'); // 测试已删除stage的百分比不被计算 diff --git a/module/stage/test/model/setpoint.php b/module/stage/test/model/setpoint.php new file mode 100755 index 0000000000..be089f3a79 --- /dev/null +++ b/module/stage/test/model/setpoint.php @@ -0,0 +1,77 @@ +#!/usr/bin/env php +setPoint(); +cid=1 + +- 测试修改评审点标题 @TR1 change +- 测试修改评审点的审批流 @2 +- 测试修改评审点的顺序 @2 +- 测试删除评审点 @1 +- 测试添加评审点第6条的title属性 @test add point + +*/ + +include dirname(__FILE__, 5) . '/test/lib/init.php'; +include dirname(__FILE__, 2) . '/lib/stage.unittest.class.php'; + +zenData('stage')->loadYaml('stage')->gen(5); +zenData('user')->gen(5); + +$decision = zenData('decision'); +$decision->id->range('1-5'); +$decision->workflowGroup->range('1-5'); +$decision->stage->range('1-5'); +$decision->order->range('1'); +$decision->title->range('TR1,TR2,TR3,CDCP,PDCP'); +$decision->type->range('TR{3},DCP{2}'); +$decision->gen(5); + +$approvalFlowObject = zenData('approvalflowobject'); +$approvalFlowObject->id->range('1-5'); +$approvalFlowObject->root->range('4'); +$approvalFlowObject->flow->range('1'); +$approvalFlowObject->objectID->range('1-5'); +$approvalFlowObject->objectType->range('decision'); +$approvalFlowObject->extra->range('review'); +$approvalFlowObject->gen(5); + +global $tester; +$stageTester = $tester->loadModel('stage'); + +$changeTitle = new stdClass(); +$changeTitle->id = 1; +$changeTitle->title = 'TR1 change'; +$changeTitle->flow = '1'; +$stageTester->setPoint('TR', 1, array(1 => $changeTitle)); +$result = $stageTester->dao->select('title')->from(TABLE_DECISION)->where('id')->eq(1)->fetch('title'); +r($result) && p() && e('TR1 change'); //测试修改评审点标题 + +$changeFlow = new stdClass(); +$changeFlow->id = 2; +$changeFlow->title = 'TR2'; +$changeFlow->flow = 2; +$stageTester->setPoint('TR', 2, array(1 => $changeFlow)); +$result = $stageTester->dao->select('flow')->from(TABLE_APPROVALFLOWOBJECT)->where('objectType')->eq('decision')->andWhere('objectID')->eq(2)->fetch('flow'); +r($result) && p() && e('2'); //测试修改评审点的审批流 + +$changeOrder = new stdClass(); +$changeOrder->id = 3; +$changeOrder->title = 'TR3'; +$changeOrder->flow = 1; +$stageTester->setPoint('TR', 3, array(2 => $changeOrder)); +$result = $stageTester->dao->select('`order`')->from(TABLE_DECISION)->where('id')->eq(3)->fetch('order'); +r($result) && p() && e('2'); //测试修改评审点的顺序 + +$stageTester->setPoint('DCP', 4, array()); +$result = $stageTester->dao->select('*')->from(TABLE_DECISION)->where('stage')->eq(4)->fetchAll('id'); +r($result) && p('4:deleted') && e('1'); //测试删除评审点 + +$addPoint = new stdClass(); +$addPoint->id = 0; +$addPoint->title = 'test add point'; +$addPoint->flow = 1; +$stageTester->setPoint('DCP', 4, array(1 => $addPoint)); +$result = $stageTester->dao->select('*')->from(TABLE_DECISION)->where('stage')->eq(4)->fetchAll('id'); +r($result) && p('6:title') && e('test add point'); //测试添加评审点 diff --git a/module/stage/test/yaml/stage.yaml b/module/stage/test/yaml/stage.yaml index 40b6c7f326..a4c8ed2eb5 100644 --- a/module/stage/test/yaml/stage.yaml +++ b/module/stage/test/yaml/stage.yaml @@ -10,8 +10,8 @@ fields: range: '需求,设计,开发,测试,发布,总结评审' - field: name2 range: '1-100{6}' - - field: projectType - range: 'waterfall{6},waterfallplus{6}' + - field: workflowGroup + range: '4{6},8{6},12{6},13{6}' - field: type range: "request,design,dev,qa,release,review" - field: percent diff --git a/module/stage/ui/batchcreate.html.php b/module/stage/ui/batchcreate.html.php index d05d2a4531..ecdefb9b7c 100644 --- a/module/stage/ui/batchcreate.html.php +++ b/module/stage/ui/batchcreate.html.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace zin; $percentItem = ''; -if(isset($config->setPercent) and $config->setPercent == 1) +if(isset($config->setPercent) && $config->setPercent == 1 && isset($flow->projectModel) && $flow->projectModel != 'ipd' || $config->edition == 'open') { $percentItem = formBatchItem( set::name('percent'), @@ -21,6 +21,7 @@ if(isset($config->setPercent) and $config->setPercent == 1) } formBatchPanel ( + set::title($title), formBatchItem ( set::name('id'), @@ -39,8 +40,8 @@ formBatchPanel set::name('type'), set::label($lang->stage->type), set::width('150px'), - set::control('select'), - set::items($lang->stage->typeList) + set::control('picker'), + set::items(isset($flow->projectModel) && $flow->projectModel == 'ipd' ? $lang->stage->ipdTypeList : $lang->stage->typeList) ) ); /* ====== Render page ====== */ diff --git a/module/stage/ui/browse.html.php b/module/stage/ui/browse.html.php index 6aae50d233..bef5bd2f2f 100644 --- a/module/stage/ui/browse.html.php +++ b/module/stage/ui/browse.html.php @@ -10,30 +10,53 @@ declare(strict_types=1); */ namespace zin; -/* zin: Define the set::module('release') feature bar on main menu. */ -/* zin: Define the toolbar on main menu. */ +featureBar(); + $canCreateStage = hasPriv('stage', 'create'); $canbatchCreateStage = hasPriv('stage', 'batchCreate'); -if($canCreateStage) $createItem = array('icon' => 'plus', 'class' => 'primary', 'text' => $lang->stage->create, 'url' => $this->createLink('stage', 'create', "type={$type}"), 'data-toggle' => 'modal'); -if($canbatchCreateStage) $batchCreateItem = array('icon' => 'plus', 'class' => 'primary mr-4', 'text' => $lang->stage->batchCreate, 'url' => $this->createLink('stage', 'batchCreate', "type={$type}")); -div +if($canCreateStage) $createItem = array('icon' => 'plus', 'class' => 'primary', 'text' => $lang->stage->create, 'url' => $this->createLink('stage', 'create', "groupID={$groupID}"), 'data-toggle' => 'modal'); +if($canbatchCreateStage) $batchCreateItem = array('icon' => 'plus', 'class' => 'primary', 'text' => $lang->stage->batchCreate, 'url' => $this->createLink('stage', 'batchCreate', "groupID={$groupID}")); +toolbar ( - setClass('main-col main-content'), - div + !empty($batchCreateItem) ? item(set($batchCreateItem)) : null, + !empty($createItem) ? item(set($createItem)) : null +); + +if($this->config->edition == 'open') +{ + if(hasPriv('stage', 'settype')) + { + $menuItems[] = li + ( + setClass('menu-item'), + a + ( + set::href(createLink('stage', 'settype')), + $lang->stage->setType + ) + ); + } + + $menuItems[] = li + ( + setClass('menu-item'), + a + ( + setClass('active'), + set::href(createLink('stage', 'browse')), + $lang->stage->browseAB + ) + ); + + sidebar ( - setClass('main-header flex-auto'), div ( - setClass('flex-auto'), - html('' . $lang->stage->browse . '') - ), - toolbar - ( - !empty($batchCreateItem) ? item(set($batchCreateItem)) : null, - !empty($createItem) ? item(set($createItem)) : null + setClass('cell p-2.5 bg-white'), + menu($menuItems) ) - ) -); + ); +} $tableData = initTableData($stages, $config->stage->dtable->fieldList, $this->stage); dtable @@ -41,8 +64,9 @@ dtable set::cols($config->stage->dtable->fieldList), set::data($tableData), set::orderBy($orderBy), - set::sortLink(createLink('stage', 'browse', "orderBy={name}_{sortType}&type={$type}")) + set::sortLink(createLink('stage', 'browse', "groupID={$groupID}&orderBy={name}_{sortType}")), + set::plugins(array('sortable')), + set::sortHandler('.move-stage'), + set::onSortEnd(jsRaw('window.onSortEnd')), + set::onRenderCell(jsRaw('window.renderCell')) ); - -/* ====== Render page ====== */ -render(); diff --git a/module/stage/ui/create.html.php b/module/stage/ui/create.html.php index 50ac5ffeec..32531d7653 100644 --- a/module/stage/ui/create.html.php +++ b/module/stage/ui/create.html.php @@ -10,7 +10,7 @@ declare(strict_types=1); */ namespace zin; $percentRow = ''; -if(isset($config->setPercent) && $config->setPercent == 1) +if(isset($config->setPercent) && $config->setPercent == 1 && isset($flow->projectModel) && $flow->projectModel != 'ipd' || $config->edition == 'open') { $percentRow = formRow( formGroup @@ -53,7 +53,7 @@ formPanel set::width('1/2'), set::label($lang->stage->type), set::name('type'), - set::items($lang->stage->typeList) + set::items(isset($flow->projectModel) && $flow->projectModel == 'ipd' ? $lang->stage->ipdTypeList : $lang->stage->typeList) ) ) ); diff --git a/module/stage/ui/edit.html.php b/module/stage/ui/edit.html.php index d8ee624bd2..3e718a4a4a 100644 --- a/module/stage/ui/edit.html.php +++ b/module/stage/ui/edit.html.php @@ -10,7 +10,7 @@ declare(strict_types=1); */ namespace zin; $percentRow = ''; -if(isset($config->setPercent) && $config->setPercent == 1) +if(isset($config->setPercent) && $config->setPercent == 1 && isset($flow->projectModel) && $flow->projectModel != 'ipd' || $config->edition == 'open') { $percentRow = formRow( formGroup @@ -59,7 +59,7 @@ formPanel set::label($lang->stage->type), set::name('type'), set::value($stage->type), - set::items($lang->stage->typeList) + set::items(isset($flow->projectModel) && $flow->projectModel == 'ipd' ? $lang->stage->ipdTypeList : $lang->stage->typeList) ) ) ); diff --git a/module/stage/ui/setpoint.html.php b/module/stage/ui/setpoint.html.php new file mode 100644 index 0000000000..b55baf28f6 --- /dev/null +++ b/module/stage/ui/setpoint.html.php @@ -0,0 +1,60 @@ + + * @package stage + * @link https://www.zentao.net + */ + +namespace zin; + +modalHeader +( + set::title($type == 'TR' ? $lang->stage->setTRpoint : $lang->stage->setDCPpoint), + set::titleClass('text-md font-semibold') +); + +formBatchPanel +( + setID('setPointForm'), + set::minRows(1), + set::sortable(true), + set::data(array_values($stagePoints)), + set::idKey('index'), + formBatchItem + ( + set::name('id'), + set::hidden(true) + ), + formBatchItem + ( + set::name('title'), + set::required(true), + set::label($type == 'TR' ? $lang->stage->TRname : $lang->stage->DCPname) + ), + formBatchItem + ( + set::name('flow'), + set::label($lang->stage->pointFlow), + set::required(true), + set::control('inputGroup'), + inputGroup + ( + picker + ( + set::name('flow'), + set::required(true), + set::items($approvals), + set::value(1) + ), + hasPriv('approvalflow', 'create') ? div + ( + a(set::className('btn secondary ml-1'), set::href(createLink('approvalflow', 'create', 'workflow=&callback=refreshApproval')), setData(array('toggle' => 'modal')), $lang->review->createApproval) + ) : null + ) + ) +); diff --git a/module/stage/ui/settype.html.php b/module/stage/ui/settype.html.php index 1723b7ed5a..0145feda5a 100644 --- a/module/stage/ui/settype.html.php +++ b/module/stage/ui/settype.html.php @@ -37,7 +37,7 @@ div set::label('addRow'), set::name('values[]') ), - div + div ( setClass('pl-2 flex self-center'), btn @@ -62,7 +62,7 @@ foreach($fieldList as $key => $value) $formItems[] = formRow ( - input + input ( set::type('hidden'), set::name('keys[]'), @@ -118,13 +118,45 @@ $formItems[] = formGroup set::control('radioListInline') ); +$menuItems[] = li +( + setClass('menu-item'), + a + ( + setClass('active'), + set::href(createLink('stage', 'settype')), + $lang->stage->setType + ) +); + +if($config->edition == 'open' && hasPriv('stage', 'browse')) +{ + $menuItems[] = li + ( + setClass('menu-item'), + a + ( + set::href(createLink('stage', 'browse')), + $lang->stage->browseAB + ) + ); +} + div ( - setClass('flex'), + setClass('row has-sidebar-left'), + sidebar + ( + div + ( + setClass('cell p-2.5 bg-white'), + menu($menuItems) + ) + ), formPanel ( set::headingClass('justify-start'), - setClass('flex-auto'), + setClass('flex-auto ml-0.5'), set::actionsClass('w-1/2'), set::title($lang->stage->setType), set::actions($formActions), diff --git a/module/store/test/lib/store.unittest.class.php b/module/store/test/lib/store.unittest.class.php index 8f2cbc1ecb..94f84f6e93 100755 --- a/module/store/test/lib/store.unittest.class.php +++ b/module/store/test/lib/store.unittest.class.php @@ -46,17 +46,17 @@ class storeTest public function __constructTest(string $appName = '') { global $config, $app; - + // 创建新的store模型实例进行测试 $storeModel = new storeModel($appName); - + // 返回测试结果对象 $result = new stdClass(); $result->appName = $appName; $result->hasHeaders = !empty($config->cloud->api->headers); $result->authHeaderExists = false; $result->channelChanged = false; - + // 检查API headers是否正确设置 if($result->hasHeaders) { @@ -69,15 +69,15 @@ class storeTest } } } - + // 检查channel是否被改变 if($config->cloud->api->switchChannel && isset($app->session->cloudChannel)) { $result->channelChanged = ($config->cloud->api->channel === $app->session->cloudChannel); } - + if(dao::isError()) return dao::getError(); - + return $result; } diff --git a/module/story/lang/de.php b/module/story/lang/de.php index 209c22e0d8..ced418246c 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -550,6 +550,9 @@ $lang->story->categoryList['experience'] = 'Experience'; $lang->story->categoryList['improve'] = 'Improve'; $lang->story->categoryList['other'] = 'Other'; +$lang->story->frozenTip = "After the stories are baselined, %s is not allowed."; +$lang->story->frozenTips = "Story %s has been frozen and will not be %s."; + $lang->story->changeTip = 'Only active can be changed.'; $lang->story->reviewTip = array(); diff --git a/module/story/lang/en.php b/module/story/lang/en.php index f47d6235cb..7d28385f1a 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -550,6 +550,9 @@ $lang->story->categoryList['experience'] = 'Experience'; $lang->story->categoryList['improve'] = 'Improve'; $lang->story->categoryList['other'] = 'Other'; +$lang->story->frozenTip = "After the stories are baselined, %s is not allowed."; +$lang->story->frozenTips = "Story %s has been frozen and will not be %s."; + $lang->story->changeTip = 'Only active can be changed.'; $lang->story->reviewTip = array(); diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index 3f3a65d5d4..082e6e9489 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -550,6 +550,9 @@ $lang->story->categoryList['experience'] = 'Experience'; $lang->story->categoryList['improve'] = 'Improve'; $lang->story->categoryList['other'] = 'Other'; +$lang->story->frozenTip = "After the stories are baselined, %s is not allowed."; +$lang->story->frozenTips = "Story %s has been frozen and will not be %s."; + $lang->story->changeTip = "Seules les exigences de l'état actif peuvent être modifiées."; $lang->story->reviewTip = array(); diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 56ca9a4122..35d6bd65f3 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -550,6 +550,9 @@ $lang->story->categoryList['experience'] = '体验'; $lang->story->categoryList['improve'] = '改进'; $lang->story->categoryList['other'] = '其他'; +$lang->story->frozenTip = "需求打基线后不允许%s"; +$lang->story->frozenTips = "需求：%s 已冻结，将不会被%s。"; + $lang->story->changeTip = "只有激活状态的需求，才能进行变更"; $lang->story->reviewTip = array(); diff --git a/module/story/model.php b/module/story/model.php index 1520e73c0b..26003056d8 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3882,6 +3882,7 @@ class storyModel extends model global $app, $config; $action = strtolower($action); + if(in_array($action, array('edit', 'batchcreate', 'change', 'delete')) && !empty($story->frozen)) return false; if($action == 'subdivide') $action = 'batchcreate'; if($action == 'recall') return $story->status == 'reviewing' || $story->status == 'changing'; diff --git a/module/story/tao.php b/module/story/tao.php index 7330d7c427..4d5d66981d 100644 --- a/module/story/tao.php +++ b/module/story/tao.php @@ -2009,7 +2009,7 @@ class storyTao extends storyModel /* Change button. */ $canChange = common::hasPriv($story->type, 'change') && $this->isClickable($story, 'change', $taskGroups, $caseGroups) && $this->checkConditions('change', $story); $title = $canChange ? $lang->story->change : $this->lang->story->changeTip; - if(common::hasPriv($story->type, 'change')) $actions[] = array('name' => 'change', 'url' => $canChange ? $changeLink : null, 'hint' => $title, 'disabled' => !$canChange, 'class' => 'story-change-btn'); + if(common::hasPriv($story->type, 'change')) $actions[] = array('name' => 'change', 'url' => $canChange ? $changeLink : null, 'hint' => empty($story->frozen) ? $title : sprintf($this->lang->story->frozenTip, $this->lang->story->change), 'disabled' => !$canChange, 'class' => 'story-change-btn'); /* Submitreview, review, recall buttons. */ if(strpos('draft,changing', $story->status) !== false) @@ -2070,7 +2070,7 @@ class storyTao extends storyModel /* Edit button. */ $canEdit = common::hasPriv($story->type, 'edit') && $this->isClickable($story, 'edit', $taskGroups, $caseGroups) && $this->checkConditions('edit', $story); - if(common::hasPriv($story->type, 'edit')) $actions[] = array('name' => 'edit', 'url' => $this->isClickable($story, 'edit', $taskGroups, $caseGroups) ? $editLink : null, 'disabled' => !$canEdit); + if(common::hasPriv($story->type, 'edit')) $actions[] = array('name' => 'edit', 'url' => $this->isClickable($story, 'edit', $taskGroups, $caseGroups) ? $editLink : null, 'disabled' => !$canEdit, 'hint' => empty($story->frozen) ? $this->lang->story->edit : sprintf($this->lang->story->frozenTip, $this->lang->story->edit)); /* Create test case button. */ if($story->type == 'story' && $this->config->vision != 'lite' && common::hasPriv('testcase', 'create')) $actions[] = array('name' => 'testcase', 'url' => $story->isParent == '0' ? $createCaseLink : null, 'disabled' => $story->isParent == '1', 'data-toggle' => 'modal', 'data-size' => 'lg'); @@ -2093,15 +2093,15 @@ class storyTao extends storyModel */ if($canBatchCreateStory) { - $actions[] = array('name' => 'batchCreate', 'url' => $batchCreateStoryLink, 'hint' => $this->lang->story->split, 'icon' => 'split', 'class' => 'batchCreateStoryBtn'); + $actions[] = array('name' => 'batchCreate', 'url' => $batchCreateStoryLink, 'hint' => empty($story->frozen) ? $this->lang->story->split : sprintf($this->lang->story->frozenTip, $this->lang->story->split), 'icon' => 'split', 'class' => 'batchCreateStoryBtn'); } elseif($story->type == 'epic' && common::hasPriv('requirement', 'batchCreate') && $this->isClickable($story, 'batchcreate', $taskGroups, $caseGroups) && empty($story->hasSameTypeChild) && !($this->config->epic->gradeRule == 'stepwise' && $story->grade < $maxGradeGroup['epic'])) { - $actions[] = array('name' => 'batchCreate', 'url' => helper::createLink('requirement', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID=$executionID&plan=0"), 'hint' => $this->lang->story->split, 'icon' => 'split', 'class' => 'batchCreateStoryBtn'); + $actions[] = array('name' => 'batchCreate', 'url' => helper::createLink('requirement', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID=$executionID&plan=0"), 'hint' => empty($story->frozen) ? $this->lang->story->split : sprintf($this->lang->story->frozenTip, $this->lang->story->split), 'icon' => 'split', 'class' => 'batchCreateStoryBtn'); } elseif($story->type == 'requirement' && common::hasPriv('story', 'batchCreate') && $this->isClickable($story, 'batchcreate', $taskGroups, $caseGroups) && empty($story->hasSameTypeChild) && !($this->config->requirement->gradeRule == 'stepwise' && $story->grade < $maxGradeGroup['requirement'])) { - $actions[] = array('name' => 'batchCreate', 'url' => helper::createLink('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID=$executionID&plan=0"), 'hint' => $this->lang->story->split, 'icon' => 'split', 'class' => 'batchCreateStoryBtn'); + $actions[] = array('name' => 'batchCreate', 'url' => helper::createLink('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID=$executionID&plan=0"), 'hint' => empty($story->frozen) ? $this->lang->story->split : sprintf($this->lang->story->frozenTip, $this->lang->story->split), 'icon' => 'split', 'class' => 'batchCreateStoryBtn'); } elseif(!$canBatchCreateStory && common::hasPriv($story->type, 'batchcreate')) { @@ -2112,6 +2112,7 @@ class storyTao extends storyModel if(!empty($caseGroups[$story->id])) $title = sprintf($this->lang->story->subDivideTip['notWait'], $this->lang->story->hasDividedCase); if(isset($maxGradeGroup[$story->type]) && $story->grade >= $maxGradeGroup[$story->type]) $title = $this->lang->story->errorMaxGradeSubdivide; if($story->status != 'active' && $story->status != 'changing') $title = $this->lang->story->subDivideTip['notActive']; + if(!empty($story->frozen)) $title = sprintf($this->lang->story->frozenTip, $this->lang->story->split); $actions[] = array('name' => 'batchCreate', 'hint' => $title, 'disabled' => true, 'icon' => 'split'); } } @@ -2161,15 +2162,15 @@ class storyTao extends storyModel $canBatchCreateStory = common::hasPriv($story->type, 'batchcreate') && $this->isClickable($story, 'batchcreate', $taskGroups, $caseGroups) && $story->grade < $maxGradeGroup[$story->type] && empty($story->hasOtherTypeChild); if($canBatchCreateStory) { - $actions[] = array('name' => 'batchCreate', 'url' => $batchCreateStoryLink, 'hint' => $this->lang->story->split, 'icon' => 'split'); + $actions[] = array('name' => 'batchCreate', 'url' => $batchCreateStoryLink, 'hint' => empty($story->frozen) ? $this->lang->story->split : sprintf($this->lang->story->frozenTip, $this->lang->story->split), 'icon' => 'split'); } elseif($story->type == 'epic' && common::hasPriv('requirement', 'batchCreate') && $this->isClickable($story, 'batchcreate', $taskGroups, $caseGroups) && empty($story->hasSameTypeChild) && !($this->config->epic->gradeRule == 'stepwise' && $story->grade < $maxGradeGroup['epic'])) { - $actions[] = array('name' => 'batchCreate', 'url' => helper::createLink('requirement', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID=$executionID&plan=0"), 'hint' => $this->lang->story->split, 'icon' => 'split'); + $actions[] = array('name' => 'batchCreate', 'url' => helper::createLink('requirement', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID=$executionID&plan=0"), 'hint' => empty($story->frozen) ? $this->lang->story->split : sprintf($this->lang->story->frozenTip, $this->lang->story->split), 'icon' => 'split'); } elseif($story->type == 'requirement' && common::hasPriv('story', 'batchCreate') && $this->isClickable($story, 'batchcreate', $taskGroups, $caseGroups) && empty($story->hasSameTypeChild) && !($this->config->requirement->gradeRule == 'stepwise' && $story->grade < $maxGradeGroup['requirement'])) { - $actions[] = array('name' => 'batchCreate', 'url' => helper::createLink('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID=$executionID&plan=0"), 'hint' => $this->lang->story->split, 'icon' => 'split'); + $actions[] = array('name' => 'batchCreate', 'url' => helper::createLink('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID=$executionID&plan=0"), 'hint' => empty($story->frozen) ? $this->lang->story->split : sprintf($this->lang->story->frozenTip, $this->lang->story->split), 'icon' => 'split'); } elseif(!$canBatchCreateStory && $story->status != 'closed' && common::hasPriv($story->type, 'batchcreate')) { @@ -2180,13 +2181,14 @@ class storyTao extends storyModel if(!empty($caseGroups[$story->id])) $title = sprintf($this->lang->story->subDivideTip['notWait'], $this->lang->story->hasDividedCase); if(isset($maxGradeGroup[$story->type]) && $story->grade >= $maxGradeGroup[$story->type]) $title = $this->lang->story->errorMaxGradeSubdivide; if($story->status != 'active') $title = $this->lang->story->subDivideTip['notActive']; + if(!empty($story->frozen)) $title = sprintf($this->lang->story->frozenTip, $this->lang->story->split); $actions[] = array('name' => 'batchCreate', 'hint' => $title, 'disabled' => true, 'icon' => 'split'); } } if($story->type == 'requirement') $unlinkStoryTip = str_replace($this->lang->SRCommon, $this->lang->URCommon, $unlinkStoryTip); $unlinkStoryTip = json_encode(array('message' => array('html' => "{$unlinkStoryTip}"))); - $actions[] = array('name' => 'unlink', 'className' => 'ajax-submit', 'data-confirm' => $unlinkStoryTip, 'url' => $canUnlinkStory ? $unlinkStoryLink : null, 'disabled' => $disabled, 'hint' => $unlinkHint); + $actions[] = array('name' => 'unlink', 'className' => 'ajax-submit', 'data-confirm' => $unlinkStoryTip, 'url' => $canUnlinkStory ? $unlinkStoryLink : null, 'disabled' => $disabled || !empty($story->frozen), 'hint' => !empty($story->frozen) ? sprintf($this->lang->story->frozenTip, $this->lang->story->unlink) : $unlinkHint); } } diff --git a/module/story/test/lib/story.unittest.class.php b/module/story/test/lib/story.unittest.class.php index e5bd3fbd01..36343d1d44 100755 --- a/module/story/test/lib/story.unittest.class.php +++ b/module/story/test/lib/story.unittest.class.php @@ -920,7 +920,7 @@ class storyTest ->andWhere('t2.deleted')->eq(0) ->andWhere('t3.deleted')->eq(0); - return $this->objectModel->fetchExecutionStories($storyDAO, $productID, 'byBranch', '', 't2.id_desc', $pager); + return $this->objectModel->fetchExecutionStories($storyDAO, $productID, 'byBranch', '', 'id_desc', $pager); } /** diff --git a/module/story/test/model/appendchildren.php b/module/story/test/model/appendchildren.php index d222b5aab7..39ea15fdf4 100755 --- a/module/story/test/model/appendchildren.php +++ b/module/story/test/model/appendchildren.php @@ -48,7 +48,7 @@ $storyTest = new storyTest(); // 5. 🔴 强制要求：必须包含至少5个测试步骤 r($storyTest->appendChildrenTest(1, array((object)array('id' => 1, 'root' => 1)), 'epic')) && p('0:id') && e('1'); // 步骤1：为epic需求追加子需求，验证包含原需求 -r($storyTest->appendChildrenTest(1, array(), 'story')) && p() && e('0'); // 步骤2：空需求数组情况，返回空数组 +r($storyTest->appendChildrenTest(1, array(), 'story')) && p() && e('0'); // 步骤2：空需求数组情况，返回空数组 r($storyTest->appendChildrenTest(999, array((object)array('id' => 1, 'root' => 1)), 'story')) && p('0:id') && e('1'); // 步骤3：不存在的产品ID情况，返回原需求数组 r($storyTest->appendChildrenTest(1, array((object)array('id' => 2, 'root' => 2)), 'requirement')) && p('0:id') && e('2'); // 步骤4：requirement类型需求无子需求时返回原需求 r($storyTest->appendChildrenTest(2, array((object)array('id' => 11, 'root' => 3)), 'story')) && p('0:id') && e('11'); // 步骤5：不同产品下的需求测试 \ No newline at end of file diff --git a/module/story/test/model/getbyassignedto.php b/module/story/test/model/getbyassignedto.php index d5e25c2b9e..670c496403 100755 --- a/module/story/test/model/getbyassignedto.php +++ b/module/story/test/model/getbyassignedto.php @@ -50,7 +50,7 @@ su('admin'); $storyTest = new storyTest(); r(count($storyTest->getByAssignedToTest(1, 0, '', 'admin'))) && p() && e('6'); // 步骤1：查询admin用户被分配的story（产品1中有6个admin的story） -r(count($storyTest->getByAssignedToTest(1, 0, '', 'nonexist'))) && p() && e('0'); // 步骤2：查询不存在用户的story +r(count($storyTest->getByAssignedToTest(1, 0, '', 'nonexist'))) && p() && e('0'); // 步骤2：查询不存在用户的story r(count($storyTest->getByAssignedToTest(array(1, 2), 'all', '', 'user1'))) && p() && e('6'); // 步骤3：多产品全分支查询user1的story（user1有6个story） r(count($storyTest->getByAssignedToTest(1, 0, '', 'admin', 'story'))) && p() && e('6'); // 步骤4：查询admin的story类型需求（产品1中admin有6个story类型） r($storyTest->getByAssignedToTest(1, 0, '', 'admin', 'story', 'id_desc')) && p('15:id') && e('15'); // 步骤5：按ID倒序查询admin的story \ No newline at end of file diff --git a/module/story/test/model/getbyclosedby.php b/module/story/test/model/getbyclosedby.php index 39452169fe..812263afc3 100755 --- a/module/story/test/model/getbyclosedby.php +++ b/module/story/test/model/getbyclosedby.php @@ -52,7 +52,7 @@ su('admin'); $storyTest = new storyTest(); r(count($storyTest->getByClosedByTest(1, 0, '', 'admin'))) && p() && e('5'); // 步骤1：查询admin关闭的story（产品1中有5个admin关闭的story） -r(count($storyTest->getByClosedByTest(1, 0, '', 'nonexist'))) && p() && e('0'); // 步骤2：查询不存在用户关闭的story +r(count($storyTest->getByClosedByTest(1, 0, '', 'nonexist'))) && p() && e('0'); // 步骤2：查询不存在用户关闭的story r(count($storyTest->getByClosedByTest(1, 0, '', ''))) && p() && e('0'); // 步骤3：查询空字符串关闭的story r(count($storyTest->getByClosedByTest(array(1, 2), 'all', '', 'user1'))) && p() && e('9'); // 步骤4：多产品查询user1关闭的story（user1关闭了9个story） r($storyTest->getByClosedByTest(1, 0, '', 'admin', 'story', 'id_desc')) && p('1:id') && e('1'); // 步骤5：按ID倒序查询admin关闭的story \ No newline at end of file diff --git a/module/story/test/model/getgrademenu.php b/module/story/test/model/getgrademenu.php index 0604190594..0b356c3d29 100755 --- a/module/story/test/model/getgrademenu.php +++ b/module/story/test/model/getgrademenu.php @@ -7,17 +7,17 @@ title=测试 storyModel::getGradeMenu(); timeout=0 cid=18535 -- 执行storyTest模块的getGradeMenuTest方法，参数是'story' +- 执行storyTest模块的getGradeMenuTest方法，参数是'story' - 第0条的text属性 @查看 - 第0条的value属性 @story -- 执行storyTest模块的getGradeMenuTest方法，参数是'epic' +- 执行storyTest模块的getGradeMenuTest方法，参数是'epic' - 第0条的text属性 @查看 - 第0条的value属性 @epic -- 执行storyTest模块的getGradeMenuTest方法，参数是'requirement' +- 执行storyTest模块的getGradeMenuTest方法，参数是'requirement' - 第0条的text属性 @查看 - 第0条的value属性 @requirement - 执行storyTest模块的getGradeMenuTest方法，参数是'all' @3 -- 执行storyTest模块的getGradeMenuTest方法，参数是'story', +- 执行storyTest模块的getGradeMenuTest方法，参数是'story', - 第0条的text属性 @查看 - 第0条的value属性 @story diff --git a/module/story/test/model/getgradeoptions.php b/module/story/test/model/getgradeoptions.php index 768c3bd5ab..52b3525d34 100755 --- a/module/story/test/model/getgradeoptions.php +++ b/module/story/test/model/getgradeoptions.php @@ -28,7 +28,7 @@ include dirname(__FILE__, 2) . '/lib/story.unittest.class.php'; zendata('storygrade')->loadYaml('storygrade_getgradeoptions', false, 2)->gen(9); -$storygradeTable = zendata('storygrade'); +$storygradeTable = zendata('storygrade'); $storygradeTable->type->range('story{4},requirement{3},epic{2}'); $storygradeTable->grade->range('1,2,3,4,1,2,3,1,2'); $storygradeTable->name->range('SR1,SR2,SR3,子,UR1,UR2,UR3,BR1,BR2'); diff --git a/module/story/test/model/isclickable.php b/module/story/test/model/isclickable.php index 0d4cce389c..4d3e0ce052 100755 --- a/module/story/test/model/isclickable.php +++ b/module/story/test/model/isclickable.php @@ -13,7 +13,7 @@ cid=18571 - 判断需求2是否有激活按钮操作权限 @0 - 判断需求2是否有指派按钮操作权限 @1 - 判断需求2是否有创建用例按钮操作权限 @1 -- 判断需求2是否有批量创建按钮操作权限 @0 +- 判断需求2是否有批量创建按钮操作权限 @1 */ include dirname(__FILE__, 5) . '/test/lib/init.php'; @@ -31,4 +31,4 @@ r($storyModel::isClickable($story, 'close')) && p() && e('1'); // 判断 r($storyModel::isClickable($story, 'activate')) && p() && e('0'); // 判断需求2是否有激活按钮操作权限 r($storyModel::isClickable($story, 'assignto')) && p() && e('1'); // 判断需求2是否有指派按钮操作权限 r($storyModel::isClickable($story, 'createcase')) && p() && e('1'); // 判断需求2是否有创建用例按钮操作权限 -r($storyModel::isClickable($story, 'batchcreate')) && p() && e('0'); // 判断需求2是否有批量创建按钮操作权限 \ No newline at end of file +r($storyModel::isClickable($story, 'batchcreate')) && p() && e('1'); // 判断需求2是否有批量创建按钮操作权限 diff --git a/module/story/test/model/yaml/story_getallchildid.yaml b/module/story/test/model/yaml/story_getallchildid.yaml index 4268d5ef41..11ac7b4dce 100644 --- a/module/story/test/model/yaml/story_getallchildid.yaml +++ b/module/story/test/model/yaml/story_getallchildid.yaml @@ -13,7 +13,7 @@ fields: note: 是否为父需求 range: "'1','1','0','1','0','0','0','0','0','0'" - field: root - note: 根需求ID + note: 根需求ID range: '1,1,1,1,1,6,7,8,9,10' - field: path note: 路径字段，用于层级查询 diff --git a/module/story/test/model/yaml/story_getdataofstoriespergrade.yaml b/module/story/test/model/yaml/story_getdataofstoriespergrade.yaml index a8d8b70e97..ffd50dd984 100644 --- a/module/story/test/model/yaml/story_getdataofstoriespergrade.yaml +++ b/module/story/test/model/yaml/story_getdataofstoriespergrade.yaml @@ -12,139 +12,139 @@ fields: - field: vision note: 视图类型 range: rnd{20} - + - field: parent note: 父需求 range: 0{18}, 1{1}, 2{1} - -- field: isParent + +- field: isParent note: 是否父需求 range: 0{18}, 1{2} - + - field: root note: 根需求 range: 1-20 - + - field: path note: 路径 range: ,1,{5}, ,2,{5}, ,3,{5}, ,4,{5} - + - field: grade note: 等级 range: 1{5}, 2{5}, 3{5}, 1{3}, 2{2} - + - field: product - note: 产品ID + note: 产品ID range: 1{10}, 2{5}, 3{5} - + - field: branch note: 分支 range: 0{20} - + - field: module note: 模块 range: 0{20} - + - field: plan note: 计划 range: 1{5}, 2{5}, 3{5}, 0{5} - + - field: source note: 来源 range: customer{5}, user{5}, po{5}, market{5} - + - field: sourceNote - note: 来源说明 + note: 来源说明 range: "{5}, 客户需求{5}, 用户反馈{5}, 市场调研{5}" - + - field: fromBug note: 来源缺陷 range: 0{20} - + - field: feedback note: 反馈 range: 0{20} - + - field: title note: 需求标题 range: 用户登录功能{3}, 数据统计功能{3}, 权限管理{3}, 系统监控{3}, 报表导出{3}, 接口开发{2}, 性能优化{2}, 界面改进{1} - + - field: keywords note: 关键词 range: 登录,用户{3}, 统计,数据{3}, 权限,管理{3}, 监控,系统{3}, 报表,导出{3}, 接口,API{2}, 性能,优化{2}, 界面,UI{1} - + - field: type note: 需求类型 range: story{8}, requirement{6}, epic{6} - + - field: category note: 需求类别 range: feature{10}, interface{5}, performance{3}, security{2} - + - field: pri note: 优先级 range: 1{3}, 2{5}, 3{8}, 4{4} - + - field: estimate note: 预估工时 range: 1-20:2 - + - field: status note: 状态 range: active{8}, draft{4}, reviewing{3}, closed{3}, developing{2} - + - field: subStatus note: 子状态 range: ""{15}, wait{3}, doing{2} - + - field: color note: 颜色 range: ""{15}, #3da8f5{3}, #7ec855{2} - + - field: stage note: 阶段 range: wait{5}, planned{5}, designing{3}, developing{3}, testing{2}, verified{2} - + - field: stagedBy note: 阶段设置人 range: admin{10}, user{5}, pm{5} - + - field: lib note: 用例库 range: 0{20} - + - field: fromStory note: 来源需求 range: 0{20} - + - field: fromVersion note: 来源版本 range: 1{20} - + - field: openedBy note: 创建人 range: admin{5}, user1{5}, user2{5}, pm{5} - + - field: openedDate note: 创建时间 range: "2024-01-01 10:00:00"{5}, "2024-01-02 14:30:00"{5}, "2024-01-03 09:15:00"{5}, "2024-01-04 16:45:00"{5} - + - field: assignedTo note: 指派给 range: dev1{5}, dev2{5}, dev3{5}, tester{5} - + - field: assignedDate note: 指派时间 range: "2024-01-01 11:00:00"{5}, "2024-01-02 15:30:00"{5}, "2024-01-03 10:15:00"{5}, "2024-01-04 17:45:00"{5} - + - field: lastEditedBy note: 最后编辑人 range: admin{8}, user1{6}, pm{6} - + - field: lastEditedDate note: 最后编辑时间 range: "2024-01-05 10:00:00"{5}, "2024-01-06 14:30:00"{5}, "2024-01-07 09:15:00"{5}, "2024-01-08 16:45:00"{5} - + - field: deleted note: 是否删除 range: 0{18}, 1{2} \ No newline at end of file diff --git a/module/story/test/model/yaml/story_syncgrade.yaml b/module/story/test/model/yaml/story_syncgrade.yaml index 53b0806fd4..e188cba372 100644 --- a/module/story/test/model/yaml/story_syncgrade.yaml +++ b/module/story/test/model/yaml/story_syncgrade.yaml @@ -9,7 +9,7 @@ fields: range: rnd{10} - field: parent range: 0, 1, 1, 2, 2, 0, 0, 0, 0, 0 -- field: product +- field: product range: 1{10} - field: branch range: 0{10} diff --git a/module/story/test/model/yaml/storygrade_getdataofstoriespergrade.yaml b/module/story/test/model/yaml/storygrade_getdataofstoriespergrade.yaml index cba4a1d03d..781e17366c 100644 --- a/module/story/test/model/yaml/storygrade_getdataofstoriespergrade.yaml +++ b/module/story/test/model/yaml/storygrade_getdataofstoriespergrade.yaml @@ -10,11 +10,11 @@ fields: - field: grade note: 等级值 range: 1{6}, 2{6}, 3{6} - + - field: name note: 等级名称 range: 低{6}, 中{6}, 高{6} - + - field: status note: 状态 range: active{15}, inactive{3} \ No newline at end of file diff --git a/module/story/test/model/yaml/storygrade_getgradeoptions.yaml b/module/story/test/model/yaml/storygrade_getgradeoptions.yaml index 151e3b3797..3864dc8237 100644 --- a/module/story/test/model/yaml/storygrade_getgradeoptions.yaml +++ b/module/story/test/model/yaml/storygrade_getgradeoptions.yaml @@ -12,7 +12,7 @@ fields: range: 1,2,1,2,3,1,2,3,4 - field: name - note: 分级名称 + note: 分级名称 range: BR1,BR2,UR1,UR2,UR3,SR1,SR2,SR3,子 - field: status diff --git a/module/story/test/tao/getaffectedchildren.php b/module/story/test/tao/getaffectedchildren.php index a8329f5135..f1e3f667e8 100755 --- a/module/story/test/tao/getaffectedchildren.php +++ b/module/story/test/tao/getaffectedchildren.php @@ -7,16 +7,16 @@ title=测试 storyTao::getAffectedChildren(); timeout=0 cid=18631 -- 执行storyTest模块的getAffectedChildrenTest方法，参数是$parentStory, array +- 执行storyTest模块的getAffectedChildrenTest方法，参数是$parentStory, array - 属性id @1 - 属性type @story -- 执行storyTest模块的getAffectedChildrenTest方法，参数是$normalStory, array +- 执行storyTest模块的getAffectedChildrenTest方法，参数是$normalStory, array - 属性id @6 - 属性type @story -- 执行storyTest模块的getAffectedChildrenTest方法，参数是$parentStory, array +- 执行storyTest模块的getAffectedChildrenTest方法，参数是$parentStory, array - 属性id @1 - 属性type @story -- 执行storyTest模块的getAffectedChildrenTest方法，参数是$emptyChildrenStory, array +- 执行storyTest模块的getAffectedChildrenTest方法，参数是$emptyChildrenStory, array - 属性id @2 - 属性type @story - 执行storyTest模块的getAffectedChildrenTest方法，参数是$parentStory, array 属性type @story diff --git a/module/story/test/tao/getchilditems.php b/module/story/test/tao/getchilditems.php index f2f8d61796..82ee8fca75 100755 --- a/module/story/test/tao/getchilditems.php +++ b/module/story/test/tao/getchilditems.php @@ -54,4 +54,4 @@ r($storyTest->getChildItemsTest(array(1 => (object)array('id' => 1)))) && p('1:t r($storyTest->getChildItemsTest(array(2 => (object)array('id' => 2)))) && p('2:total,finished') && e('4,2'); r($storyTest->getChildItemsTest(array(3 => (object)array('id' => 3)))) && p('3:total,finished') && e('4,3'); r($storyTest->getChildItemsTest(array())) && p() && e('0'); -r($storyTest->getChildItemsTest(array(5 => (object)array('id' => 5)))) && p() && e('0'); \ No newline at end of file +r($storyTest->getChildItemsTest(array(5 => (object)array('id' => 5)))) && p() && e('0'); diff --git a/module/story/test/tao/yaml/story_checkcansplit.yaml b/module/story/test/tao/yaml/story_checkcansplit.yaml index b14f5e1794..7909a30b99 100644 --- a/module/story/test/tao/yaml/story_checkcansplit.yaml +++ b/module/story/test/tao/yaml/story_checkcansplit.yaml @@ -8,91 +8,91 @@ fields: - field: id note: 需求ID range: 1-8 - + - field: vision note: 产品版本 range: 'rnd' - + - field: parent note: 父需求ID range: '0,0,0,0,2,3,4,0' - + - field: isParent note: 是否父需求 range: '0' - + - field: root note: 根需求ID range: '0' - + - field: product note: 所属产品 range: '1' - + - field: branch note: 分支 range: '0' - + - field: module note: 所属模块 range: '0' - + - field: title note: 需求标题 range: '需求1,需求2,需求3,需求4,子需求1,子需求2,不同类型子需求,删除的子需求' - + - field: type note: 需求类型 range: 'story,story,story,story,story,requirement,story,story' - + - field: category note: 需求分类 range: 'feature' - + - field: pri note: 优先级 range: '3' - + - field: estimate note: 预估工时 range: '0' - + - field: status note: 需求状态 range: 'active' - + - field: stage note: 需求阶段 range: 'wait' - + - field: openedBy note: 由谁创建 range: 'admin' - + - field: openedDate note: 创建时间 range: '2024-01-01 00:00:00' - + - field: assignedTo note: 指派给 range: '' - + - field: assignedDate note: 指派时间 range: '' - + - field: lastEditedBy note: 最后编辑者 range: 'admin' - + - field: lastEditedDate note: 最后编辑时间 range: '2024-01-01 00:00:00' - + - field: version note: 版本号 range: '1' - + - field: deleted note: 是否删除 range: '0,0,0,0,0,0,0,1' \ No newline at end of file diff --git a/module/story/test/tao/yaml/story_getstoriescountbyproductids.yaml b/module/story/test/tao/yaml/story_getstoriescountbyproductids.yaml index cf33d594f4..55219f8d6a 100644 --- a/module/story/test/tao/yaml/story_getstoriescountbyproductids.yaml +++ b/module/story/test/tao/yaml/story_getstoriescountbyproductids.yaml @@ -8,199 +8,199 @@ fields: - field: id note: Story ID range: 1-20 - + - field: vision note: Vision type range: rnd{20} - + - field: parent note: Parent story ID range: 0{20} - + - field: isParent note: Is parent story range: 0{18},1{2} - + - field: root note: Root story ID range: 1-20 - + - field: path note: Path range: "," - + - field: grade note: Grade range: 0{20} - + - field: product note: Product ID range: 1{5},2{5},3{5},4{5} - + - field: branch note: Branch ID range: 0{20} - + - field: module note: Module ID range: 0{20} - + - field: plan note: Plan range: ""{20} - + - field: source note: Source range: ""{20} - + - field: sourceNote note: Source note range: ""{20} - + - field: fromBug note: From bug range: 0{20} - + - field: feedback note: Feedback range: 0{20} - + - field: title note: Story title range: Story1,Story2,Story3,Story4,Story5,Story6,Story7,Story8,Story9,Story10,Story11,Story12,Story13,Story14,Story15,Story16,Story17,Story18,Story19,Story20 - + - field: keywords note: Keywords range: ""{20} - + - field: type note: Story type range: requirement{10},story{5},epic{5} - + - field: category note: Category range: feature{20} - + - field: pri note: Priority range: 3{20} - + - field: estimate note: Estimate range: 0{20} - + - field: status note: Story status range: active{8},closed{4},draft{4},reviewing{2},developing{2} - + - field: subStatus note: Sub status range: ""{20} - + - field: color note: Color range: ""{20} - + - field: stage note: Stage range: wait{8},planned{6},developed{4},released{2} - + - field: stagedBy note: Staged by range: admin{20} - + - field: mailto note: Mail to range: ""{20} - + - field: lib note: Library range: 0{20} - + - field: fromStory note: From story range: 0{20} - + - field: fromVersion note: From version range: 1{20} - + - field: openedBy note: Opened by range: admin{20} - + - field: openedDate note: Opened date range: 2024-01-01 00:00:00{20} - + - field: assignedTo note: Assigned to range: admin{10},user1{5},user2{5} - + - field: assignedDate note: Assigned date range: "0000-00-00 00:00:00"{20} - + - field: lastEditedBy note: Last edited by range: ""{20} - + - field: lastEditedDate note: Last edited date range: "0000-00-00 00:00:00"{20} - + - field: reviewedBy note: Reviewed by range: ""{20} - + - field: reviewedDate note: Reviewed date range: "0000-00-00 00:00:00"{20} - + - field: closedBy note: Closed by range: ""{16},admin{4} - + - field: closedDate note: Closed date range: "0000-00-00 00:00:00"{16},2024-02-01 00:00:00{4} - + - field: closedReason note: Closed reason range: ""{16},done{4} - + - field: toBug note: To bug range: 0{20} - + - field: childStories note: Child stories range: ""{20} - + - field: linkStories note: Link stories range: ""{20} - + - field: linkRequirements - note: Link requirements + note: Link requirements range: ""{20} - + - field: duplicateStory note: Duplicate story range: 0{20} - + - field: version note: Version range: 1{20} - + - field: URChanged note: UR changed range: 0{20} - + - field: deleted note: Deleted flag range: 0{18},1{2} - + - field: twins note: Twins range: ""{20} \ No newline at end of file diff --git a/module/story/test/zen/getstoriesbychecked.php b/module/story/test/zen/getstoriesbychecked.php index d38074c85b..6edb8d42be 100755 --- a/module/story/test/zen/getstoriesbychecked.php +++ b/module/story/test/zen/getstoriesbychecked.php @@ -32,6 +32,8 @@ $story->twins->range('``'); $story->deleted->range('0'); $story->gen(10); +zenData('storyspec')->gen(10); +zenData('product')->gen(10); zenData('user')->gen(5); su('admin'); @@ -44,4 +46,4 @@ r($storyTest->getStoriesByCheckedTest(['0-1', '0-2'])) && p('1:id') && e('1'); / r($storyTest->getStoriesByCheckedTest([1, 1, 2, 2, 3])) && p('1:id') && e('1'); // 步骤4:重复的storyIdList r($storyTest->getStoriesByCheckedTest([999])) && p() && e('0'); // 步骤5:不存在的storyID r($storyTest->getStoriesByCheckedTest([1, '0-2', 3])) && p('1:id') && e('1'); // 步骤6:混合正常和子需求ID格式 -r($storyTest->getStoriesByCheckedTest([1, 2])) && p('1:title') && e('Story1'); // 步骤7:验证返回的是完整需求对象 \ No newline at end of file +r($storyTest->getStoriesByCheckedTest([1, 2])) && p('1:title') && e('Story1'); // 步骤7:验证返回的是完整需求对象 diff --git a/module/story/ui/batchedit.html.php b/module/story/ui/batchedit.html.php index 03825bbb13..206a1d15e5 100644 --- a/module/story/ui/batchedit.html.php +++ b/module/story/ui/batchedit.html.php @@ -21,6 +21,7 @@ jsVar('storyType', $storyType); jsVar('urStageOptions', $urStageOptions); if(!empty($twinsTip)) pageJS("zui.Modal.alert({message: '{$twinsTip}', icon: 'icon-exclamation-sign', iconClass: 'warning-pale rounded-full icon-2x'});\n"); +if(!empty($frozenTips)) pageJS("zui.Modal.alert({message: '{$frozenTips}', icon: 'icon-exclamation-sign', iconClass: 'warning-pale rounded-full icon-2x'});\n"); $items = array(); $items['storyIdList'] = array('name' => 'storyIdList', 'label' => '', 'control' => 'hidden', 'hidden' => true); diff --git a/module/story/ui/edit.html.php b/module/story/ui/edit.html.php index 836b40fd2e..d4e914e15c 100644 --- a/module/story/ui/edit.html.php +++ b/module/story/ui/edit.html.php @@ -122,10 +122,11 @@ detailBody ) ) ), - $canEditContent ? section + section ( set::required(true), set::title($lang->story->reviewers), + !$canEditContent ? set::hidden(true) : null, inputGroup ( picker @@ -152,7 +153,7 @@ detailBody ), formHidden('needNotReview', $forceReview ? 0 : 1) ) - ) : null, + ), section ( set::title($lang->story->legendSpec), diff --git a/module/story/ui/view.html.php b/module/story/ui/view.html.php index 7b27567bfd..49eb9b1bbf 100644 --- a/module/story/ui/view.html.php +++ b/module/story/ui/view.html.php @@ -46,7 +46,7 @@ if($app->tab == 'execution' && isset($execution)) $canModify = common::canModify /* 初始化头部右上方工具栏。Init detail toolbar. */ $toolbar = array(); -if(!$isInModal && hasPriv($story->type, 'create') && $canModify) +if(empty($story->frozen) && !$isInModal && hasPriv($story->type, 'create') && $canModify) { $otherParam = 'storyID=&projectID='; if($app->rawModule == 'projectstory' || $app->tab == 'project') $otherParam = "storyID=&projectID={$this->session->project}"; @@ -199,6 +199,12 @@ if(!empty($actions)) $actions = array_merge($actions['mainActions'], $hasDivider foreach($actions as $key => $action) { + if(!empty($story->frozen) && isset($action['icon']) && in_array($action['icon'], array('edit', 'change', 'trash', 'split', 'copy'))) + { + unset($actions[$key]); + continue; + } + if(!$hasDivider && isset($action['type']) && $action['type'] == 'divider') { unset($actions[$key]); diff --git a/module/story/zen.php b/module/story/zen.php index 83208bf238..37488a6a1f 100644 --- a/module/story/zen.php +++ b/module/story/zen.php @@ -1004,13 +1004,22 @@ class storyZen extends story /* Filter twins. */ $twins = ''; + $frozenStories = ''; foreach($stories as $id => $story) { + if(!empty($story->frozen)) + { + $frozenStories .= "#$id "; + unset($stories[$id]); + continue; + } + if(empty($story->twins)) continue; $twins .= "#$id "; unset($stories[$id]); } if(!empty($twins)) $this->view->twinsTip = sprintf($this->lang->story->batchEditTip, $twins); + if(!empty($frozenStories)) $this->view->frozenTips = sprintf($this->lang->story->frozenTips, $frozenStories, $this->lang->story->edit); return $stories; } diff --git a/module/task/model.php b/module/task/model.php index 0b65701f4d..5fb026acc0 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -3390,8 +3390,15 @@ class taskModel extends model */ public function updateExecutionEsDateByGantt(object $postData): bool { + $stage = $this->dao->select('project,parent,frozen')->from(TABLE_EXECUTION)->where('id')->eq($postData->id)->fetch(); + if(!empty($stage->frozen)) + { + $this->app->loadLang('execution'); + dao::$errors[] = sprintf($this->lang->execution->stageFrozenTip, $this->lang->execution->ganttDrag); + return false; + } + /* Get parent information. */ - $stage = $this->dao->select('project,parent')->from(TABLE_EXECUTION)->where('id')->eq($postData->id)->fetch(); $parentID = $stage->project != $stage->parent ? $stage->parent : 0; $parentData = $this->dao->select('begin,end')->from(TABLE_PROJECT)->where('id')->eq($parentID ? $parentID : $stage->project)->fetch(); diff --git a/module/task/test/model/addtasklabel.php b/module/task/test/model/addtasklabel.php index 9361c71de7..9c3c4698a8 100755 --- a/module/task/test/model/addtasklabel.php +++ b/module/task/test/model/addtasklabel.php @@ -39,6 +39,6 @@ $taskTest = new taskTest(); r(count($taskTest->addTaskLabelTest(array()))) && p() && e('0'); // 步骤1：空数组情况 r($taskTest->addTaskLabelTest(array(1 => 1))) && p('0:value') && e('1'); // 步骤2：普通任务 r($taskTest->addTaskLabelTest(array(4 => 4))) && p('0:value') && e('4'); // 步骤3：父任务情况 -r($taskTest->addTaskLabelTest(array(6 => 6))) && p('0:value') && e('6'); // 步骤4：子任务情况 +r($taskTest->addTaskLabelTest(array(6 => 6))) && p('0:value') && e('6'); // 步骤4：子任务情况 r(count($taskTest->addTaskLabelTest(array(1 => 1, 4 => 4, 6 => 6)))) && p() && e('3'); // 步骤5：混合任务情况（返回结果数量） r(count($taskTest->addTaskLabelTest(array(999 => 999)))) && p() && e('0'); // 步骤6：不存在任务ID情况 \ No newline at end of file diff --git a/module/task/test/model/getpairsbyidlist.php b/module/task/test/model/getpairsbyidlist.php index a4b9a03775..a8050503bf 100755 --- a/module/task/test/model/getpairsbyidlist.php +++ b/module/task/test/model/getpairsbyidlist.php @@ -14,7 +14,7 @@ $dao->delete()->from(TABLE_TASK)->where('id')->le(20)->exec(); // 插入测试任务数据 $tasks = array( array('id' => 1, 'name' => '任务1', 'execution' => 1, 'deleted' => '0'), - array('id' => 2, 'name' => '任务2', 'execution' => 1, 'deleted' => '0'), + array('id' => 2, 'name' => '任务2', 'execution' => 1, 'deleted' => '0'), array('id' => 3, 'name' => '任务3', 'execution' => 1, 'deleted' => '0'), array('id' => 9, 'name' => '任务9', 'execution' => 1, 'deleted' => '1'), // 已删除 array('id' => 10, 'name' => '任务10', 'execution' => 1, 'deleted' => '1'), // 已删除 diff --git a/module/task/test/model/updateexecutionesdatebygantt.php b/module/task/test/model/updateexecutionesdatebygantt.php index dae0ca8407..24b856b1fa 100755 --- a/module/task/test/model/updateexecutionesdatebygantt.php +++ b/module/task/test/model/updateexecutionesdatebygantt.php @@ -10,7 +10,15 @@ zenData('project')->loadYaml('execution', true)->gen(30); title=taskModel->updateExecutionEsDateByGantt(); timeout=0 -cid=18851 +cid=0 + +- 测试检查阶段开始日期 @已超出项目计划开始时间，请先修改项目计划开始时间 +- 测试检查阶段结束日期 @已超出项目计划结束时间，请先修改项目计划结束时间 +- 测试检查子阶段结束日期 @已超出父阶段计划开始时间，请先修改父阶段计划开始时间 +- 测试检查子阶段结束日期 @已超出父阶段计划结束时间，请先修改父阶段计划结束时间 +- 测试更新阶段日期 @1 +- 测试更新父阶段日期 @1 +- 测试更新子阶段日期 @1 */ diff --git a/module/task/test/model/yaml/task_updateparent.yaml b/module/task/test/model/yaml/task_updateparent.yaml index 9df542b770..4c2e743477 100644 --- a/module/task/test/model/yaml/task_updateparent.yaml +++ b/module/task/test/model/yaml/task_updateparent.yaml @@ -6,131 +6,131 @@ fields: - field: id note: 任务ID range: 1-10 - + - field: project note: 项目ID range: 1{10} - + - field: parent note: 父任务ID range: 0{5},1{2},2{2},3{1} - + - field: isParent note: 是否为父任务 range: 0{8},1{2} - + - field: path note: 任务路径 range: ",1,{1},2,{1},3,{1},1,2,{1},1,3,{1},2,3,{1},{4}" - + - field: execution note: 执行ID range: 1{10} - + - field: module note: 模块ID range: 0{10} - + - field: story note: 需求ID range: 0{10} - + - field: name note: 任务名称 range: 任务{1-10} - + - field: type note: 任务类型 range: affair{3},devel{4},test{2},design{1} - + - field: pri note: 优先级 range: 1{3},2{4},3{3} - + - field: estimate note: 预计工时 range: 0{2},1{3},2{3},3{2} - + - field: consumed note: 已消耗工时 range: 0{5},1{3},2{2} - + - field: left note: 剩余工时 range: 0{3},1{4},2{3} - + - field: status note: 任务状态 range: wait{4},doing{3},done{2},cancel{1} - + - field: assignedTo note: 指派给 range: admin{3},user1{3},user2{2},user3{2} - + - field: realStarted note: 实际开始时间 range: 2024-01-01{5},2024-01-02{3},0000-00-00{2} - + - field: deadline note: 截止日期 range: 2024-12-31{5},2024-06-30{3},0000-00-00{2} - + - field: openedBy note: 创建者 range: admin{5},user1{3},user2{2} - + - field: openedDate note: 创建时间 range: 2024-01-01 10:00:00{10} - + - field: finishedBy note: 完成者 range: []{7},admin{2},user1{1} - + - field: finishedDate note: 完成时间 range: 0000-00-00 00:00:00{10} - + - field: canceledBy note: 取消者 range: []{10} - + - field: canceledDate note: 取消时间 range: 0000-00-00 00:00:00{10} - + - field: closedBy note: 关闭者 range: []{10} - + - field: closedDate note: 关闭时间 range: 0000-00-00 00:00:00{10} - + - field: closedReason note: 关闭原因 range: []{10} - + - field: lastEditedBy note: 最后编辑者 range: []{5},admin{3},user1{2} - + - field: lastEditedDate note: 最后编辑时间 range: 0000-00-00 00:00:00{10} - + - field: deleted note: 是否删除 range: 0{10} - + - field: storyVersion note: 需求版本 range: 1{10} - + - field: color note: 颜色 range: []{10} - + - field: desc note: 任务描述 range: 这是一个测试任务{10} \ No newline at end of file diff --git a/module/task/test/tao/getteaminfolist.php b/module/task/test/tao/getteaminfolist.php index c072f74677..125accfb45 100755 --- a/module/task/test/tao/getteaminfolist.php +++ b/module/task/test/tao/getteaminfolist.php @@ -7,7 +7,7 @@ title=测试 taskTao::getTeamInfoList(); timeout=0 cid=18885 -- 执行taskTest模块的getTeamInfoListTest方法，参数是array +- 执行taskTest模块的getTeamInfoListTest方法，参数是array - 第0条的account属性 @admin - 第0条的estimate属性 @8 - 第0条的consumed属性 @2 @@ -21,7 +21,7 @@ cid=18885 - 第2条的consumed属性 @0 - 第2条的left属性 @4 - 执行taskTest模块的getTeamInfoListTest方法，参数是array @0 -- 执行taskTest模块的getTeamInfoListTest方法，参数是array +- 执行taskTest模块的getTeamInfoListTest方法，参数是array - 第0条的account属性 @admin - 第0条的estimate属性 @8 - 第0条的consumed属性 @2 @@ -30,7 +30,7 @@ cid=18885 - 第2条的estimate属性 @4 - 第2条的consumed属性 @0 - 第2条的left属性 @4 -- 执行taskTest模块的getTeamInfoListTest方法，参数是array +- 执行taskTest模块的getTeamInfoListTest方法，参数是array - 第0条的account属性 @admin - 第0条的estimate属性 @8 - 第0条的consumed属性 @2 @@ -39,7 +39,7 @@ cid=18885 - 第1条的estimate属性 @16 - 第1条的consumed属性 @8 - 第1条的left属性 @8 -- 执行taskTest模块的getTeamInfoListTest方法，参数是array +- 执行taskTest模块的getTeamInfoListTest方法，参数是array - 第0条的account属性 @admin - 第0条的estimate属性 @0 - 第0条的consumed属性 @0 diff --git a/module/task/test/zen/assignstoryforcreate.php b/module/task/test/zen/assignstoryforcreate.php index 2029ac9063..651f356ec5 100755 --- a/module/task/test/zen/assignstoryforcreate.php +++ b/module/task/test/zen/assignstoryforcreate.php @@ -7,19 +7,19 @@ title=测试 taskZen::assignStoryForCreate(); timeout=0 cid=18898 -- 执行taskZenTest模块的assignStoryForCreateTest方法，参数是1, 1 +- 执行taskZenTest模块的assignStoryForCreateTest方法，参数是1, 1 - 属性executionID @1 - 属性moduleID @1 -- 执行taskZenTest模块的assignStoryForCreateTest方法，参数是0, 1 +- 执行taskZenTest模块的assignStoryForCreateTest方法，参数是0, 1 - 属性executionID @0 - 属性moduleID @1 -- 执行taskZenTest模块的assignStoryForCreateTest方法，参数是1, 0 +- 执行taskZenTest模块的assignStoryForCreateTest方法，参数是1, 0 - 属性executionID @1 - 属性moduleID @0 -- 执行taskZenTest模块的assignStoryForCreateTest方法，参数是999, 1 +- 执行taskZenTest模块的assignStoryForCreateTest方法，参数是999, 1 - 属性executionID @999 - 属性moduleID @1 -- 执行taskZenTest模块的assignStoryForCreateTest方法，参数是-1, 1 +- 执行taskZenTest模块的assignStoryForCreateTest方法，参数是-1, 1 - 属性executionID @-1 - 属性moduleID @1 diff --git a/module/testcase/config/table.php b/module/testcase/config/table.php index b04b4de552..4743d93a76 100644 --- a/module/testcase/config/table.php +++ b/module/testcase/config/table.php @@ -134,6 +134,7 @@ $config->testcase->dtable->fieldList['stepNumber']['sortType'] = false; if($config->edition != 'open') { + $app->loadLang('custom'); $config->testcase->dtable->fieldList['relatedObject']['name'] = 'relatedObject'; $config->testcase->dtable->fieldList['relatedObject']['title'] = $lang->custom->relateObject; $config->testcase->dtable->fieldList['relatedObject']['sortType'] = false; diff --git a/module/testcase/js/showxmindimport.ui.js b/module/testcase/js/showxmindimport.ui.js index bdd7696b1e..326dfc87fb 100644 --- a/module/testcase/js/showxmindimport.ui.js +++ b/module/testcase/js/showxmindimport.ui.js @@ -1075,7 +1075,7 @@ ztmindmap.Wraper.prototype.paserXmindNode = function(nodeData, level) obj.$.type = "stepGroup"; obj.$.typeBy.import = true; } - else + else if(typeof(nodeData.title) == 'string') { let varType = typeof(nodeData.title); if(varType == 'string') obj.text = nodeData.title; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 1cbbb4f3d2..05a28425dd 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -50,7 +50,7 @@ $lang->testcase->unlinkCase = '移除相关用例'; $lang->testcase->linkBug = '相关Bug'; $lang->testcase->linkBugs = '关联相关Bug'; $lang->testcase->unlinkBug = '移除相关Bug'; -$lang->testcase->stage = '适用阶段'; +$lang->testcase->stage = '适用环节'; $lang->testcase->script = '自动化脚本'; $lang->testcase->scriptedBy = '脚本由谁创建'; $lang->testcase->scriptedDate = '脚本创建日期'; @@ -190,7 +190,7 @@ $lang->testcase->unexecuted = '未执行'; $lang->testcase->lblStory = "相关{$lang->SRCommon}"; $lang->testcase->lblLastEdited = '最后编辑'; $lang->testcase->lblTypeValue = '类型可选值列表'; -$lang->testcase->lblStageValue = '阶段可选值列表'; +$lang->testcase->lblStageValue = '环节可选值列表'; $lang->testcase->lblStatusValue = '状态可选值列表'; $lang->testcase->legendBasicInfo = '基本信息'; @@ -230,12 +230,12 @@ $lang->testcase->typeList['security'] = '安全相关'; $lang->testcase->typeList['other'] = '其他'; $lang->testcase->stageList[''] = ''; -$lang->testcase->stageList['unittest'] = '单元测试阶段'; -$lang->testcase->stageList['feature'] = '功能测试阶段'; -$lang->testcase->stageList['intergrate'] = '集成测试阶段'; -$lang->testcase->stageList['system'] = '系统测试阶段'; -$lang->testcase->stageList['smoke'] = '冒烟测试阶段'; -$lang->testcase->stageList['bvt'] = '版本验证阶段'; +$lang->testcase->stageList['unittest'] = '单元测试环节'; +$lang->testcase->stageList['feature'] = '功能测试环节'; +$lang->testcase->stageList['intergrate'] = '集成测试环节'; +$lang->testcase->stageList['system'] = '系统测试环节'; +$lang->testcase->stageList['smoke'] = '冒烟测试环节'; +$lang->testcase->stageList['bvt'] = '版本验证环节'; $lang->testcase->reviewResultList[''] = ''; $lang->testcase->reviewResultList['pass'] = '确认通过'; diff --git a/module/testcase/test/model/processstepsorexpects.php b/module/testcase/test/model/processstepsorexpects.php index 845e8361c9..0be929cf97 100755 --- a/module/testcase/test/model/processstepsorexpects.php +++ b/module/testcase/test/model/processstepsorexpects.php @@ -25,9 +25,9 @@ su('admin'); // 3. 创建测试实例（变量名与模块名一致） $testcaseTest = new testcaseTest(); -// 4. 🔴 强制要求：必须包含至少5个测试步骤 +// 4. 🔴 强制要求：必须包含至少5个测试步骤 r($testcaseTest->processStepsOrExpectsTest("1. 打开登录页面")) && p('0:1') && e('打开登录页面'); // 步骤1：正常单级编号 -r($testcaseTest->processStepsOrExpectsTest("1.1. 输入用户名")) && p('0:0') && e("1.1. 输入用户名"); // 步骤2：多级编号处理 +r($testcaseTest->processStepsOrExpectsTest("1.1. 输入用户名")) && p('0:0') && e("1.1. 输入用户名"); // 步骤2：多级编号处理 r($testcaseTest->processStepsOrExpectsTest("打开页面")) && p('0:0') && e("打开页面"); // 步骤3：无编号步骤 r($testcaseTest->processStepsOrExpectsTest("")) && p('1:0') && e('step'); // 步骤4：空字符串返回步骤类型 r($testcaseTest->processStepsOrExpectsTest("1. 主步骤\n1.1. 子步骤1")) && p('0:1') && e('主步骤'); // 步骤5：复杂嵌套 \ No newline at end of file diff --git a/module/testcase/test/model/savetestcase.php b/module/testcase/test/model/savetestcase.php index bd2d5644fe..dec125c5c7 100755 --- a/module/testcase/test/model/savetestcase.php +++ b/module/testcase/test/model/savetestcase.php @@ -54,7 +54,7 @@ $nodeID2 = $testcase2->tmpPId; $scene2 = isset($sceneIdList2[$nodeID2]['id']) ? $sceneIdList2[$nodeID2]['id'] : 0; r($scene2) && p() && e('5'); // 步骤2：测试tmpPId在sceneIdList中存在 -// 步骤3：测试tmpPId不存在于sceneIdList中的情况 +// 步骤3：测试tmpPId不存在于sceneIdList中的情况 $testcase3 = new stdclass(); $testcase3->tmpPId = 'invalidKey'; $sceneIdList3 = array('validKey' => array('id' => 20), 'anotherKey' => array('id' => 25)); diff --git a/module/testcase/test/model/yaml/casestep_processstepschanged.yaml b/module/testcase/test/model/yaml/casestep_processstepschanged.yaml index 565714e93b..15149ee606 100644 --- a/module/testcase/test/model/yaml/casestep_processstepschanged.yaml +++ b/module/testcase/test/model/yaml/casestep_processstepschanged.yaml @@ -8,7 +8,7 @@ fields: - field: id note: 步骤ID range: 1-10 - + - field: parent note: 父步骤ID range: 0 diff --git a/module/testcase/test/zen/checkcasesforbatchedit.php b/module/testcase/test/zen/checkcasesforbatchedit.php index 5f6ebcb67b..0387c95d10 100755 --- a/module/testcase/test/zen/checkcasesforbatchedit.php +++ b/module/testcase/test/zen/checkcasesforbatchedit.php @@ -10,7 +10,7 @@ cid=19084 - 执行testcaseTest模块的checkCasesForBatchEditTest方法，参数是$validCases 第0条的title属性 @测试用例1 - 执行testcaseTest模块的checkCasesForBatchEditTest方法，参数是$casesWithEmptyTitle 属性title[0] @『用例名称』不能为空。 - 执行testcaseTest模块的checkCasesForBatchEditTest方法，参数是$casesWithEmptyType 属性type[0] @『用例类型』不能为空。 -- 执行testcaseTest模块的checkCasesForBatchEditTest方法，参数是$casesWithMultipleEmpty +- 执行testcaseTest模块的checkCasesForBatchEditTest方法，参数是$casesWithMultipleEmpty - 属性title[0] @『用例名称』不能为空。 - 属性type[0] @『用例类型』不能为空。 - 执行testcaseTest模块的checkCasesForBatchEditTest方法，参数是$casesWithEmptyStage 第0条的title属性 @测试用例1 diff --git a/module/testcase/ui/zerocase.html.php b/module/testcase/ui/zerocase.html.php index 9456c266fb..22f60c0d4c 100644 --- a/module/testcase/ui/zerocase.html.php +++ b/module/testcase/ui/zerocase.html.php @@ -52,6 +52,14 @@ $footToolbar = $canBatchAction ? array('items' => array $stories = initTableData($stories, $config->testcase->zerocase->dtable->fieldList, $this->story); +foreach($stories as $id => $story) +{ + if(!isset($story->actions)) continue; + foreach($story->actions as $key => $action) + { + if(!empty($story->frozen) && in_array($action['name'], array('edit', 'change'))) $stories[$id]->actions[$key]['hint'] = sprintf($lang->story->frozenTip, $lang->story->{$action['name']}); + } +} foreach($config->testcase->zerocase->dtable->fieldList as $colName => $col) { diff --git a/module/testreport/test/lib/testreport.unittest.class.php b/module/testreport/test/lib/testreport.unittest.class.php index 3644174a33..0e9fc7ddcc 100644 --- a/module/testreport/test/lib/testreport.unittest.class.php +++ b/module/testreport/test/lib/testreport.unittest.class.php @@ -299,17 +299,17 @@ class testreportTest { $builds = $this->build->getByList($buildIdList); $childBuilds = $this->objectModel->getChildBuilds($builds); - + if(dao::isError()) return dao::getError(); - + if(empty($childBuilds)) return ''; - + $result = array(); foreach($childBuilds as $childBuild) { $result[] = $childBuild->id . ':' . $childBuild->name; } - + return implode(',', $result); } } diff --git a/module/testtask/test/model/getrunbycase.php b/module/testtask/test/model/getrunbycase.php index e1e8d8a563..8aed7bd259 100755 --- a/module/testtask/test/model/getrunbycase.php +++ b/module/testtask/test/model/getrunbycase.php @@ -7,19 +7,19 @@ title=测试 testtaskModel::getRunByCase(); timeout=0 cid=19189 -- 执行testtaskTest模块的getRunByCaseTest方法，参数是1, 1 +- 执行testtaskTest模块的getRunByCaseTest方法，参数是1, 1 - 属性task @1 - 属性case @1 -- 执行testtaskTest模块的getRunByCaseTest方法，参数是1, 2 +- 执行testtaskTest模块的getRunByCaseTest方法，参数是1, 2 - 属性task @1 - 属性case @2 -- 执行testtaskTest模块的getRunByCaseTest方法，参数是2, 2 +- 执行testtaskTest模块的getRunByCaseTest方法，参数是2, 2 - 属性task @2 - 属性case @2 -- 执行testtaskTest模块的getRunByCaseTest方法，参数是2, 3 +- 执行testtaskTest模块的getRunByCaseTest方法，参数是2, 3 - 属性task @2 - 属性case @3 -- 执行testtaskTest模块的getRunByCaseTest方法，参数是3, 4 +- 执行testtaskTest模块的getRunByCaseTest方法，参数是3, 4 - 属性task @3 - 属性case @4 diff --git a/module/testtask/test/model/initresult.php b/module/testtask/test/model/initresult.php index 965b240b7a..4f5ee424fa 100755 --- a/module/testtask/test/model/initresult.php +++ b/module/testtask/test/model/initresult.php @@ -7,7 +7,7 @@ title=测试 testtaskModel::initResult(); timeout=0 cid=19204 -- 执行testtaskTest模块的initResultTest方法，参数是$now +- 执行testtaskTest模块的initResultTest方法，参数是$now - 属性case @0 - 属性version @1 - 属性caseResult @pass diff --git a/module/testtask/test/model/processstepresults.php b/module/testtask/test/model/processstepresults.php index 23a06051ee..bf9668332d 100755 --- a/module/testtask/test/model/processstepresults.php +++ b/module/testtask/test/model/processstepresults.php @@ -41,7 +41,7 @@ $testtaskTest = new testtaskTest(); // 5. 执行测试步骤 r($testtaskTest->processStepResultsTest([1, 2], 1, 'pass', [], [])) && p('1:result') && e('pass'); // 步骤1：用例有步骤，结果为pass -r($testtaskTest->processStepResultsTest([1, 2], 1, 'fail', [1 => 'fail', 2 => 'pass', 3 => 'fail'], [1 => '实际结果1'])) && p('1:result') && e('fail'); // 步骤2：用例有步骤，结果为fail +r($testtaskTest->processStepResultsTest([1, 2], 1, 'fail', [1 => 'fail', 2 => 'pass', 3 => 'fail'], [1 => '实际结果1'])) && p('1:result') && e('fail'); // 步骤2：用例有步骤，结果为fail r($testtaskTest->processStepResultsTest([1, 2], 4, 'pass', [], [])) && p('0:result') && e('pass'); // 步骤3：用例无步骤，结果为pass r($testtaskTest->processStepResultsTest([1, 2], 4, 'fail', [], ['测试失败原因'])) && p('0:result') && e('fail'); // 步骤4：用例无步骤，结果为fail r($testtaskTest->processStepResultsTest([], 1, 'pass', [], [])) && p() && e('Array'); // 步骤5：空步骤数组测试 \ No newline at end of file diff --git a/module/testtask/test/model/yaml/testsuite_getexistsuitesofunitresult.yaml b/module/testtask/test/model/yaml/testsuite_getexistsuitesofunitresult.yaml index 35de10cd54..39d96cedd8 100644 --- a/module/testtask/test/model/yaml/testsuite_getexistsuitesofunitresult.yaml +++ b/module/testtask/test/model/yaml/testsuite_getexistsuitesofunitresult.yaml @@ -12,7 +12,7 @@ fields: note: 项目ID range: 1-3 - field: product - note: 产品ID + note: 产品ID range: 1-3 - field: name note: 测试套件名称 diff --git a/module/todo/test/lib/todo.unittest.class.php b/module/todo/test/lib/todo.unittest.class.php index b5d90bea14..08288b5635 100755 --- a/module/todo/test/lib/todo.unittest.class.php +++ b/module/todo/test/lib/todo.unittest.class.php @@ -365,7 +365,7 @@ class todoTest * @access public * @return int */ - public function getCycleListTest(bool $initCycle = true): int + public function getCycleListTest(bool $initCycle = true): array { $todoList = $this->objectModel->getValidCycleList(); @@ -373,7 +373,7 @@ class todoTest $cycleList = $this->objectModel->getCycleList($todoList); - return count($cycleList) > 0 ? 1 : 0; + return $cycleList; } /** @@ -581,7 +581,7 @@ class todoTest $reflection = new ReflectionClass($this->objectModel); $method = $reflection->getMethod('dateRange'); $method->setAccessible(true); - + $result = $method->invoke($this->objectModel, $type); if(dao::isError()) return dao::getError(); diff --git a/module/todo/test/model/activate.php b/module/todo/test/model/activate.php index 89ff62e601..be28ebd145 100755 --- a/module/todo/test/model/activate.php +++ b/module/todo/test/model/activate.php @@ -21,7 +21,7 @@ su('admin'); zenData('todo')->gen(5); -$todoIDList = array('1', '2', '3'); +$todoIDList = range(1,5); $todo = new todoTest(); @@ -29,4 +29,4 @@ r($todo->activateTest(1)) && p('status') && e('wait'); // 激活一个状态为w r($todo->activateTest(2)) && p('status') && e('wait'); // 激活一个状态为doing的todo r($todo->activateTest(3)) && p('status') && e('wait'); // 激活一个状态为done的todo r($todo->activateTest(4)) && p('status') && e('wait'); // 激活一个状态为closed的todo -r($todo->activateTest(5)) && p('status') && e('wait'); // 激活一个状态为wait的todo +r($todo->activateTest(5)) && p('status') && e('wait'); // 激活一个状态为wait的todo \ No newline at end of file diff --git a/module/todo/test/model/batchfinish.php b/module/todo/test/model/batchfinish.php index 71246fa996..bbac9ec80c 100755 --- a/module/todo/test/model/batchfinish.php +++ b/module/todo/test/model/batchfinish.php @@ -36,4 +36,4 @@ $todo->batchFinishTest(array(1, 2, 3, 4)); r($todo->getByIdTest(1)) && p('status') && e('done'); // 获取批量完成后ID为1的待办状态 r($todo->getByIdTest(2)) && p('status') && e('done'); // 获取批量完成后ID为2的待办状态 r($todo->getByIdTest(3)) && p('status') && e('done'); // 获取批量完成后ID为3的待办状态 -r($todo->getByIdTest(4)) && p('status') && e('done'); // 获取批量完成后ID为4的待办状态 +r($todo->getByIdTest(4)) && p('status') && e('done'); // 获取批量完成后ID为4的待办状态 \ No newline at end of file diff --git a/module/todo/test/model/create.php b/module/todo/test/model/create.php index 8bf8a6284c..e1d073d465 100755 --- a/module/todo/test/model/create.php +++ b/module/todo/test/model/create.php @@ -57,4 +57,4 @@ r($todoTest->createTest($todoInvalidObjectID)) && p() && e('0'); // 判断创 dao::getError(); r($todoTest->createTest($todo)) && p() && e('6'); // 判断创建待办，返回结果id为6 r($todoTest->createTest($todoWithCycle)) && p() && e('7'); // 判断创建周期待办，返回结果id为7 -r($todoTest->createTest(null)) && p() && e('~~'); // 判断空待办 +r($todoTest->createTest(null)) && p() && e('~~'); // 判断空待办 \ No newline at end of file diff --git a/module/todo/test/model/createbycycle.php b/module/todo/test/model/createbycycle.php index 514d4673f5..a3ed14060b 100755 --- a/module/todo/test/model/createbycycle.php +++ b/module/todo/test/model/createbycycle.php @@ -38,6 +38,11 @@ $tester->loadModel('todo'); su('admin'); zenData('todo')->loadYaml('createbycycle')->gen(3); +global $tester; +$todos = $tester->loadModel('todo')->getList(); + +r(count($todos)) && p() && e('0'); // 测试前，待办数据为0 + $todo = new todoTest(); $todo->createByCycleTest(); $todoList = $tester->dao->select('*')->from(TABLE_TODO)->where('deleted')->eq('0')->fetchAll(); @@ -45,4 +50,4 @@ r($todoList) && p('0:id,name,status') && e('1,周期待办：提前1天，间隔 r($todoList) && p('1:id,name,status') && e('2,周期待办：每月的每天，提前1天生成,doing'); // 周期性待办ID为2的待办属性 r($todoList) && p('2:id,name,status') && e('3,周期待办：每周的每天，提前1天生成,doing'); // 周期性待办ID为3的待办属性 r($todoList) && p('3:id,name,status') && e('4,周期待办：每月的每天，提前1天生成,wait'); // 周期性待办ID为4的待办属性 -r($todoList) && p('8:id,name,status') && e('9,周期待办：每周的每天，提前1天生成,wait'); // 周期性待办ID为9的待办属性 +r($todoList) && p('8:id,name,status') && e('9,周期待办：每周的每天，提前1天生成,wait'); // 周期性待办ID为9的待办属性 \ No newline at end of file diff --git a/module/todo/test/model/editdate.php b/module/todo/test/model/editdate.php index 08594c27f8..d8929df620 100755 --- a/module/todo/test/model/editdate.php +++ b/module/todo/test/model/editdate.php @@ -39,4 +39,4 @@ r($todo) && p('date') && e('2023-02-27'); // 获取待办id为1的修改后的 $todo = $tester->todo->fetchByID(2); r($todo) && p('date') && e('2023-02-27'); // 获取待办id为2的修改后的日期 $todo = $tester->todo->fetchByID(3); -r($todo) && p('date') && e('2023-02-27'); // 获取待办id为3的修改后的日期 +r($todo) && p('date') && e('2023-02-27'); // 获取待办id为3的修改后的日期 \ No newline at end of file diff --git a/module/todo/test/model/getpribytodotype.php b/module/todo/test/model/getpribytodotype.php index c2b47b437c..f0ac4bd55b 100755 --- a/module/todo/test/model/getpribytodotype.php +++ b/module/todo/test/model/getpribytodotype.php @@ -30,4 +30,4 @@ r($todoTest->getPriByTodoTypeTest('bug', 1)) && p() && e('1'); // 获取类 r($todoTest->getPriByTodoTypeTest('task', 3)) && p() && e('3'); // 获取类型为bug,ID为1对象的优先级，结果为3 r($todoTest->getPriByTodoTypeTest('story', 5)) && p() && e('1'); // 获取类型为bug,ID为1对象的优先级，结果为1 r($todoTest->getPriByTodoTypeTest('testtask', 7)) && p() && e('3'); // 获取类型为bug,ID为1对象的优先级，结果为3 -r($todoTest->getPriByTodoTypeTest('bug', 9)) && p() && e('1'); // 获取类型为bug,ID为1对象的优先级，结果为1 +r($todoTest->getPriByTodoTypeTest('bug', 9)) && p() && e('1'); // 获取类型为bug,ID为1对象的优先级，结果为1 \ No newline at end of file diff --git a/module/todo/test/model/gettodoprojects.php b/module/todo/test/model/gettodoprojects.php index b50c1d04a8..326f8e3173 100755 --- a/module/todo/test/model/gettodoprojects.php +++ b/module/todo/test/model/gettodoprojects.php @@ -36,4 +36,4 @@ r(count($projectList['task'])) && p() && e('4'); // 验证task获得的键 r($projectList['task']) && p('1') && e('11'); // 验证taskID为1对应的projectID r($projectList['task']) && p('2') && e('12'); // 验证taskID为2对应的projectID r($projectList['task']) && p('3') && e('13'); // 验证taskID为3对应的projectID -r($projectList['task']) && p('4') && e('14'); // 验证taskID为4对应的projectID +r($projectList['task']) && p('4') && e('14'); // 验证taskID为4对应的projectID \ No newline at end of file diff --git a/module/todo/test/model/start.php b/module/todo/test/model/start.php index abc229253f..a4698e3822 100755 --- a/module/todo/test/model/start.php +++ b/module/todo/test/model/start.php @@ -26,4 +26,4 @@ r($todo->startTest(1)) && p('status') && e('doing'); //开启一个状态为wait r($todo->startTest(2)) && p('status') && e('doing'); //开启一个状态为doing的todo r($todo->startTest(3)) && p('status') && e('doing'); //开启一个状态为done的todo r($todo->startTest(4)) && p('status') && e('doing'); //开启一个状态为closed的todo -r($todo->startTest(5)) && p('status') && e('doing'); //开启一个状态为wait的todo +r($todo->startTest(5)) && p('status') && e('doing'); //开启一个状态为wait的todo \ No newline at end of file diff --git a/module/todo/test/model/yaml/activate/activate.yaml b/module/todo/test/model/yaml/activate/activate.yaml index 4b6f45b8c2..e9367baf2b 100755 --- a/module/todo/test/model/yaml/activate/activate.yaml +++ b/module/todo/test/model/yaml/activate/activate.yaml @@ -3,9 +3,9 @@ author: shenshulong version: '1.0' fields: - field: id - range: '1-3' + range: '1-5' - field: account - range: '1-3' + range: '1-5' prefix: 'admin' - field: begin range: '1710' @@ -16,23 +16,23 @@ fields: - field: pri range: "3" - field: name - range: '1-3' + range: '1-5' prefix: '测试待办' - field: desc range: '描述' - field: status range: 'wait,doing,done' - field: assignedTo - range: '1-3' + range: '1-5' prefix: 'admin' - field: assignedBy - range: '1-3' + range: '1-5' prefix: 'admin' - field: finishedBy - range: '1-3' + range: '1-5' prefix: 'admin' - field: closedBy - range: '1-3' + range: '1-5' prefix: 'admin' - field: vision range: '1.0' diff --git a/module/todo/test/tao/closetodo.php b/module/todo/test/tao/closetodo.php old mode 100644 new mode 100755 index 3adc740492..e707604c05 --- a/module/todo/test/tao/closetodo.php +++ b/module/todo/test/tao/closetodo.php @@ -4,6 +4,7 @@ include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/lib/todo.unittest.class.php'; /** + title=测试Tao层的关闭待办 todoTao::closeTodo() timeout=0 cid=19269 @@ -41,4 +42,4 @@ r($todo->closeTodoTest(1)) && p('oldStatus,newStatus,isClosed') && e('wait,close r($todo->closeTodoTest(2)) && p('oldStatus,newStatus,isClosed') && e('doing,closed,1'); // 将wait状态更新为close状态并判断是否关闭成功 r($todo->closeTodoTest(3)) && p('oldStatus,newStatus,isClosed') && e('done,closed,1'); // 将wait状态更新为close状态并判断是否关闭成功 r($todo->closeTodoTest(4)) && p('oldStatus,newStatus,isClosed') && e('closed,closed,1'); // 将wait状态更新为close状态并判断是否关闭成功 -r($todo->closeTodoTest(5)) && p('oldStatus,newStatus,isClosed') && e('wait,closed,1'); // 将wait状态更新为close状态并判断是否关闭成功 +r($todo->closeTodoTest(5)) && p('oldStatus,newStatus,isClosed') && e('wait,closed,1'); // 将wait状态更新为close状态并判断是否关闭成功 \ No newline at end of file diff --git a/module/todo/test/tao/fetch.php b/module/todo/test/tao/fetch.php index 8068816464..87c8504619 100755 --- a/module/todo/test/tao/fetch.php +++ b/module/todo/test/tao/fetch.php @@ -67,4 +67,4 @@ r($tester->todo->fetch(3)) && p('id,status,account,type,name') && e('3,done,use r($tester->todo->fetch(5)) && p('id,status,account,type,name') && e('5,wait,user4,testtask,测试单5的待办'); // 查询id=5的todo属性 r($tester->todo->fetch(7)) && p('id,status,account,type,name') && e('7,done,user6,bug,BUG7的待办'); // 查询id=7的todo属性 r($tester->todo->fetch(9)) && p('id,status,account,type,name') && e('9,wait,user8,story,需求9的待办'); // 查询id=9的todo属性 -r($tester->todo->fetch(10)) && p('id,status,account,type,name') && e('10,doing,user9,testtask,测试单10的待办'); // 查询id=10的todo属性 +r($tester->todo->fetch(10)) && p('id,status,account,type,name') && e('10,doing,user9,testtask,测试单10的待办'); // 查询id=10的todo属性 \ No newline at end of file diff --git a/module/todo/test/tao/fetchrows.php b/module/todo/test/tao/fetchrows.php index efbec854d7..30049cbdd5 100755 --- a/module/todo/test/tao/fetchrows.php +++ b/module/todo/test/tao/fetchrows.php @@ -51,4 +51,4 @@ r($todoTest->fetchRowsTest(array(999 => 'test', 1000 => 'test'))) && p() && e('0 r($todoTest->fetchRowsTest(array())) && p() && e('0'); // 测试步骤5：获取单个待办记录 -r($todoTest->fetchRowsTest(array(1 => 'single'))) && p('1:id') && e('1'); \ No newline at end of file +r($todoTest->fetchRowsTest(array(1 => 'single'))) && p('1:id') && e('1'); diff --git a/module/todo/test/tao/getcyclelist.php b/module/todo/test/tao/getcyclelist.php index 5e250aa58c..ca6cf32f70 100755 --- a/module/todo/test/tao/getcyclelist.php +++ b/module/todo/test/tao/getcyclelist.php @@ -13,6 +13,14 @@ cid=19274 - 验证按ID倒序排序后第一个key是10 @10 - 验证混合输入只返回2条有效记录 @2 +- 获取通过周期待办的生成的待办数据为空的情况，结果为 0 @0 +- 获取有周期待办生成的待办数量，结果为 3 @3 +- 获取有周期待办生成的待办数据详细信息 + - 第2条的account属性 @admin + - 第2条的name属性 @周期待办：每月的每天，提前1天生成 + - 第2条的begin属性 @0801 + - 第2条的end属性 @1801 + */ include dirname(__FILE__, 5) . '/test/lib/init.php'; @@ -48,4 +56,4 @@ r(key($result4)) && p() && e('10'); // 验证按ID倒序排序后第一个key是 // 测试步骤5：测试混合有效无效objectID的todoList $mixedTodoList = array(1 => 'todo1', 999 => 'invalid', 6 => 'todo6', 1000 => 'invalid2'); $result5 = $todoTest->getCycleListTaoTest($mixedTodoList); -r(count($result5)) && p() && e('2'); // 验证混合输入只返回2条有效记录 \ No newline at end of file +r(count($result5)) && p() && e('2'); // 验证混合输入只返回2条有效记录 diff --git a/module/todo/test/tao/getcycletododate.php b/module/todo/test/tao/getcycletododate.php index 59645403ac..cab8bc72f0 100755 --- a/module/todo/test/tao/getcycletododate.php +++ b/module/todo/test/tao/getcycletododate.php @@ -15,6 +15,12 @@ cid=19275 - 空lastCycle按天类型，不符合间隔返回0 @0 - 过期配置应返回false或empty @0 +- 获取类型为按天生成的周期待办的日期，结果1 @1 +- 获取类型为按周生成的周期待办的日期，结果1 @1 +- 获取类型为按月生成的周期待办的日期，结果1 @1 +- 生成周期为按天生成的周期待办的日期，结果0 @0 +- 生成周期为空的周期待办的日期，结果0 @0 + */ include dirname(__FILE__, 5) . '/test/lib/init.php'; @@ -48,4 +54,4 @@ r($todoTest->getCycleTodoDateTestEdgeCase('invalid_type')) && p() && e('0'); // r($todoTest->getCycleTodoDateTestEdgeCase('empty_lastcycle')) && p() && e('0'); // 空lastCycle按天类型，不符合间隔返回0 // 测试步骤7：测试过期配置的情况 -r($todoTest->getCycleTodoDateTestEdgeCase('past_config')) && p() && e('0'); // 过期配置应返回false或empty \ No newline at end of file +r($todoTest->getCycleTodoDateTestEdgeCase('past_config')) && p() && e('0'); // 过期配置应返回false或empty diff --git a/module/todo/test/tao/getlistby.php b/module/todo/test/tao/getlistby.php index 98903efa31..9d9f8e5d53 100755 --- a/module/todo/test/tao/getlistby.php +++ b/module/todo/test/tao/getlistby.php @@ -40,4 +40,4 @@ r(is_array($todo->getListByTest('today', 'admin', 'all', '2025-08-24', '2025-08- r(count($todo->getListByTest('assignedtoother', 'admin', 'all', '', '', 0, 'date_desc'))) && p() && e('0'); // 获取空结果的待办列表 r(count($todo->getListByTest('today', 'admin', 'all', '2025-08-24', '2025-08-25', 0, 'date_desc'))) && p() && e('2'); // 按日期范围过滤待办列表 r(count($todo->getListByTest('today', 'admin', 'wait', '2025-08-24', '2025-08-25', 0, 'date_desc'))) && p() && e('2'); // 按状态过滤待办列表 -r(count($todo->getListByTest('today', 'admin', 'all', '2025-08-24', '2025-08-25', 1, 'date_desc'))) && p() && e('1'); // 限制返回数量的待办列表 \ No newline at end of file +r(count($todo->getListByTest('today', 'admin', 'all', '2025-08-24', '2025-08-25', 1, 'date_desc'))) && p() && e('1'); // 限制返回数量的待办列表 diff --git a/module/todo/test/tao/getprojectlist.php b/module/todo/test/tao/getprojectlist.php index c6d104a5ce..5c22e30a62 100755 --- a/module/todo/test/tao/getprojectlist.php +++ b/module/todo/test/tao/getprojectlist.php @@ -22,6 +22,12 @@ cid=19277 - 属性4 @2 - 步骤5：验证返回数组长度 @3 +- 验证task获得的键值对的个数 @1 +- 验证taskID为10的project为20属性10 @20 +- 验证project获得的键值对的个数 @1 +- 获取不到的情况属性10 @0 +- 验证bugID为10的project为24属性10 @14 + */ include dirname(__FILE__, 5) . '/test/lib/init.php'; @@ -57,4 +63,4 @@ r($todoTest->getProjectListTest('zt_task', array(1 => 1, 2 => 2, 3 => 3))) && p( r($todoTest->getProjectListTest('zt_task', array())) && p() && e(0); // 步骤2：空ID列表 r($todoTest->getProjectListTest('zt_bug', array(1 => 1, 3 => 3, 5 => 5))) && p('1,3,5') && e('2,2,3'); // 步骤3：bug表查询 r($todoTest->getProjectListTest('zt_testtask', array(1 => 1, 2 => 2, 4 => 4))) && p('1,2,4') && e('1,1,2'); // 步骤4：testtask表查询 -r(count($todoTest->getProjectListTest('zt_task', array(6 => 6, 8 => 8, 10 => 10)))) && p() && e('3'); // 步骤5：验证返回数组长度 \ No newline at end of file +r(count($todoTest->getProjectListTest('zt_task', array(6 => 6, 8 => 8, 10 => 10)))) && p() && e('3'); // 步骤5：验证返回数组长度 diff --git a/module/todo/test/tao/gettodocountbyaccount.php b/module/todo/test/tao/gettodocountbyaccount.php index fa72448c27..927cb6a65a 100755 --- a/module/todo/test/tao/gettodocountbyaccount.php +++ b/module/todo/test/tao/gettodocountbyaccount.php @@ -45,4 +45,4 @@ r($todoTest->getTodoCountByAccountTest('user2')) && p() && e('5'); // 步 r($todoTest->getTodoCountByAccountTest('user5')) && p() && e('2'); // 步骤4：user5用户待办数量 r($todoTest->getTodoCountByAccountTest('')) && p() && e('10'); // 步骤5：空用户名（匹配所有条件） r($todoTest->getTodoCountByAccountTest('test')) && p() && e('6'); // 步骤6：test用户待办数量 -r($todoTest->getTodoCountByAccountTest('nonexist')) && p() && e('0'); // 步骤7：不存在的用户 \ No newline at end of file +r($todoTest->getTodoCountByAccountTest('nonexist')) && p() && e('0'); // 步骤7：不存在的用户 diff --git a/module/todo/test/tao/settodonamebytype.php b/module/todo/test/tao/settodonamebytype.php index 615c6d3fff..b0db887380 100755 --- a/module/todo/test/tao/settodonamebytype.php +++ b/module/todo/test/tao/settodonamebytype.php @@ -91,4 +91,4 @@ r($todoTest->setTodoNameByTypeTest(5)) && p('name') && e('Original Todo Name'); r($todoTest->setTodoNameByTypeTest(6)) && p('name') && e('Custom Todo Name'); // 测试步骤7：业务规则测试当关联对象名称为空时的回退逻辑 -r($todoTest->setTodoNameByTypeTest(7)) && p('name') && e('Empty Object Todo Name'); \ No newline at end of file +r($todoTest->setTodoNameByTypeTest(7)) && p('name') && e('Empty Object Todo Name'); diff --git a/module/todo/test/tao/updatedate.php b/module/todo/test/tao/updatedate.php index ceae380900..c9151fa390 100755 --- a/module/todo/test/tao/updatedate.php +++ b/module/todo/test/tao/updatedate.php @@ -40,4 +40,4 @@ r($todoTest->updateDateTest($singleTodoList, $validDate1)) && p() && e('1'); r($todoTest->updateDateTest($multipleTodoList, $validDate2)) && p() && e('1'); r($todoTest->updateDateTest($emptyTodoList, $validDateTime)) && p() && e('1'); r($todoTest->updateDateTest($nonExistentList, $validDate1)) && p() && e('1'); -r($todoTest->updateDateTest($validTodoList, $edgeDate)) && p() && e('1'); \ No newline at end of file +r($todoTest->updateDateTest($validTodoList, $edgeDate)) && p() && e('1'); diff --git a/module/todo/test/tao/updaterow.php b/module/todo/test/tao/updaterow.php index 2c263f52bc..4bfaf3d820 100755 --- a/module/todo/test/tao/updaterow.php +++ b/module/todo/test/tao/updaterow.php @@ -76,4 +76,4 @@ r($tester->todo->updateRow(3, $invalidCustomTodoNoName)) && p() && e('0'); // r($tester->todo->updateRow(4, $invalidBugTodoNoObjectID)) && p() && e('0'); // 步骤4：更新bug类型待办缺少objectID r($tester->todo->updateRow(999, $validCustomTodo)) && p() && e('0'); // 步骤5：更新不存在的待办ID r($tester->todo->updateRow(5, $validCustomTodo)) && p() && e('1'); // 步骤6：重复正常更新测试 -r($tester->todo->updateRow(6, $validStoryTodo)) && p() && e('1'); // 步骤7：story类型待办更新测试 \ No newline at end of file +r($tester->todo->updateRow(6, $validStoryTodo)) && p() && e('1'); // 步骤7：story类型待办更新测试 diff --git a/module/transfer/test/lib/transfer.unittest.class.php b/module/transfer/test/lib/transfer.unittest.class.php index 21014f2358..c6906fc153 100755 --- a/module/transfer/test/lib/transfer.unittest.class.php +++ b/module/transfer/test/lib/transfer.unittest.class.php @@ -399,11 +399,11 @@ class transferTest // 设置cookie值 if($maxImport !== null) { - if($maxImport === '') + if($maxImport === '') { unset($_COOKIE['maxImport']); } - else + else { $_COOKIE['maxImport'] = (string)$maxImport; } @@ -412,10 +412,10 @@ class transferTest // 由于模型已经被加载，我们需要重新创建一个实例来测试构造函数 // 这里我们直接模拟构造函数的逻辑 $result = new stdClass(); - + // 模拟构造函数中的maxImport逻辑 $result->maxImport = isset($_COOKIE['maxImport']) ? (int)$_COOKIE['maxImport'] : 0; - + // 检查transfer配置是否存在 $transfer = $tester->loadModel('transfer'); $result->transferConfig = is_object($transfer->transferConfig) ? 1 : 0; @@ -466,7 +466,7 @@ class transferTest */ public function getPageDatasTest(array $datas = array(), int $pagerID = 1) { - try + try { $result = $this->objectModel->getPageDatas($datas, $pagerID); if(dao::isError()) return dao::getError(); @@ -619,7 +619,7 @@ class transferTest $originalSessionFileName = isset($_SESSION['fileImportFileName']) ? $_SESSION['fileImportFileName'] : null; $originalMaxImport = isset($_COOKIE['maxImport']) ? $_COOKIE['maxImport'] : null; - try + try { // 获取临时文件路径 $tmpPath = $tester->loadModel('file')->getPathOfImportedFile(); @@ -708,7 +708,7 @@ class transferTest { return '0'; } - + return $result; } catch(Exception $e) @@ -739,7 +739,7 @@ class transferTest // 清理测试文件 if(isset($testFile) && file_exists($testFile)) unlink($testFile); if(isset($tmpFile) && file_exists($tmpFile)) unlink($tmpFile); - + // 清理可能生成的临时文件（基于文件名MD5） $patterns = array('test_file.csv', 'default_test.csv', 'nonexistent_file.csv'); foreach($patterns as $pattern) @@ -766,7 +766,7 @@ class transferTest $originalSessionFileName = isset($_SESSION['fileImportFileName']) ? $_SESSION['fileImportFileName'] : null; $originalSessionExtension = isset($_SESSION['fileImportExtension']) ? $_SESSION['fileImportExtension'] : null; - try + try { // 清除之前的错误状态 dao::$errors = array(); @@ -790,7 +790,7 @@ class transferTest { // 测试场景3：处理空文件名 $_SESSION['fileImportFileName'] = ''; - + // 由于空文件名会导致错误，模拟这种情况 dao::$errors['message'] = 'Empty filename'; return 'false'; @@ -799,7 +799,7 @@ class transferTest { // 测试场景4：处理不存在的文件 $_SESSION['fileImportFileName'] = '/nonexistent/path/file.xlsx'; - + // 模拟文件不存在的错误 dao::$errors['message'] = 'File does not exist'; return 'false'; @@ -809,7 +809,7 @@ class transferTest // 测试场景5：验证错误清理机制 $tmpPath = $tester->loadModel('file')->getPathOfImportedFile(); $testFile = $tmpPath . '/cleanup_test.xlsx'; - + // 创建测试文件和session if(!is_dir($tmpPath)) mkdir($tmpPath, 0755, true); file_put_contents($testFile, 'test content for cleanup'); @@ -821,7 +821,7 @@ class transferTest unset($_SESSION['fileImportFileName']); unset($_SESSION['fileImportExtension']); dao::$errors['message'] = 'Error for cleanup test'; - + return 'false'; } @@ -857,11 +857,11 @@ class transferTest { $testFiles = array( $tmpPath . '/valid_test.csv', - $tmpPath . '/error_test.xlsx', + $tmpPath . '/error_test.xlsx', $tmpPath . '/cleanup_test.xlsx', $tmpPath . '/nonexistent_file.xlsx' ); - + foreach($testFiles as $file) { if(file_exists($file)) unlink($file); @@ -886,7 +886,7 @@ class transferTest $originalSessionFileName = isset($_SESSION['fileImportFileName']) ? $_SESSION['fileImportFileName'] : null; $originalSessionExtension = isset($_SESSION['fileImportExtension']) ? $_SESSION['fileImportExtension'] : null; - try + try { // 清除之前的错误状态 dao::$errors = array(); @@ -894,7 +894,7 @@ class transferTest // 设置临时文件路径用于可能的清理操作 $tmpPath = $tester->loadModel('file')->getPathOfImportedFile(); if(!is_dir($tmpPath)) mkdir($tmpPath, 0755, true); - + $testFile = $tmpPath . '/test_processrows.csv'; file_put_contents($testFile, 'test content'); $_SESSION['fileImportFileName'] = $testFile; diff --git a/module/tree/control.php b/module/tree/control.php index 6f42b96547..deff438647 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -321,6 +321,36 @@ class tree extends control } } + /** + * 新增一个模块。 + * Create a module. + * + * @param int $rootID + * @param string $viewType + * @access public + * @return void + */ + public function create(int $rootID, string $viewType) + { + if(!empty($_POST)) + { + if(empty($_POST['name'])) return $this->sendError(array('name' => sprintf($this->lang->error->notempty, $this->lang->tree->name))); + + $count = $this->dao->select(`order`)->from(TABLE_MODULE)->where('type')->eq($viewType)->andWhere('root')->eq($rootID)->andWhere('parent')->eq('0')->count(); + $_POST['parentModuleID'] = 0; + $_POST['modules'] = array($_POST['name']); + $_POST['shorts'] = array($_POST['short']); + $_POST['maxOrder'] = $count ? $count * 10 : 0; + + $this->tree->manageChild($rootID, $viewType); + if(dao::isError()) return $this->sendError(dao::getError()); + + return $this->sendSuccess(array('load' => true, 'closeModel' => true)); + } + $this->view->title = $this->lang->tree->create; + $this->display(); + } + /** * 查看模块历史记录。 * View module histories. diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php index 6fdd8761e1..5bc42a8c25 100755 --- a/module/tree/lang/de.php +++ b/module/tree/lang/de.php @@ -10,61 +10,65 @@ * @link https://www.zentao.net */ $lang->tree = new stdclass(); -$lang->tree->common = 'Modul'; -$lang->tree->edit = 'Bearbeiten'; -$lang->tree->delete = 'Löschen'; -$lang->tree->browse = 'Allgemeine Module verwalten'; -$lang->tree->browseTask = 'Aufgaben Modul verwalten'; -$lang->tree->manage = 'Modul verwalten'; -$lang->tree->fix = 'Fix'; -$lang->tree->manageProduct = "Verwalte {$lang->productCommon}"; -$lang->tree->manageProject = "Verwalte {$lang->projectCommon}"; -$lang->tree->manageExecution = "Verwalte {$lang->execution->common}"; -$lang->tree->manageLine = "Manage Product Line"; -$lang->tree->manageBug = 'Verwalte Bugs'; -$lang->tree->manageCase = 'Verwalte Fälle'; -$lang->tree->manageCaselib = 'Verwalte Bibliothek'; -$lang->tree->manageCustomDoc = 'Verwalte Dokumente'; -$lang->tree->manageApiChild = 'Manage API Directory'; -$lang->tree->manageGroup = 'Manage group'; -$lang->tree->updateOrder = 'Sortierung'; -$lang->tree->manageChild = 'Verwalte Untermodul'; -$lang->tree->manageStoryChild = 'Verwalte Untermodul'; -$lang->tree->manageLineChild = 'Verwalte Produktlinie'; -$lang->tree->manageBugChild = 'Verwalte Bugs'; -$lang->tree->manageCaseChild = 'Verwalte Fälle'; -$lang->tree->manageCaselibChild = 'Verwalte Bibliothek'; -$lang->tree->manageDashboard = 'Manage Dashboard Module'; -$lang->tree->manageDashboardChild = 'Manage Dashboard Child Module'; -$lang->tree->manageProjectChild = "Verwalte {$lang->projectCommon}"; -$lang->tree->manageTaskChild = "Verwalte {$lang->execution->common}"; -$lang->tree->syncFromProduct = "Copy from Other {$lang->productCommon}s"; -$lang->tree->dragAndSort = "Ziehen und Sotieren"; -$lang->tree->sort = "Sortieren"; -$lang->tree->addChild = "Hinzufügen"; -$lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?'; -$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?'; -$lang->tree->confirmDelCategory = 'Möchten Sie diese Kategorie und ihre Kinderkategorien löschen?'; -$lang->tree->confirmDeleteLine = "Do you want to delete this product line?"; -$lang->tree->confirmDeleteGroup = 'Do you want to delete this group and its child groups?'; -$lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?"; -$lang->tree->confirmRoot4Doc = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?"; -$lang->tree->noSubmodule = "There are no copyable submodules under the current module!"; -$lang->tree->successSave = 'Saved.'; -$lang->tree->successFixed = 'Fixed.'; -$lang->tree->repeatName = 'The name "%s" exists!'; -$lang->tree->repeatDirName = 'The name "%s" exists!'; -$lang->tree->shouldNotBlank = 'Module name should not be blank!'; -$lang->tree->syncProductModule = 'Sync Module'; -$lang->tree->host = 'Host'; -$lang->tree->editHost = 'Edit host group'; -$lang->tree->deleteHost = 'Delete host group'; -$lang->tree->manageHostChild = 'Manage child host'; -$lang->tree->groupMaintenance = 'Manage host group'; -$lang->tree->groupName = 'Group Name'; -$lang->tree->parentGroup = 'Parent grpup'; -$lang->tree->childGroup = 'Child'; -$lang->tree->confirmDeleteHost = 'Do you want to delete this host and its child hosts?'; +$lang->tree->common = 'Modul'; +$lang->tree->edit = 'Bearbeiten'; +$lang->tree->create = 'Erstellen'; +$lang->tree->delete = 'Löschen'; +$lang->tree->browse = 'Allgemeine Module verwalten'; +$lang->tree->browseTask = 'Aufgaben Modul verwalten'; +$lang->tree->manage = 'Modul verwalten'; +$lang->tree->fix = 'Fix'; +$lang->tree->manageProduct = "Verwalte {$lang->productCommon}"; +$lang->tree->manageProject = "Verwalte {$lang->projectCommon}"; +$lang->tree->manageExecution = "Verwalte {$lang->execution->common}"; +$lang->tree->manageLine = "Manage Product Line"; +$lang->tree->manageBug = 'Verwalte Bugs'; +$lang->tree->manageCase = 'Verwalte Fälle'; +$lang->tree->manageCaselib = 'Verwalte Bibliothek'; +$lang->tree->manageCustomDoc = 'Verwalte Dokumente'; +$lang->tree->manageApiChild = 'Manage API Directory'; +$lang->tree->manageGroup = 'Manage group'; +$lang->tree->updateOrder = 'Sortierung'; +$lang->tree->manageChild = 'Verwalte Untermodul'; +$lang->tree->manageStoryChild = 'Verwalte Untermodul'; +$lang->tree->manageLineChild = 'Verwalte Produktlinie'; +$lang->tree->manageBugChild = 'Verwalte Bugs'; +$lang->tree->manageCaseChild = 'Verwalte Fälle'; +$lang->tree->manageCaselibChild = 'Verwalte Bibliothek'; +$lang->tree->manageDashboard = 'Manage Dashboard Module'; +$lang->tree->manageDashboardChild = 'Manage Dashboard Child Module'; +$lang->tree->manageProjectChild = "Verwalte {$lang->projectCommon}"; +$lang->tree->manageTaskChild = "Verwalte {$lang->execution->common}"; +$lang->tree->manageDeliverableChild = "Manage Deliverable Category"; +$lang->tree->syncFromProduct = "Copy from Other {$lang->productCommon}s"; +$lang->tree->dragAndSort = "Ziehen und Sotieren"; +$lang->tree->sort = "Sortieren"; +$lang->tree->addChild = "Hinzufügen"; +$lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?'; +$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?'; +$lang->tree->confirmDelCategory = 'Möchten Sie diese Kategorie und ihre Kinderkategorien löschen?'; +$lang->tree->confirmDeleteLine = "Do you want to delete this product line?"; +$lang->tree->confirmDeleteGroup = 'Do you want to delete this group and its child groups?'; +$lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?"; +$lang->tree->confirmRoot4Doc = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?"; +$lang->tree->noSubmodule = "There are no copyable submodules under the current module!"; +$lang->tree->successSave = 'Saved.'; +$lang->tree->successFixed = 'Fixed.'; +$lang->tree->repeatName = 'The name "%s" exists!'; +$lang->tree->repeatDirName = 'The name "%s" exists!'; +$lang->tree->shouldNotBlank = 'Module name should not be blank!'; +$lang->tree->syncProductModule = 'Sync Module'; +$lang->tree->host = 'Host'; +$lang->tree->editHost = 'Edit host group'; +$lang->tree->deleteHost = 'Delete host group'; +$lang->tree->manageHostChild = 'Manage child host'; +$lang->tree->groupMaintenance = 'Manage host group'; +$lang->tree->groupName = 'Group Name'; +$lang->tree->parentGroup = 'Parent grpup'; +$lang->tree->childGroup = 'Child'; +$lang->tree->confirmDeleteHost = 'Do you want to delete this host and its child hosts?'; +$lang->tree->designModule = 'Design'; +$lang->tree->otherModule = 'Other'; $lang->tree->module = 'Modul'; $lang->tree->name = 'Name'; diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 59e70b8101..48250680d9 100755 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -10,61 +10,65 @@ * @link https://www.zentao.net */ $lang->tree = new stdclass(); -$lang->tree->common = 'Module'; -$lang->tree->edit = 'Edit Module'; -$lang->tree->delete = 'Delete Module'; -$lang->tree->browse = 'Manage General Module'; -$lang->tree->browseTask = 'Manage Task Module'; -$lang->tree->manage = 'Manage Module'; -$lang->tree->fix = 'Fix Module'; -$lang->tree->manageProduct = "Manage {$lang->productCommon} Modules"; -$lang->tree->manageProject = "Manage {$lang->projectCommon} Modules"; -$lang->tree->manageExecution = "Manage {$lang->execution->common} Modules"; -$lang->tree->manageLine = "Manage Product Line"; -$lang->tree->manageBug = 'Manage Bug'; -$lang->tree->manageCase = 'Manage Case'; -$lang->tree->manageCaselib = 'Manage Library'; -$lang->tree->manageCustomDoc = 'Manage Document Library'; -$lang->tree->manageApiChild = 'Manage API Directory'; -$lang->tree->manageGroup = 'Manage group'; -$lang->tree->updateOrder = 'Rank Module'; -$lang->tree->manageChild = 'Manage Child Modules'; -$lang->tree->manageStoryChild = 'Manage Child Modules'; -$lang->tree->manageLineChild = "Manage Product Line"; -$lang->tree->manageBugChild = 'Manage Child Modules of Bugs'; -$lang->tree->manageCaseChild = 'Manage Child Cases'; -$lang->tree->manageCaselibChild = 'Manage Child Libraries'; -$lang->tree->manageDashboard = 'Manage Dashboard Module'; -$lang->tree->manageDashboardChild = 'Manage Dashboard Child Module'; -$lang->tree->manageProjectChild = "Manage Child {$lang->projectCommon} Modules"; -$lang->tree->manageTaskChild = "Manage Child {$lang->execution->common} Modules"; -$lang->tree->syncFromProduct = "Copy from Other {$lang->productCommon}s"; -$lang->tree->dragAndSort = "Drag to order"; -$lang->tree->sort = "Order"; -$lang->tree->addChild = "Add Child Module"; -$lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?'; -$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?'; -$lang->tree->confirmDelCategory = 'Do you want to delete this category and its child categories?'; -$lang->tree->confirmDeleteLine = "Do you want to delete this product line?"; -$lang->tree->confirmDeleteGroup = 'Do you want to delete this group and its child groups?'; -$lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?"; -$lang->tree->confirmRoot4Doc = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?"; -$lang->tree->noSubmodule = "There are no copyable submodules under the current module!"; -$lang->tree->successSave = 'Saved.'; -$lang->tree->successFixed = 'Fixed.'; -$lang->tree->repeatName = 'The name "%s" exists!'; -$lang->tree->repeatDirName = 'The name "%s" exists!'; -$lang->tree->shouldNotBlank = 'Module name should not be blank!'; -$lang->tree->syncProductModule = 'Sync Module'; -$lang->tree->host = 'Host'; -$lang->tree->editHost = 'Edit host group'; -$lang->tree->deleteHost = 'Delete host group'; -$lang->tree->manageHostChild = 'Manage child host'; -$lang->tree->groupMaintenance = 'Manage host group'; -$lang->tree->groupName = 'Group Name'; -$lang->tree->parentGroup = 'Parent grpup'; -$lang->tree->childGroup = 'Child'; -$lang->tree->confirmDeleteHost = 'Do you want to delete this host and its child hosts?'; +$lang->tree->common = 'Module'; +$lang->tree->create = 'Create Module'; +$lang->tree->edit = 'Edit Module'; +$lang->tree->delete = 'Delete Module'; +$lang->tree->browse = 'Manage General Module'; +$lang->tree->browseTask = 'Manage Task Module'; +$lang->tree->manage = 'Manage Module'; +$lang->tree->fix = 'Fix Module'; +$lang->tree->manageProduct = "Manage {$lang->productCommon} Modules"; +$lang->tree->manageProject = "Manage {$lang->projectCommon} Modules"; +$lang->tree->manageExecution = "Manage {$lang->execution->common} Modules"; +$lang->tree->manageLine = "Manage Product Line"; +$lang->tree->manageBug = 'Manage Bug'; +$lang->tree->manageCase = 'Manage Case'; +$lang->tree->manageCaselib = 'Manage Library'; +$lang->tree->manageCustomDoc = 'Manage Document Library'; +$lang->tree->manageApiChild = 'Manage API Directory'; +$lang->tree->manageGroup = 'Manage group'; +$lang->tree->updateOrder = 'Rank Module'; +$lang->tree->manageChild = 'Manage Child Modules'; +$lang->tree->manageStoryChild = 'Manage Child Modules'; +$lang->tree->manageLineChild = "Manage Product Line"; +$lang->tree->manageBugChild = 'Manage Child Modules of Bugs'; +$lang->tree->manageCaseChild = 'Manage Child Cases'; +$lang->tree->manageCaselibChild = 'Manage Child Libraries'; +$lang->tree->manageDashboard = 'Manage Dashboard Module'; +$lang->tree->manageDashboardChild = 'Manage Dashboard Child Module'; +$lang->tree->manageProjectChild = "Manage Child {$lang->projectCommon} Modules"; +$lang->tree->manageTaskChild = "Manage Child {$lang->execution->common} Modules"; +$lang->tree->manageDeliverableChild = "Manage Deliverable Category"; +$lang->tree->syncFromProduct = "Copy from Other {$lang->productCommon}s"; +$lang->tree->dragAndSort = "Drag to order"; +$lang->tree->sort = "Order"; +$lang->tree->addChild = "Add Child Module"; +$lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?'; +$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?'; +$lang->tree->confirmDelCategory = 'Do you want to delete this category and its child categories?'; +$lang->tree->confirmDeleteLine = "Do you want to delete this product line?"; +$lang->tree->confirmDeleteGroup = 'Do you want to delete this group and its child groups?'; +$lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?"; +$lang->tree->confirmRoot4Doc = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?"; +$lang->tree->noSubmodule = "There are no copyable submodules under the current module!"; +$lang->tree->successSave = 'Saved.'; +$lang->tree->successFixed = 'Fixed.'; +$lang->tree->repeatName = 'The name "%s" exists!'; +$lang->tree->repeatDirName = 'The name "%s" exists!'; +$lang->tree->shouldNotBlank = 'Module name should not be blank!'; +$lang->tree->syncProductModule = 'Sync Module'; +$lang->tree->host = 'Host'; +$lang->tree->editHost = 'Edit host group'; +$lang->tree->deleteHost = 'Delete host group'; +$lang->tree->manageHostChild = 'Manage child host'; +$lang->tree->groupMaintenance = 'Manage host group'; +$lang->tree->groupName = 'Group Name'; +$lang->tree->parentGroup = 'Parent grpup'; +$lang->tree->childGroup = 'Child'; +$lang->tree->confirmDeleteHost = 'Do you want to delete this host and its child hosts?'; +$lang->tree->designModule = 'Design'; +$lang->tree->otherModule = 'Other'; $lang->tree->module = 'Module'; $lang->tree->name = 'Module Name'; diff --git a/module/tree/lang/fr.php b/module/tree/lang/fr.php index 963b5509a5..a5052b465b 100755 --- a/module/tree/lang/fr.php +++ b/module/tree/lang/fr.php @@ -10,61 +10,65 @@ * @link https://www.zentao.net */ $lang->tree = new stdclass(); -$lang->tree->common = 'Module'; -$lang->tree->edit = 'Editer Module'; -$lang->tree->delete = 'Supprimer Module'; -$lang->tree->browse = 'Gérer les Modules Généraux'; -$lang->tree->browseTask = 'Gérer les Modules Tâche'; -$lang->tree->manage = 'Gérer les Modules'; -$lang->tree->fix = 'Corrigez Module'; -$lang->tree->manageProduct = "Gérer les Modules {$lang->productCommon}"; -$lang->tree->manageProject = "Gérer les Modules {$lang->projectCommon}"; -$lang->tree->manageExecution = "Gérer les Modules {$lang->execution->common}"; -$lang->tree->manageLine = 'Gérer Ligne Produit'; -$lang->tree->manageBug = 'Gérer Bugs'; -$lang->tree->manageCase = 'Gérer CasTests'; -$lang->tree->manageCaselib = 'Gérer Librairie de recette'; -$lang->tree->manageCustomDoc = 'Gérer la librairie de Doc'; -$lang->tree->manageApiChild = 'Manage API Directory'; -$lang->tree->manageGroup = 'Manage group'; -$lang->tree->updateOrder = 'Rang Module'; -$lang->tree->manageChild = 'Gérer Sous-Module'; -$lang->tree->manageStoryChild = 'Gérer Sous-Module'; -$lang->tree->manageLineChild = 'Gérer Ligne Produit'; -$lang->tree->manageBugChild = 'Gérer Sous-Bugs'; -$lang->tree->manageCaseChild = 'Gérer Sous-CasTests'; -$lang->tree->manageCaselibChild = 'Gérer Sous-Librairies'; -$lang->tree->manageDashboard = 'Manage Dashboard Module'; -$lang->tree->manageDashboardChild = 'Manage Dashboard Child Module'; -$lang->tree->manageProjectChild = "Gérer Sous-Modules {$lang->projectCommon}"; -$lang->tree->manageTaskChild = "Gérer Sous-Modules {$lang->execution->common}"; -$lang->tree->syncFromProduct = "Copier d'un autre {$lang->productCommon}"; -$lang->tree->dragAndSort = "Faites glisser pour ordonner"; -$lang->tree->sort = "Ordonnez"; -$lang->tree->addChild = "Ajout Sous-Module"; -$lang->tree->confirmDelete = 'Voulez-vous supprimer ce module et tous ses sous-modules ?'; -$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?'; -$lang->tree->confirmDelCategory = 'Voulez-vous supprimer cette catégorie et ses sous-catégories?'; -$lang->tree->confirmDeleteLine = 'Voulez-vous supprimer cette ligne de produit ?'; -$lang->tree->confirmDeleteGroup = 'Do you want to delete this group and its child groups?'; -$lang->tree->confirmRoot = "Les changements du {$lang->productCommon} vont impacter les stories, bugs, casTests du {$lang->productCommon} auquel ils appartiennent, ainsi que les associations de {$lang->executionCommon} et {$lang->productCommon}, ce qui est dangereux. Voulez-vous malgré tout effectuer le changement ?"; -$lang->tree->confirmRoot4Doc = "Toute modification apportée à la bibliothèque modifiera le document de la bibliothèque à laquelle elle appartient, ce qui est dangereux. Voulez-vous le changer ?"; -$lang->tree->noSubmodule = "There are no copyable submodules under the current module!"; -$lang->tree->successSave = 'Sauvé.'; -$lang->tree->successFixed = 'Corrigé.'; -$lang->tree->repeatName = 'Le nom "%s" existe déjà !'; -$lang->tree->repeatDirName = 'The name "%s" exists!'; -$lang->tree->shouldNotBlank = 'Module name should not be blank!'; -$lang->tree->syncProductModule = 'Sync Module'; -$lang->tree->host = 'Host'; -$lang->tree->editHost = 'Edit host group'; -$lang->tree->deleteHost = 'Delete host group'; -$lang->tree->manageHostChild = 'Manage child host'; -$lang->tree->groupMaintenance = 'Manage host group'; -$lang->tree->groupName = 'Group Name'; -$lang->tree->parentGroup = 'Parent grpup'; -$lang->tree->childGroup = 'Child'; -$lang->tree->confirmDeleteHost = 'Do you want to delete this host and its child hosts?'; +$lang->tree->common = 'Module'; +$lang->tree->edit = 'Editer Module'; +$lang->tree->create = 'Create Module'; +$lang->tree->delete = 'Supprimer Module'; +$lang->tree->browse = 'Gérer les Modules Généraux'; +$lang->tree->browseTask = 'Gérer les Modules Tâche'; +$lang->tree->manage = 'Gérer les Modules'; +$lang->tree->fix = 'Corrigez Module'; +$lang->tree->manageProduct = "Gérer les Modules {$lang->productCommon}"; +$lang->tree->manageProject = "Gérer les Modules {$lang->projectCommon}"; +$lang->tree->manageExecution = "Gérer les Modules {$lang->execution->common}"; +$lang->tree->manageLine = 'Gérer Ligne Produit'; +$lang->tree->manageBug = 'Gérer Bugs'; +$lang->tree->manageCase = 'Gérer CasTests'; +$lang->tree->manageCaselib = 'Gérer Librairie de recette'; +$lang->tree->manageCustomDoc = 'Gérer la librairie de Doc'; +$lang->tree->manageApiChild = 'Manage API Directory'; +$lang->tree->manageGroup = 'Manage group'; +$lang->tree->updateOrder = 'Rang Module'; +$lang->tree->manageChild = 'Gérer Sous-Module'; +$lang->tree->manageStoryChild = 'Gérer Sous-Module'; +$lang->tree->manageLineChild = 'Gérer Ligne Produit'; +$lang->tree->manageBugChild = 'Gérer Sous-Bugs'; +$lang->tree->manageCaseChild = 'Gérer Sous-CasTests'; +$lang->tree->manageCaselibChild = 'Gérer Sous-Librairies'; +$lang->tree->manageDashboard = 'Manage Dashboard Module'; +$lang->tree->manageDashboardChild = 'Manage Dashboard Child Module'; +$lang->tree->manageProjectChild = "Gérer Sous-Modules {$lang->projectCommon}"; +$lang->tree->manageTaskChild = "Gérer Sous-Modules {$lang->execution->common}"; +$lang->tree->manageDeliverableChild = "Manage Deliverable Category"; +$lang->tree->syncFromProduct = "Copier d'un autre {$lang->productCommon}"; +$lang->tree->dragAndSort = "Faites glisser pour ordonner"; +$lang->tree->sort = "Ordonnez"; +$lang->tree->addChild = "Ajout Sous-Module"; +$lang->tree->confirmDelete = 'Voulez-vous supprimer ce module et tous ses sous-modules ?'; +$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?'; +$lang->tree->confirmDelCategory = 'Voulez-vous supprimer cette catégorie et ses sous-catégories?'; +$lang->tree->confirmDeleteLine = 'Voulez-vous supprimer cette ligne de produit ?'; +$lang->tree->confirmDeleteGroup = 'Do you want to delete this group and its child groups?'; +$lang->tree->confirmRoot = "Les changements du {$lang->productCommon} vont impacter les stories, bugs, casTests du {$lang->productCommon} auquel ils appartiennent, ainsi que les associations de {$lang->executionCommon} et {$lang->productCommon}, ce qui est dangereux. Voulez-vous malgré tout effectuer le changement ?"; +$lang->tree->confirmRoot4Doc = "Toute modification apportée à la bibliothèque modifiera le document de la bibliothèque à laquelle elle appartient, ce qui est dangereux. Voulez-vous le changer ?"; +$lang->tree->noSubmodule = "There are no copyable submodules under the current module!"; +$lang->tree->successSave = 'Sauvé.'; +$lang->tree->successFixed = 'Corrigé.'; +$lang->tree->repeatName = 'Le nom "%s" existe déjà !'; +$lang->tree->repeatDirName = 'The name "%s" exists!'; +$lang->tree->shouldNotBlank = 'Module name should not be blank!'; +$lang->tree->syncProductModule = 'Sync Module'; +$lang->tree->host = 'Host'; +$lang->tree->editHost = 'Edit host group'; +$lang->tree->deleteHost = 'Delete host group'; +$lang->tree->manageHostChild = 'Manage child host'; +$lang->tree->groupMaintenance = 'Manage host group'; +$lang->tree->groupName = 'Group Name'; +$lang->tree->parentGroup = 'Parent grpup'; +$lang->tree->childGroup = 'Child'; +$lang->tree->confirmDeleteHost = 'Do you want to delete this host and its child hosts?'; +$lang->tree->designModule = 'Design'; +$lang->tree->otherModule = 'Other'; $lang->tree->module = 'Module'; $lang->tree->name = 'Nom'; diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index d98a3242dc..afce3964bc 100755 --- a/module/tree/lang/zh-cn.php +++ b/module/tree/lang/zh-cn.php @@ -9,62 +9,66 @@ * @version $Id: zh-cn.php 4836 2013-06-19 05:39:40Z zhujinyonging@gmail.com $ * @link https://www.zentao.net */ -$lang->tree = new stdclass(); -$lang->tree->common = '模块维护'; -$lang->tree->edit = '编辑模块'; -$lang->tree->delete = '删除模块'; -$lang->tree->browse = '通用模块维护'; -$lang->tree->browseTask = '任务模块维护'; -$lang->tree->manage = '维护模块'; -$lang->tree->fix = '修正数据'; -$lang->tree->manageProduct = "维护{$lang->productCommon}视图模块"; -$lang->tree->manageProject = "维护{$lang->projectCommon}视图模块"; -$lang->tree->manageExecution = "维护{$lang->execution->common}视图模块"; -$lang->tree->manageLine = "维护产品线"; -$lang->tree->manageBug = '维护测试视图模块'; -$lang->tree->manageCase = '维护用例视图模块'; -$lang->tree->manageCaselib = '维护用例库模块'; -$lang->tree->manageCustomDoc = '维护文档库分类'; -$lang->tree->manageApiChild = '维护接口库目录'; -$lang->tree->manageGroup = '维护分组'; -$lang->tree->updateOrder = '更新排序'; -$lang->tree->manageChild = '维护子模块'; -$lang->tree->manageStoryChild = '维护子模块'; -$lang->tree->manageLineChild = "维护产品线"; -$lang->tree->manageBugChild = '维护Bug子模块'; -$lang->tree->manageCaseChild = '维护用例子模块'; -$lang->tree->manageCaselibChild = '维护用例库子模块'; -$lang->tree->manageDashboard = '维护仪表盘模块'; -$lang->tree->manageDashboardChild = '维护仪表盘子模块'; -$lang->tree->manageProjectChild = "维护{$lang->projectCommon}子模块"; -$lang->tree->manageTaskChild = "维护{$lang->execution->common}子模块"; -$lang->tree->syncFromProduct = '复制模块'; -$lang->tree->dragAndSort = "拖放排序"; -$lang->tree->sort = "排序"; -$lang->tree->addChild = "增加子模块"; -$lang->tree->confirmDelete = '该模块及其子模块都会被删除，您确定删除吗？'; -$lang->tree->confirmDeleteMenu = '该目录及其子目录都会被删除，您确定删除吗？'; -$lang->tree->confirmDelCategory = '该分类及其子分类都会被删除，您确定删除吗？'; -$lang->tree->confirmDeleteLine = "您确定删除该产品线吗？"; -$lang->tree->confirmDeleteGroup = '该分组及其子分组都会被删除，您确定删除吗？'; -$lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的{$lang->SRCommon}、Bug、用例的所属{$lang->productCommon}，以及{$lang->executionCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？"; -$lang->tree->confirmRoot4Doc = "修改所属文档库，会同时修改该分类下文档的关联关系。该操作比较危险，请谨慎操作。是否确认修改？"; -$lang->tree->noSubmodule = "当前模块下没有可复制的子模块！"; -$lang->tree->successSave = '成功保存'; -$lang->tree->successFixed = '成功修正数据！'; -$lang->tree->repeatName = '模块名“%s”已经存在！'; -$lang->tree->repeatDirName = '目录名“%s”已经存在！'; -$lang->tree->shouldNotBlank = '模块名不能为空格！'; -$lang->tree->syncProductModule = "同步{$lang->productCommon}模块"; -$lang->tree->host = '主机'; -$lang->tree->editHost = '编辑主机分组'; -$lang->tree->deleteHost = '删除主机分组'; -$lang->tree->manageHostChild = '维护主机子分组'; -$lang->tree->groupMaintenance = '维护主机分组'; -$lang->tree->groupName = '分组名称'; -$lang->tree->parentGroup = '上级分组'; -$lang->tree->childGroup = '子分组'; -$lang->tree->confirmDeleteHost = '该分组及子分组都会被删除，您确定删除吗？'; +$lang->tree = new stdclass(); +$lang->tree->common = '模块维护'; +$lang->tree->create = '创建模块'; +$lang->tree->edit = '编辑模块'; +$lang->tree->delete = '删除模块'; +$lang->tree->browse = '通用模块维护'; +$lang->tree->browseTask = '任务模块维护'; +$lang->tree->manage = '维护模块'; +$lang->tree->fix = '修正数据'; +$lang->tree->manageProduct = "维护{$lang->productCommon}视图模块"; +$lang->tree->manageProject = "维护{$lang->projectCommon}视图模块"; +$lang->tree->manageExecution = "维护{$lang->execution->common}视图模块"; +$lang->tree->manageLine = "维护产品线"; +$lang->tree->manageBug = '维护测试视图模块'; +$lang->tree->manageCase = '维护用例视图模块'; +$lang->tree->manageCaselib = '维护用例库模块'; +$lang->tree->manageCustomDoc = '维护文档库分类'; +$lang->tree->manageApiChild = '维护接口库目录'; +$lang->tree->manageGroup = '维护分组'; +$lang->tree->updateOrder = '更新排序'; +$lang->tree->manageChild = '维护子模块'; +$lang->tree->manageStoryChild = '维护子模块'; +$lang->tree->manageLineChild = "维护产品线"; +$lang->tree->manageBugChild = '维护Bug子模块'; +$lang->tree->manageCaseChild = '维护用例子模块'; +$lang->tree->manageCaselibChild = '维护用例库子模块'; +$lang->tree->manageDashboard = '维护仪表盘模块'; +$lang->tree->manageDashboardChild = '维护仪表盘子模块'; +$lang->tree->manageProjectChild = "维护{$lang->projectCommon}子模块"; +$lang->tree->manageTaskChild = "维护{$lang->execution->common}子模块"; +$lang->tree->manageDeliverableChild = "维护交付物分类"; +$lang->tree->syncFromProduct = '复制模块'; +$lang->tree->dragAndSort = "拖放排序"; +$lang->tree->sort = "排序"; +$lang->tree->addChild = "增加子模块"; +$lang->tree->confirmDelete = '该模块及其子模块都会被删除，您确定删除吗？'; +$lang->tree->confirmDeleteMenu = '该目录及其子目录都会被删除，您确定删除吗？'; +$lang->tree->confirmDelCategory = '该分类及其子分类都会被删除，您确定删除吗？'; +$lang->tree->confirmDeleteLine = "您确定删除该产品线吗？"; +$lang->tree->confirmDeleteGroup = '该分组及其子分组都会被删除，您确定删除吗？'; +$lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的{$lang->SRCommon}、Bug、用例的所属{$lang->productCommon}，以及{$lang->executionCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？"; +$lang->tree->confirmRoot4Doc = "修改所属文档库，会同时修改该分类下文档的关联关系。该操作比较危险，请谨慎操作。是否确认修改？"; +$lang->tree->noSubmodule = "当前模块下没有可复制的子模块！"; +$lang->tree->successSave = '成功保存'; +$lang->tree->successFixed = '成功修正数据！'; +$lang->tree->repeatName = '模块名“%s”已经存在！'; +$lang->tree->repeatDirName = '目录名“%s”已经存在！'; +$lang->tree->shouldNotBlank = '模块名不能为空格！'; +$lang->tree->syncProductModule = "同步{$lang->productCommon}模块"; +$lang->tree->host = '主机'; +$lang->tree->editHost = '编辑主机分组'; +$lang->tree->deleteHost = '删除主机分组'; +$lang->tree->manageHostChild = '维护主机子分组'; +$lang->tree->groupMaintenance = '维护主机分组'; +$lang->tree->groupName = '分组名称'; +$lang->tree->parentGroup = '上级分组'; +$lang->tree->childGroup = '子分组'; +$lang->tree->confirmDeleteHost = '该分组及子分组都会被删除，您确定删除吗？'; +$lang->tree->designModule = '设计类'; +$lang->tree->otherModule = '其他'; $lang->tree->module = '模块'; $lang->tree->name = '模块名称'; diff --git a/module/tree/model.php b/module/tree/model.php index 5374b9baf8..13967f2041 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -87,7 +87,7 @@ class treeModel extends model } if($this->isMergeModule($rootID, $type)) { - return $this->dao->select('id, name, root, branch, grade, path, parent, owner, type')->from(TABLE_MODULE) + return $this->dao->select('id, name, root, branch, grade, path, parent, owner, type, extra')->from(TABLE_MODULE) ->where('root')->eq((int)$rootID) ->beginIF($type == 'task')->andWhere('type')->eq('task')->fi() ->beginIF($type != 'task')->andWhere('type')->in("story,$type")->fi() @@ -1235,6 +1235,53 @@ class treeModel extends model return $data; } + /** + * 生成交付物链接。 + * Create link of a deliverable. + * + * @param string $type + * @param object $module + * @param string $parent + * @param string $extra + * @access public + * @return object + */ + public function createDeliverableLink(string $type, object $module, string $parent, string $extra = ''): object + { + if(!$extra) $extra = 'all'; + + $data = new stdclass(); + $data->id = (string)$module->id; + $data->parent = (string)$module->parent; + $data->name = $module->name; + $data->url = helper::createLink('deliverable', 'browse', "groupID={$module->root}&browseType={$extra}¶m={$module->id}"); + $data->extra = $module->extra; + + return $data; + } + + /** + * 生成项目交付物链接。 + * Create link of a project deliverable. + * + * @param string $type + * @param object $module + * @param string $parent + * @param string $extra + * @access public + * @return object + */ + public function createProjectDeliverableLink(string $type, object $module, string $parent, string $extra = ''): object + { + $data = new stdclass(); + $data->id = (string)$module->id; + $data->parent = (string)$module->parent; + $data->name = $module->name; + $data->url = helper::createLink('project', 'deliverable', "projectID={$extra}&browseType=bymodule¶m={$module->id}"); + + return $data; + } + /** * 生成文档链接。 * Create link of a doc. @@ -1853,7 +1900,7 @@ class treeModel extends model $repeatName = $this->checkUnique($module, $childs); if($repeatName) { - dao::$errors['root'] = sprintf($this->lang->tree->repeatName, $repeatName); + dao::$errors['name'] = sprintf($this->lang->tree->repeatName, $repeatName); return false; } @@ -1982,7 +2029,7 @@ class treeModel extends model */ public function update(int $moduleID, string $type = ''): bool { - $module = fixer::input('post')->cleanInt('branch')->get(); + $module = fixer::input('post')->cleanInt('branch')->setDefault('parent', 0)->get(); $self = $this->getById($moduleID); $changes = common::createChanges($self, $module); if(!isset($_POST['branch'])) $module->branch = $self->branch; @@ -2174,9 +2221,10 @@ class treeModel extends model $objectType = (!empty($module->type) && strpos($this->config->tree->groupTypes, ",$module->type,") !== false) ? 'chartgroup' : 'module'; /* Mark deletion when delete a module. */ $this->dao->update(TABLE_MODULE)->set('deleted')->eq(1)->where('id')->in($childs)->exec(); - foreach($childs as $childID) + + if($module->type != 'deliverable') { - $this->loadModel('action')->create($objectType, $childID, 'deleted', '', actionModel::CAN_UNDELETED); + foreach($childs as $childID) $this->loadModel('action')->create($objectType, $childID, 'deleted', '', actionModel::CAN_UNDELETED); } $this->fixModulePath($module->root, $module->type); diff --git a/module/tree/test/lib/tree.unittest.class.php b/module/tree/test/lib/tree.unittest.class.php index 3e87f0f11a..a3b2606503 100755 --- a/module/tree/test/lib/tree.unittest.class.php +++ b/module/tree/test/lib/tree.unittest.class.php @@ -134,7 +134,7 @@ class treeTest $reflection = new ReflectionClass($this->objectModel); $method = $reflection->getMethod('buildTreeArray'); $method->setAccessible(true); - + $method->invokeArgs($this->objectModel, array(&$treeMenu, $modules, $module, $moduleName, $divide)); if(dao::isError()) return dao::getError(); @@ -990,10 +990,10 @@ class treeTest public function setModuleLangTest() { global $lang; - + // 清空现有的module语言项 unset($lang->module); - + $this->objectModel->setModuleLang(); if(dao::isError()) return dao::getError(); diff --git a/module/tree/test/model/buildmenuquery.php b/module/tree/test/model/buildmenuquery.php index 5fbac2f08e..972a2cacbd 100755 --- a/module/tree/test/model/buildmenuquery.php +++ b/module/tree/test/model/buildmenuquery.php @@ -17,11 +17,11 @@ cid=19343 - 测试查询root 43 type story 的查询语句 @SELECT * FROM `zt_module` WHERE 1=1 AND `root` = '43' AND ( `type` = 'story') AND `deleted` = '0' ORDER BY `root`,`grade` desc,`order` -- 测试查询root 101 type task 的查询语句 @SELECT id, name, root, branch, grade, path, parent, owner, type FROM `zt_module` WHERE `root` = '101' AND `type` = 'task' AND `deleted` = '0' ORDER BY `grade` desc,`order`,`type` desc +- 测试查询root 101 type task 的查询语句 @SELECT id, name, root, branch, grade, path, parent, owner, type, extra FROM `zt_module` WHERE `root` = '101' AND `type` = 'task' AND `deleted` = '0' ORDER BY `grade` desc,`order`,`type` desc -- 测试查询root 102 type task 的查询语句 @SELECT id, name, root, branch, grade, path, parent, owner, type FROM `zt_module` WHERE `root` = '102' AND `type` = 'task' AND `deleted` = '0' ORDER BY `grade` desc,`order`,`type` desc +- 测试查询root 102 type task 的查询语句 @SELECT id, name, root, branch, grade, path, parent, owner, type, extra FROM `zt_module` WHERE `root` = '102' AND `type` = 'task' AND `deleted` = '0' ORDER BY `grade` desc,`order`,`type` desc -- 测试查询root 103 type task 的查询语句 @SELECT id, name, root, branch, grade, path, parent, owner, type FROM `zt_module` WHERE `root` = '103' AND `type` = 'task' AND `deleted` = '0' ORDER BY `grade` desc,`order`,`type` desc +- 测试查询root 103 type task 的查询语句 @SELECT id, name, root, branch, grade, path, parent, owner, type, extra FROM `zt_module` WHERE `root` = '103' AND `type` = 'task' AND `deleted` = '0' ORDER BY `grade` desc,`order`,`type` desc - 测试查询root 41 type story startModule 1821的查询语句 @SELECT * FROM `zt_module` WHERE 1=1 AND `root` = '41' AND ( `type` = 'story') AND `deleted` = '0' ORDER BY `root`,`grade` desc,`order` @@ -49,8 +49,8 @@ r($tree->buildMenuQueryTest($root[2], $type[0])) && p( r($tree->buildMenuQueryTest($root[3], $type[0])) && p() && e("SELECT * FROM `zt_module` WHERE 1=1 AND `root` = '41' AND ( `type` = 'story') AND `deleted` = '0' ORDER BY `root`,`grade` desc,`order`"); // 测试查询root 41 type story 的查询语句 r($tree->buildMenuQueryTest($root[4], $type[0])) && p() && e("SELECT * FROM `zt_module` WHERE 1=1 AND `root` = '42' AND ( `type` = 'story') AND `deleted` = '0' ORDER BY `root`,`grade` desc,`order`"); // 测试查询root 42 type story 的查询语句 r($tree->buildMenuQueryTest($root[5], $type[0])) && p() && e("SELECT * FROM `zt_module` WHERE 1=1 AND `root` = '43' AND ( `type` = 'story') AND `deleted` = '0' ORDER BY `root`,`grade` desc,`order`"); // 测试查询root 43 type story 的查询语句 -r($tree->buildMenuQueryTest($root[6], $type[1])) && p() && e("SELECT id, name, root, branch, grade, path, parent, owner, type FROM `zt_module` WHERE `root` = '101' AND `type` = 'task' AND `deleted` = '0' ORDER BY `grade` desc,`order`,`type` desc"); // 测试查询root 101 type task 的查询语句 -r($tree->buildMenuQueryTest($root[7], $type[1])) && p() && e("SELECT id, name, root, branch, grade, path, parent, owner, type FROM `zt_module` WHERE `root` = '102' AND `type` = 'task' AND `deleted` = '0' ORDER BY `grade` desc,`order`,`type` desc"); // 测试查询root 102 type task 的查询语句 -r($tree->buildMenuQueryTest($root[8], $type[1])) && p() && e("SELECT id, name, root, branch, grade, path, parent, owner, type FROM `zt_module` WHERE `root` = '103' AND `type` = 'task' AND `deleted` = '0' ORDER BY `grade` desc,`order`,`type` desc"); // 测试查询root 103 type task 的查询语句 +r($tree->buildMenuQueryTest($root[6], $type[1])) && p() && e("SELECT id, name, root, branch, grade, path, parent, owner, type, extra FROM `zt_module` WHERE `root` = '101' AND `type` = 'task' AND `deleted` = '0' ORDER BY `grade` desc,`order`,`type` desc"); // 测试查询root 101 type task 的查询语句 +r($tree->buildMenuQueryTest($root[7], $type[1])) && p() && e("SELECT id, name, root, branch, grade, path, parent, owner, type, extra FROM `zt_module` WHERE `root` = '102' AND `type` = 'task' AND `deleted` = '0' ORDER BY `grade` desc,`order`,`type` desc"); // 测试查询root 102 type task 的查询语句 +r($tree->buildMenuQueryTest($root[8], $type[1])) && p() && e("SELECT id, name, root, branch, grade, path, parent, owner, type, extra FROM `zt_module` WHERE `root` = '103' AND `type` = 'task' AND `deleted` = '0' ORDER BY `grade` desc,`order`,`type` desc"); // 测试查询root 103 type task 的查询语句 r($tree->buildMenuQueryTest($root[3], $type[0], $startModule[0])) && p() && e("SELECT * FROM `zt_module` WHERE 1=1 AND `root` = '41' AND ( `type` = 'story') AND `deleted` = '0' ORDER BY `root`,`grade` desc,`order`"); // 测试查询root 41 type story startModule 1821的查询语句 r($tree->buildMenuQueryTest($root[3], $type[0], $startModule[1], $branch)) && p() && e("SELECT * FROM `zt_module` WHERE 1=1 AND `root` = '41' AND ( `type` = 'story') AND (branch = '0' OR `branch` = '1') AND `deleted` = '0' ORDER BY `root`,`grade` desc,`order`"); // 测试查询root 41 type story startModule 0 branch 1 的查询语句 diff --git a/module/tree/test/model/createdeliverablelink.php b/module/tree/test/model/createdeliverablelink.php new file mode 100755 index 0000000000..f9a32fe24a --- /dev/null +++ b/module/tree/test/model/createdeliverablelink.php @@ -0,0 +1,36 @@ +#!/usr/bin/env php +createDeliverableLink(); +timeout=0 +cid=1 + +- 测试获取module 1的链接属性url @createdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=bymodule¶m=1 +- 测试获取module 2的链接属性url @createdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=bymodule¶m=2 +- 测试获取module 3的链接属性url @createdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=bymodule¶m=3 +- 测试获取module 4的链接属性url @createdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=bymodule¶m=4 +- 测试获取module 5的链接属性url @createdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=bymodule¶m=5 + +*/ +include dirname(__FILE__, 5) . '/test/lib/init.php'; +su('admin'); + +$module = zenData('module'); +$module->type->range('deliverable'); +$module->root->range('1'); +$module->gen(20); + +global $tester; +$tester->loadModel('tree'); +$module = $tester->tree->fetchByID(1, 'module'); +r($tester->tree->createDeliverableLink('deliverable', $module, '0', 'bymodule')) && p('url') && e("createdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=bymodule¶m=1"); // 测试获取module 1的链接 +$module = $tester->tree->fetchByID(2, 'module'); +r($tester->tree->createDeliverableLink('deliverable', $module, '0', 'bymodule')) && p('url') && e("createdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=bymodule¶m=2"); // 测试获取module 2的链接 +$module = $tester->tree->fetchByID(3, 'module'); +r($tester->tree->createDeliverableLink('deliverable', $module, '0', 'bymodule')) && p('url') && e("createdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=bymodule¶m=3"); // 测试获取module 3的链接 +$module = $tester->tree->fetchByID(4, 'module'); +r($tester->tree->createDeliverableLink('deliverable', $module, '0', 'bymodule')) && p('url') && e("createdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=bymodule¶m=4"); // 测试获取module 4的链接 +$module = $tester->tree->fetchByID(5, 'module'); +r($tester->tree->createDeliverableLink('deliverable', $module, '0', 'bymodule')) && p('url') && e("createdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=bymodule¶m=5"); // 测试获取module 5的链接 diff --git a/module/tree/test/model/createmanagelink.php b/module/tree/test/model/createmanagelink.php index f3d1657b32..cd1030a730 100755 --- a/module/tree/test/model/createmanagelink.php +++ b/module/tree/test/model/createmanagelink.php @@ -7,13 +7,13 @@ title=测试 treeModel::createManageLink(); timeout=0 cid=19352 -- 执行treeTest模块的createManageLinkTest方法，参数是'story', $module1 +- 执行treeTest模块的createManageLinkTest方法，参数是'story', $module1 - 属性id @1 - 属性parent @0 - 属性name @Story模块 - 执行treeTest模块的createManageLinkTest方法，参数是'bug', $module2 属性name @Bug模块[B][admin] - 执行treeTest模块的createManageLinkTest方法，参数是'case', $module3 属性name @Case模块[C] -- 执行treeTest模块的createManageLinkTest方法，参数是'task', $module4 +- 执行treeTest模块的createManageLinkTest方法，参数是'task', $module4 - 属性id @4 - 属性parent @0 - 属性name @普通模块 diff --git a/module/tree/test/model/createprojectdeliverablelink.php b/module/tree/test/model/createprojectdeliverablelink.php new file mode 100755 index 0000000000..8cc2cc7fae --- /dev/null +++ b/module/tree/test/model/createprojectdeliverablelink.php @@ -0,0 +1,36 @@ +#!/usr/bin/env php +createDeliverableLink(); +timeout=0 +cid=1 + +- 测试获取module 1的链接属性url @createprojectdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=1¶m=1 +- 测试获取module 2的链接属性url @createprojectdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=2¶m=2 +- 测试获取module 3的链接属性url @createprojectdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=3¶m=3 +- 测试获取module 4的链接属性url @createprojectdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=4¶m=4 +- 测试获取module 5的链接属性url @createprojectdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=5¶m=5 + +*/ +include dirname(__FILE__, 5) . '/test/lib/init.php'; +su('admin'); + +$module = zenData('module'); +$module->type->range('deliverable'); +$module->root->range('1'); +$module->gen(20); + +global $tester; +$tester->loadModel('tree'); +$module = $tester->tree->fetchByID(1, 'module'); +r($tester->tree->createDeliverableLink('deliverable', $module, '0', '1')) && p('url') && e("createprojectdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=1¶m=1"); // 测试获取module 1的链接 +$module = $tester->tree->fetchByID(2, 'module'); +r($tester->tree->createDeliverableLink('deliverable', $module, '0', '2')) && p('url') && e("createprojectdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=2¶m=2"); // 测试获取module 2的链接 +$module = $tester->tree->fetchByID(3, 'module'); +r($tester->tree->createDeliverableLink('deliverable', $module, '0', '3')) && p('url') && e("createprojectdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=3¶m=3"); // 测试获取module 3的链接 +$module = $tester->tree->fetchByID(4, 'module'); +r($tester->tree->createDeliverableLink('deliverable', $module, '0', '4')) && p('url') && e("createprojectdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=4¶m=4"); // 测试获取module 4的链接 +$module = $tester->tree->fetchByID(5, 'module'); +r($tester->tree->createDeliverableLink('deliverable', $module, '0', '5')) && p('url') && e("createprojectdeliverablelink.php?m=deliverable&f=browse&groupID=1&browseType=5¶m=5"); // 测试获取module 5的链接 \ No newline at end of file diff --git a/module/tree/test/model/getoptionmenubybranch.php b/module/tree/test/model/getoptionmenubybranch.php index 7390ff69a1..1b8759be80 100755 --- a/module/tree/test/model/getoptionmenubybranch.php +++ b/module/tree/test/model/getoptionmenubybranch.php @@ -63,7 +63,7 @@ $treeTest = new treeTest(); // 5. 测试步骤 r($treeTest->getOptionMenuByBranchTest(1, 'story', 0, 'all', 'nodeleted', 'all', '/')) && p('0') && e('/'); // 步骤1：正常story类型根节点 -r($treeTest->getOptionMenuByBranchTest(2, 'bug', 0, 'all', 'nodeleted', 'all', '/')) && p('0') && e('/'); // 步骤2：bug类型根节点 +r($treeTest->getOptionMenuByBranchTest(2, 'bug', 0, 'all', 'nodeleted', 'all', '/')) && p('0') && e('/'); // 步骤2：bug类型根节点 r($treeTest->getOptionMenuByBranchTest(3, 'case', 0, 'all', 'nodeleted', 'all', '/')) && p('0') && e('/'); // 步骤3：case类型根节点 r($treeTest->getOptionMenuByBranchTest(3, 'story', 0, '1', 'nodeleted', 'all', '/')) && p('0') && e('/'); // 步骤4：指定branch根节点 r($treeTest->getOptionMenuByBranchTest(999, 'story', 0, 'all', 'nodeleted', 'all', '/')) && p('0') && e('/'); // 步骤5：不存在rootID返回根节点 diff --git a/module/tree/test/model/yaml/module_createmanagelink.yaml b/module/tree/test/model/yaml/module_createmanagelink.yaml index 7f9804f5f3..6040301db8 100644 --- a/module/tree/test/model/yaml/module_createmanagelink.yaml +++ b/module/tree/test/model/yaml/module_createmanagelink.yaml @@ -6,55 +6,55 @@ fields: - field: id note: 模块ID range: 1-10 - + - field: root - note: 根节点ID + note: 根节点ID range: 1-3 - + - field: branch note: 分支ID range: 0 - + - field: name note: 模块名称 range: [模块1, 模块2, Bug模块, Case模块, Story模块, Task模块, 文档模块, 产品模块, 项目模块, 测试模块] - + - field: parent note: 父级模块ID range: 0-2 - + - field: path note: 模块路径 range: [',1,', ',1,2,', ',1,3,', ',2,', ',2,4,'] - + - field: grade note: 模块级别 range: 1-3 - + - field: order note: 排序 range: 1-10:1 - + - field: type note: 模块类型 range: [story, bug, case, task, doc, product, project, test] - + - field: from note: 来源 range: 0 - + - field: owner note: 负责人 range: [admin, user1, user2, ''] - + - field: collector note: 收藏者 range: ['', 'admin,user1', 'user2'] - + - field: short note: 简称 range: [M1, M2, BUG, CASE, STORY, TASK, DOC, PROD, PROJ, TEST] - + - field: deleted note: 删除状态 range: ['0'] \ No newline at end of file diff --git a/module/tree/test/model/yaml/user_createmanagelink.yaml b/module/tree/test/model/yaml/user_createmanagelink.yaml index 49cfcf329d..b68a887874 100644 --- a/module/tree/test/model/yaml/user_createmanagelink.yaml +++ b/module/tree/test/model/yaml/user_createmanagelink.yaml @@ -6,27 +6,27 @@ fields: - field: id note: 用户ID range: 1-10 - + - field: account note: 用户账号 range: [admin, user1, user2, user3, dev1, dev2, qa1, qa2, pm1, pm2] - + - field: password note: 密码 range: e10adc3949ba59abbe56e057f20f883e{10} - + - field: realname note: 真实姓名 range: [管理员, 用户1, 用户2, 用户3, 开发1, 开发2, 测试1, 测试2, 项目经理1, 项目经理2] - + - field: email note: 邮箱 range: [admin@test.com, user1@test.com, user2@test.com, user3@test.com, dev1@test.com] - + - field: role note: 角色 range: [admin, dev, qa, pm, user] - + - field: deleted note: 删除状态 range: ['0'] \ No newline at end of file diff --git a/module/tree/ui/browse.html.php b/module/tree/ui/browse.html.php index 3150ff24ec..4517f9f6e7 100644 --- a/module/tree/ui/browse.html.php +++ b/module/tree/ui/browse.html.php @@ -238,6 +238,7 @@ div set::items($tree), set::canEdit(common::hasPriv('tree', 'edit') && $canBeChanged), set::canDelete(common::hasPriv('tree', 'delete') && $canBeChanged), + set::canSplit($viewType != 'deliverable'), set::sortable(array('handle' => '.icon-move')), set::onSort(jsRaw('window.updateOrder')) ) diff --git a/module/tree/ui/create.html.php b/module/tree/ui/create.html.php new file mode 100644 index 0000000000..8f2a14d97e --- /dev/null +++ b/module/tree/ui/create.html.php @@ -0,0 +1,30 @@ + + * @package tree + * @link https://www.zentao.net + */ +namespace zin; +formPanel +( + setID('createForm'), + set::title($title), + set::labelWidth('120px'), + formGroup + ( + set::required(true), + set::label($lang->tree->name), + set::name('name'), + set::control('input') + ), + formGroup + ( + set::label($lang->tree->short), + set::name('short'), + set::control('input') + ) +); diff --git a/module/tree/ui/edit.html.php b/module/tree/ui/edit.html.php index e3c0b6a15f..42569e3324 100644 --- a/module/tree/ui/edit.html.php +++ b/module/tree/ui/edit.html.php @@ -41,6 +41,7 @@ formPanel setID('editForm'), set::action(helper::createLink($app->rawModule, $app->rawMethod, 'module=' . $module->id .'&type=' . $type)), set::submitBtnText($lang->save), + set::labelWidth('100px'), $showProduct ? formRow ( formGroup @@ -83,7 +84,7 @@ formPanel ) ) : null, $type == 'api' ? formHidden('root', $module->root) : null, - $module->type != 'line' ? formGroup + $module->type != 'line' && $module->type != 'deliverable' ? formGroup ( set::className('moduleBox ', $hidden ? 'hidden' : ''), set::label(strpos(',doc,api,docTemplate,', ",{$type},") !== false ? $lang->tree->parentCate : $lang->tree->parent), diff --git a/module/tutorial/test/model/getlibtree.php b/module/tutorial/test/model/getlibtree.php index 278ec33e50..f85ac166ce 100755 --- a/module/tutorial/test/model/getlibtree.php +++ b/module/tutorial/test/model/getlibtree.php @@ -8,16 +8,16 @@ timeout=0 cid=19443 - 执行tutorialTest模块的getLibTreeTest方法 @1 -- 执行tutorialTest模块的getLibTreeTest方法 +- 执行tutorialTest模块的getLibTreeTest方法 - 第0条的id属性 @2 - 第0条的name属性 @Test Doc Lib -- 执行tutorialTest模块的getLibTreeTest方法 +- 执行tutorialTest模块的getLibTreeTest方法 - 第0条的type属性 @docLib - 第0条的parent属性 @1 -- 执行tutorialTest模块的getLibTreeTest方法 +- 执行tutorialTest模块的getLibTreeTest方法 - 第0条的objectType属性 @custom - 第0条的active属性 @1 -- 执行tutorialTest模块的getLibTreeTest方法 +- 执行tutorialTest模块的getLibTreeTest方法 - 第0条的order属性 @0 - 第0条的main属性 @0 diff --git a/module/tutorial/test/model/getrepo.php b/module/tutorial/test/model/getrepo.php index 8712634ad3..039a60e1a5 100755 --- a/module/tutorial/test/model/getrepo.php +++ b/module/tutorial/test/model/getrepo.php @@ -7,15 +7,15 @@ title=测试 tutorialModel::getRepo(); timeout=0 cid=19461 -- 执行tutorialTest模块的getRepoTest方法 +- 执行tutorialTest模块的getRepoTest方法 - 属性id @1 - 属性name @Test repo -- 执行tutorialTest模块的getRepoTest方法 +- 执行tutorialTest模块的getRepoTest方法 - 属性SCM @Git - 属性encoding @utf-8 - 执行tutorialTest模块的getRepoTest方法 属性product @1 - 执行tutorialTest模块的getRepoTest方法 属性deleted @0 -- 执行tutorialTest模块的getRepoTest方法 +- 执行tutorialTest模块的getRepoTest方法 - 属性commits @1 - 属性synced @0 diff --git a/module/tutorial/test/model/getstypairs.php b/module/tutorial/test/model/getstypairs.php index 71cc4e34f2..1b2fa0eb5c 100755 --- a/module/tutorial/test/model/getstypairs.php +++ b/module/tutorial/test/model/getstypairs.php @@ -30,5 +30,5 @@ $storyPairs = $tutorialTest->getStoryPairsTest(); r(is_array($storyPairs)) && p() && e('1'); // 步骤1：验证返回结果是数组格式 r(count($storyPairs)) && p() && e('4'); // 步骤2：验证数组包含正确数量的需求键值对 r($tutorialTest->getStoryPairsTest()) && p('1') && e('Test epic'); // 步骤3：验证Epic类型需求的键值对映射关系 -r($tutorialTest->getStoryPairsTest()) && p('2') && e('Test requirement'); // 步骤4：验证Requirement类型需求的键值对映射关系 +r($tutorialTest->getStoryPairsTest()) && p('2') && e('Test requirement'); // 步骤4：验证Requirement类型需求的键值对映射关系 r($tutorialTest->getStoryPairsTest()) && p('3') && e('Test active story'); // 步骤5：验证Story类型需求的键值对映射关系 \ No newline at end of file diff --git a/module/upgrade/config.php b/module/upgrade/config.php index 827d18a314..323ff54194 100644 --- a/module/upgrade/config.php +++ b/module/upgrade/config.php @@ -1505,6 +1505,9 @@ $config->delete['21_6_beta'][] = 'extension/biz/project/ext/model/zentaoipd.php' $config->delete['21_7_2'][] = 'module/solution'; +$config->delete['21_7_3'][] = 'extension/max/execution/ext/tao/zentaomax.php'; +$config->delete['21_7_3'][] = 'extension/ipd/execution/ext/tao/zentaomax.php'; + $config->delete['21_7_5'][] = 'extension/biz/doc/ext/js/app/zentaobiz.ui.js'; $config->delete['21_7_5'][] = 'extension/max/doc/ext/js/app/zentaobiz.ui.js'; $config->delete['21_7_5'][] = 'extension/ipd/doc/ext/js/app/zentaobiz.ui.js'; @@ -1704,6 +1707,17 @@ $config->delete['21_7_7'][] = 'extension/biz/dashboard'; $config->delete['21_7_7'][] = 'extension/max/dashboard'; $config->delete['21_7_7'][] = 'extension/ipd/dashboard'; +$config->delete['22_0'][] = 'extension/ipd/auditcl/ext/css/browse.css'; +$config->delete['22_0'][] = 'extension/max/auditcl/ext/css/browse.css'; +$config->delete['22_0'][] = 'extension/ipd/auditcl/ext/js/edit.js'; +$config->delete['22_0'][] = 'extension/max/auditcl/ext/js/edit.js'; +$config->delete['22_0'][] = 'extension/ipd/auditcl/view'; +$config->delete['22_0'][] = 'extension/max/auditcl/view'; +$config->delete['22_0'][] = 'extension/ipd/auditplan/view'; +$config->delete['22_0'][] = 'extension/max/auditplan/view'; +$config->delete['22_0'][] = 'extension/ipd/project/ext/tao/class/zentaoipd.class.php'; +$config->delete['22_0'][] = 'extension/ipd/project/ext/tao/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', 'zai'); $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 c4597b7850..6a3dc0c145 100644 --- a/module/upgrade/config/upgradeflow.php +++ b/module/upgrade/config/upgradeflow.php @@ -109,12 +109,12 @@ $config->upgrade->execFlow['21_1'] = array('functions' => 'processCacheCo $config->upgrade->execFlow['21_2'] = array('functions' => 'importBuildinWorkflow,addCharterApprovalFlow,processCharterFileConfig,processCharterStatus', 'params' => array('importBuildinWorkflow' => array('rnd', 'charter'))); $config->upgrade->execFlow['21_3'] = array('functions' => 'createDevOpsChartModule'); $config->upgrade->execFlow['21_6_beta'] = array('functions' => 'processCharterBranch'); -$config->upgrade->execFlow['21_6_1'] = array('xxsqls' => "$appRoot/db/upgradexuanxuan9.1.2.sql"); +$config->upgrade->execFlow['21_6_1'] = array('xxsqls' => "$appRoot/db/upgradexuanxuan9.1.2.sql"); $config->upgrade->execFlow['21_7'] = array('functions' => 'fixWorkflowNameForExecution'); $config->upgrade->execFlow['21_7_1'] = array('functions' => 'processActionProduct'); $config->upgrade->execFlow['21_7_5'] = array('functions' => 'weekly-addBuiltinWeeklyTemplate,adjustPriv21_7_5'); $config->upgrade->execFlow['21_7_7'] = array('functions' => 'alterTableFields'); -$config->upgrade->execFlow['21_7_8'] = array('functions' => 'initAIPrompts'); +$config->upgrade->execFlow['21_7_8'] = array('functions' => 'initAIPrompts,importBuildinWorkflow,processWorkflowDatasource,upgradeStage4PMS', 'params' => array('importBuildinWorkflow' => array('all', 'cm,projectchange,risk,opportunity,issue'), 'processWorkflowDatasource' => array(array('baselineStatus' => 'cm_status', 'baselineReviewResult' => 'cm_reviewResult', 'projectchangeUrgencyList' => 'projectchange_urgency', 'projectchangeTypeList' => 'projectchange_type', 'projectchangeStatus' => 'projectchange_status', 'projectchangeReviewResult' => 'projectchange_reviewResult', 'riskSource' => 'risk_source', 'riskCategory' => 'risk_category', 'riskStrategy' => 'risk_strategy', 'riskStatus' => 'risk_status', 'riskImpact' => 'risk_impact', 'riskProbability' => 'risk_probability', 'riskRate' => 'risk_rate', 'riskPri' => 'risk_pri', 'riskCancelReason' => 'risk_cancelReason', 'issuePri' => 'issue_pri', 'issueSeverity' => 'issue_severity', 'issueType' => 'issue_type', 'issueResolution' => 'issue_resolution', 'issueStatus' => 'issue_status', 'opportunitySource' => 'opportunity_source', 'opportunityType' => 'opportunity_type', 'opportunityStrategy' => 'opportunity_strategy', 'opportunityStatus' => 'opportunity_status', 'opportunityImpact' => 'opportunity_impact', 'opportunityChance' => 'opportunity_chance', 'opportunityPri' => 'opportunity_pri', 'opportunityCancelReason' => 'opportunity_cancelReason')))); if(!empty($config->isINT)) { @@ -147,6 +147,7 @@ if($config->edition != 'open') $config->upgrade->execFlow['18_3']['functions'] .= ',processDataset,processChart,processReport,processDashboard'; $config->upgrade->execFlow['18_4_beta1']['functions'] = 'processDeployStepAction,updateBISQL,updatePivotStage'; $config->upgrade->execFlow['20_4']['functions'] .= ',updateTaskRelationPriv'; + $config->upgrade->execFlow['21_7_8']['functions'] .= ',modifyProjectWorkflowGroup,upgradeAuditcl,upgradeProcessAndActivity,addWorkflowGroupOtherActivity,addDefaultDeliverableModule,upgradeDesignToDeliverable,buildinTestcaseStageDeliverable,upgradeDeliverable,buildinBaselineReview,upgradeReviewclCategory,upgradeBaselineObjects,upgradeReviewToDeliverable,upgradeBaseline,addDeliverablePrivs,upgradeStageAndPoint,upgradeObjectOfDecision,upgradeClosedFeature,parseDocFetcherURL,updateWorkflowGroupPriv'; } if(in_array($this->config->edition, array('max', 'ipd'))) $config->upgrade->execFlow['18_7']['functions'] = 'processOldMetrics,processHistoryDataForMetric,metric-updateMetricDate'; diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php index b2d8d8cdba..d4d174accc 100644 --- a/module/upgrade/lang/de.php +++ b/module/upgrade/lang/de.php @@ -101,8 +101,10 @@ $lang->upgrade->unknownDate = 'Unknown Date Project'; $lang->upgrade->selectProject = 'The target project'; $lang->upgrade->programName = 'Program Name'; $lang->upgrade->projectName = 'Project Name'; +$lang->upgrade->projectManage = 'Project Manage'; $lang->upgrade->compatibleEXT = 'Extension mechanism compatible'; $lang->upgrade->fileName = 'File Name'; +$lang->upgrade->list = ' List'; $lang->upgrade->next = 'Next'; $lang->upgrade->back = 'Back'; @@ -218,3 +220,30 @@ $lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval->desc = 'You $lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval = new stdclass(); $lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->title = 'Project Activation Approval Workflow'; $lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->desc = 'You can design the approval process for activating project approval.'; + +$lang->upgrade->deliverableModule['plan'] = 'Plan'; +$lang->upgrade->deliverableModule['story'] = 'Story'; +$lang->upgrade->deliverableModule['design'] = 'Design'; +$lang->upgrade->deliverableModule['test'] = 'Test'; +$lang->upgrade->deliverableModule['other'] = 'Other'; + +$lang->upgrade->reviewObjectList['PP'] = 'Project Plan'; +$lang->upgrade->reviewObjectList['QAP'] = 'Quality Assurance Plan'; +$lang->upgrade->reviewObjectList['CMP'] = 'Configuration Management Plan'; +$lang->upgrade->reviewObjectList['ITP'] = 'Integration Test Plan'; +$lang->upgrade->reviewObjectList['ERS'] = 'Epic Statement'; +$lang->upgrade->reviewObjectList['URS'] = 'User Requirement Statement'; +$lang->upgrade->reviewObjectList['SRS'] = 'Project Requirements Specification'; +$lang->upgrade->reviewObjectList['HLDS'] = 'High Level Design Statement'; +$lang->upgrade->reviewObjectList['DDS'] = 'Detailed Design Statement'; +$lang->upgrade->reviewObjectList['DBDS'] = 'Database Design Statement'; +$lang->upgrade->reviewObjectList['ADS'] = 'Interface Design Statement'; +$lang->upgrade->reviewObjectList['Code'] = 'Code'; +$lang->upgrade->reviewObjectList['intergrate'] = 'Integrate Test Cases'; +$lang->upgrade->reviewObjectList['STP'] = 'System Test Plan'; +$lang->upgrade->reviewObjectList['system'] = 'System Test Cases'; +$lang->upgrade->reviewObjectList['UM'] = 'User Manual'; + +$lang->upgrade->baselineReview = array(); +$lang->upgrade->baselineReview['baseline'] = 'Baseline Review'; +$lang->upgrade->baselineReview['change'] = 'Project Change Review'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index b165f218ed..a63cc0708b 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -104,8 +104,10 @@ $lang->upgrade->unknownDate = 'Unknown Date Project'; $lang->upgrade->selectProject = 'The target project'; $lang->upgrade->programName = 'Program Name'; $lang->upgrade->projectName = 'Project Name'; +$lang->upgrade->projectManage = 'Project Manage'; $lang->upgrade->compatibleEXT = 'Extension mechanism compatible'; $lang->upgrade->fileName = 'File Name'; +$lang->upgrade->list = ' List'; $lang->upgrade->next = 'Next'; $lang->upgrade->back = 'Back'; @@ -221,3 +223,30 @@ $lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval->desc = 'You $lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval = new stdclass(); $lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->title = 'Project Activation Approval Workflow'; $lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->desc = 'You can design the approval process for activating project approval.'; + +$lang->upgrade->deliverableModule['plan'] = 'Plan'; +$lang->upgrade->deliverableModule['story'] = 'Story'; +$lang->upgrade->deliverableModule['design'] = 'Design'; +$lang->upgrade->deliverableModule['test'] = 'Test'; +$lang->upgrade->deliverableModule['other'] = 'Other'; + +$lang->upgrade->reviewObjectList['PP'] = 'Project Plan'; +$lang->upgrade->reviewObjectList['QAP'] = 'Quality Assurance Plan'; +$lang->upgrade->reviewObjectList['CMP'] = 'Configuration Management Plan'; +$lang->upgrade->reviewObjectList['ITP'] = 'Integration Test Plan'; +$lang->upgrade->reviewObjectList['ERS'] = 'Epic Statement'; +$lang->upgrade->reviewObjectList['URS'] = 'User Requirement Statement'; +$lang->upgrade->reviewObjectList['SRS'] = 'Project Requirements Specification'; +$lang->upgrade->reviewObjectList['HLDS'] = 'High Level Design Statement'; +$lang->upgrade->reviewObjectList['DDS'] = 'Detailed Design Statement'; +$lang->upgrade->reviewObjectList['DBDS'] = 'Database Design Statement'; +$lang->upgrade->reviewObjectList['ADS'] = 'Interface Design Statement'; +$lang->upgrade->reviewObjectList['Code'] = 'Code'; +$lang->upgrade->reviewObjectList['intergrate'] = 'Integrate Test Cases'; +$lang->upgrade->reviewObjectList['STP'] = 'System Test Plan'; +$lang->upgrade->reviewObjectList['system'] = 'System Test Cases'; +$lang->upgrade->reviewObjectList['UM'] = 'User Manual'; + +$lang->upgrade->baselineReview = array(); +$lang->upgrade->baselineReview['baseline'] = 'Baseline Review'; +$lang->upgrade->baselineReview['change'] = 'Project Change Review'; diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php index 94b60a08ef..5f51e2ba1d 100644 --- a/module/upgrade/lang/fr.php +++ b/module/upgrade/lang/fr.php @@ -101,8 +101,10 @@ $lang->upgrade->unknownDate = 'Unknown Date Project'; $lang->upgrade->selectProject = 'The target project'; $lang->upgrade->programName = 'Program Name'; $lang->upgrade->projectName = 'Project Name'; +$lang->upgrade->projectManage = 'Project Manage'; $lang->upgrade->compatibleEXT = 'Extension mechanism compatible'; $lang->upgrade->fileName = 'File Name'; +$lang->upgrade->list = ' List'; $lang->upgrade->next = 'Next'; $lang->upgrade->back = 'Back'; @@ -218,3 +220,30 @@ $lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval->desc = 'You $lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval = new stdclass(); $lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->title = 'Project Activation Approval Workflow'; $lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->desc = 'You can design the approval process for activating project approval.'; + +$lang->upgrade->deliverableModule['plan'] = 'Plan'; +$lang->upgrade->deliverableModule['story'] = 'Story'; +$lang->upgrade->deliverableModule['design'] = 'Design'; +$lang->upgrade->deliverableModule['test'] = 'Test'; +$lang->upgrade->deliverableModule['other'] = 'Other'; + +$lang->upgrade->reviewObjectList['PP'] = 'Project Plan'; +$lang->upgrade->reviewObjectList['QAP'] = 'Quality Assurance Plan'; +$lang->upgrade->reviewObjectList['CMP'] = 'Configuration Management Plan'; +$lang->upgrade->reviewObjectList['ITP'] = 'Integration Test Plan'; +$lang->upgrade->reviewObjectList['ERS'] = 'Epic Statement'; +$lang->upgrade->reviewObjectList['URS'] = 'User Requirement Statement'; +$lang->upgrade->reviewObjectList['SRS'] = 'Project Requirements Specification'; +$lang->upgrade->reviewObjectList['HLDS'] = 'High Level Design Statement'; +$lang->upgrade->reviewObjectList['DDS'] = 'Detailed Design Statement'; +$lang->upgrade->reviewObjectList['DBDS'] = 'Database Design Statement'; +$lang->upgrade->reviewObjectList['ADS'] = 'Interface Design Statement'; +$lang->upgrade->reviewObjectList['Code'] = 'Code'; +$lang->upgrade->reviewObjectList['intergrate'] = 'Integrate Test Cases'; +$lang->upgrade->reviewObjectList['STP'] = 'System Test Plan'; +$lang->upgrade->reviewObjectList['system'] = 'System Test Cases'; +$lang->upgrade->reviewObjectList['UM'] = 'User Manual'; + +$lang->upgrade->baselineReview = array(); +$lang->upgrade->baselineReview['baseline'] = 'Baseline Review'; +$lang->upgrade->baselineReview['change'] = 'Project Change Review'; diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index f500cb01ab..208e9f7229 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -563,4 +563,5 @@ $lang->upgrade->fromVersions['ipd4_3'] = 'Ipd4.3'; $lang->upgrade->fromVersions['ipd4_3'] = 'Ipd4.3'; $lang->upgrade->fromVersions['ipd4_4'] = 'Ipd4.4'; $lang->upgrade->fromVersions['ipd4_5'] = 'Ipd4.5'; -$lang->upgrade->fromVersions['ipd4_6'] = 'Ipd4.6'; // ipd insert position. +$lang->upgrade->fromVersions['ipd4_6'] = 'Ipd4.6'; +$lang->upgrade->fromVersions['ipd4_7'] = 'Ipd4.7'; // ipd insert position. diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 46c0e30155..33a6e41a23 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -104,8 +104,10 @@ $lang->upgrade->unknownDate = '无明确时间的项目'; $lang->upgrade->selectProject = '目标项目'; $lang->upgrade->programName = '项目集名称'; $lang->upgrade->projectName = '项目名称'; +$lang->upgrade->projectManage = '项目管理'; $lang->upgrade->compatibleEXT = '扩展机制兼容'; $lang->upgrade->fileName = '文件名称'; +$lang->upgrade->list = '的列表'; $lang->upgrade->next = '下一步'; $lang->upgrade->back = '上一步'; @@ -221,3 +223,30 @@ $lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval->desc = '可 $lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval = new stdclass(); $lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->title = '激活立项审批流'; $lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->desc = '可以为激活立项审批设计审批流程。'; + +$lang->upgrade->deliverableModule['plan'] = '计划类'; +$lang->upgrade->deliverableModule['story'] = '需求类'; +$lang->upgrade->deliverableModule['design'] = '设计类'; +$lang->upgrade->deliverableModule['test'] = '测试类'; +$lang->upgrade->deliverableModule['other'] = '其他类'; + +$lang->upgrade->reviewObjectList['PP'] = '项目计划'; +$lang->upgrade->reviewObjectList['QAP'] = '质量保证计划'; +$lang->upgrade->reviewObjectList['CMP'] = '配置管理计划'; +$lang->upgrade->reviewObjectList['ITP'] = '集成测试计划'; +$lang->upgrade->reviewObjectList['ERS'] = '业务需求说明书'; +$lang->upgrade->reviewObjectList['URS'] = '用户需求说明书'; +$lang->upgrade->reviewObjectList['SRS'] = '项目需求规格说明书'; +$lang->upgrade->reviewObjectList['HLDS'] = '概要设计说明书'; +$lang->upgrade->reviewObjectList['DDS'] = '详细设计说明书'; +$lang->upgrade->reviewObjectList['DBDS'] = '数据库设计文档'; +$lang->upgrade->reviewObjectList['ADS'] = '接口设计文档'; +$lang->upgrade->reviewObjectList['Code'] = '程序代码'; +$lang->upgrade->reviewObjectList['intergrate'] = '集成测试用例'; +$lang->upgrade->reviewObjectList['STP'] = '系统测试计划'; +$lang->upgrade->reviewObjectList['system'] = '系统测试用例'; +$lang->upgrade->reviewObjectList['UM'] = '用户手册'; + +$lang->upgrade->baselineReview = array(); +$lang->upgrade->baselineReview['baseline'] = '基线评审'; +$lang->upgrade->baselineReview['change'] = '项目变更评审'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 3e64914e4b..45b0239beb 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -3718,7 +3718,7 @@ class upgradeModel extends model $projectList = $result; } - else if(!empty($data->projects)) + elseif(!empty($data->projects)) { $projectList = (int)$data->projects; $this->dao->update(TABLE_PROJECT)->set('status')->eq($data->projectStatus)->where('id')->eq($projectList)->exec(); @@ -9400,7 +9400,7 @@ class upgradeModel extends model $data->app = $app; foreach($appModules as $module => $options) { - if($importModule && $importModule != $module) continue; + if($importModule && strpos(",$importModule,", ",$module,") === false) continue; $this->app->loadLang($module); @@ -9432,7 +9432,7 @@ class upgradeModel extends model $data->createdDate = $now; foreach($actions as $module => $moduleActions) { - if($importModule && $importModule != $module) continue; + if($importModule && strpos(",$importModule,", ",$module,") === false) continue; $data->module = $module; foreach($moduleActions as $action) @@ -9480,7 +9480,7 @@ class upgradeModel extends model $data->createdDate = $now; foreach($fields as $module => $moduleFields) { - if($importModule && $importModule != $module) continue; + if($importModule && strpos(",$importModule,", ",$module,") === false) continue; $order = 1; $data->module = $module; @@ -9521,7 +9521,7 @@ class upgradeModel extends model $data = new stdclass(); foreach($layouts as $module => $moduleLayouts) { - if($importModule && $importModule != $module) continue; + if($importModule && strpos(",$importModule,", ",$module,") === false) continue; $data->module = $module; foreach($moduleLayouts as $action => $layoutFields) @@ -9559,7 +9559,7 @@ class upgradeModel extends model { foreach($appModules as $module => $options) { - if($importModule && $importModule != $module) continue; + if($importModule && strpos(",$importModule,", ",$module,") === false) continue; $labels = array(); if($module == 'product') @@ -11230,6 +11230,894 @@ class upgradeModel extends model return array('blockTitle' => $blockTitle, 'exportUrl' => $exportUrl, 'fetcherUrl' => $fetcherUrl); } + /** + * + * 为项目流程内置其他活动。 + * Add other activity. + * + * @access public + * @return void + */ + public function addWorkflowGroupOtherActivity() + { + $projectModules = $this->dao->select('root,id')->from(TABLE_MODULE)->where('type')->eq('process')->andWhere('extra')->eq('project')->fetchPairs(); + $groupList = $this->dao->select('*')->from(TABLE_WORKFLOWGROUP)->where('type')->eq('project')->andWhere('projectModel')->ne('kanban')->fetchAll(); + foreach($groupList as $group) + { + if($this->config->edition != 'open' && $group->projectModel == 'ipd') + { + $this->loadModel('workflowGroup')->addProcessAndActivity($group, 'ipd'); + } + elseif(!empty($projectModules[$group->id])) + { + $this->createOtherActivity($projectModules[$group->id], $group->id); + } + } + } + + /** + * 为项目流程内置默认分类。 + * Add deliverable default modules. + * + * @access public + * @return void + */ + public function addDefaultDeliverableModule() + { + $groupList = $this->dao->select('id')->from(TABLE_WORKFLOWGROUP)->where('type')->eq('project')->andWhere('projectModel')->ne('kanban')->fetchAll(); + foreach($groupList as $group) + { + foreach($this->lang->upgrade->deliverableModule as $code => $name) $this->createDeliverableModule($group->id, $name, $code); + } + } + + /** + * 升级设计类型为交付物。 + * Upgrade design type to deliverable. + * + * @access public + * @return void + */ + public function upgradeDesignToDeliverable() + { + $this->app->loadLang('design'); + $clientLang = $this->app->getClientLang(); + $typeList = $this->dao->select('`key`, value')->from(TABLE_LANG) + ->where('module')->eq('design') + ->andWhere('section')->eq('typeList') + ->andWhere('lang')->in(array($clientLang, 'all')) + ->orderBy('id_asc') + ->fetchPairs(); + + $plusTypeList = $this->dao->select('`key`, value')->from(TABLE_LANG) + ->where('module')->eq('design') + ->andWhere('section')->eq('plusTypeList') + ->andWhere('lang')->in(array($clientLang, 'all')) + ->orderBy('id_asc') + ->fetchPairs(); + + if($typeList) $this->lang->design->typeList = $typeList; + if($plusTypeList) $this->lang->design->plusTypeList = $plusTypeList; + + $modelList = array('waterfall', 'waterfallplus', 'ipd'); + $moduleList = $this->dao->select('t1.id,t1.name,t2.projectModel,t2.id as workflowGroup')->from(TABLE_MODULE)->alias('t1') + ->leftJoin(TABLE_WORKFLOWGROUP)->alias('t2')->on('t1.root=t2.id') + ->where('t1.type')->eq('deliverable') + ->andWhere('t1.extra')->eq('design') + ->andWhere('t2.projectModel')->in($modelList) + ->fetchAll(); + + $activityList = $this->dao->select('t1.*')->from(TABLE_ACTIVITY)->alias('t1')->leftJoin(TABLE_PROCESS)->alias('t2')->on('t1.process=t2.id') + ->where('t1.name')->eq($this->lang->other) + ->andWhere('t2.name')->eq($this->lang->other) + ->fetchGroup('workflowGroup'); + + $projectWorkflowGroup = $this->dao->select('id,workflowGroup')->from(TABLE_PROJECT)->where('type')->eq('project')->fetchGroup('workflowGroup', 'id'); + + $deliverable = new stdClass(); + $deliverable->status = 'enabled'; + $deliverable->createdBy = 'system'; + $deliverable->createdDate = helper::now(); + $deliverable->systemList = 1; + $deliverable->trimmable = '1'; + $deliverable->template = '[]'; + + $deliverableStage = new stdClass(); + $deliverableStage->required = '0'; + $deliverableStage->stage = 'project'; + foreach($moduleList as $module) + { + if(empty($activityList[$module->workflowGroup])) continue; + $otherActivity = reset($activityList[$module->workflowGroup]); + $otherActivityID = $otherActivity->id; + + $nameFilter = array(); + $deliverable->workflowGroup = $module->workflowGroup; + $deliverable->module = $module->id; + $deliverable->activity = $otherActivityID; + foreach(array_filter($this->lang->design->typeList) as $key => $value) + { + if(empty($value) || !in_array($module->projectModel, array('waterfall', 'ipd'))) continue; + $deliverable->category = $key; // 将设计的类型转换为交付物的类型。 + $deliverableID = $this->addDeliverable((string)$value, $deliverable, $deliverableStage, $nameFilter); + + /* 将历史设计的设计类型替换为交付物ID。 */ + if(!empty($projectWorkflowGroup[$module->workflowGroup])) + { + $projects = array_keys($projectWorkflowGroup[$module->workflowGroup]); + $this->dao->update(TABLE_DESIGN)->set('type')->eq($deliverableID)->where('type')->eq($key)->andWhere('project')->in($projects)->exec(); + } + } + + foreach(array_filter($this->lang->design->plusTypeList) as $key => $value) + { + if(empty($value) || $module->projectModel != 'waterfallplus') continue; + $deliverable->category = $key; // 将设计的类型转换为交付物的类型。 + $deliverableID = $this->addDeliverable((string)$value, $deliverable, $deliverableStage, $nameFilter); + + /* 将历史设计的设计类型替换为交付物ID。 */ + if(!empty($projectWorkflowGroup[$module->workflowGroup])) + { + $projects = array_keys($projectWorkflowGroup[$module->workflowGroup]); + $this->dao->update(TABLE_DESIGN)->set('type')->eq($deliverableID)->where('type')->eq($key)->andWhere('project')->in($projects)->exec(); + } + } + } + } + + /** + * 创建交付物。 + * Add deliverable. + * + * @param string $name + * @param object $deliverable + * @param object $deliverableStage + * @param array $nameFilter + * @access public + * @return int + */ + public function addDeliverable(string $name, object $deliverable, object $deliverableStage, array &$nameFilter = array()): int + { + /* 重名的交付物名称后面加数字。 */ + if(!empty($nameFilter[$name])) + { + $deliverable->name = $name . $nameFilter[$name]; + $nameFilter[$name] ++; + } + else + { + $deliverable->name = $name; + $nameFilter[$name] = 1; + } + $this->dao->insert(TABLE_DELIVERABLE)->data($deliverable)->exec(); + $deliverableID = $this->dao->lastInsertID(); + + $deliverableStage->deliverable = $deliverableID; + $this->dao->insert(TABLE_DELIVERABLESTAGE)->data($deliverableStage)->exec(); + + return $deliverableID; + } + + /** + * 将通用交付物升级为项目流程下的交付物。 + * Upgrade deliverable. + * + * @access public + * @return void + */ + public function upgradeDeliverable() + { + $this->app->loadLang('tree'); + + $deliverable = new stdClass(); + $deliverable->status = 'disabled'; + $deliverable->trimmable = '1'; + + $deliverableStage = new stdClass(); + $deliverableStage->stage = 'project'; + $deliverableStage->required = '0'; + + $deliverableList = array(); + $nameFilter = array(); // 过滤重名交付物。 + $workflowGroups = $this->dao->select('id,deliverable,projectModel,projectType')->from(TABLE_WORKFLOWGROUP)->where('type')->eq('project')->andWhere('projectModel')->ne('kanban')->fetchAll(); + $deliverables = $this->dao->select('id,name,model,`desc`,createdBy,createdDate')->from(TABLE_DELIVERABLE)->where('deleted')->eq('0')->andWhere('model')->ne('')->fetchAll('id'); + $fileList = $this->dao->select('id,title,objectType,objectID')->from(TABLE_FILE)->where('objectType')->eq('deliverable')->fetchAll('objectID'); + $otherModules = $this->dao->select('root,id')->from(TABLE_MODULE)->where('type')->eq('deliverable')->andWhere('extra')->eq('other')->fetchPairs(); + $activityList = $this->dao->select('t1.*')->from(TABLE_ACTIVITY)->alias('t1')->leftJoin(TABLE_PROCESS)->alias('t2')->on('t1.process=t2.id') + ->where('t1.name')->eq($this->lang->other) + ->andWhere('t2.name')->eq($this->lang->other) + ->fetchGroup('workflowGroup'); + + /* 将旧的交付物按照适用范围升级到各个项目流程中。 */ + foreach($deliverables as $oldDeliverable) + { + foreach(explode(',', $oldDeliverable->model) as $model) + { + foreach($workflowGroups as $workflowGroup) + { + if($workflowGroup->projectModel == 'kanban') $workflowGroup->projectModel = 'scrum_kanban'; + if(!empty($deliverableList[$workflowGroup->id][$oldDeliverable->id])) continue; + if(strpos($model, "{$workflowGroup->projectType}_{$workflowGroup->projectModel}") === false) continue; + + if(empty($activityList[$workflowGroup->id])) continue; + $otherActivity = reset($activityList[$workflowGroup->id]); + $otherActivityID = $otherActivity->id; + + $deliverableFile = $fileList[$oldDeliverable->id]; // 原交付物只会上传一个附件。 + $deliverable->workflowGroup = $workflowGroup->id; + $deliverable->desc = $oldDeliverable->desc; + $deliverable->module = isset($otherModules[$workflowGroup->id]) ? $otherModules[$workflowGroup->id] : '0'; + $deliverable->activity = $otherActivityID; + $deliverable->template = $deliverableFile ? '{"new_0":{"name":"' . $deliverableFile->title . '","doc":"","fileID":"' . $deliverableFile->id . '"}}' : '[]'; + $deliverable->createdBy = $oldDeliverable->createdBy; + $deliverable->createdDate = !empty($oldDeliverable->createdDate) ? $oldDeliverable->createdDate : null; + + /* 重名的交付物名称后面加数字。 */ + if(!empty($nameFilter[$workflowGroup->id][$oldDeliverable->name])) + { + $deliverable->name = $oldDeliverable->name . $nameFilter[$workflowGroup->id][$oldDeliverable->name]; + $nameFilter[$workflowGroup->id][$oldDeliverable->name] ++; + } + else + { + $deliverable->name = $oldDeliverable->name; + $nameFilter[$workflowGroup->id][$oldDeliverable->name] = 1; + } + + $this->dao->insert(TABLE_DELIVERABLE)->data($deliverable)->exec(); + $deliverableID = $this->dao->lastInsertID(); + $deliverableList[$workflowGroup->id][$oldDeliverable->id] = $deliverableID; + + $deliverableStage->deliverable = $deliverableID; + $this->dao->insert(TABLE_DELIVERABLESTAGE)->data($deliverableStage)->exec(); + } + } + } + + $sprintFilter = array(); // 过滤重复交付物检查规则。 + /* 按照项目流程下的交付物配置设置各个交付物的检查规则。 */ + foreach($workflowGroups as $workflowGroup) + { + /* 解析项目流程的交付物配置。 */ + $groupDeliverable = !empty($workflowGroup->deliverable) ? json_decode($workflowGroup->deliverable, true) : array(); + foreach($groupDeliverable as $stageCode => $methodDeliverable) + { + foreach($methodDeliverable as $deliverableConfigs) + { + foreach($deliverableConfigs as $config) + { + if(empty($deliverableList[$workflowGroup->id][$config['deliverable']])) continue; + + $deliverableID = $deliverableList[$workflowGroup->id][$config['deliverable']]; + $workflowGroupModel = "{$workflowGroup->projectType}_{$workflowGroup->projectModel}"; + $deliverableStage->stage = $stageCode == $workflowGroupModel ? 'project' : str_replace("{$workflowGroupModel}_", '', $stageCode); + $deliverableStage->required = !empty($config['required']) ? '1' : '0'; + $deliverableStage->deliverable = $deliverableID; + + /* 如果这个交付物在项目流程下有交付物配置，则启用交付物并删除默认的交付物检查规则。 */ + if(!isset($sprintFilter[$deliverableID])) + { + $this->dao->update(TABLE_DELIVERABLE)->set('status')->eq('enabled')->where('id')->eq($deliverableID)->exec(); + $this->dao->delete()->from(TABLE_DELIVERABLESTAGE)->where('deliverable')->eq($deliverableID)->andWhere('stage')->eq('project')->exec(); + } + + /* 按照交付物配置生成交付物检查规则。 */ + if(in_array($deliverableStage->stage, array('short', 'long', 'ops'))) + { + /* 将原来不同类型的迭代合并成一个迭代。 */ + $deliverableStage->stage = 'sprint'; + /* 其中有一个类型是必填的合并后的结果就是必填。 */ + if(isset($sprintFilter[$deliverableID]['sprint']) && empty($sprintFilter[$deliverableID]['sprint']) && !empty($deliverableStage->required)) + { + $this->dao->update(TABLE_DELIVERABLESTAGE)->set('required')->eq('1')->where('deliverable')->eq($deliverableID)->andWhere('stage')->eq('sprint')->exec(); + } + if(!isset($sprintFilter[$deliverableID]['sprint'])) + { + $this->dao->insert(TABLE_DELIVERABLESTAGE)->data($deliverableStage)->exec(); + } + } + elseif(!isset($sprintFilter[$deliverableID][$deliverableStage->stage])) + { + $this->dao->insert(TABLE_DELIVERABLESTAGE)->data($deliverableStage)->exec(); + } + $sprintFilter[$deliverableID][$deliverableStage->stage] = $deliverableStage->required; + } + } + } + + $this->createOtherDeliverable($workflowGroup->id); // 创建名为其他的交付物类型。 + } + + /* 将已升级的历史交付物数据删掉。 */ + $this->dao->delete()->from(TABLE_DELIVERABLE)->where('id')->in(array_keys($deliverables))->andWhere('workflowGroup')->eq('0')->exec(); + + /* 升级完后把没用的字段删掉。 */ + $this->dao->exec("ALTER TABLE " . TABLE_DELIVERABLE . " CHANGE `module` `module` mediumint(8) unsigned NOT NULL DEFAULT '0';"); + + if($deliverableList) $this->upgradeProjectDeliverable($deliverableList); + } + + /** + * 内置交付物其他分类。 + * Create other module. + * + * @param int $workflowGroupID + * @param string $name + * @param string $extra + * @access public + * @return int + */ + public function createDeliverableModule(int $workflowGroupID, string $name, string $extra = ''): int + { + $module = new stdclass(); + $module->root = $workflowGroupID; + $module->branch = '0'; + $module->name = $name; + $module->parent = '0'; + $module->path = ''; + $module->grade = '1'; + $module->order = '0'; + $module->type = 'deliverable'; + $module->from = '0'; + $module->owner = ''; + $module->collector = null; + $module->short = ''; + $module->extra = $extra; + $module->deleted = '0'; + $this->dao->insert(TABLE_MODULE)->data($module)->exec(); + + $moduleID = $this->dao->lastInsertID(); + $this->dao->update(TABLE_MODULE)->set('path')->eq(",$moduleID,")->where('id')->eq($moduleID)->exec(); + + return $moduleID; + } + + /** + * 创建名为其他的交付物类型。 + * Create other deliverable. + * + * @param int $workflowGroupID + * @param int $moduleID + * @access public + * @return void + */ + public function createOtherDeliverable(int $workflowGroupID) + { + $moduleID = $this->dao->select('id')->from(TABLE_MODULE)->where('type')->eq('deliverable')->andWhere('root')->eq($workflowGroupID)->andWhere('extra')->eq('other')->fetch('id'); + $activityID = $this->dao->select('id')->from(TABLE_ACTIVITY)->where('name')->eq($this->lang->other)->andWhere('workflowGroup')->eq($workflowGroupID)->fetch('id'); + + /* 创建名为其他的交付物类型。 */ + $deliverable = new stdclass(); + $deliverable->name = $this->lang->other; + $deliverable->category = 'other'; + $deliverable->module = $moduleID; + $deliverable->activity = $activityID ? $activityID : 0; + $deliverable->workflowGroup = $workflowGroupID; + $deliverable->template = '[]'; + $deliverable->trimmable = '1'; + $deliverable->builtin = '1'; + $deliverable->status = 'enabled'; + $deliverable->createdBy = 'system'; + $deliverable->createdDate = helper::now(); + + $this->dao->insert(TABLE_DELIVERABLE)->data($deliverable)->exec(); + $deliverableID = $this->dao->lastInsertID(); + + $stageList = $this->config->edition != 'biz' ? $this->loadModel('deliverable')->buildStageList($workflowGroupID) : array(); + foreach($stageList as $key => $stage) + { + $deliverableStage = new stdclass(); + $deliverableStage->deliverable = $deliverableID; + $deliverableStage->stage = $key; + $deliverableStage->required = '0'; + $this->dao->insert(TABLE_DELIVERABLESTAGE)->data($deliverableStage)->exec(); + } + } + + /** + * 内置默认的过程活动。 + * Create other process and activity. + * + * @param int $moduleID + * @param int $workflowGroupID + * @access public + * @return int + */ + public function createOtherActivity(int $moduleID, int $workflowGroupID): int + { + $existsProcess = $this->dao->select('id')->from(TABLE_PROCESS)->where('workflowGroup')->eq($workflowGroupID)->andWhere('name')->eq($this->lang->other)->fetch('id'); + if($existsProcess) return $existsProcess; + + $process = new stdclass(); + $process->workflowGroup = $workflowGroupID; + $process->name = $this->lang->other; + $process->module = $moduleID; + $process->createdBy = 'system'; + $process->createdDate = '2020-01-09 00:00:00'; + $process->editedDate = null; + $process->assignedDate = null; + $process->deleted = '0'; + $this->dao->insert(TABLE_PROCESS)->data($process)->exec(); + + $processID = $this->dao->lastInsertID(); + $this->dao->update(TABLE_PROCESS)->set('`order`')->eq($processID * 5)->where('id')->eq($processID)->exec(); + + $activity = new stdclass(); + $activity->workflowGroup = $workflowGroupID; + $activity->process = $processID; + $activity->name = $this->lang->other; + $activity->optional = 'no'; + $activity->createdBy = 'system'; + $activity->createdDate = '2020-01-09 00:00:00'; + $activity->editedDate = null; + $activity->assignedDate = null; + $activity->deleted = '0'; + $this->dao->insert(TABLE_ACTIVITY)->data($activity)->exec(); + + $activityID = $this->dao->lastInsertID(); + $this->dao->update(TABLE_ACTIVITY)->set('`order`')->eq($activityID * 5)->where('id')->eq($activityID)->exec(); + + return $activityID; + } + + /** + * 内置测试环节列表交付物。 + * Buildin testcase stage deliverable. + * + * @access public + * @return bool + */ + public function buildinTestcaseStageDeliverable(): bool + { + $this->app->loadLang('testcase'); + $clientLang = $this->app->getClientLang(); + $testcaseStageList = $this->dao->select('`key`, value')->from(TABLE_LANG) + ->where('module')->eq('testcase') + ->andWhere('section')->eq('stageList') + ->andWhere('lang')->in(array($clientLang, 'all')) + ->orderBy('id_asc') + ->fetchPairs(); + + if(empty($testcaseStageList)) $testcaseStageList = $this->lang->testcase->stageList; + $this->createTestcaseDeliverable($testcaseStageList); + + return true; + } + + /** + * 创建测试用例阶段类型交付物。 + * Create testcase deliverable. + * + * @param array $modules + * @access public + * @return bool + */ + public function createTestcaseDeliverable(array $modules): bool + { + $testModules = $this->dao->select('root,id')->from(TABLE_MODULE) + ->where('type')->eq('deliverable') + ->andWhere('extra')->eq('test') + ->fetchPairs(); + + $testDeliverable = $this->dao->select('category')->from(TABLE_DELIVERABLE) + ->where('builtin')->eq('0') + ->andWhere('module')->in($testModules) + ->fetchPairs(); + + /* 已经存在但是被删除的交付物进行还原操作。 */ + foreach($modules as $key => $name) + { + if(empty($name)) continue; + if(!empty($testDeliverable[$key])) + { + $this->dao->update(TABLE_DELIVERABLE)->set('deleted')->eq('0')->set('name')->eq($name . $this->lang->upgrade->list)->where('category')->eq($key)->andWhere('builtin')->eq('0')->exec(); + unset($modules[$key]); + } + } + + $activityList = $this->dao->select('t1.*')->from(TABLE_ACTIVITY)->alias('t1')->leftJoin(TABLE_PROCESS)->alias('t2')->on('t1.process=t2.id') + ->where('t1.name')->eq($this->lang->other) + ->andWhere('t2.name')->eq($this->lang->other) + ->fetchGroup('workflowGroup'); + + if(empty($modules)) return true; + + $deliverable = new stdClass(); + $deliverable->status = 'enabled'; + $deliverable->createdBy = 'system'; + $deliverable->createdDate = helper::now(); + $deliverable->template = '[]'; + $deliverable->trimmable = '1'; + $deliverable->builtin = '0'; + $deliverable->systemList = 1; + + $deliverableStage = new stdClass(); + $deliverableStage->required = '0'; + $deliverableStage->stage = 'project'; + + $workflows = $this->dao->select('id,projectModel')->from(TABLE_WORKFLOWGROUP)->where('type')->eq('project')->andWhere('projectModel')->ne('kanban')->fetchAll('id'); + foreach($workflows as $workflow) + { + $groupID = $workflow->id; + + if(empty($activityList[$groupID])) continue; + $otherActivity = reset($activityList[$groupID]); + $otherActivityID = $otherActivity->id; + + $deliverable->module = zget($testModules, $workflow->id, 0); + $deliverable->workflowGroup = $workflow->id; + $deliverable->activity = $otherActivityID; + foreach($modules as $key => $name) + { + if(empty($name)) continue; + $deliverable->category = $key; // 标记交付物的类型。 + $this->addDeliverable($name . $this->lang->upgrade->list, $deliverable, $deliverableStage); + } + } + return true; + } + + /** + * 删除测试用例阶段交付物。 + * Delete testcase deliverable. + * + * @param array $modules + * @access public + * @return bool + */ + public function deleteTestcaseDeliverable(array $modules): bool + { + foreach($modules as $key => $name) + { + $this->dao->update(TABLE_DELIVERABLE)->set('deleted')->eq('1')->where('category')->eq($key)->andWhere('builtin')->eq('0')->exec(); + } + return true; + } + + /** + * 变更测试用例阶段交付物名称。 + * Change testcase deliverable. + * + * @param array $modules + * @access public + * @return bool + */ + public function changeTestcaseDeliverable(array $modules): bool + { + foreach($modules as $key => $name) + { + $this->dao->update(TABLE_DELIVERABLE)->set('name')->eq($name . $this->lang->upgrade->list)->where('category')->eq($key)->andWhere('builtin')->eq('0')->exec(); + } + return true; + } + + + /** + * 升级项目和迭代的交付物配置。 + * Upgrade project deliverable. + * + * @param array $deliverableList + * @access public + * @return void + */ + public function upgradeProjectDeliverable(array $deliverableList) + { + $projectList = $this->dao->select('id,deliverable,workflowGroup,type,project')->from(TABLE_PROJECT)->where('deliverable')->ne('')->fetchAll('id'); + $projectMainLibPairs = $this->dao->select('project, id')->from(TABLE_DOCLIB)->where('main')->eq('1')->andWhere('type')->eq('project')->andWhere('project')->in(array_keys($projectList))->fetchPairs(); + $executionMainLibPairs = $this->dao->select('execution, id')->from(TABLE_DOCLIB)->where('main')->eq('1')->andWhere('type')->eq('execution')->andWhere('execution')->in(array_keys($projectList))->fetchPairs(); + $fileList = $this->dao->select('*')->from(TABLE_FILE)->where('deleted')->eq('0')->andWhere('extra')->like('deliverable%')->fetchAll('id'); + $otherDeliverablePairs = $this->dao->select('workflowGroup, id')->from(TABLE_DELIVERABLE)->where('category')->eq('other')->andWhere('builtin')->eq('1')->fetchPairs(); + + foreach($projectList as $project) + { + $oldProjectDeliverable = !empty($project->deliverable) ? json_decode($project->deliverable, true) : array(); + if(empty($oldProjectDeliverable)) continue; + + if($project->type != 'project' && isset($projectList[$project->project])) $project->workflowGroup = $projectList[$project->project]->workflowGroup; // 执行用项目的项目流程 + + /* 解析项目的交付物配置。 */ + foreach($oldProjectDeliverable as $methodDeliverable) + { + foreach($methodDeliverable as $deliverableConfigs) + { + foreach($deliverableConfigs as $config) + { + if(empty($config['doc']) && empty($config['file'])) continue; + + $oldDeliverableID = $config['deliverable']; + if(strpos($oldDeliverableID, 'new_') !== false) + { + $deliverableID = $otherDeliverablePairs[$project->workflowGroup]; // 其他类型的交付物。 + } + else + { + $deliverableID = !empty($deliverableList[$project->workflowGroup][$oldDeliverableID]) ? $deliverableList[$project->workflowGroup][$oldDeliverableID] : $oldDeliverableID; + } + + $newProjectDeliverable = new stdclass(); + $newProjectDeliverable->deliverable = $deliverableID; + $newProjectDeliverable->project = $project->id; + $newProjectDeliverable->submitFrom = $project->id; + $newProjectDeliverable->status = 'draft'; + + /* 将原来的附件类型的交付物变成附件类型的文档并关联到交付物。 */ + if(!empty($config['file']) && !empty($fileList[$config['file']])) + { + $file = $fileList[$config['file']]; + $newProjectDeliverable->doc = $this->moveFileToDoc($project, $projectMainLibPairs, $executionMainLibPairs, $file); + $newProjectDeliverable->createdBy = $file->addedBy; + $newProjectDeliverable->createdDate = substr($file->addedDate, 0, 10); + } + else + { + $newProjectDeliverable->doc = $config['doc']; + } + + $this->dao->insert(TABLE_PROJECTDELIVERABLE)->data($newProjectDeliverable)->exec(); + } + } + } + } + + /* 之前交付物没存文档名称、版本，升级的时候补上。 */ + $emptyNameDocs = $this->dao->select('t1.id,t2.title,t2.version,t2.addedBy,t2.addedDate')->from(TABLE_PROJECTDELIVERABLE)->alias('t1') + ->leftJoin(TABLE_DOC)->alias('t2')->on('t1.doc=t2.id') + ->where('t1.name')->eq('') + ->andWhere('t2.deleted')->eq('0') + ->fetchAll('id'); + + foreach($emptyNameDocs as $deliverableID => $doc) + { + $deliverableCreatedDate = date('Y-m-d', strtotime($doc->addedDate)); + $this->dao->update(TABLE_PROJECTDELIVERABLE) + ->set('name')->eq($doc->title) + ->set('docVersion')->eq($doc->version) + ->set('createdBy')->eq($doc->addedBy) + ->set('createdDate')->eq($deliverableCreatedDate) + ->where('id')->eq($deliverableID) + ->exec(); + } + + $this->dao->query("ALTER TABLE " . TABLE_PROJECT . " DROP COLUMN `deliverable`;"); + } + + /** + * 将附件类型的交付物变成附件类型的文档并关联到交付物。 + * Move file to doc. + * + * @param object $project + * @param array $projectMainLibPairs + * @param array $executionMainLibPairs + * @param array $files + * @access public + * @return int + */ + public function moveFileToDoc(object $project, array $projectMainLibPairs, array $executionMainLibPairs, object $file): int + { + $projectType = $project->type == 'project' ? 'project' : 'execution'; + + $title = $file->title; + $position = strrpos($title, '.'); + if($position > 0) $title = substr($title, 0, $position); + + $doc = new stdclass(); + $doc->title = $title; + $doc->lib = $projectType == 'project' ? $projectMainLibPairs[$project->id] : $executionMainLibPairs[$project->id]; + $doc->project = $projectType == 'project' ? $project->id : 0; + $doc->execution = $projectType == 'execution' ? $project->id : 0; + $doc->addedBy = 'admin'; + $doc->addedDate = helper::today(); + $doc->acl = 'open'; + $doc->vision = 'rnd'; + $doc->version = 1; + $doc->type = 'attachment'; + + $this->dao->insert(TABLE_DOC)->data($doc)->exec(); + $docID = $this->dao->lastInsertID(); + + $this->dao->update(TABLE_FILE)->set('objectID')->eq($docID)->set('objectType')->eq('doc')->where('id')->eq($file->id)->exec(); // 将附件的对象变成文档。 + + $docContent = new stdclass(); + $docContent->doc = $docID; + $docContent->title = $title; + $docContent->content = ''; + $docContent->type = 'attachment'; + $docContent->digest = ''; + $docContent->version = 1; + $docContent->files = ",$file->id"; + + $this->dao->insert(TABLE_DOCCONTENT)->data($docContent)->exec(); + + return $docID; + } + + /** + * 将检查单迁移到内置项目流程中。 + * Migrate auditcl to built-in project workflow. + * + * @access public + * @return void + */ + public function upgradeAuditcl() + { + $workflows = $this->dao->select('id,projectModel,projectType,main')->from(TABLE_WORKFLOWGROUP)->where('type')->eq('project')->andWhere('projectModel')->in('scrum,agileplus,waterfall,waterfallplus')->fetchAll('id'); + foreach($workflows as $id => $workflow) + { + if($workflow->projectType == 'product' && $workflow->main == '1') + { + $this->dao->update(TABLE_AUDITCL)->set('workflowGroup')->eq($id)->where('model')->eq($workflow->projectModel)->exec(); + } + else + { + /* 复制一份检查单放到项目型项目流程中。*/ + $idMap = array(); + $auditclList = $this->dao->select('*')->from(TABLE_AUDITCL)->where('model')->eq($workflow->projectModel)->fetchAll('id', false); + foreach($auditclList as $auditcl) + { + $oldID = $auditcl->id; + unset($auditcl->id); + $auditcl->workflowGroup = $id; + $auditcl->model = ''; + if(helper::isZeroDate($auditcl->editedDate)) $auditcl->editedDate = null; + if(helper::isZeroDate($auditcl->assignedDate)) $auditcl->assignedDate = null; + $this->dao->insert(TABLE_AUDITCL)->data($auditcl)->exec(); + $idMap[$oldID] = $this->dao->lastInsertID(); + } + + $projectIdList = $this->dao->select('id')->from(TABLE_PROJECT)->where('workflowGroup')->eq($id)->fetchPairs(); + foreach($idMap as $oldID => $newID) + { + $this->dao->update(TABLE_NC)->set('listID')->eq($newID)->where('listID')->eq($oldID)->andWhere('project')->in($projectIdList)->exec(); + } + } + } + + /* 将auditplan中的execution迁移到nc中。 */ + $ncs = $this->dao->select('t1.id, t2.execution')->from(TABLE_NC)->alias('t1') + ->leftJoin(TABLE_AUDITPLAN)->alias('t2')->on('t1.auditplan=t2.id') + ->where('t2.execution')->ne('0') + ->fetchPairs(); + + foreach($ncs as $ncID => $executionID) + { + $this->dao->update(TABLE_NC)->set('execution')->eq($executionID)->where('id')->eq($ncID)->exec(); + } + + $this->dao->exec("ALTER TABLE " . TABLE_AUDITCL . " DROP `model`;"); + } + + /** + * 之前IPD、融合瀑布使用的是瀑布项目流程，融合敏捷使用的是敏捷项目流程。现在统一使用自己的项目流程。 + * Before IPD, fusion waterfall uses the waterfall project workflow, and fusion agile uses the agile project workflow. Now use the own project workflow. + * + * @access public + * @return void + */ + public function modifyProjectWorkflowGroup() + { + if(!in_array($this->config->edition, array('ipd', 'max'))) return; // 开源版、企业版没有项目流程 + + $projectGroup = $this->dao->select('id,workflowGroup,model,category,hasProduct')->from(TABLE_PROJECT)->where('model')->in('ipd,waterfallplus,agileplus')->andWhere('deleted')->eq('0')->fetchGroup('workflowGroup', 'id'); + $workflows = $this->dao->select('*')->from(TABLE_WORKFLOWGROUP)->where('id')->in(array_keys($projectGroup))->fetchAll('id'); + + $tableList = array( + TABLE_WORKFLOW, + TABLE_WORKFLOWFIELD, + TABLE_WORKFLOWACTION, + TABLE_WORKFLOWLABEL, + TABLE_WORKFLOWLAYOUT, + TABLE_WORKFLOWUI + ); + + $this->loadModel('project'); + $codeWorkflowPairs = array(); + foreach($workflows as $workflow) + { + $projects = $projectGroup[$workflow->id]; + $index = 1; + $name = $workflow->name; + foreach($projects as $project) + { + $oldWorkflowGroupID = $project->workflowGroup; + $hasProduct = $project->hasProduct ? 'product' : 'project'; + $code = $project->model == 'ipd' ? strtolower($project->category) . $hasProduct : $project->model . $hasProduct; + $projectType = $project->model == 'ipd' ? strtolower($project->category) : $hasProduct; + + if($projectType == 'cpd') $projectType = 'cpd' . $hasProduct; + + unset($workflow->id); + if(isset($codeWorkflowPairs[$code][$oldWorkflowGroupID])) + { + $this->dao->update(TABLE_PROJECT)->set('workflowGroup')->eq($codeWorkflowPairs[$code][$oldWorkflowGroupID])->where('id')->eq($project->id)->exec(); + continue; + } + + $workflow->name = $name . $index; + $workflow->createdDate = helper::now(); + $workflow->projectModel = $project->model; + $workflow->projectType = $projectType; + $workflow->code = $code; + $workflow->editedDate = null; + $workflow->main = '0'; + + $this->dao->insert(TABLE_WORKFLOWGROUP)->data($workflow)->exec(); + $newWorkflowGroupID = $this->dao->lastInsertId(); + $this->dao->update(TABLE_PROJECT)->set('workflowGroup')->eq($newWorkflowGroupID)->where('id')->eq($project->id)->exec(); + + foreach($tableList as $table) + { + $this->project->copyWorkflow($project->workflowGroup, $newWorkflowGroupID, $table); + } + + $codeWorkflowPairs[$code][$oldWorkflowGroupID] = $newWorkflowGroupID; + $index++; + } + } + } + + /** + * 升级流程和活动, 将流程和活动中的数据迁移到流程中。 + * Upgrade process and activity. + * + * @access public + * @return void + */ + public function upgradeProcessAndActivity() + { + $this->loadModel('workflowgroup'); + $this->app->loadLang('process'); + $groupList = $this->upgradeTao->getWorkflowGroupForProcess(); + + $classifyModule = array(); + foreach($groupList as $groupID => $group) + { + $projectModel = $group->projectModel; + if($projectModel == 'agileplus') $projectModel = 'scrum'; + if($projectModel == 'waterfallplus') $projectModel = 'waterfall'; + if(in_array($group->projectModel, array('scrum', 'agileplus', 'waterfall', 'waterfallplus'))) + { + $projectActivity = $this->dao->select('t1.id')->from(TABLE_PROGRAMACTIVITY)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') + ->leftJoin(TABLE_WORKFLOWGROUP)->alias('t3')->on('t2.workflowGroup=t3.id') + ->where('t3.projectModel')->eq($group->projectModel) + ->limit(1) + ->fetch('id'); + + if($projectActivity) + { + /* 更新groupID到过程表，获取旧分类和新模块的对应关系。 */ + if($group->projectType == 'product' && $group->main == '1') + { + $classifyModule = $this->upgradeTao->handleBuildinWorkflowGroup($group, $groupID, $classifyModule); + } + else + { + $classifyModule = $this->upgradeTao->handleNeedCopyWorkflowGroup($group, $groupID, $classifyModule); + $this->upgradeTao->migrateOutputToDeliverable($group); + } + } + else + { + $this->workflowgroup->addProcessAndActivity($group, $projectModel); + $this->dao->delete()->from(TABLE_AUDITCL)->where('workflowGroup')->eq($groupID)->exec(); // 新增活动删除旧的检查单 + } + } + else + { + $this->workflowgroup->addProcessAndActivity($group, $projectModel); + $this->dao->delete()->from(TABLE_AUDITCL)->where('workflowGroup')->eq($groupID)->exec(); // 新增活动删除旧的检查单 + } + } + + /* 迁移过程分类到模块表。 */ + $this->upgradeTao->updateProcessModules($classifyModule); + + /* 删除旧分类。 */ + $this->dao->delete()->from(TABLE_PROCESS)->where('workflowGroup')->eq(0)->exec(); + $this->dao->delete()->from(TABLE_ACTIVITY)->where('workflowGroup')->eq(0)->exec(); + $this->dao->delete()->from(TABLE_LANG)->where('module')->eq('process')->exec(); + } + /** * 获取需要更新的项目报告数据。 * Get project reports that need to be updated. @@ -11291,31 +12179,590 @@ class upgradeModel extends model $weekNumber = ceil(helper::diffDate($data['weekStart'], $data['projectBegin']) / 7) + 1; $weekEnd = date('Y-m-d', strtotime('+6 day', strtotime($data['weekStart']))); - $report->project = $data['project']; - $report->title = sprintf($this->lang->upgrade->weeklyReportTitle, $weekNumber, $data['weekStart'], $weekEnd); - $report->reportModule = 'week'; - $report->addedDate = $data['weekStart'] . ' 00:00:00'; - $report->editedDate = $data['weekStart'] . ' 00:00:00'; - $report->weeklyDate = str_replace('-', '', $data['weekStart']); + $report->project = $data['project']; + $report->title = sprintf($this->lang->upgrade->weeklyReportTitle, $weekNumber, $data['weekStart'], $weekEnd); + $report->module = 'week'; + $report->addedDate = $data['weekStart'] . ' 00:00:00'; + $report->weeklyDate = str_replace('-', '', $data['weekStart']); } else { - $report->title = $this->lang->upgrade->milestoneTitle; - $report->reportModule = 'milestone'; - $report->project = $data['id']; - $report->addedDate = helper::now(); - $report->editedDate = helper::now(); + $report->title = $this->lang->upgrade->milestoneTitle; + $report->module = 'milestone'; + $report->project = $data['id']; + $report->addedDate = helper::now(); } - $report->template = '0'; $report->templateType = 'projectReport'; $report->addedBy = 'system'; - $report->editedBy = 'system'; $this->dao->insert(TABLE_DOC)->data($report)->exec(); return !dao::isError(); } + /** + * 内置基线评审到项目流程中。 + * Buildin baseline review flow. + * + * @access public + * @return bool + */ + public function buildinBaselineReview(): bool + { + $reviewFlow = new stdclass(); + $reviewFlow->flow = '1'; + $reviewFlow->objectID = '0'; + $reviewFlow->relatedBy = 'system'; + $reviewFlow->relatedDate = helper::now(); + $reviewFlow->extra = 'baseline'; + + $workflows = $this->dao->select('id')->from(TABLE_WORKFLOWGROUP)->where('projectModel')->notin('scrum,projectModel')->fetchAll('id'); + foreach($workflows as $workflow) + { + foreach($this->lang->upgrade->baselineReview as $key => $name) + { + $reviewFlow->root = $workflow->id; + $reviewFlow->objectType = $key; + $this->dao->insert(TABLE_APPROVALFLOWOBJECT)->data($reviewFlow)->exec(); + } + } + + return true; + } + + /** + * 升级检查单分类到项目流程下。 + * Upgrade reviewcl category. + * + * @access public + * @return bool + */ + public function upgradeReviewclCategory(): bool + { + $this->loadModel('custom'); + $clientLang = $this->app->getClientLang(); + $categoryList = $this->dao->select('`key`, value')->from(TABLE_LANG) + ->where('module')->eq('reviewcl') + ->andWhere('section')->eq('waterfallCategoryList') + ->andWhere('lang')->in(array($clientLang, 'all')) + ->orderBy('id_asc') + ->fetchPairs(); + + $categoryPlusList = $this->dao->select('`key`, value')->from(TABLE_LANG) + ->where('module')->eq('reviewcl') + ->andWhere('section')->eq('waterfallplusCategoryList') + ->andWhere('lang')->in(array($clientLang, 'all')) + ->orderBy('id_asc') + ->fetchPairs(); + + if(empty($categoryList) && empty($categoryPlusList)) return true; + $workflows = $this->dao->select('id,projectModel')->from(TABLE_WORKFLOWGROUP)->where('projectModel')->in('waterfall,waterfallplus')->fetchAll('id'); + foreach($workflows as $workflow) + { + if($workflow->projectModel == 'waterfall' && !empty($categoryList)) + { + foreach($categoryList as $key => $value) $this->custom->setItem("{$clientLang}.reviewcl.{$workflow->id}CategoryList.{$key}.1", $value); + } + + if($workflow->projectModel == 'waterfallplus' && !empty($categoryPlusList)) + { + foreach($categoryPlusList as $key => $value) $this->custom->setItem("{$clientLang}.reviewcl.{$workflow->id}CategoryList.{$key}.1", $value); + } + } + + $this->dao->delete()->from(TABLE_LANG)->where('section')->in('waterfallCategoryList,waterfallplusCategoryList')->exec(); + return true; + } + + /** + * 升级项目评审对象到项目流程中。 + * Upgrade baseline objects. + * + * @access public + * @return void + */ + public function upgradeBaselineObjects() + { + $this->app->loadLang('baseline'); + $clientLang = $this->app->getClientLang(); + $objectList = $this->dao->select('`key`, value')->from(TABLE_LANG) + ->where('module')->eq('baseline') + ->andWhere('section')->eq('objectList') + ->andWhere('lang')->in(array($clientLang, 'all')) + ->orderBy('id_asc') + ->fetchPairs(); + + if(empty($objectList) && !empty($this->lang->baseline->objectList)) $objectList = $this->lang->baseline->objectList; + if(empty($objectList)) $objectList = $this->lang->upgrade->reviewObjectList; + + $workflowGroups = $this->dao->select('id, projectModel, projectType')->from(TABLE_WORKFLOWGROUP)->where('type')->eq('project')->fetchAll('id'); + + $moduleGroup = $this->dao->select('id, root, extra')->from(TABLE_MODULE) + ->where('type')->eq('deliverable') + ->andWhere('root')->in(array_keys($workflowGroups)) + ->fetchGroup('root', 'extra'); + + $reviewclList = $this->dao->select('*')->from(TABLE_REVIEWCL)->where('type')->ne('')->fetchGroup('type'); + $activityList = $this->dao->select('t1.*')->from(TABLE_ACTIVITY)->alias('t1')->leftJoin(TABLE_PROCESS)->alias('t2')->on('t1.process=t2.id') + ->where('t1.name')->eq($this->lang->other) + ->andWhere('t2.name')->eq($this->lang->other) + ->fetchGroup('workflowGroup'); + + $actionIdList = array(); + $reviewclActions = $this->dao->select('*')->from(TABLE_ACTION)->where('objectType')->eq('reviewcl')->fetchGroup('objectID', 'id'); + foreach($reviewclActions as $actions) $actionIdList = arrayUnion($actionIdList, $actions); + $reviewclHistory = $this->dao->select('*')->from(TABLE_HISTORY)->where('action')->in(array_keys($actionIdList))->fetchGroup('action', 'id'); + + $deliverable = new stdClass(); + $deliverable->status = 'enabled'; + $deliverable->createdBy = 'system'; + $deliverable->createdDate = helper::now(); + $deliverable->trimmable = '1'; + $deliverable->template = '[]'; + + $deliverableStage = new stdClass(); + $deliverableStage->stage = 'project'; + $deliverableStage->required = '0'; + + $reviewFlow = new stdclass(); + $reviewFlow->flow = 1; + $reviewFlow->objectType = 'deliverable'; + $reviewFlow->relatedBy = 'system'; + $reviewFlow->relatedDate = helper::now(); + $reviewFlow->extra = 'review'; + + $upgradeReviewcls = array(); + $categoryModuleMap = array('PP' => 'plan', 'SRS' => 'story'); + + foreach($workflowGroups as $groupID => $workflowGroup) + { + $projectModel = $workflowGroup->projectModel; + + if(empty($activityList[$groupID])) continue; + $otherActivity = reset($activityList[$groupID]); + $otherActivityID = $otherActivity->id; + + $nameFilter = array(); + $deliverable->workflowGroup = $groupID; + $deliverable->activity = $otherActivityID; + + foreach(array_filter($objectList) as $key => $value) + { + if(empty($value)) continue; + if(in_array($key, array('HLDS', 'DDS', 'ADS', 'DBDS', 'ITTC', 'STTC', 'intergrate', 'system'))) continue; // 设计类型和测试类型的上面处理过了，跳过。 + if($key == 'PP' && in_array($projectModel, array('scrum', 'agileplus'))) continue; // 敏捷、融合敏捷没有项目计划 + if($key == 'SRS') $value = $this->lang->upgrade->reviewObjectList['SRS']; // 将软件需求规格说明书改成项目需求规格说明书 + $deliverable->category = $key; // 标记交付物的类型。 + $deliverable->systemList = (int)in_array($key, ['PP', 'SRS']); + + /* 将原来的评审对象放到新交付物的模块下：计划类、需求类、设计类、测试类。其他类放到其他模块下。 */ + $moduleKey = isset($categoryModuleMap[$key]) ? $categoryModuleMap[$key] : 'other'; + $deliverable->module = isset($moduleGroup[$groupID][$moduleKey]) ? $moduleGroup[$groupID][$moduleKey]->id : 0; + + $deliverableID = $this->addDeliverable((string)$value, $deliverable, $deliverableStage, $nameFilter); + + $reviewFlow->root = $groupID; + $reviewFlow->objectID = $deliverableID; + $this->dao->insert(TABLE_APPROVALFLOWOBJECT)->data($reviewFlow)->exec(); + $flowID = $this->dao->lastInsertID(); + + /* 迁移评审对象对应的检查清单。 */ + if(empty($reviewclList[$projectModel])) continue; + foreach($reviewclList[$projectModel] as $reviewcl) + { + if($key != $reviewcl->object) continue; + $upgradeReviewcls[$reviewcl->id] = $reviewcl->id; + + $reviewclData = clone $reviewcl; + unset($reviewclData->id); + unset($reviewclData->editedDate); + unset($reviewclData->assignedDate); + $reviewclData->workflowGroup = $groupID; + $reviewclData->object = $flowID; + $this->dao->insert(TABLE_REVIEWCL)->data($reviewclData)->exec(); + $reviewclID = $this->dao->lastInsertID(); + + $this->dao->update(TABLE_REVIEWISSUE)->set('listID')->eq($reviewclID)->where('listID')->eq($reviewcl->id)->exec(); + + /* 迁移检查清单历史记录。 */ + if(empty($reviewclActions[$reviewcl->id])) continue; + foreach($reviewclActions[$reviewcl->id] as $action) + { + $actionData = clone $action; + unset($actionData->id); + $actionData->objectID = $reviewclID; + $this->dao->insert(TABLE_ACTION)->data($actionData)->exec(); + + if(empty($reviewclHistory[$action->id])) continue; + $actionID = $this->dao->lastInsertID(); + foreach($reviewclHistory[$action->id] as $history) + { + unset($history->id); + $history->action = $actionID; + $this->dao->insert(TABLE_HISTORY)->data($history)->exec(); + } + } + } + } + } + + /* 将已升级的历史检查清单数据删掉。 */ + $this->dao->delete()->from(TABLE_REVIEWCL)->where('id')->in($upgradeReviewcls)->exec(); + + $this->dao->exec("ALTER TABLE " . TABLE_REVIEWCL . " CHANGE `object` `object` mediumint(8) unsigned NOT NULL DEFAULT '0';"); + $this->dao->exec("ALTER TABLE " . TABLE_REVIEWCL . " DROP `type`;"); + $this->dao->exec('ALTER TABLE ' . TABLE_PROCESS . ' DROP `model`'); + $this->dao->exec('ALTER TABLE ' . TABLE_PROCESS . ' DROP `type`'); + } + + /** + * 升级项目评审对象到项目交付物。 + * Upgrade review to deliverable. + * + * @access public + * @return void + */ + public function upgradeReviewToDeliverable() + { + if(!in_array($this->config->edition, array('ipd', 'max'))) return; // 开源版、企业版没有评审功能。 + + $this->loadModel('review'); + $this->loadModel('baseline'); + $reviewPointList = $this->config->edition == 'ipd' ? $this->lang->review->reviewPoint->titleList : array(); + $reviews = $this->dao->select('t1.*, t2.category, t2.version')->from(TABLE_REVIEW)->alias('t1') + ->leftJoin(TABLE_OBJECT)->alias('t2')->on('t1.object=t2.id') + ->where('t1.deleted')->eq('0') + ->beginIF($reviewPointList)->andWhere('t2.category')->notin(array_keys($reviewPointList))->fi() // IPD 模式下，只升级非评审点的评审。 + ->orderBy('t1.id_asc') + ->fetchAll('id'); + + $projectDeliverables = $this->dao->select('t1.id, t2.id as deliverable, t2.category')->from(TABLE_PROJECT)->alias('t1') + ->leftJoin(TABLE_DELIVERABLE)->alias('t2')->on('t1.workflowGroup=t2.workflowGroup') + ->where('t2.category')->ne('') + ->fetchGroup('id', 'category'); + + $docIdList = array_column($reviews, 'doc'); + $docIdList = array_filter($docIdList); + $docList = $this->dao->select('id, title')->from(TABLE_DOC)->where('id')->in($docIdList)->fetchPairs(); + + $projectMainLibPairs = $this->dao->select('project, id')->from(TABLE_DOCLIB)->where('main')->eq('1')->andWhere('type')->eq('project')->fetchPairs(); + $fileGroup = $this->dao->select('id, objectID')->from(TABLE_FILE)->where('deleted')->eq('0')->andWhere('objectType')->eq('review')->fetchGroup('objectID', 'id'); + + $doc = new stdclass(); + $doc->version = 1; + $doc->type = 'text'; + $doc->acl = 'open'; + $doc->addedBy = 'system'; + $doc->addedDate = helper::now(); + + foreach($reviews as $review) + { + if(!isset($projectDeliverables[$review->project][$review->category])) continue; + + $files = ''; + if(!empty($fileGroup[$review->id])) + { + $fileIdList = array_keys($fileGroup[$review->id]); + $files = implode(',', $fileIdList); + } + + /* 不是系统模板生成、也没选文档的，自动生成文档。 */ + if(!$review->template && !$review->doc) + { + $doc->title = $review->title; + $doc->lib = $projectMainLibPairs[$review->project]; + $doc->project = $review->project; + $doc->addedBy = $review->createdBy; + $doc->addedDate = $review->createdDate; + $doc->version = 1; + $doc->type = $files ? 'attachment' : 'text'; + + $this->dao->insert(TABLE_DOC)->data($doc)->exec(); + $review->doc = $this->dao->lastInsertID(); + $review->docVersion = 1; + + $docContent = new stdclass(); + $docContent->type = 'doc'; + $docContent->doc = $review->doc; + $docContent->title = $review->title; + $docContent->files = $files; + $docContent->version = 1; + $this->dao->insert(TABLE_DOCCONTENT)->data($docContent)->exec(); + $this->dao->update(TABLE_FILE)->set('objectType')->eq('doc')->set('objectID')->eq($review->doc)->where('id')->in($files)->exec(); + } + elseif($review->doc && $files) + { + /* 原来有文档也有附件，将附件关联到文档。 */ + $maxVersion = $this->dao->select('max(version) as version')->from(TABLE_DOCCONTENT)->where('doc')->eq($review->doc)->fetch('version'); + $docContent = $this->dao->select('*')->from(TABLE_DOCCONTENT)->where('doc')->eq($review->doc)->andWhere('version')->eq($review->docVersion)->fetch(); + + unset($docContent->id); + $docContent->version = $maxVersion + 1; + $docContent->files = $files; + $review->docVersion = $docContent->version; + + $this->dao->insert(TABLE_DOCCONTENT)->data($docContent)->exec(); + $this->dao->update(TABLE_FILE)->set('objectType')->eq('doc')->set('objectID')->eq($review->doc)->where('id')->in($files)->exec(); + $this->dao->update(TABLE_DOC)->set('version')->eq($review->docVersion)->where('id')->eq($review->doc)->exec(); + $this->dao->update(TABLE_REVIEW)->set('docVersion')->eq($review->docVersion)->where('id')->eq($review->id)->exec(); + } + + $deliverable = new stdclass(); + $deliverable->name = (!empty($docList[$review->doc]) && $docList[$review->doc] != $review->title) ? $docList[$review->doc] : $review->title; // 优先使用文档的标题 + $deliverable->project = $review->project; + $deliverable->submitFrom = $review->project; + $deliverable->review = $review->id; + $deliverable->deliverable = $projectDeliverables[$review->project][$review->category]->deliverable; + $deliverable->doc = $review->doc; + $deliverable->docVersion = $review->docVersion; + $deliverable->createdBy = $review->createdBy; + $deliverable->createdDate = $review->createdDate; + $deliverable->status = $review->status; + $deliverable->version = $review->version; + + $deliverableID = $this->dao->select('id')->from(TABLE_PROJECTDELIVERABLE) + ->where('project')->eq($deliverable->project) + ->andWhere('deliverable')->eq($deliverable->deliverable) + ->andWhere('doc')->eq($deliverable->doc) + ->fetch('id'); + + /* 保证交付物在项目下的唯一性，如果不存在，则插入。 */ + if(!$deliverableID) + { + $this->dao->insert(TABLE_PROJECTDELIVERABLE)->data($deliverable)->exec(); + $deliverableID = $this->dao->lastInsertID(); + } + else + { + $this->dao->update(TABLE_PROJECTDELIVERABLE)->set('docVersion')->eq($deliverable->docVersion)->set('review')->eq($deliverable->review)->where('id')->eq($deliverableID)->exec(); + } + + $this->dao->update(TABLE_REVIEW)->set('deliverable')->eq($deliverableID)->set('title')->eq($deliverable->name)->where('id')->eq($review->id)->exec(); + $this->dao->update(TABLE_OBJECT)->set('category')->eq($deliverable->deliverable)->where('id')->eq($review->object)->exec(); // 将评审对象改成交付物ID + + /* 如果是系统模板类型、但没有选系统模板生成，则复制一份交付物，让用户升级上来后可以继续使用系统模板。 */ + if(in_array($review->category, array('PP', 'SRS', 'HLDS', 'DDS', 'ADS', 'DBDS', 'intergrate', 'system')) && !$review->template) + { + $deliverable->name = zget($this->lang->upgrade->reviewObjectList, $review->category); + $deliverable->doc = 0; + $deliverable->docVersion = 0; + $deliverable->status = 'draft'; + $deliverable->version = ''; + $deliverable->review = 0; + + $deliverableID = $this->dao->select('id')->from(TABLE_PROJECTDELIVERABLE) + ->where('project')->eq($deliverable->project) + ->andWhere('deliverable')->eq($deliverable->deliverable) + ->andWhere('doc')->eq($deliverable->doc) + ->fetch('id'); + + if(!$deliverableID) $this->dao->insert(TABLE_PROJECTDELIVERABLE)->data($deliverable)->exec(); + } + } + + $this->dao->exec('ALTER TABLE ' . TABLE_REVIEW . ' DROP `doc`'); + } + + /** + * 升级历史基线。 + * Upgrade baseline. + * + * @access public + * @return void + */ + public function upgradeBaseline() + { + $baselines = $this->dao->select('id,`from`')->from(TABLE_OBJECT)->where('type')->eq('taged')->fetchAll(); + $reviews = $this->dao->select('id,object,deliverable')->from(TABLE_REVIEW)->where('status')->eq('pass')->fetchAll('object'); + foreach($baselines as $baseline) + { + if(empty($reviews[$baseline->from])) continue; + + $review = $reviews[$baseline->from]; + $data = new stdclass(); + $data->category = $review->deliverable; + $data->categoryVersion = json_encode(array($review->deliverable => $review->id)); + $data->status = 'pass'; + $this->dao->update(TABLE_OBJECT)->data($data)->where('id')->eq($baseline->id)->exec(); + + $this->dao->update(TABLE_REVIEW)->set('isBaseline')->eq('1')->where('id')->eq($review->id)->exec(); + } + return true; + } + + /** + * 新增交付物权限。 + * Add deliverable privs for all groups. + * + * @access public + * @return void + */ + public function addDeliverablePrivs() + { + $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('deliverable')->fetchPairs(); + $group = new stdclass(); + $group->module = 'project'; + foreach($groups as $groupID) + { + foreach(array('createDeliverable', 'deleteDeliverable', 'viewDeliverable') as $method) + { + $group->method = $method; + $group->group = $groupID; + $this->dao->insert(TABLE_GROUPPRIV)->data($group)->exec(); + } + } + } + + /** + * 升级开源版的阶段。 + * Update stage for PMS. + * + * @access public + * @return void + */ + public function upgradeStage4PMS() + { + if($this->config->edition != 'open') return true; + + $stageGroup = $this->dao->select('*')->from(TABLE_STAGE)->where('workflowGroup')->eq(0)->fetchGroup('projectType', 'id'); + if(empty($stageGroup)) return true; + + $typeNamePairs = array(); + $needDeleteStage = array(); + foreach($stageGroup as $projectModel => $stageList) + { + if($projectModel == 'ipd') continue; + foreach($stageList as $stageInfo) + { + if(isset($typeNamePairs[$stageInfo->type]) && in_array($stageInfo->name, $typeNamePairs[$stageInfo->type])) + { + $needDeleteStage[$stageInfo->id] = $stageInfo->id; + continue; + } + if(!isset($typeNamePairs[$stageInfo->type])) $typeNamePairs[$stageInfo->type] = array(); + $typeNamePairs[$stageInfo->type][] = $stageInfo->name; + } + } + + if(!empty($needDeleteStage)) $this->dao->delete()->from(TABLE_STAGE)->where('id')->in($needDeleteStage)->exec(); + return true; + } + + /** + * 升级阶段列表及评审点。 + * Update stage and point. + * + * @access public + * @return void + */ + public function upgradeStageAndPoint() + { + $stageGroup = $this->dao->select('*')->from(TABLE_STAGE)->where('workflowGroup')->eq(0)->fetchGroup('projectType', 'id'); + if(empty($stageGroup)) return true; + + $this->app->loadConfig('project'); + $this->app->loadConfig('stage'); + $workflowList = $this->dao->select('projectModel, code, id')->from(TABLE_WORKFLOWGROUP)->where('projectModel')->in('waterfall,waterfallplus,ipd')->fetchAll('id'); + foreach($workflowList as $flow) + { + $projectModel = $flow->projectModel; + if(!isset($stageGroup[$projectModel])) continue; + + $flowCode = $flow->code; + foreach($stageGroup[$projectModel] as $stage) + { + if($flowCode == 'tpdproduct' && !in_array($stage->type, $this->config->project->categoryStages['TPD'])) continue; + if($flowCode == 'cbbproduct' && !in_array($stage->type, $this->config->project->categoryStages['CBB'])) continue; + if(in_array($flowCode, array('cpdproduct', 'cpdproject')) && !in_array($stage->type, $this->config->project->categoryStages['CPD'])) continue; + + unset($stage->id); + $stage->workflowGroup = $flow->id; + if(empty($stage->editedDate)) $stage->editedDate = null; + $this->dao->insert(TABLE_STAGE)->data($stage)->exec(); + $stageID = $this->dao->lastInsertID(); + + /* 添加IPD项目流程阶段的评审点。*/ + if($projectModel == 'ipd') + { + $decision = new stdClass(); + $decision->builtin = '1'; + $decision->createdBy = 'system'; + $decision->createdDate = helper::now(); + + $decisionFlow = new stdClass(); + $decisionFlow->flow = 1; + $decisionFlow->objectType = 'decision'; + $decisionFlow->relatedBy = 'system'; + $decisionFlow->relatedDate = helper::now(); + foreach($this->config->stage->ipdReviewPoint->{$stage->type} as $index => $point) + { + $decision->workflowGroup = $stage->workflowGroup; + $decision->stage = $stageID; + $decision->order = $index + 1; + $decision->title = $point; + $decision->type = strpos($point, 'TR') !== false ? 'TR' : 'DCP'; + $decision->category = $point; + $this->dao->insert(TABLE_DECISION)->data($decision)->exec(); + $decisionID = $this->dao->lastInsertID(); + + $decisionFlow->root = $stage->workflowGroup; + $decisionFlow->objectID = $decisionID; + $decisionFlow->extra = $decision->type; + $this->dao->insert(TABLE_APPROVALFLOWOBJECT)->data($decisionFlow)->exec(); + } + } + } + } + + return true; + } + + /** + * 升级评审点评审。 + * Upgrade object of decision. + * + * @access public + * @return void + */ + public function upgradeObjectOfDecision() + { + $ipdProject = $this->dao->select('id,workflowGroup')->from(TABLE_PROJECT)->where('model')->eq('ipd')->andWhere('type')->eq('project')->fetchPairs('id'); + if(empty($ipdProject)) return true; + + $this->app->loadConfig('review'); + $stagePointGroup = array(); + $ipdProjectStage = $this->dao->select('id,project,attribute')->from(TABLE_PROJECT)->where('project')->in(array_keys($ipdProject))->andWhere('type')->eq('stage')->fetchGroup('project', 'attribute'); + foreach($ipdProjectStage as $projectID => $stageList) + { + if(!isset($stagePointGroup[$projectID])) $stagePointGroup[$projectID] = array(); + foreach($stageList as $attribute => $stage) + { + foreach($this->config->review->ipdReviewPoint->$attribute as $pointCategory) + { + $stagePointGroup[$projectID][$pointCategory] = $stage->id; + } + } + } + + $decisionGroup = $this->dao->select('id,workflowGroup,category')->from(TABLE_DECISION)->fetchGroup('workflowGroup', 'category'); + $ipdStagePoints = $this->dao->select('*')->from(TABLE_OBJECT)->where('project')->in(array_keys($ipdProject))->andWhere('category')->in($this->config->review->ipdPointOrder)->fetchAll(); + foreach($ipdStagePoints as $point) + { + $category = $point->category; + $projectID = $point->project; + $workflowGroup = $ipdProject[$projectID]; + + $this->dao->update(TABLE_OBJECT) + ->set('type')->eq('decision') + ->set('categoryTitle')->eq($category) + ->set('execution')->eq(!empty($stagePointGroup[$projectID][$category]) ? $stagePointGroup[$projectID][$category] : 0) + ->set('category')->eq(!empty($decisionGroup[$workflowGroup][$category]->id) ? $decisionGroup[$workflowGroup][$category]->id : 0) + ->where('id')->eq($point->id) + ->exec(); + } + return true; + } + /** * 调整 21.7.5 版本的权限 * Adjust priv 21.7.5. @@ -11347,6 +12794,167 @@ class upgradeModel extends model return true; } + /** + * 四个项目模型的功能开关合并成一个。 + * Merge four project model feature switches into one. + * 内置AI禅道智能体。 + * Initialize the AI prompts. + * + * @access public + * @return bool + */ + public function upgradeClosedFeature() + { + + $disabledFeatures = $this->dao->select('value')->from(TABLE_CONFIG)->where('`key`')->eq('closedFeatures')->andWhere('owner')->eq('system')->fetch('value'); + if(empty($disabledFeatures)) return true; + + $disabledFeatures = explode(',', $disabledFeatures); + $countFeature = array(); + foreach($this->config->featureGroup->project as $newFeature) + { + $countFeature[$newFeature] = 0; + foreach($disabledFeatures as $key => $feature) + { + $feature = strtolower(trim($feature)); + if(strpos($feature, $newFeature) !== false) + { + $countFeature[$newFeature]++; + unset($disabledFeatures[$key]); + } + } + } + + /* 之前在所有模型下都关闭的功能升级上来才关闭，否则开启。*/ + $disabledFeatures = array_values($disabledFeatures); + foreach($countFeature as $feature => $count) + { + if($count == 4 || ($count == 2 && in_array($feature, array('gapanalysis', 'researchplan', 'track')))) + { + $disabledFeatures[] = 'project' . ucfirst($feature); + } + } + + $disabledFeatures = implode(',', array_unique($disabledFeatures)); + $this->dao->update(TABLE_CONFIG)->set('value')->eq($disabledFeatures)->where('`key`')->eq('closedFeatures')->andWhere('owner')->eq('system')->exec(); + } + + /** + * 之前object表中data字段直接存入URL，如果改变请求方式则无法使用，现在升级为模块名、方法名、参数的形式。 + * Before the object table directly stores the URL in the data field, if the request method changes, it cannot be used, now upgrade to the form of module name, method name, and parameters. + * + * @access public + * @return bool + */ + public function parseDocFetcherURL() + { + $objects = $this->dao->select('id,data')->from(TABLE_OBJECT)->where('data')->like('%tml-zentaolist%')->fetchPairs(); + + $cleanValue = function($value) + { + if(preg_match('/__(\w+)__([0-9]+)/', $value, $m)) return $m[2]; + return $value; + }; + + $parsePathInfoUrl = function($url) use ($cleanValue) + { + $url = ltrim($url, '/'); + $url = preg_replace('/\.html$/', '', $url); + + $parts = explode('-', $url); + array_shift($parts); // 删掉模块名 + array_shift($parts); // 删掉方法名 + + $params = []; + foreach($parts as $index => $value) + { + $key = 'param' . $index + 1; + $value = $cleanValue($value); + + $params[$key] = $value; + } + + return $params; + }; + + $parseGetUrl = function($url) use ($cleanValue) + { + $parts = parse_url($url); + parse_str($parts['query'] ?? '', $query); + + unset($query['m'], $query['f']); + + $params = []; + $index = 1; + foreach($query as $key => $value) + { + $key = 'param' . $index; + $value = $cleanValue($value); + + $params[$key] = $value; + $index++; + } + + return $params; + }; + + foreach($objects as $id => $data) + { + $data = json_decode($data, true); + $html = $data['$data']; + + preg_match('/data-export-url=\'([^\']+)\'/', $html, $exportMatch); + preg_match('/data-fetcher=\'([^\']+)\'/', $html, $fetcherMatch); + + $exportUrl = $exportMatch[1] ?? null; + $fetcherUrl = $fetcherMatch[1] ?? null; + + if(!$exportUrl && !$fetcherUrl) continue; + + if(strpos($exportUrl, '?') !== false) + { + $data['exportParams'] = $parseGetUrl($exportUrl); + } + else + { + $data['exportParams'] = $parsePathInfoUrl($exportUrl); + } + + if(strpos($fetcherUrl, '?') !== false) + { + $data['fetcherParams'] = $parseGetUrl($fetcherUrl); + } + else + { + $data['fetcherParams'] = $parsePathInfoUrl($fetcherUrl); + } + + $data['$data'] = str_replace($exportMatch[1], '', $data['$data']); + $data['$data'] = str_replace($fetcherMatch[1], '', $data['$data']); + + $data = json_encode($data); + $this->dao->update(TABLE_OBJECT)->set('data')->eq($data)->where('id')->eq($id)->exec(); + } + } + + /** + * 处理升级新增的工作流数据源。 + * Process workflow datasource. + * + * @param array $codeList + * @access public + * @return void + */ + public function processWorkflowDatasource($codeList) + { + $datasources = $this->dao->select('id,code')->from(TABLE_WORKFLOWDATASOURCE)->where('code')->in(array_keys($codeList))->fetchAll(); + foreach($datasources as $datasource) + { + list($module, $field) = explode('_', $codeList[$datasource->code]); + $this->dao->update(TABLE_WORKFLOWFIELD)->set('options')->eq($datasource->id)->where('module')->eq($module)->andWhere('field')->eq($field)->exec(); + } + } + /** * 内置AI禅道智能体。 * Initialize the AI prompts. @@ -11417,4 +13025,39 @@ class upgradeModel extends model $this->dao->insert(TABLE_AI_PROMPTFIELD)->data($field, 'id')->exec(); } } + + /* + * 升级项目流程相关的权限。 + * Update the priv of workflow group. + * + * @access public + * @return bool + */ + public function updateWorkflowGroupPriv(): bool + { + $designFlowGroupIdList = $this->dao->select('`group`')->from(TABLE_GROUPPRIV) + ->where('module')->eq('workflowfield') + ->andWhere('method')->eq('browse') + ->fetchPairs(); + foreach($designFlowGroupIdList as $groupID) $this->dao->insert(TABLE_GROUPPRIV)->set('group')->eq($groupID)->set('module')->eq('workflowgroup')->set('method')->eq('designFlow')->exec(); + + $flowReportGroupIdList = $this->dao->select('`group`')->from(TABLE_GROUPPRIV) + ->where('module')->eq('workflowgroup') + ->andWhere('method')->eq('design') + ->fetchPairs(); + foreach($flowReportGroupIdList as $groupID) $this->dao->insert(TABLE_GROUPPRIV)->set('group')->eq($groupID)->set('module')->eq('workflowgroup')->set('method')->eq('report')->exec(); + + $setDelieverableGroupIdList = $this->dao->select('`group`')->from(TABLE_GROUPPRIV) + ->where('module')->eq('workflowgroup') + ->andWhere('method')->eq('deliverable') + ->fetchPairs(); + foreach($setDelieverableGroupIdList as $groupID) + { + $this->dao->insert(TABLE_GROUPPRIV)->set('group')->eq($groupID)->set('module')->eq('deliverable')->set('method')->eq('enable')->exec(); + $this->dao->insert(TABLE_GROUPPRIV)->set('group')->eq($groupID)->set('module')->eq('deliverable')->set('method')->eq('disable')->exec(); + } + $this->dao->delete()->from(TABLE_GROUPPRIV)->where('module')->eq('workflowgroup')->andWhere('method')->eq('deliverable')->exec(); + + return true; + } } diff --git a/module/upgrade/systemfiles.txt b/module/upgrade/systemfiles.txt index f20d9a2cae..5cab61a3ca 100644 --- a/module/upgrade/systemfiles.txt +++ b/module/upgrade/systemfiles.txt @@ -879,18 +879,6 @@ ,cm/view/edit.html.php, ,cm/view/report.html.php, ,cm/view/view.html.php, -,cmcl/control.php, -,cmcl/css/browse.css, -,cmcl/js/browse.js, -,cmcl/lang/en.php, -,cmcl/lang/zh-cn.php, -,cmcl/lang/zh-tw.php, -,cmcl/model.php, -,cmcl/view/batchcreate.html.php, -,cmcl/view/browse.html.php, -,cmcl/view/create.cmmi.html.hook.php, -,cmcl/view/edit.html.php, -,cmcl/view/view.html.php, ,common/ext/index.html, ,common/ext/lang/de/bizext.php, ,common/ext/lang/de/crystal.php, diff --git a/module/upgrade/tao.php b/module/upgrade/tao.php index 4d6dbb76d5..53e4faae0d 100644 --- a/module/upgrade/tao.php +++ b/module/upgrade/tao.php @@ -901,4 +901,303 @@ class upgradeTao extends upgradeModel return $duplicateList; } + + /** + * 获取工作流组列表 + * Get workflow group list for process. + * + * @return array + */ + protected function getWorkflowGroupForProcess() + { + return $this->dao->select('id,projectModel,projectType,main')->from(TABLE_WORKFLOWGROUP) + ->where('projectModel')->in('scrum,waterfall,agileplus,waterfallplus') + ->andWhere('deleted')->eq('0') + ->fetchAll('id'); + } + + /** + * 处理使用内置数据的流程。 + * Handle buildin workflow group. + * + * @param object $group 流程对象 + * @param int $groupID 流程ID + * @param array $classifyModule 分类模块数组 + * @return array + */ + protected function handleBuildinWorkflowGroup(object $group, int $groupID, array $classifyModule) + { + $this->dao->update(TABLE_PROCESS)->set('workflowGroup')->eq($groupID)->where('model')->eq($group->projectModel)->exec(); + + /* 更新活动的流程。 */ + $processList = $this->dao->select('id')->from(TABLE_PROCESS)->where('workflowGroup')->eq($groupID)->andWhere('deleted')->eq('0')->fetchPairs(); + $this->dao->update(TABLE_ACTIVITY)->set('workflowGroup')->eq($groupID)->where('process')->in(array_keys($processList))->exec(); + + $this->migrateOutputToDeliverable($group); + + $classifyModule[$groupID] = $this->migrateClassifyToModule($group, $groupID); + + return $classifyModule; + } + + /** + * 将过程分类从语言表迁移到模块表 + * Migrate process classify from language table to module table. + * + * @param object $group 流程对象 + * @param int $groupID 流程ID + * @return array + */ + protected function migrateClassifyToModule(object $group, int $groupID) + { + $this->app->loadLang('process'); + $classifyKey = $group->projectModel == 'waterfall' ? 'classify' : $group->projectModel . 'Classify'; + $classifyList = $this->dao->select('`key`,`value`')->from(TABLE_LANG)->where('module')->eq('process')->andWhere('section')->eq($classifyKey)->fetchPairs(); + if(empty($classifyList)) $classifyList = $this->lang->process->classifyList; + + $orderList = array('project' => 10, 'engineering' => 20, 'support' => 30); + + $classifyModule = array(); + $customOrder = 40; + foreach($classifyList as $key => $value) + { + $order = isset($orderList[$key]) ? $orderList[$key] : $customOrder; + $moduleID = $this->createProcessModule($groupID, $key, $value, $order); + $classifyModule[$key] = $moduleID; + if(!isset($orderList[$key])) $customOrder += 10; + } + + return $classifyModule; + } + + /** + * 创建过程模块。 + * Create process module. + * + * @param int $groupID 流程ID + * @param string $key 模块标识 + * @param string $name 模块名称 + * @param int $order 排序 + * @return int + */ + protected function createProcessModule(int $groupID, string $key, string $name, int $order) + { + $module = new stdclass(); + $module->root = $groupID; + $module->branch = '0'; + $module->name = $name; + $module->grade = '1'; + $module->order = $order; + $module->type = 'process'; + $module->extra = $key; + + $this->dao->insert(TABLE_MODULE)->data($module)->exec(); + $moduleID = $this->dao->lastInsertID(); + $this->dao->update(TABLE_MODULE)->set('path')->eq(",$moduleID,")->where('id')->eq($moduleID)->exec(); + + return $moduleID; + } + + /** + * 处理需要复制过程和活动的流程。 + * Handle need copy workflow group. + * + * @param object $group 流程对象 + * @param int $groupID 流程ID + * @param array $classifyModule 分类模块数组 + */ + protected function handleNeedCopyWorkflowGroup(object $group, int $groupID, array $classifyModule) + { + $projectIdList = $this->dao->select('id')->from(TABLE_PROJECT)->where('workflowGroup')->eq($group->id)->fetchPairs(); + $processList = $this->dao->select('*')->from(TABLE_PROCESS)->where('model')->eq($group->projectModel)->andWhere('deleted')->eq('0')->fetchAll('id'); + $activityGroup = $this->dao->select('*')->from(TABLE_ACTIVITY)->where('process')->in(array_keys($processList))->andWhere('deleted')->eq('0')->fetchGroup('process', 'id'); + $outputGroup = $this->dao->select('t1.*')->from(TABLE_ZOUTPUT) + ->alias('t1')->leftJoin(TABLE_ACTIVITY) + ->alias('t2')->on('t1.activity = t2.id') + ->where('t2.process')->in(array_keys($processList)) + ->andWhere('t1.deleted')->eq('0') + ->fetchGroup('activity', 'id'); + + foreach($processList as $process) + { + $this->copyProcessWithActivities($process, $groupID, $activityGroup, $outputGroup, $projectIdList); + } + + $classifyModule[$groupID] = $this->migrateClassifyToModule($group, $groupID); + + return $classifyModule; + } + + /** + * 复制过程及其活动。 + * Copy process and activities. + * + * @param object $process 过程对象 + * @param int $groupID 流程ID + * @param array $activityGroup 活动分组 + * @param array $outputGroup 文档分组 + * @param array $projectIdList 项目ID列表 + */ + protected function copyProcessWithActivities(object $process, int $groupID, array $activityGroup, array $outputGroup, array $projectIdList) + { + $activityList = zget($activityGroup, $process->id, array()); + unset($process->id); + $process->workflowGroup = $groupID; + $process->model = ''; + $process->editedBy = ''; + $process->editedDate = null; + $process->assignedDate = null; + $this->dao->insert(TABLE_PROCESS)->data($process)->exec(); + $processID = $this->dao->lastInsertID(); + + foreach($activityList as $activity) + { + $this->copyActivity($activity, $processID, $groupID, $outputGroup, $projectIdList); + } + } + + /** + * 复制活动。 + * Copy activity. + * + * @param object $activity 活动对象 + * @param int $processID 过程ID + * @param int $groupID 流程ID + * @param array $outputGroup 文档分组 + * @param array $projectIdList 项目ID列表 + */ + protected function copyActivity(object $activity, int $processID, int $groupID, array $outputGroup, array $projectIdList) + { + $outputList = zget($outputGroup, $activity->id, array()); + + $oldActivityID = $activity->id; + unset($activity->id); + + $activity->process = $processID; + $activity->optional = !empty($activity->optional) ? $activity->optional : 'no'; + $activity->workflowGroup = $groupID; + $activity->editedBy = ''; + $activity->editedDate = null; + $activity->assignedDate = null; + $this->dao->insert(TABLE_ACTIVITY)->data($activity)->exec(); + + $newActivityID = $this->dao->lastInsertID(); + + $this->dao->update(TABLE_AUDITPLAN)->set('objectID')->eq($newActivityID)->where('objectID')->eq($oldActivityID)->andWhere('objectType')->eq('activity')->andWhere('project')->in($projectIdList)->exec(); + $this->dao->update(TABLE_AUDITCL)->set('objectID')->eq($newActivityID)->where('objectID')->eq($oldActivityID)->andWhere('workflowGroup')->eq($groupID)->andWhere('objectType')->eq('activity')->exec(); + $this->dao->update(TABLE_PROGRAMACTIVITY)->set('activity')->eq($newActivityID)->where('activity')->eq($oldActivityID)->andWhere('project')->in($projectIdList)->exec(); + + $idMap = array(); + foreach($outputList as $output) + { + $oldID = $output->id; + unset($output->id); + $output->activity = $newActivityID; + $output->editedBy = ''; + $output->editedDate = null; + $this->dao->insert(TABLE_ZOUTPUT)->data($output)->exec(); + $newOutputID = $this->dao->lastInsertID(); + + $idMap[$oldID] = $newOutputID; + } + + foreach($idMap as $oldID => $newOutputID) + { + $this->dao->update(TABLE_AUDITCL)->set('objectID')->eq($newOutputID)->where('objectID')->eq($oldID)->andWhere('workflowGroup')->eq($groupID)->andWhere('objectType')->eq('zoutput')->exec(); + $this->dao->update(TABLE_AUDITPLAN)->set('objectID')->eq($newOutputID)->where('objectID')->eq($oldID)->andWhere('objectType')->eq('zoutput')->andWhere('project')->in($projectIdList)->exec(); + } + } + + /** + * 将过程文档迁移到交付物。 + * Migrate process output to deliverable. + * + * @param object $group + * @return void + */ + public function migrateOutputToDeliverable(object $group): void + { + $outputList = $this->dao->select('t1.*')->from(TABLE_ZOUTPUT) + ->alias('t1')->leftJoin(TABLE_ACTIVITY) + ->alias('t2')->on('t1.activity = t2.id') + ->where('t2.workflowGroup')->eq($group->id) + ->andWhere('t1.deleted')->eq('0') + ->fetchAll('id'); + + if(empty($outputList)) return; + + $otherModule = $this->dao->select('id')->from(TABLE_MODULE)->where('root')->eq($group->id)->andWhere('type')->eq('deliverable')->andWhere('deleted')->eq('0')->andWhere('extra')->eq('other')->fetch('id'); + + $deliverable = new stdclass(); + $deliverable->template = '[]'; + $deliverable->status = 'hidden'; + $deliverable->workflowGroup = $group->id; + $deliverable->module = $otherModule; + $deliverable->builtin = 1; + $deliverable->deleted = '1'; + + $idMap = array(); + foreach($outputList as $output) + { + $deliverable->name = $output->name; + $deliverable->activity = $output->activity; + $deliverable->trimmable = $output->optional == 'yes' ? '1' : '0'; + + $this->dao->insert(TABLE_DELIVERABLE)->data($deliverable)->exec(); + $deliverableID = $this->dao->lastInsertID(); + + $idMap[$output->id] = $deliverableID; + } + + $projectIdList = $this->dao->select('id')->from(TABLE_PROJECT)->where('workflowGroup')->eq($group->id)->fetchPairs(); + + $projectOutputList = $this->dao->select('id,output')->from(TABLE_PROGRAMOUTPUT)->where('project')->in($projectIdList)->andWhere('output')->in(array_keys($idMap))->fetchPairs(); + foreach($projectOutputList as $id => $outputID) + { + $newID = $idMap[$outputID]; + $this->dao->update(TABLE_PROGRAMOUTPUT)->set('output')->eq($newID)->where('id')->eq($id)->exec(); + } + + $auditplans = $this->dao->select('id,objectID')->from(TABLE_AUDITPLAN) + ->where('objectType')->eq('zoutput') + ->andWhere('objectID')->in(array_keys($idMap)) + ->andWhere('project')->in($projectIdList) + ->fetchPairs(); + + foreach($auditplans as $id => $objectID) + { + $newID = $idMap[$objectID]; + $this->dao->update(TABLE_AUDITPLAN)->set('objectID')->eq($newID)->where('id')->eq($id)->exec(); + } + + $auditcls = $this->dao->select('id, objectID')->from(TABLE_AUDITCL) + ->where('objectType')->eq('zoutput') + ->andWhere('workflowGroup')->eq($group->id) + ->andWhere('objectID')->in(array_keys($outputList)) + ->andWhere('deleted')->eq('0') + ->fetchPairs(); + + foreach($auditcls as $id => $objectID) + { + $newID = $idMap[$objectID]; + $this->dao->update(TABLE_AUDITCL)->set('objectID')->eq($newID)->where('id')->eq($id)->exec(); + } + } + + /** + * 更新过程的模块分类。 + * Update process modules. + * + * @param array $classifyModule + */ + protected function updateProcessModules(array $classifyModule) + { + foreach($classifyModule as $groupID => $modules) + { + foreach($modules as $key => $moduleID) + { + $this->dao->update(TABLE_PROCESS)->set('module')->eq($moduleID)->where('workflowGroup')->eq($groupID)->andWhere('type')->eq($key)->exec(); + } + } + } } diff --git a/module/upgrade/zen.php b/module/upgrade/zen.php index 025dfaf4cb..da12694cab 100644 --- a/module/upgrade/zen.php +++ b/module/upgrade/zen.php @@ -95,8 +95,6 @@ class upgradeZen extends upgrade { $this->loadModel('setting')->setItem('system.common.global.mode', 'PLM'); $this->setting->setItem('system.custom.URAndSR', '1'); - $this->setting->setItem('system.common.closedFeatures', ''); - $this->setting->setItem('system.common.disabledFeatures', ''); $this->upgrade->addORPriv($openVersion); } diff --git a/module/user/model.php b/module/user/model.php index 6098baf364..d42c6e6425 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1322,10 +1322,10 @@ 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); } + if(in_array($this->config->edition, array('max', 'ipd'))) $projects = $this->project->countDeliverable($projects, 'project'); + return $projects; } diff --git a/module/user/test/lib/user.unittest.class.php b/module/user/test/lib/user.unittest.class.php index 161da17881..764bf21e50 100755 --- a/module/user/test/lib/user.unittest.class.php +++ b/module/user/test/lib/user.unittest.class.php @@ -1340,7 +1340,7 @@ class userTest $reflection = new ReflectionClass($this->objectModel); $method = $reflection->getMethod('getProgramStakeholder'); $method->setAccessible(true); - + $result = $method->invoke($this->objectModel, $programProduct); if(dao::isError()) return dao::getError(); diff --git a/module/user/test/model/checkprogrampriv.php b/module/user/test/model/checkprogrampriv.php index ec16b8c071..ea0ff17fa5 100755 --- a/module/user/test/model/checkprogrampriv.php +++ b/module/user/test/model/checkprogrampriv.php @@ -43,7 +43,7 @@ $projectModel = $tester->loadModel('project'); // 获取测试项目集 $openProgram = $projectModel->getByID(1); // 开放项目集 (acl: open, PM: admin, openedBy: admin) $privateProgram = $projectModel->getByID(4); // 私有项目集 (acl: private, PM: admin, openedBy: user1) -$pmProgram = $projectModel->getByID(5); // PM项目集 (acl: private, PM: testpm, openedBy: user2) +$pmProgram = $projectModel->getByID(5); // PM项目集 (acl: private, PM: testpm, openedBy: user2) $creatorProgram = $projectModel->getByID(6); // 创建者项目集 (acl: private, PM: testcreator, openedBy: testcreator) $childProgram = $projectModel->getByID(9); // 子级项目集 (parent: 1) diff --git a/module/user/test/model/getobjectsauthedusers.php b/module/user/test/model/getobjectsauthedusers.php index f1f222de5d..b96307b5f9 100755 --- a/module/user/test/model/getobjectsauthedusers.php +++ b/module/user/test/model/getobjectsauthedusers.php @@ -13,7 +13,7 @@ cid=19620 - 执行userTest模块的getObjectsAuthedUsersTest方法，参数是array 属性admin @admin - 执行userTest模块的getObjectsAuthedUsersTest方法，参数是array @0 - 执行userTest模块的getObjectsAuthedUsersTest方法，参数是array @0 -- 执行userTest模块的getObjectsAuthedUsersTest方法，参数是array +- 执行userTest模块的getObjectsAuthedUsersTest方法，参数是array - 属性admin @admin - 属性user4 @user4 diff --git a/module/user/test/model/getprogramstakeholder.php b/module/user/test/model/getprogramstakeholder.php index 63d549afe4..f7aa2d5c4e 100755 --- a/module/user/test/model/getprogramstakeholder.php +++ b/module/user/test/model/getprogramstakeholder.php @@ -42,7 +42,7 @@ $userTest = new userTest(); // 5. 测试步骤（必须包含至少5个） r($userTest->getProgramStakeholderTest(array(1 => array(1, 2), 2 => array(3)))) && p('1:admin') && e('admin'); // 步骤1：正常情况，检查产品1有admin -r($userTest->getProgramStakeholderTest(array())) && p() && e(0); // 步骤2：空数组 +r($userTest->getProgramStakeholderTest(array())) && p() && e(0); // 步骤2：空数组 r($userTest->getProgramStakeholderTest(array(999 => array()))) && p() && e(0); // 步骤3：不存在项目ID r($userTest->getProgramStakeholderTest(array(5 => array(5)))) && p('5:pm4') && e('pm4'); // 步骤4：仅项目经理 r($userTest->getProgramStakeholderTest(array(1 => array(1, 2)))) && p('1:admin;2:admin') && e('admin;admin'); // 步骤5：单项目多产品 \ No newline at end of file diff --git a/module/user/test/model/getuseracls.php b/module/user/test/model/getuseracls.php index b5cc3d177d..ff4695c112 100755 --- a/module/user/test/model/getuseracls.php +++ b/module/user/test/model/getuseracls.php @@ -26,7 +26,7 @@ su('admin'); $userTest = new userTest(); r(is_array($userTest->getUserAclsTest('guest'))) && p() && e('1'); // 步骤1：测试guest用户权限获取 -r(is_array($userTest->getUserAclsTest('admin'))) && p() && e('1'); // 步骤2：测试admin用户权限获取 +r(is_array($userTest->getUserAclsTest('admin'))) && p() && e('1'); // 步骤2：测试admin用户权限获取 r(is_array($userTest->getUserAclsTest('dev1'))) && p() && e('1'); // 步骤3：测试有权限组用户的权限获取 r(is_array($userTest->getUserAclsTest('nonexistent'))) && p() && e('1'); // 步骤4：测试不存在用户的权限获取 r(array_key_exists('programs', $userTest->getUserAclsTest('admin'))) && p() && e('1'); // 步骤5：测试返回结构包含programs字段 \ No newline at end of file diff --git a/module/user/test/model/islogon.php b/module/user/test/model/islogon.php index d6b09f1a6d..ab6ac39670 100755 --- a/module/user/test/model/islogon.php +++ b/module/user/test/model/islogon.php @@ -32,6 +32,9 @@ r($userTest->isLogonTest()) && p() && e(1); // 步骤2：正常登录用户user1 $_SESSION['user'] = (object)array('account' => 'guest'); r($userTest->isLogonTest()) && p() && e(0); // 步骤3：guest用户的登录状态检查 +$_SESSION['user'] = $userTest->getbyIdTest('test999'); +r($userTest->isLogonTest()) && p() && e(0); // session 中用户为 test999 时获取用户的登录状态。 + $_SESSION['user'] = false; r($userTest->isLogonTest()) && p() && e(0); // 步骤4：session中用户为false时的状态检查 @@ -42,4 +45,4 @@ $_SESSION['user'] = (object)array('account' => null); r($userTest->isLogonTest()) && p() && e(0); // 步骤6：用户对象存在但account为null的状态检查 unset($_SESSION['user']); -r($userTest->isLogonTest()) && p() && e(0); // 步骤7：session中完全没有user时的状态检查 \ No newline at end of file +r($userTest->isLogonTest()) && p() && e(0); // 步骤7：session中完全没有user时的状态检查 diff --git a/module/user/test/model/su.php b/module/user/test/model/su.php index e36510172a..2a9f6eb01b 100755 --- a/module/user/test/model/su.php +++ b/module/user/test/model/su.php @@ -58,4 +58,4 @@ catch(EndResponseException $e) $error = new stdClass(); $error->message = $e->getContent(); } -r($error) && p('message') && e('No admin users.'); \ No newline at end of file +r($error) && p('message') && e('No admin users.'); diff --git a/module/user/test/model/unbind.php b/module/user/test/model/unbind.php index 21d17ca495..57914af98b 100755 --- a/module/user/test/model/unbind.php +++ b/module/user/test/model/unbind.php @@ -39,4 +39,4 @@ r($userTest->unbindTest('user1')) && p('') && e('success'); // 步骤1：解绑 r($userTest->unbindTest('test999')) && p('') && e('success'); // 步骤2：解绑不存在的用户账号 r($userTest->unbindTest('user4')) && p('') && e('success'); // 步骤3：解绑已经为空的然之账号 r($userTest->unbindTest('')) && p('') && e('success'); // 步骤4：解绑空字符串账号参数 -r($userTest->unbindTest('user@#$%')) && p('') && e('success'); // 步骤5：解绑包含特殊字符的账号 \ No newline at end of file +r($userTest->unbindTest('user@#$%')) && p('') && e('success'); // 步骤5：解绑包含特殊字符的账号 diff --git a/module/user/test/model/uploadavatar.php b/module/user/test/model/uploadavatar.php index bfd82f8384..e7d9a2fcc9 100755 --- a/module/user/test/model/uploadavatar.php +++ b/module/user/test/model/uploadavatar.php @@ -31,6 +31,6 @@ $userTest = new userTest(); // 5. 🔴 强制要求：必须包含至少5个测试步骤 r($userTest->uploadAvatarTest()) && p('result') && e('fail'); // 步骤1：正常情况下无文件上传 r($userTest->uploadAvatarTest()) && p('result') && e('fail'); // 步骤2：模拟上传成功但无文件 -r($userTest->uploadAvatarTest()) && p('result') && e('fail'); // 步骤3：模拟获取文件信息失败 +r($userTest->uploadAvatarTest()) && p('result') && e('fail'); // 步骤3：模拟获取文件信息失败 r($userTest->uploadAvatarTest()) && p('result') && e('fail'); // 步骤4：模拟文件扩展名验证逻辑 r($userTest->uploadAvatarTest()) && p('result') && e('fail'); // 步骤5：测试方法返回数组结构 \ No newline at end of file diff --git a/module/user/test/model/yaml/project_getprojectview.yaml b/module/user/test/model/yaml/project_getprojectview.yaml index 62d260240f..4bbc61203f 100644 --- a/module/user/test/model/yaml/project_getprojectview.yaml +++ b/module/user/test/model/yaml/project_getprojectview.yaml @@ -6,39 +6,39 @@ fields: - field: id note: 项目ID range: 1-10 - + - field: name note: 项目名称 range: '项目{3}, 禅道项目{3}, 敏捷项目{2}, 瀑布项目{2}' - + - field: type note: 项目类型 range: 'project{5}, sprint{3}, kanban{2}' - + - field: acl note: 权限控制 range: 'open{4}, private{3}, program{3}' - + - field: status note: 项目状态 range: 'wait{2}, doing{5}, suspended{2}, closed{1}' - + - field: openedBy note: 创建者 range: 'admin{3}, user1{2}, user2{2}, manager{3}' - + - field: PM note: 项目经理 range: 'manager{5}, user1{2}, user2{3}' - + - field: begin note: 开始日期 range: '2024-01-01{3}, 2024-02-01{3}, 2024-03-01{4}' - + - field: end note: 结束日期 range: '2024-12-31{3}, 2024-06-30{3}, 2024-09-30{4}' - + - field: deleted note: 是否删除 range: '0{9}, 1{1}' \ No newline at end of file diff --git a/module/user/test/model/yaml/usertpl_saveoldusertemplate.yaml b/module/user/test/model/yaml/usertpl_saveoldusertemplate.yaml index 02f30ccc83..dbc35898bb 100644 --- a/module/user/test/model/yaml/usertpl_saveoldusertemplate.yaml +++ b/module/user/test/model/yaml/usertpl_saveoldusertemplate.yaml @@ -13,7 +13,7 @@ fields: - field: account note: 用户账号 range: admin{3}, user1{2}, user2{2}, user3{3} -- field: type +- field: type note: 模板类型 range: bug{5}, story{3}, task{2} - field: title diff --git a/module/user/zen.php b/module/user/zen.php index 715ff53d50..f141f01086 100644 --- a/module/user/zen.php +++ b/module/user/zen.php @@ -104,8 +104,8 @@ class userZen extends user if(common::hasPriv($moduleName, 'testcase')) $featureBarMenus['testcase'] = array('active' => false, 'url' => $this->createLink($moduleName, 'testcase', $params), 'text' => $this->lang->user->testCase); if(common::hasPriv($moduleName, 'execution') && in_array($this->config->systemMode, array('ALM', 'PLM'))) $featureBarMenus['execution'] = array('active' => false, 'url' => $this->createLink($moduleName, 'execution', $params), 'text' => $this->lang->user->execution); - if(common::hasPriv($moduleName, 'issue') && in_array($this->config->edition, array('max', 'ipd'))) $featureBarMenus['issue'] = array('active' => false, 'url' => $this->createLink($moduleName, 'issue', $params), 'text' => $this->lang->user->issue); - if(common::hasPriv($moduleName, 'risk') && in_array($this->config->edition, array('max', 'ipd'))) $featureBarMenus['risk'] = array('active' => false, 'url' => $this->createLink($moduleName, 'risk', $params), 'text' => $this->lang->user->risk); + if(common::hasPriv($moduleName, 'issue') && in_array($this->config->edition, array('max', 'ipd')) && helper::hasFeature('issue')) $featureBarMenus['issue'] = array('active' => false, 'url' => $this->createLink($moduleName, 'issue', $params), 'text' => $this->lang->user->issue); + if(common::hasPriv($moduleName, 'risk') && in_array($this->config->edition, array('max', 'ipd')) && helper::hasFeature('risk')) $featureBarMenus['risk'] = array('active' => false, 'url' => $this->createLink($moduleName, 'risk', $params), 'text' => $this->lang->user->risk); if(common::hasPriv($moduleName, 'dynamic')) $featureBarMenus['dynamic'] = array('active' => false, 'url' => $this->createLink($moduleName, 'dynamic', "$params&type=today"), 'text' => $this->lang->user->dynamic); if(common::hasPriv($moduleName, 'profile')) $featureBarMenus['profile'] = array('active' => false, 'url' => $this->createLink($moduleName, 'profile', $params), 'text' => $this->lang->user->profile); diff --git a/module/webhook/test/lib/webhook.unittest.class.php b/module/webhook/test/lib/webhook.unittest.class.php index 1c41ee2ab7..05a4176756 100644 --- a/module/webhook/test/lib/webhook.unittest.class.php +++ b/module/webhook/test/lib/webhook.unittest.class.php @@ -608,7 +608,7 @@ class webhookTest $reflection = new ReflectionClass($this->objectTao); $method = $reflection->getMethod('getDingdingSecret'); $method->setAccessible(true); - + $result = $method->invoke($this->objectTao, $webhook); if(dao::isError()) return dao::getError(); @@ -627,7 +627,7 @@ class webhookTest $reflection = new ReflectionClass($this->objectTao); $method = $reflection->getMethod('getWeixinSecret'); $method->setAccessible(true); - + $result = $method->invoke($this->objectTao, $webhook); if(dao::isError()) return dao::getError(); @@ -646,7 +646,7 @@ class webhookTest $reflection = new ReflectionClass($this->objectTao); $method = $reflection->getMethod('getFeishuSecret'); $method->setAccessible(true); - + $result = $method->invoke($this->objectTao, $webhook); if(dao::isError()) return dao::getError(); @@ -668,7 +668,7 @@ class webhookTest $reflection = new ReflectionClass($this->objectTao); $method = $reflection->getMethod('getActionText'); $method->setAccessible(true); - + $result = $method->invoke($this->objectTao, $data, $action, $object, $users); if(dao::isError()) return dao::getError(); diff --git a/module/webhook/test/model/bind.php b/module/webhook/test/model/bind.php index 57bd0dfb41..6a938934cb 100755 --- a/module/webhook/test/model/bind.php +++ b/module/webhook/test/model/bind.php @@ -1,6 +1,8 @@ #!/usr/bin/env php gen(0); + /** title=测试 webhookModel::bind(); @@ -44,4 +46,4 @@ r($webhookTest->bindTest(1, $duplicateUserList)) && p() && e('1'); // 步骤5：测试不存在的webhookID绑定 $validUserList2 = array('admin' => 'openid_admin_888'); -r($webhookTest->bindTest(999, $validUserList2)) && p() && e('1'); \ No newline at end of file +r($webhookTest->bindTest(999, $validUserList2)) && p() && e('1'); diff --git a/module/webhook/test/model/builddata.php b/module/webhook/test/model/builddata.php index cc885da343..202c012c07 100755 --- a/module/webhook/test/model/builddata.php +++ b/module/webhook/test/model/builddata.php @@ -38,4 +38,4 @@ r(true) && p() && e(true); // 步骤1：正常参数测试 r(true) && p() && e(true); // 步骤2：空objectType参数 r(true) && p() && e(true); // 步骤3：不存在的actionType（有数据） r(true) && p() && e(true); // 步骤4：不存在的actionID -r(true) && p() && e(true); // 步骤5：无匹配数据 \ No newline at end of file +r(true) && p() && e(true); // 步骤5：无匹配数据 diff --git a/module/webhook/test/model/getbindaccount.php b/module/webhook/test/model/getbindaccount.php index 98aef870c8..a183911929 100755 --- a/module/webhook/test/model/getbindaccount.php +++ b/module/webhook/test/model/getbindaccount.php @@ -38,4 +38,4 @@ r($webhookTest->getBindAccountTest(1, 'webhook', 'openid1')) && p() && e('admin' r($webhookTest->getBindAccountTest(999, 'webhook', 'openid1')) && p() && e('0'); // 步骤2：查询不存在的webhookID r($webhookTest->getBindAccountTest(1, 'nonexist', 'openid1')) && p() && e('0'); // 步骤3：查询不存在的webhookType r($webhookTest->getBindAccountTest(1, 'webhook', 'nonexist')) && p() && e('0'); // 步骤4：查询不存在的openID -r($webhookTest->getBindAccountTest(0, '', '')) && p() && e('0'); // 步骤5：查询空参数情况 \ No newline at end of file +r($webhookTest->getBindAccountTest(0, '', '')) && p() && e('0'); // 步骤5：查询空参数情况 diff --git a/module/webhook/test/model/savelog.php b/module/webhook/test/model/savelog.php index 28c1c6dc42..2b6cb2b6a1 100755 --- a/module/webhook/test/model/savelog.php +++ b/module/webhook/test/model/savelog.php @@ -65,4 +65,4 @@ r($saveResult) && p() && e('1'); r($webhookTest->saveLogTest($webhook2, 999, 'action test data', 'action test result')) && p('action,objectID') && e('999,2'); -r($webhookTest->saveLogTest($webhook3, 106, 'special chars: 中文', 'result with special chars')) && p('data,contentType') && e('special chars: 中文,application/xml'); \ No newline at end of file +r($webhookTest->saveLogTest($webhook3, 106, 'special chars: 中文', 'result with special chars')) && p('data,contentType') && e('special chars: 中文,application/xml'); diff --git a/module/weekly/test/model/save.php b/module/weekly/test/model/save.php index c8883405c7..7db0153601 100755 --- a/module/weekly/test/model/save.php +++ b/module/weekly/test/model/save.php @@ -7,19 +7,19 @@ title=测试 weeklyModel::save(); timeout=0 cid=19739 -- 执行weeklyTest模块的saveTest方法，参数是1, '2023-10-15' +- 执行weeklyTest模块的saveTest方法，参数是1, '2023-10-15' - 属性project @1 - 属性weekStart @2023-10-09 -- 执行weeklyTest模块的saveTest方法，参数是0, '2023-10-15' +- 执行weeklyTest模块的saveTest方法，参数是0, '2023-10-15' - 属性project @0 - 属性weekStart @2023-10-09 -- 执行weeklyTest模块的saveTest方法，参数是2, '2023-10-15' +- 执行weeklyTest模块的saveTest方法，参数是2, '2023-10-15' - 属性project @2 - 属性weekStart @2023-10-09 -- 执行weeklyTest模块的saveTest方法，参数是3, '2023-10-15' +- 执行weeklyTest模块的saveTest方法，参数是3, '2023-10-15' - 属性project @3 - 属性weekStart @2023-10-09 -- 执行weeklyTest模块的saveTest方法，参数是5, '2023-10-15' +- 执行weeklyTest模块的saveTest方法，参数是5, '2023-10-15' - 属性project @5 - 属性weekStart @2023-10-09 diff --git a/module/weekly/test/model/yaml/project_save.yaml b/module/weekly/test/model/yaml/project_save.yaml index 6ede924970..e42317b116 100644 --- a/module/weekly/test/model/yaml/project_save.yaml +++ b/module/weekly/test/model/yaml/project_save.yaml @@ -11,7 +11,7 @@ fields: range: project{1-10} - field: begin range: 2023-09-01{5},2023-10-01{5} -- field: end +- field: end range: 2023-12-31{5},2024-01-31{5} - field: realBegan range: 2023-09-01{5},2023-10-01{5} diff --git a/module/zahost/test/lib/zahost.unittest.class.php b/module/zahost/test/lib/zahost.unittest.class.php index 3c4cec3c73..e66b08c994 100755 --- a/module/zahost/test/lib/zahost.unittest.class.php +++ b/module/zahost/test/lib/zahost.unittest.class.php @@ -227,7 +227,7 @@ class zahostTest { $image = $this->objectModel->getImageByID($imageID); if(!$image) return false; - + $image->address = "https://pkg.qucheng.com/zenagent/image/{$image->name}.qcow2"; $result = $this->objectModel->downloadImage($image); diff --git a/module/zanode/test/lib/zanode.unittest.class.php b/module/zanode/test/lib/zanode.unittest.class.php index f451f42176..e48ceceaae 100755 --- a/module/zanode/test/lib/zanode.unittest.class.php +++ b/module/zanode/test/lib/zanode.unittest.class.php @@ -442,7 +442,7 @@ class zanodeTest if(!$oldNode) return '0'; $result = $this->destroy($id); - + if($result === '') return 'success'; return $result ? $result : '0'; } @@ -463,14 +463,14 @@ class zanodeTest ->leftJoin(TABLE_IMAGE)->alias('t3')->on('t3.id = t1.image') ->where('t1.id')->eq($nodeID) ->fetch(); - + if(empty($node)) return false; - + // 调用protected方法processNodeStatus $reflection = new ReflectionClass($this->objectModel); $method = $reflection->getMethod('processNodeStatus'); $method->setAccessible(true); - + return $method->invoke($this->objectModel, $node); } @@ -540,15 +540,15 @@ class zanodeTest // 检查必要参数是否存在 if(!isset($data->image) || !isset($data->parent)) return false; if($data->image === null || $data->parent === null) return false; - + // 检查镜像是否存在 $image = $this->getImageByID($data->image); if(!$image) return false; - + // 检查宿主机是否存在 $host = $this->getHostByID($data->parent); if(!$host) return false; - + $result = $this->linkAgentService($data); if(dao::isError()) return dao::getError(); @@ -638,7 +638,7 @@ class zanodeTest $reflection = new ReflectionClass($this->objectTao); $method = $reflection->getMethod('getSubZahostListByID'); $method->setAccessible(true); - + $result = $method->invoke($this->objectTao, $hostID, $orderBy); if(dao::isError()) return dao::getError(); @@ -674,7 +674,7 @@ class zanodeTest $reflection = new ReflectionClass($this->objectTao); $method = $reflection->getMethod('getZaNodeListByQuery'); $method->setAccessible(true); - + $result = $method->invoke($this->objectTao, $query, $orderBy, $pager); if(dao::isError()) return dao::getError(); @@ -716,7 +716,7 @@ class zanodeTest $reflection = new ReflectionClass($this->objectTao); $method = $reflection->getMethod('getHostsByIDList'); $method->setAccessible(true); - + $result = $method->invoke($this->objectTao, $hostIDList); if(dao::isError()) return dao::getError(); diff --git a/module/zanode/test/model/setmenu.php b/module/zanode/test/model/setmenu.php index 66601d7580..7b83ca1235 100755 --- a/module/zanode/test/model/setmenu.php +++ b/module/zanode/test/model/setmenu.php @@ -7,11 +7,11 @@ title=测试 zanodeModel::setMenu(); timeout=0 cid=19845 -- 执行zanodeTest模块的setMenuTest方法，参数是true +- 执行zanodeTest模块的setMenuTest方法，参数是true - 属性beforeCall @1 - 属性afterCall @1 - 属性createHost @1 -- 执行zanodeTest模块的setMenuTest方法，参数是false +- 执行zanodeTest模块的setMenuTest方法，参数是false - 属性beforeCall @1 - 属性afterCall @0 - 属性createHost @0 diff --git a/test/data/approvalflow.yaml b/test/data/approvalflow.yaml index b99c1cf235..7764f9d62f 100644 --- a/test/data/approvalflow.yaml +++ b/test/data/approvalflow.yaml @@ -18,5 +18,3 @@ fields: range: "(M)-(w)" type: timestamp format: "YY/MM/DD" - - field: type - range: 'project' diff --git a/test/data/approvalflowspec.yaml b/test/data/approvalflowspec.yaml index 4c22449e66..dbf091d046 100644 --- a/test/data/approvalflowspec.yaml +++ b/test/data/approvalflowspec.yaml @@ -1,4 +1,4 @@ -title: table zt_approvalflow +title: table zt_approvalflowspec desc: "" author: sun guangming version: "1.0" @@ -10,9 +10,8 @@ fields: - field: version range: 1 - field: nodes - range: `[{"type":"start","ccs":[]},{"id":"3ewcj92p55e","type":"approval","title":"审批","reviewType":"manual","multiple":"and","agentType":"pass","reviewers":[{"type":"select"}],"ccs":[]},{"type":"end","ccs":[]}]` - - field: code - range: 'simple' + range: '' + prefix: '[{"type":"start","ccs":[]},{"id":"3ewcj92p55e","type":"approval","title":"审批","reviewType":"manual","multiple":"and","percent":"50","commentType":"required","agentType":"pass","selfType":"selfReview","deletedType":"setAdmin","reviewers":[{"type":"select","users":[],"roles":[""],"depts":[""],"positions":[""],"userRange":"all","required":"yes"}],"ccs":[{"type":"select","users":[],"roles":[""],"depts":[""],"positions":[""],"userRange":"all"}]},{"id":"pxodxd2rq9","type":"approval","title":"审批","reviewType":"manual","multiple":"and","percent":"50","commentType":"noRequired","agentType":"pass","selfType":"selfReview","deletedType":"setAdmin","reviewers":[{"type":"setByPrev"}],"ccs":[{"type":"select","users":[],"roles":[""],"depts":[""],"positions":[""],"userRange":"all"}]},{"type":"end","ccs":[]}]' - field: createdBy range: 'admin' - field: createdDate diff --git a/test/data/auditcl.yaml b/test/data/auditcl.yaml index 33477f38a2..f646bdaee0 100644 --- a/test/data/auditcl.yaml +++ b/test/data/auditcl.yaml @@ -45,13 +45,6 @@ fields: postfix: "" loop: 0 format: "" - - field: parent - note: "父流程ID" - range: 0 - prefix: "" - postfix: "" - loop: 0 - format: "" - field: assignedTo note: "指派给" from: common.user.v1.yaml @@ -67,13 +60,6 @@ fields: postfix: "" loop: 0 format: "" - - field: subStatus - note: "子状态" - range: 0 - prefix: "" - postfix: "" - loop: 0 - format: "" - field: createdBy note: "由谁创建" from: common.user.v1.yaml @@ -84,12 +70,9 @@ fields: format: "" - field: createdDate note: "创建日期" - from: common.date.v1.yaml - use: dateA - prefix: "" - postfix: "" - loop: 0 - format: "" + range: "(M)-(w)" + type: timestamp + format: "YY/MM/DD" - field: editedBy note: "由谁编辑" from: common.user.v1.yaml @@ -100,12 +83,9 @@ fields: format: "" - field: editedDate note: "编辑日期" - from: common.date.v1.yaml - use: dateA - prefix: "" - postfix: "" - loop: 0 - format: "" + range: "(M)-(w)" + type: timestamp + format: "YY/MM/DD" - field: assignedBy note: "由谁指派" from: common.user.v1.yaml @@ -116,12 +96,9 @@ fields: format: "" - field: assignedDate note: "指派日期" - from: common.date.v1.yaml - use: dateA - prefix: "" - postfix: "" - loop: 0 - format: "" + range: "(M)-(w)" + type: timestamp + format: "YY/MM/DD" - field: deleted note: "是否删除" range: 0 diff --git a/test/data/deliverable.yaml b/test/data/deliverable.yaml index ee40d120cc..2c72f0fcb1 100644 --- a/test/data/deliverable.yaml +++ b/test/data/deliverable.yaml @@ -13,22 +13,22 @@ fields: - field: name2 range: 1-1000 - field: module - range: project,execution - - field: method - range: create,close - - field: model + range: 1-100 + - field: workflowGroup + range: 1-100 + - field: status + range: enabled,disabled + - field: activity + range: 1-100 + - field: trimmable + range: 0,1 + - field: trimRule 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: name1 + range: '裁剪准则' + - field: name2 + range: 1-100 - field: desc - range: '交付物描述' \ No newline at end of file + range: '交付物描述' + - field: template + prefix: "[]" diff --git a/test/data/nc.yaml b/test/data/nc.yaml index 7b13f4ee46..b14a584cc7 100644 --- a/test/data/nc.yaml +++ b/test/data/nc.yaml @@ -4,18 +4,11 @@ author: automated export version: "1.0" fields: - field: id - note: "" + note: "ID" + range: 1-10000 prefix: "" postfix: "" loop: 0 - loopfix: "" - format: "" - - field: program - note: "" - prefix: "" - postfix: "" - loop: 0 - loopfix: "" format: "" - field: auditplan note: "" @@ -67,12 +60,10 @@ fields: loopfix: "" format: "" - field: deadline - note: "" - prefix: "" - postfix: "" - loop: 0 - loopfix: "" - format: "" + note: "截至日期" + range: "(M)-(w)" + type: timestamp + format: "YY-MM-DD" - field: resolvedBy note: "" prefix: "" @@ -88,12 +79,10 @@ fields: loopfix: "" format: "" - field: resolvedDate - note: "" - prefix: "" - postfix: "" - loop: 0 - loopfix: "" - format: "" + note: "解决日期" + range: "(M)-(w)" + type: timestamp + format: "YY-MM-DD" - field: closedBy note: "" prefix: "" @@ -102,12 +91,10 @@ fields: loopfix: "" format: "" - field: closedDate - note: "" - prefix: "" - postfix: "" - loop: 0 - loopfix: "" - format: "" + note: "关闭日期" + range: "(M)-(w)" + type: timestamp + format: "YY-MM-DD" - field: parent note: "" prefix: "" @@ -130,12 +117,10 @@ fields: loopfix: "" format: "" - field: createdDate - note: "" - prefix: "" - postfix: "" - loop: 0 - loopfix: "" - format: "" + note: "创建日期" + range: "(M)-(w)" + type: timestamp + format: "YY-MM-DD" - field: editedBy note: "" prefix: "" @@ -144,12 +129,10 @@ fields: loopfix: "" format: "" - field: editedDate - note: "" - prefix: "" - postfix: "" - loop: 0 - loopfix: "" - format: "" + note: "编辑日期" + range: "(M)-(w)" + type: timestamp + format: "YY-MM-DD" - field: deleted note: "" prefix: "" diff --git a/test/data/object.yaml b/test/data/object.yaml index c441d71be6..8891b78b6a 100644 --- a/test/data/object.yaml +++ b/test/data/object.yaml @@ -59,13 +59,6 @@ fields: postfix: "" loop: 0 format: "" - - field: range - note: "范围" - range: all - prefix: "" - postfix: "" - loop: 0 - format: "" - field: data note: "数据" range: 1-10000 @@ -73,18 +66,6 @@ fields: postfix: "" loop: 0 format: "" - - field: storyEst - range: "" - - field: taskEst - range: "" - - field: requestEst - range: "" - - field: testEst - range: "" - - field: devEst - range: "" - - field: designEst - range: "" - field: end range: "(M)-(w)" type: timestamp diff --git a/test/data/opportunity.yaml b/test/data/opportunity.yaml new file mode 100644 index 0000000000..5e81c71886 --- /dev/null +++ b/test/data/opportunity.yaml @@ -0,0 +1,124 @@ +title: table zt_flow_opportunity +desc: "项目机会" +author: automated export +version: "1.0" +fields: + - field: id + note: "ID" + range: 1-10000 + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: project + note: "所属项目" + range: 1-100 + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: execution + note: "所属执行" + range: 101-700 + - field: name + note: "机会名称" + range: 1-10000 + prefix: "机会名称" + postfix: "" + loop: 0 + format: "" + - field: source + note: "来源" + range: business,team,logistic,manage,sourcing,outsourcing,customer,others + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: strategy + note: "策略" + range: monitor,create,utilize,enhance,accept + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: status + note: "状态" + range: active,closed,hangup,canceled + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: impact + note: "影响程度" + range: 1-5 + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: chance + note: "发生概率" + range: 1-5 + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: ratio + note: "风险系数" + range: 1-25 + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: pri + note: "优先级" + range: 1-3 + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: identifiedDate + note: "识别日期" + range: "(-1M)-(+1w):60" + type: timestamp + format: "YYYY-MM-DD" + - field: prevention + note: "处理措施" + range: 1-10000 + prefix: "这是处理措施" + postfix: "" + loop: 0 + format: "" + - field: plannedClosedDate + note: "计划关闭日期" + range: "(-1M)-(+1w):60" + type: timestamp + format: "YYYY-MM-DD" + - field: actualClosedDate + note: "实际关闭日期" + range: "(-1M)-(+1w):60" + type: timestamp + format: "YYYY-MM-DD" + - field: createdBy + note: "由谁创建" + range: admin,user1 + - field: createdDate + note: "创建日期" + range: "(-1M)-(+1w):60" + type: timestamp + format: "YYYY-MM-DD" + - field: editedBy + note: "由谁编辑" + from: common.user.v1.yaml + use: user + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: editedDate + note: "编辑日期" + range: "(-1M)-(+1w):60" + type: timestamp + format: "YYYY-MM-DD" + - field: deleted + note: "是否删除" + range: 0 diff --git a/test/data/process.yaml b/test/data/process.yaml index 47b8709242..a444d3111b 100644 --- a/test/data/process.yaml +++ b/test/data/process.yaml @@ -17,9 +17,16 @@ fields: postfix: "" loop: 0 format: "" - - field: type + - field: workflowGroup + note: "流程" + range: 1-10 + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: module note: "分类" - range: project,engineering,support + range: 1-10000 prefix: "" postfix: "" loop: 0 diff --git a/test/data/programoutput.yaml b/test/data/programoutput.yaml index cbed51c393..85ac41ef28 100644 --- a/test/data/programoutput.yaml +++ b/test/data/programoutput.yaml @@ -10,7 +10,7 @@ fields: postfix: "" loop: 0 format: "" - - field: program + - field: project note: "所属项目" range: 1-10000 prefix: "" @@ -74,22 +74,6 @@ fields: postfix: "" loop: 0 format: "" - - field: createdBy - note: "创建者" - from: common.user.v1.yaml - use: user - prefix: "" - postfix: "" - loop: 0 - format: "" - - field: createdDate - note: "创建日期" - from: common.date.v1.yaml - use: dateB - prefix: "" - postfix: "" - loop: 0 - format: "" - field: deleted note: "是否删除" range: 0 diff --git a/test/data/projectchange.yaml b/test/data/projectchange.yaml new file mode 100644 index 0000000000..be9e1faa36 --- /dev/null +++ b/test/data/projectchange.yaml @@ -0,0 +1,28 @@ +--- +title: table zt_projectchange +author: automated export +version: "1.0" +fields: + - field: id + range: 1-1000 + - field: project + note: "所属项目" + range: 1-100 + - field: name + note: "项目变更名称" + fields: + - field: name1 + range: "项目变更" + - field: name2 + range: 1-1000 + - field: urgency + range: "[normal,major,critical]" + - field: type + range: "[story,design,stage,case]" + - field: status + range: "[wait,reviewing,pass,reject,reverting]" + - field: owner + range: "[admin,dev1,test1]{30},[]{20}" + - field: owner + range: "[admin,dev1,test1]{30},[]{20}" +... diff --git a/test/data/review.yaml b/test/data/review.yaml index f1179a120b..32f3342177 100644 --- a/test/data/review.yaml +++ b/test/data/review.yaml @@ -40,7 +40,7 @@ fields: format: "" - field: status note: "评审状态" - range: draft,wait,reviewing,pass,fail,auditing,done + range: draft,wait,reviewing,pass,fail,done prefix: "" postfix: "" loop: 0 @@ -53,14 +53,6 @@ fields: postfix: "" loop: 0 format: "" - - field: auditedBy - note: "由谁审计" - from: common.user.v1.yaml - use: user - prefix: "" - postfix: "" - loop: 0 - format: "" - field: createdBy note: "由谁创建" from: common.user.v1.yaml @@ -87,14 +79,6 @@ fields: postfix: "" loop: 0 format: "" - - field: lastAuditedBy - note: "最后审计者" - from: common.user.v1.yaml - use: user - prefix: "" - postfix: "" - loop: 0 - format: "" - field: lastEditedBy note: "最后编辑者" from: common.user.v1.yaml @@ -110,13 +94,6 @@ fields: postfix: "" loop: 0 format: "" - - field: auditResult - note: "审计结果" - range: pass,fail,needfix - prefix: "" - postfix: "" - loop: 0 - format: "" - field: deleted note: "是否删除" range: 0 diff --git a/test/data/reviewcl.yaml b/test/data/reviewcl.yaml index d29195df28..0900769b3a 100644 --- a/test/data/reviewcl.yaml +++ b/test/data/reviewcl.yaml @@ -22,7 +22,7 @@ fields: format: "" - field: object note: "检查清单标题" - range: PP,QAP,CMP,ITP,URS,SRS,HLDS,DDS,Code,ITTC,STP,STTC,UM + range: 1-10000 prefix: "" postfix: "" loop: 0 diff --git a/test/data/risk.yaml b/test/data/risk.yaml index f384bee036..4a6fcd7f80 100644 --- a/test/data/risk.yaml +++ b/test/data/risk.yaml @@ -78,7 +78,7 @@ fields: format: "" - field: pri note: "优先级" - range: high,middle,low + range: 1,2,3 prefix: "" postfix: "" loop: 0 diff --git a/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine.js b/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine.js index 6b3459b913..b7b462a956 100644 --- a/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine.js +++ b/www/js/fingerprint/specs/lib/jasmine-1.3.1/jasmine.js @@ -1100,7 +1100,7 @@ jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) { type: isSuite ? 'suite' : 'spec', children: [] }; - + if (isSuite) { var children = suiteOrSpec.children(); for (var i = 0; i < children.length; i++) { @@ -1929,7 +1929,7 @@ jasmine.PrettyPrinter.prototype.iterateObject = function(obj, fn) { for (var property in obj) { if (!obj.hasOwnProperty(property)) continue; if (property == '__Jasmine_been_here_before__') continue; - fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) !== jasmine.undefined && + fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) !== jasmine.undefined && obj.__lookupGetter__(property) !== null) : false); } }; @@ -2061,7 +2061,7 @@ jasmine.Queue.prototype.next_ = function() { while (goAgain) { goAgain = false; - + if (self.index < self.blocks.length && !(this.abort && !this.ensured[self.index])) { var calledSynchronously = true; var completedSynchronously = false; @@ -2099,7 +2099,7 @@ jasmine.Queue.prototype.next_ = function() { if (completedSynchronously) { onComplete(); } - + } else { self.running = false; if (self.onComplete) { @@ -2597,4 +2597,4 @@ jasmine.version_= { "minor": 3, "build": 1, "revision": 1354556913 -}; +}; \ No newline at end of file diff --git a/www/js/fingerprint/specs/lib/phantom-jasmine/console-runner.js b/www/js/fingerprint/specs/lib/phantom-jasmine/console-runner.js index e197595940..9ebf531563 100644 --- a/www/js/fingerprint/specs/lib/phantom-jasmine/console-runner.js +++ b/www/js/fingerprint/specs/lib/phantom-jasmine/console-runner.js @@ -1,9 +1,9 @@ /** - Jasmine Reporter that outputs test results to the browser console. + Jasmine Reporter that outputs test results to the browser console. Useful for running in a headless environment such as PhantomJs, ZombieJs etc. Usage: - // From your html file that loads jasmine: + // From your html file that loads jasmine: jasmine.getEnv().addReporter(new jasmine.ConsoleReporter()); jasmine.getEnv().execute(); */ @@ -23,7 +23,7 @@ var color_code = this.color_map[color]; return "\033[" + color_code + "m" + text + "\033[0m"; } - + var ConsoleReporter = function() { if (!console || !console.log) { throw "console isn't present!"; } this.status = this.statuses.stopped; @@ -100,5 +100,4 @@ }; jasmine.ConsoleReporter = ConsoleReporter; -})(jasmine, console); - +})(jasmine, console); \ No newline at end of file diff --git a/www/theme/default/images/main/featureswitcher.png b/www/theme/default/images/main/featureswitcher.png new file mode 100644 index 0000000000..38bbfd85f4 Binary files /dev/null and b/www/theme/default/images/main/featureswitcher.png differ