From b2fa96b29ade2f271f39d910aba7ab928f62a909 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Fri, 29 Dec 2023 16:10:08 +0800 Subject: [PATCH] - Remove measurement,measrecord,meas module. --- module/admin/config.php | 2 +- module/admin/lang/de.php | 1 - module/admin/lang/en.php | 1 - module/admin/lang/fr.php | 1 - module/admin/lang/zh-cn.php | 1 - module/common/lang/common.php | 1 - module/common/lang/menu.php | 1 - module/common/lang/vi.php | 4 - module/group/lang/de.php | 2 - module/group/lang/en.php | 2 - module/group/lang/fr.php | 2 - module/group/lang/zh-cn.php | 2 - module/group/packagemanager.php | 40 - module/meas/model.php | 15 - module/measrecord/control.php | 40 - module/measrecord/css/browse.css | 34 - module/measrecord/js/browse.js | 8 - module/measrecord/lang/de.php | 8 - module/measrecord/lang/en.php | 8 - module/measrecord/lang/fr.php | 8 - module/measrecord/lang/zh-cn.php | 8 - module/measrecord/model.php | 74 - module/measrecord/view/browse.html.php | 86 - module/measurement/config.php | 58 - module/measurement/control.php | 763 --------- module/measurement/css/common.css | 5 - module/measurement/css/setsql.css | 2 - module/measurement/css/viewtemplate.css | 1 - module/measurement/js/batchedit.js | 12 - module/measurement/js/browse.js | 12 - module/measurement/js/createtemplate.js | 0 module/measurement/js/design.js | 94 -- module/measurement/js/setphpparams.js | 37 - module/measurement/js/setsql.js | 95 -- module/measurement/js/setsqlparams.js | 38 - module/measurement/js/viewtemplate.js | 12 - module/measurement/lang/de.php | 234 --- module/measurement/lang/en.php | 234 --- module/measurement/lang/fr.php | 234 --- module/measurement/lang/zh-cn.php | 229 --- module/measurement/model.php | 1426 ----------------- module/measurement/tao.php | 59 - .../view/ajaxbuildparamform.html.php | 58 - module/measurement/view/batchedit.html.php | 51 - module/measurement/view/browse.html.php | 85 - .../measurement/view/complextemplate.html.php | 32 - module/measurement/view/createbasic.html.php | 60 - .../view/createcollectconf.html.php | 83 - .../view/createderivation.html.php | 61 - .../measurement/view/createtemplate.html.php | 44 - module/measurement/view/definition.html.php | 125 -- module/measurement/view/derivation.html.php | 48 - module/measurement/view/design.html.php | 68 - module/measurement/view/designphp.html.php | 47 - module/measurement/view/designsql.html.php | 42 - module/measurement/view/editbasic.html.php | 61 - .../measurement/view/editcollectconf.html.php | 84 - .../measurement/view/editderivation.html.php | 62 - module/measurement/view/edittemplate.html.php | 30 - module/measurement/view/getphpparams.html.php | 51 - module/measurement/view/getsqlparams.html.php | 51 - module/measurement/view/holdermodal.html.php | 144 -- module/measurement/view/menu.html.php | 11 - .../measurement/view/paramformmodal.html.php | 104 -- module/measurement/view/report.html.php | 27 - module/measurement/view/setparams.html.php | 78 - module/measurement/view/setsql.html.php | 68 - module/measurement/view/settips.html.php | 126 -- .../measurement/view/showsqlparams.html.php | 19 - .../measurement/view/singletemplate.html.php | 43 - module/measurement/view/template.html.php | 35 - module/measurement/view/viewtemplate.html.php | 34 - module/upgrade/config.php | 2 +- 73 files changed, 2 insertions(+), 5726 deletions(-) delete mode 100644 module/meas/model.php delete mode 100644 module/measrecord/control.php delete mode 100644 module/measrecord/css/browse.css delete mode 100644 module/measrecord/js/browse.js delete mode 100644 module/measrecord/lang/de.php delete mode 100644 module/measrecord/lang/en.php delete mode 100644 module/measrecord/lang/fr.php delete mode 100644 module/measrecord/lang/zh-cn.php delete mode 100644 module/measrecord/model.php delete mode 100644 module/measrecord/view/browse.html.php delete mode 100644 module/measurement/config.php delete mode 100644 module/measurement/control.php delete mode 100644 module/measurement/css/common.css delete mode 100644 module/measurement/css/setsql.css delete mode 100644 module/measurement/css/viewtemplate.css delete mode 100644 module/measurement/js/batchedit.js delete mode 100644 module/measurement/js/browse.js delete mode 100644 module/measurement/js/createtemplate.js delete mode 100644 module/measurement/js/design.js delete mode 100644 module/measurement/js/setphpparams.js delete mode 100644 module/measurement/js/setsql.js delete mode 100644 module/measurement/js/setsqlparams.js delete mode 100644 module/measurement/js/viewtemplate.js delete mode 100644 module/measurement/lang/de.php delete mode 100644 module/measurement/lang/en.php delete mode 100644 module/measurement/lang/fr.php delete mode 100644 module/measurement/lang/zh-cn.php delete mode 100644 module/measurement/model.php delete mode 100644 module/measurement/tao.php delete mode 100644 module/measurement/view/ajaxbuildparamform.html.php delete mode 100644 module/measurement/view/batchedit.html.php delete mode 100644 module/measurement/view/browse.html.php delete mode 100644 module/measurement/view/complextemplate.html.php delete mode 100644 module/measurement/view/createbasic.html.php delete mode 100644 module/measurement/view/createcollectconf.html.php delete mode 100644 module/measurement/view/createderivation.html.php delete mode 100644 module/measurement/view/createtemplate.html.php delete mode 100644 module/measurement/view/definition.html.php delete mode 100644 module/measurement/view/derivation.html.php delete mode 100644 module/measurement/view/design.html.php delete mode 100644 module/measurement/view/designphp.html.php delete mode 100644 module/measurement/view/designsql.html.php delete mode 100644 module/measurement/view/editbasic.html.php delete mode 100644 module/measurement/view/editcollectconf.html.php delete mode 100644 module/measurement/view/editderivation.html.php delete mode 100644 module/measurement/view/edittemplate.html.php delete mode 100644 module/measurement/view/getphpparams.html.php delete mode 100644 module/measurement/view/getsqlparams.html.php delete mode 100644 module/measurement/view/holdermodal.html.php delete mode 100644 module/measurement/view/menu.html.php delete mode 100644 module/measurement/view/paramformmodal.html.php delete mode 100644 module/measurement/view/report.html.php delete mode 100644 module/measurement/view/setparams.html.php delete mode 100644 module/measurement/view/setsql.html.php delete mode 100644 module/measurement/view/settips.html.php delete mode 100644 module/measurement/view/showsqlparams.html.php delete mode 100644 module/measurement/view/singletemplate.html.php delete mode 100644 module/measurement/view/template.html.php delete mode 100644 module/measurement/view/viewtemplate.html.php diff --git a/module/admin/config.php b/module/admin/config.php index da4829eabd..bf0b399957 100755 --- a/module/admin/config.php +++ b/module/admin/config.php @@ -9,7 +9,7 @@ $config->admin->menuGroup['system'] = array('custom|mode', 'backup', 'cron', $config->admin->menuGroup['company'] = array('dept', 'company', 'user', 'group', 'tutorial'); $config->admin->menuGroup['switch'] = array('admin|setmodule'); $config->admin->menuGroup['model'] = array('auditcl', 'stage', 'design', 'cmcl', 'reviewcl', 'custom|required', 'custom|set', 'custom|flow', 'custom|code', 'custom|percent','custom|estimate', 'custom|hours', 'subject', 'process', 'activity', 'zoutput', 'classify', 'holiday', 'reviewsetting'); -$config->admin->menuGroup['feature'] = array('custom|set', 'custom|product', 'custom|execution', 'custom|required', 'custom|kanban', 'approvalflow', 'measurement', 'meetingroom', 'custom|browsestoryconcept', 'custom|kanban', 'sqlbuilder', 'report', 'custom|limittaskdate'); +$config->admin->menuGroup['feature'] = array('custom|set', 'custom|product', 'custom|execution', 'custom|required', 'custom|kanban', 'approvalflow', 'meetingroom', 'custom|browsestoryconcept', 'custom|kanban', 'sqlbuilder', 'report', 'custom|limittaskdate'); $config->admin->menuGroup['template'] = array('custom|set', 'baseline'); $config->admin->menuGroup['message'] = array('mail', 'webhook', 'sms', 'message'); $config->admin->menuGroup['dev'] = array('dev', 'entry', 'editor'); diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index bc9c4566e4..074d3bb7df 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -101,7 +101,6 @@ $lang->admin->setModule->issue = 'Issue'; $lang->admin->setModule->risk = 'Risk'; $lang->admin->setModule->opportunity = 'Opportunity'; $lang->admin->setModule->process = 'Process'; -$lang->admin->setModule->measrecord = 'Measrecord'; $lang->admin->setModule->auditplan = 'QA'; $lang->admin->setModule->meeting = 'Meeting'; $lang->admin->setModule->roadmap = 'Roadmap'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index e7c128d38b..5bba4572f7 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -101,7 +101,6 @@ $lang->admin->setModule->issue = 'Issue'; $lang->admin->setModule->risk = 'Risk'; $lang->admin->setModule->opportunity = 'Opportunity'; $lang->admin->setModule->process = 'Process'; -$lang->admin->setModule->measrecord = 'Measrecord'; $lang->admin->setModule->auditplan = 'QA'; $lang->admin->setModule->meeting = 'Meeting'; $lang->admin->setModule->roadmap = 'Roadmap'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index 1d7940be7e..65ec12825f 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -101,7 +101,6 @@ $lang->admin->setModule->issue = 'Issue'; $lang->admin->setModule->risk = 'Risk'; $lang->admin->setModule->opportunity = 'Opportunity'; $lang->admin->setModule->process = 'Process'; -$lang->admin->setModule->measrecord = 'Measrecord'; $lang->admin->setModule->auditplan = 'QA'; $lang->admin->setModule->meeting = 'Meeting'; $lang->admin->setModule->roadmap = 'Roadmap'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 8df4ba6564..97b1b4ff5b 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -101,7 +101,6 @@ $lang->admin->setModule->issue = '问题'; $lang->admin->setModule->risk = '风险'; $lang->admin->setModule->opportunity = '机会'; $lang->admin->setModule->process = '过程'; -$lang->admin->setModule->measrecord = '度量'; $lang->admin->setModule->auditplan = 'QA'; $lang->admin->setModule->meeting = '会议'; $lang->admin->setModule->roadmap = '路线图'; diff --git a/module/common/lang/common.php b/module/common/lang/common.php index 989833aab0..0296036ded 100644 --- a/module/common/lang/common.php +++ b/module/common/lang/common.php @@ -19,7 +19,6 @@ $lang->requirement = new stdclass(); $lang->release = new stdclass(); $lang->branch = new stdclass(); $lang->productplan = new stdclass(); -$lang->measurement = new stdclass(); $lang->review = new stdclass(); $lang->milestone = new stdclass(); $lang->qa = new stdclass(); diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 9ab3efde83..ae8fda0a3f 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -614,7 +614,6 @@ $lang->navGroup->cm = 'project'; $lang->navGroup->nc = 'project'; $lang->navGroup->projectrelease = 'project'; $lang->navGroup->build = 'project'; -$lang->navGroup->measrecord = 'project'; $lang->navGroup->milestone = 'project'; $lang->navGroup->researchplan = 'project'; $lang->navGroup->workestimation = 'project'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index fb2e595f54..7c22422d6f 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -229,9 +229,6 @@ $lang->system->menu->company = array('link' => 'User|company|browse|', 'subModu $lang->system->menu->team = array('link' => 'Team|my|team|'); $lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); -$lang->measurement = new stdclass(); -$lang->measurement->menu = new stdclass(); - $lang->devops->compile = 'Pipelines'; $lang->devops->mr = 'Merge Request'; $lang->devops->repo = 'Repo'; @@ -639,7 +636,6 @@ $lang->navGroup->job = 'project'; $lang->navGroup->jenkins = 'project'; $lang->navGroup->compile = 'project'; $lang->navGroup->report = 'project'; -$lang->navGroup->measrecord = 'project'; $lang->navGroup->execution = 'execution'; $lang->navGroup->task = 'execution'; diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 086d45f17e..d75e386908 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -403,7 +403,6 @@ $lang->group->package->deleteOpportunity = 'Delete Opportunity'; $lang->group->package->importOpportunityLib = 'Import Opportunity Lib'; $lang->group->package->importOpportunity = 'Import Opportunity'; $lang->group->package->pssp = 'Pssp'; -$lang->group->package->measrecord = 'Measrecord'; $lang->group->package->manageAuditPlan = 'Manage Audit Plan'; $lang->group->package->nc = 'Nc'; $lang->group->package->meeting = 'Meeting'; @@ -472,7 +471,6 @@ $lang->group->package->activity = 'Activity'; $lang->group->package->zoutput = 'Zoutput'; $lang->group->package->custom = 'Custom'; $lang->group->package->approvalflow = 'Approval flow'; -$lang->group->package->measurement = 'Measurement'; $lang->group->package->usercl = 'Usercl'; $lang->group->package->meetingroom = 'Meetingroom'; $lang->group->package->sqlBuilder = 'Sql Builder'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index aae79cb4f6..b095035f1a 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -403,7 +403,6 @@ $lang->group->package->deleteOpportunity = 'Delete Opportunity'; $lang->group->package->importOpportunityLib = 'Import Opportunity Lib'; $lang->group->package->importOpportunity = 'Import Opportunity'; $lang->group->package->pssp = 'Pssp'; -$lang->group->package->measrecord = 'Measrecord'; $lang->group->package->manageAuditPlan = 'Manage Audit Plan'; $lang->group->package->nc = 'Nc'; $lang->group->package->meeting = 'Meeting'; @@ -472,7 +471,6 @@ $lang->group->package->activity = 'Activity'; $lang->group->package->zoutput = 'Zoutput'; $lang->group->package->custom = 'Custom'; $lang->group->package->approvalflow = 'Approval flow'; -$lang->group->package->measurement = 'Measurement'; $lang->group->package->usercl = 'Usercl'; $lang->group->package->meetingroom = 'Meetingroom'; $lang->group->package->sqlBuilder = 'Sql Builder'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 3920c883b0..6da1a6bb56 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -403,7 +403,6 @@ $lang->group->package->deleteOpportunity = 'Delete Opportunity'; $lang->group->package->importOpportunityLib = 'Import Opportunity Lib'; $lang->group->package->importOpportunity = 'Import Opportunity'; $lang->group->package->pssp = 'Pssp'; -$lang->group->package->measrecord = 'Measrecord'; $lang->group->package->manageAuditPlan = 'Manage Audit Plan'; $lang->group->package->nc = 'Nc'; $lang->group->package->meeting = 'Meeting'; @@ -472,7 +471,6 @@ $lang->group->package->activity = 'Activity'; $lang->group->package->zoutput = 'Zoutput'; $lang->group->package->custom = 'Custom'; $lang->group->package->approvalflow = 'Approval flow'; -$lang->group->package->measurement = 'Measurement'; $lang->group->package->usercl = 'Usercl'; $lang->group->package->meetingroom = 'Meetingroom'; $lang->group->package->sqlBuilder = 'Sql Builder'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index c1013f15a3..2928a25d6b 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -403,7 +403,6 @@ $lang->group->package->deleteOpportunity = '删除机会'; $lang->group->package->importOpportunityLib = '导入机会库'; $lang->group->package->importOpportunity = '导入导出机会'; $lang->group->package->pssp = '项目过程'; -$lang->group->package->measrecord = '项目度量'; $lang->group->package->manageAuditPlan = '维护质量保证计划'; $lang->group->package->nc = '不符合项'; $lang->group->package->meeting = '会议'; @@ -472,7 +471,6 @@ $lang->group->package->activity = '活动设置'; $lang->group->package->zoutput = '文档设置'; $lang->group->package->custom = '自定义配置'; $lang->group->package->approvalflow = '审批设置'; -$lang->group->package->measurement = '度量设置'; $lang->group->package->usercl = '用户设置'; $lang->group->package->meetingroom = '会议室设置'; $lang->group->package->sqlBuilder = 'sql构建器'; diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index dba2ddab01..96cf4538dc 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -129,10 +129,6 @@ $config->group->subset->cm = new stdclass(); $config->group->subset->cm->order = 440; $config->group->subset->cm->nav = 'project'; -$config->group->subset->measrecord = new stdclass(); -$config->group->subset->measrecord->order = 480; -$config->group->subset->measrecord->nav = 'project'; - $config->group->subset->projectreport = new stdclass(); $config->group->subset->projectreport->order = 490; $config->group->subset->projectreport->nav = 'project'; @@ -2317,17 +2313,6 @@ $config->group->package->pssp->privs = array(); $config->group->package->pssp->privs['pssp-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('project-index'), 'recommend' => array()); $config->group->package->pssp->privs['pssp-update'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('pssp-browse'), 'recommend' => array()); -$config->group->package->measrecord = new stdclass(); -$config->group->package->measrecord->order = 5; -$config->group->package->measrecord->subset = 'measrecord'; -$config->group->package->measrecord->privs = array(); -$config->group->package->measrecord->privs['measrecord-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('project-index'), 'recommend' => array()); -$config->group->package->measrecord->privs['report-show'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array(), 'recommend' => array()); -$config->group->package->measrecord->privs['report-customeredReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array(), 'recommend' => array()); -$config->group->package->measrecord->privs['report-viewReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('report-customeredReport'), 'recommend' => array()); -$config->group->package->measrecord->privs['report-projectSummary'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array(), 'recommend' => array()); -$config->group->package->measrecord->privs['report-projectWorkload'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array(), 'recommend' => array()); - $config->group->package->manageAuditPlan = new stdclass(); $config->group->package->manageAuditPlan->order = 5; $config->group->package->manageAuditPlan->subset = 'projectauditplan'; @@ -3035,31 +3020,6 @@ $config->group->package->approvalflow->privs['approvalflow-createRole'] = array( $config->group->package->approvalflow->privs['approvalflow-editRole'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-createRole', 'approvalflow-deleteRole')); $config->group->package->approvalflow->privs['approvalflow-deleteRole'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-createRole', 'approvalflow-editRole')); -$config->group->package->measurement = new stdclass(); -$config->group->package->measurement->order = 15; -$config->group->package->measurement->subset = 'featureconfig'; -$config->group->package->measurement->privs = array(); -$config->group->package->measurement->privs['measurement-settips'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array()); -$config->group->package->measurement->privs['measurement-setSQL'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array('measurement-browse'), 'recommend' => array('measurement-createBasic', 'measurement-delete', 'measurement-editBasic')); -$config->group->package->measurement->privs['measurement-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array(), 'recommend' => array()); -$config->group->package->measurement->privs['measurement-createBasic'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array('measurement-browse'), 'recommend' => array('measurement-delete', 'measurement-editBasic', 'measurement-setSQL')); -$config->group->package->measurement->privs['measurement-delete'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 6, 'depend' => array('measurement-browse'), 'recommend' => array('measurement-batchEdit', 'measurement-createBasic', 'measurement-editBasic', 'measurement-setSQL')); -$config->group->package->measurement->privs['measurement-editBasic'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array('measurement-browse'), 'recommend' => array('measurement-batchEdit', 'measurement-createBasic', 'measurement-delete', 'measurement-setSQL')); -$config->group->package->measurement->privs['measurement-searchMeas'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 14, 'depend' => array('measurement-browse'), 'recommend' => array()); -$config->group->package->measurement->privs['measurement-template'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 7, 'depend' => array(), 'recommend' => array()); -$config->group->package->measurement->privs['measurement-createTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 23, 'depend' => array('measurement-template'), 'recommend' => array('measurement-editTemplate', 'measurement-viewTemplate')); -$config->group->package->measurement->privs['measurement-editTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array('measurement-template'), 'recommend' => array('measurement-createTemplate', 'measurement-viewTemplate')); -$config->group->package->measurement->privs['measurement-viewTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array('measurement-template'), 'recommend' => array()); -$config->group->package->measurement->privs['measurement-batchEdit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('measurement-browse'), 'recommend' => array('measurement-editBasic')); -$config->group->package->measurement->privs['measurement-saveReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 24, 'depend' => array('measurement-viewTemplate'), 'recommend' => array()); -$config->group->package->measurement->privs['report-custom'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 17, 'depend' => array('measurement-template'), 'recommend' => array()); -$config->group->package->measurement->privs['report-editReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 18, 'depend' => array('measurement-template'), 'recommend' => array()); -$config->group->package->measurement->privs['report-useReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 19, 'depend' => array('measurement-template'), 'recommend' => array()); -$config->group->package->measurement->privs['report-deleteReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 20, 'depend' => array('measurement-template'), 'recommend' => array()); -$config->group->package->measurement->privs['report-saveReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 21, 'depend' => array('measurement-template'), 'recommend' => array()); -$config->group->package->measurement->privs['report-crystalExport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 22, 'depend' => array('measurement-template'), 'recommend' => array()); -$config->group->package->measurement->privs['report-export'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 25, 'depend' => array('measurement-template'), 'recommend' => array()); - $config->group->package->meetingroom = new stdclass(); $config->group->package->meetingroom->order = 30; $config->group->package->meetingroom->subset = 'featureconfig'; diff --git a/module/meas/model.php b/module/meas/model.php deleted file mode 100644 index 695a5b30ba..0000000000 --- a/module/meas/model.php +++ /dev/null @@ -1,15 +0,0 @@ - - * @package meas - * @link https://www.zentao.net - */ -class measModel extends model -{ - -} diff --git a/module/measrecord/control.php b/module/measrecord/control.php deleted file mode 100644 index eb0e8648c8..0000000000 --- a/module/measrecord/control.php +++ /dev/null @@ -1,40 +0,0 @@ - - * @package measrecord - * @version $Id$ - * @link https://www.zentao.net - */ -class measrecord extends control -{ - public function browse($program = 0, $measID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 10, $pageID = 1) - { - $this->app->loadLang('measurement'); - $this->app->loadClass('pager', true); - $pager = new pager($recTotal, $recPerPage, $pageID); - - $this->lang->navGroup->measrecord = 'project'; - - $this->loadModel('project')->setMenu($program); - - $this->view->records = $this->measrecord->getListByProgram($program, $measID, $orderBy, $pager); - $this->view->measList = $this->measrecord->getSavedMeas($program); - $this->view->title = $this->lang->measrecord->browse; - $this->view->program = $program; - $this->view->programs = $this->loadModel('program')->getPairs(); - $this->view->products = $this->loadModel('product')->getPairs(); - $this->view->projects = $this->loadModel('project')->getPairsByProgram(); - - if($measID) - { - $measurement = $this->loadModel('measurement')->getByID($measID); - $measurement->params = json_decode($measurement->params); - $this->view->measurement = $measurement; - } - $this->display(); - } -} diff --git a/module/measrecord/css/browse.css b/module/measrecord/css/browse.css deleted file mode 100644 index cb0846f9f4..0000000000 --- a/module/measrecord/css/browse.css +++ /dev/null @@ -1,34 +0,0 @@ -.side-col .detail-content{padding-left: 10px; margin-top: 0px} -.tree li.has-list.open:before {border-left: none;} -#measTree li {padding: 0 0 0 8px;} -#measTree li.has-list {padding-left: 20px;} -#measTree li > a {display: block; padding: 5px 0; border-radius: 2px; padding-left: 6px; height: 30px;} -#measTree li > a > span {display: inline-block;} -#measTree li > a > span + span {margin-left: 8px;} -#measTree li.selected > a {background-color: #E8F3FC;} -#measTree li.selected > a > span.title {color: #006AF1;} -#measTree .label-id {border-color: #cbd0db; color: #7d8599} -#measTree .label.label-type {background: #fff; border: 1px solid #7d8599; color:#7d8599} - -#measTree li > a > span.title {color: #3C4353; white-space: nowrap; max-width: 60%; overflow: hidden; text-overflow: ellipsis; vertical-align: middle;} -#measTree li > a > span.user {color: #838a9d;} -#measTree li > a > span.user > .icon-person {font-size: 14px; position: relative; top: -1px; color: #a6aab8} - -#measTree li > .list-toggle {transform: rotate(0deg); width: 16px; height: 16px; border: 4px solid #a6aab8; border-radius: 2px; top: 7px;} -#measTree li > .list-toggle:before {content: ' '; display: block; position: absolute; border: 1px solid #a6aab8; top: 2px; left: -3px; right: -3px; bottom: 2px; min-width: 0; transition: all .2s;} -#measTree li > .list-toggle:hover:before, -#measTree li > .list-toggle:hover {border-color: #006AF1;} -#measTree li.open > .list-toggle {width: 12px; height: 12px; top: 9px; background-color: #a6aab8; border-width: 3px; left: 3px;} -#measTree li.open > .list-toggle:before {border: none; height: 2px; width: 6px; left: 0; top: 2px; background: #fff;} -#measTree li.open > .list-toggle:hover {background: #006AF1;} - -#measTree ul > li:after {display: block; position: absolute; content: ' '; border-top: 2px solid #cbd0db; top: 14px; left: -12px; z-index: 1; width: 10px;} -#measTree ul > li:before, -#measTree ul > li.has-list:before {background: none; content: ' '; display: block; position: absolute; width: auto; height: auto; border: none; border-left: 2px solid #cbd0db; top: -13px; bottom: 12px; left: -12px;} -#measTree ul > li:last-child:before {bottom: auto; height: 29px;} -#measTree ul > li:first-child:before {top: -9px;} -#measTree ul > li.has-list:first-child:before {top: -13px;} -#measTree ul > li.tree-single-item:before {height: 23px;} -#measTree ul > li.has-list:after {width: 14px;} -#measTree ul > li.item-meas a.selected{color: #0c64eb;} -.side-col{padding-right: 5px; width: 25%} diff --git a/module/measrecord/js/browse.js b/module/measrecord/js/browse.js deleted file mode 100644 index ff645ecc8e..0000000000 --- a/module/measrecord/js/browse.js +++ /dev/null @@ -1,8 +0,0 @@ -$(function() -{ - var $taskTree = $('#measTree').tree( - { - name: 'measTree', - initialState: 'preserve' - }); -}); diff --git a/module/measrecord/lang/de.php b/module/measrecord/lang/de.php deleted file mode 100644 index e84c7a4536..0000000000 --- a/module/measrecord/lang/de.php +++ /dev/null @@ -1,8 +0,0 @@ -measrecord->common = 'Project Measurement'; -$lang->measrecord->browse = 'History'; -$lang->measrecord->list = 'Measurements'; -$lang->measrecord->params = 'Measurement Parameters'; - -$lang->measrecord->value = 'Metrics'; -$lang->measrecord->date = 'Created'; diff --git a/module/measrecord/lang/en.php b/module/measrecord/lang/en.php deleted file mode 100644 index e84c7a4536..0000000000 --- a/module/measrecord/lang/en.php +++ /dev/null @@ -1,8 +0,0 @@ -measrecord->common = 'Project Measurement'; -$lang->measrecord->browse = 'History'; -$lang->measrecord->list = 'Measurements'; -$lang->measrecord->params = 'Measurement Parameters'; - -$lang->measrecord->value = 'Metrics'; -$lang->measrecord->date = 'Created'; diff --git a/module/measrecord/lang/fr.php b/module/measrecord/lang/fr.php deleted file mode 100644 index e84c7a4536..0000000000 --- a/module/measrecord/lang/fr.php +++ /dev/null @@ -1,8 +0,0 @@ -measrecord->common = 'Project Measurement'; -$lang->measrecord->browse = 'History'; -$lang->measrecord->list = 'Measurements'; -$lang->measrecord->params = 'Measurement Parameters'; - -$lang->measrecord->value = 'Metrics'; -$lang->measrecord->date = 'Created'; diff --git a/module/measrecord/lang/zh-cn.php b/module/measrecord/lang/zh-cn.php deleted file mode 100644 index ad3a24dfb1..0000000000 --- a/module/measrecord/lang/zh-cn.php +++ /dev/null @@ -1,8 +0,0 @@ -measrecord->common = '项目度量'; -$lang->measrecord->browse = '度量记录'; -$lang->measrecord->list = '度量列表'; -$lang->measrecord->params = '度量参数'; - -$lang->measrecord->value = '度量值'; -$lang->measrecord->date = '创建时间'; diff --git a/module/measrecord/model.php b/module/measrecord/model.php deleted file mode 100644 index ed73d9f2fa..0000000000 --- a/module/measrecord/model.php +++ /dev/null @@ -1,74 +0,0 @@ - - * @package measrecord - * @version $Id$ - * @link https://www.zentao.net - */ -class measrecordModel extends model -{ - /** - * Get list by program - * - * @param int $program - * @param int $measurementID - * @param string $orderBy - * @param object $pager - * @access public - * @return array - */ - public function getListByProgram($program, $measurementID, $orderBy = 'id_desc', $pager = null) - { - return $this->dao->select('*')->from(TABLE_MEASRECORDS) - ->where('project')->eq($program) - ->andWhere('mid')->eq($measurementID) - ->orderBy($orderBy) - ->page($pager) - ->fetchAll(); - } - - public function getSavedMeas($program) - { - return $this->dao->select('DISTINCT r.mid, m.name, m.purpose')->from(TABLE_BASICMEAS)->alias('m') - ->leftJoin(TABLE_MEASRECORDS)->alias('r') - ->on('m.id=r.mid') - ->where('project')->eq($program) - ->orderBy('m.purpose, m.order desc') - ->fetchGroup('purpose'); - } - - /** - * Save meas record. - * - * @param object $measurement - * @param array $params - * @param mix $queryResult - * @access public - * @return bool - */ - public function save($measurement, $params, $value, $type = '') - { - $record = new stdclass(); - $record->type = $type; - $record->mid = $measurement->id; - $record->measCode = $measurement->code; - $record->date = helper::today(); - $record->year = date('Y'); - $record->month = date('Ym'); - $record->week = date('W'); - $record->day = date('Ymd'); - $record->params = json_encode($params); - $record->value = $value; - - if(isset($params['$program'])) $record->program = $params['$program']; - if(isset($params['$product'])) $record->product = $params['$product']; - if(isset($params['$project'])) $record->project = $params['$project']; - - $this->dao->insert(TABLE_MEASRECORDS)->data($record)->exec(); - return !dao::isError(); - } -} diff --git a/module/measrecord/view/browse.html.php b/module/measrecord/view/browse.html.php deleted file mode 100644 index 3399ef262a..0000000000 --- a/module/measrecord/view/browse.html.php +++ /dev/null @@ -1,86 +0,0 @@ -getModuleRoot() . 'common/view/header.html.php';?> -