From 22ab2f9599fd828ed0180adc39dafd3d482bb78d Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Tue, 25 Aug 2020 16:41:40 +0800 Subject: [PATCH 01/14] * Adjust code. --- module/block/control.php | 5 ++++- module/block/view/scrumroadmapblock.html.php | 10 +++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index 7f704843fe..cd53a66a89 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1621,7 +1621,10 @@ class block extends control $products = $this->loadModel('product')->getPairs(); ksort($products); - $this->view->roadmaps = $this->product->getRoadmap(key($products), 0, 6); +$productID = key($products); + $this->view->roadmaps = $this->product->getRoadmap($productID, 0, 6); + $this->view->productID = $productID; + $this->view->products = $products; } /** diff --git a/module/block/view/scrumroadmapblock.html.php b/module/block/view/scrumroadmapblock.html.php index 2872e54ab2..98147b6d19 100644 --- a/module/block/view/scrumroadmapblock.html.php +++ b/module/block/view/scrumroadmapblock.html.php @@ -13,8 +13,16 @@ -
+
+
+
createLink('productplan', 'create', 'productID=' . $productID), ''. $lang->productplan->create, '', 'class="btn btn-mini" id="createPlan"');?>
+
+
    $mapBranches):?> From a3cb36f6e3403a5416cf1b47d05cee8802d3c81b Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 25 Aug 2020 16:42:25 +0800 Subject: [PATCH 02/14] * Modified design/lang/en.php --- module/design/lang/en.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/design/lang/en.php b/module/design/lang/en.php index 94c96296e8..c51c12de1f 100644 --- a/module/design/lang/en.php +++ b/module/design/lang/en.php @@ -26,6 +26,7 @@ $lang->design->desc = 'Description'; $lang->design->product = 'Linked Product'; $lang->design->basicInfo = 'Basic Information'; $lang->design->commitDate = 'Committed Date'; +$lang->design->commitBy = 'Commit By'; $lang->design->affectedStory = "{$lang->storyCommon}"; $lang->design->affectedTasks = 'Task'; $lang->design->submit = 'Submit Review'; From 267ac8f0b77a4e9e894579083e23cfdff9478f94 Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 25 Aug 2020 16:54:51 +0800 Subject: [PATCH 03/14] * task #7651, improve UI of programteam block. --- module/block/view/programteamblock.html.php | 82 ++++++++++++++++----- 1 file changed, 65 insertions(+), 17 deletions(-) diff --git a/module/block/view/programteamblock.html.php b/module/block/view/programteamblock.html.php index 3d863a5698..842fd44b24 100644 --- a/module/block/view/programteamblock.html.php +++ b/module/block/view/programteamblock.html.php @@ -1,24 +1,72 @@
    block->emptyTip;?>
    -
    - - - - - - - - - + +
    +
    +
    + -
    - - - - + teamCount, $maxTeamCount); + $maxConsumed = max($program->consumed, $maxConsumed); + ?> +
    name;?>
    - -
    program->teamCount;?>task->consumed;?>
    name;?>teamCount;?>consumed;?>
    +
    +
    +
    +
    +
    program->teamCount;?>
    + +
    +
    +
    +
    teamCount;?>
    +
    +
    +
    + +
    +
    +
    task->consumed;?>
    + +
    +
    +
    +
    consumed;?>
    +
    +
    +
    + +
    +
    +
    +
+
From dbba92d084280cf4ad3ffd22ee186b47176c0afc Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 25 Aug 2020 16:59:54 +0800 Subject: [PATCH 04/14] * Fix Bug #3401. --- module/repo/model.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/module/repo/model.php b/module/repo/model.php index a019cffced..c6eee0d991 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -343,15 +343,17 @@ class repoModel extends model /** * Get commits. * - * @param object $repo - * @param string $entry - * @param string $revision - * @param string $type - * @param object $pager + * @param object $repo + * @param string $entry + * @param string $revision + * @param string $type + * @param object $pager + * @param string $begin + * @param string $end * @access public * @return array */ - public function getCommits($repo, $entry, $revision = 'HEAD', $type = 'dir', $pager = null) + public function getCommits($repo, $entry, $revision = 'HEAD', $type = 'dir', $pager = null, $begin = 0, $end = 0) { $entry = ltrim($entry, '/'); $entry = $repo->prefix . (empty($entry) ? '' : '/' . $entry); @@ -395,6 +397,8 @@ class repoModel extends model ->andWhere('left(t1.comment, 12)')->ne('Merge branch') ->beginIF($this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi() ->beginIF($entry != '/' and !empty($entry))->andWhere('t1.id')->in($historyIdList)->fi() + ->beginIF($begin)->andWhere('t1.time')->ge($begin)->fi() + ->beginIF($end)->andWhere('t1.time')->le($end)->fi() ->orderBy('time desc'); if($entry == '/' or empty($entry))$comments->page($pager, 't1.id'); $comments = $comments->fetchAll('revision'); From 1b1ad2a3849ac443b0007388ea3e9ffa96a03cb4 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 25 Aug 2020 17:24:32 +0800 Subject: [PATCH 05/14] * Fix Bug #3400. --- module/design/view/create.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/design/view/create.html.php b/module/design/view/create.html.php index 307749a332..a82134215e 100644 --- a/module/design/view/create.html.php +++ b/module/design/view/create.html.php @@ -35,12 +35,12 @@ design->type;?> - design->typeList, '', "class='form-control chosen'");?> + design->typeList, '', "class='form-control chosen'");?> design->name;?> - + From 11b3c29bb27e1a3cdce54a3ce9ccec2cef579adf Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Tue, 25 Aug 2020 17:25:42 +0800 Subject: [PATCH 06/14] * Add en.php. --- module/budget/lang/en.php | 28 +++++++++ module/milestone/lang/en.php | 100 ++++++++++++++++++++++++++++++ module/workestimation/lang/en.php | 21 +++++++ 3 files changed, 149 insertions(+) create mode 100644 module/budget/lang/en.php create mode 100644 module/milestone/lang/en.php create mode 100644 module/workestimation/lang/en.php diff --git a/module/budget/lang/en.php b/module/budget/lang/en.php new file mode 100644 index 0000000000..7638876af6 --- /dev/null +++ b/module/budget/lang/en.php @@ -0,0 +1,28 @@ +budget->create = 'Create Budget'; +$lang->budget->edit = 'Edit Budget'; +$lang->budget->total = 'Total Budget'; +$lang->budget->summary = 'Summary'; +$lang->budget->browse = 'Browse Dudget'; +$lang->budget->list = 'Budget List'; +$lang->budget->view = 'Budget Detail'; +$lang->budget->delete = 'Delete'; +$lang->budget->batchCreate = 'Batch Create'; +$lang->budget->common = 'Cost Estimate'; +$lang->budget->id = 'ID'; +$lang->budget->stage = 'Stage'; +$lang->budget->subject = 'Subject'; +$lang->budget->name = 'Name of fee'; +$lang->budget->amount = 'Estimated amount'; +$lang->budget->desc = 'Explain'; +$lang->budget->yuan = 'yuan'; +$lang->budget->dollar = 'Dollars'; +$lang->budget->createdBy = 'CreatedBy'; +$lang->budget->createdDate = 'CreatedDate'; +$lang->budget->lastEditedBy = 'LastEditBy'; +$lang->budget->lastEditedDate = 'LastEditedDate'; +$lang->budget->basicInfo = 'BasicInfo'; +$lang->budget->noData = 'No Data'; + +$lang->budget->summaryReport = 'SummaryReport'; +$lang->budget->confirmDelete = 'Are you sure you want to delete it?'; diff --git a/module/milestone/lang/en.php b/module/milestone/lang/en.php new file mode 100644 index 0000000000..9210d7efc8 --- /dev/null +++ b/module/milestone/lang/en.php @@ -0,0 +1,100 @@ +milestone->index = 'Milestone Home'; +$lang->milestone->title = 'Milestone Report'; +$lang->milestone->common = 'Project Milestone Report'; +$lang->milestone->name = 'Milestone Name'; +$lang->milestone->stage = 'Milestone Stage'; +$lang->milestone->save = 'Save'; + +$lang->milestone->startedWeeks = 'Started Weeks'; +$lang->milestone->finishedWeeks = 'Finished Weeks'; +$lang->milestone->offset = 'Milestone Deviation'; + +$lang->milestone->processCommon = 'Project Current Status'; +$lang->milestone->process = 'Project Schedule'; +$lang->milestone->projectCost = 'Project Cost'; +$lang->milestone->toNow = 'So far'; +$lang->milestone->targetRange = 'Target Range'; +$lang->milestone->ge = 'ge'; +$lang->milestone->le = 'le'; +$lang->milestone->analysis = 'Analysis'; +$lang->milestone->PV = 'The work to be done(PV)'; +$lang->milestone->EV = 'Actual work done(EV)'; +$lang->milestone->AC = 'Actual cost(AC)'; +$lang->milestone->SPI = 'Project schedule performance(SPI)'; +$lang->milestone->CPI = 'Project cost performance(CPI)'; +$lang->milestone->SV = 'Rate of progress deviation(SV%)'; +$lang->milestone->CV = 'Cost deviation rate(CV%)'; + +$lang->milestone->workHours = 'Workload (man-hour)'; +$lang->milestone->allStage = 'Project Stage'; +$lang->milestone->devHours = 'Development Workload'; +$lang->milestone->toHours = 'Rework Workload'; +$lang->milestone->qaHours = 'Test Workload'; +$lang->milestone->rowSummary = 'Workload Subtotal'; +$lang->milestone->rowPercent = 'Percentage Distribution(%)'; +$lang->milestone->colPercent = 'Percentage of workload(%)'; +$lang->milestone->colSummary = 'Total'; +$lang->milestone->qatoDev = 'Test Development ratio'; + +$lang->milestone->projectRisk = '5.Project Risks (top five highest priority risks)'; +$lang->milestone->riskCountermove = 'Risk Countermove'; +$lang->milestone->riskDescriptio = 'Risk Description'; +$lang->milestone->riskPossibility = 'Risk Possibility'; +$lang->milestone->riskSeriousness = 'Risk Seriousness'; +$lang->milestone->riskFactor = 'Risk Factor'; +$lang->milestone->riskMeasures = 'Risk Measures'; +$lang->milestone->riskAccumulate = 'Risk Accumulate'; + +$lang->milestone->otherIssue = 'Other Issue'; +$lang->milestone->issueSolutions = 'Issue Solutions'; +$lang->milestone->issueDescription = 'Issue Description'; +$lang->milestone->needHelp = 'Help'; +$lang->milestone->issuePropose = 'Issue Propose'; + +$lang->milestone->demandStatus = '4.Customer Demand Analysis'; +$lang->milestone->storyUnit = 'Unit:Item'; +$lang->milestone->engineeringStage = 'Engineering Stage'; +$lang->milestone->rateChange = 'Rate of change in demand'; +$lang->milestone->originalStory = 'Quantity of original demand'; +$lang->milestone->modifyNumber = 'Total post-change requirements'; +$lang->milestone->changeStory = 'Number of changed requirements'; + +$lang->milestone->paogressForecast = 'Project Forecast'; +$lang->milestone->duration = 'Construction period(day)'; +$lang->milestone->cost = 'Cost(hours)'; +$lang->milestone->forecastResults = 'Forecast Results'; +$lang->milestone->plannedValue = 'Planned Value'; +$lang->milestone->predictedValue = 'Predicted Value'; +$lang->milestone->predictedValueDesc = 'Rentenformel (Germany)：If the project progress performance(SPI)=0,So the predicted value=0,Otherwise,Predicted value=Planned value divided by Project schedule performance(SPI)'; +$lang->milestone->periodDeviation = 'Period Deviation'; +$lang->milestone->costDeviation = 'Cost Deviation'; +$lang->milestone->nextStage = 'Next Stage'; +$lang->milestone->overallProject = 'Overall Project'; +$lang->milestone->corrective = 'Corrective Measure'; +$lang->milestone->timeOverrun = 'The total construction time will exceed:%s day.'; +$lang->milestone->costOverrun = 'The total cost will exceed:%s unit'; +$lang->milestone->saveOtherProblem = 'Save Other Problem'; + +$lang->milestone->chart = new stdclass(); +$lang->milestone->chart->title = 'Trend Chart of project progress to date'; +$lang->milestone->chart->time = 'No'; +$lang->milestone->chart->week = 'week'; +$lang->milestone->chart->month = 'month'; +$lang->milestone->chart->workhour = 'Development Workload Analysis Chart'; + +$lang->milestone->otherproblem = '6.Other Problem'; +$lang->milestone->problemandsuggest = 'Problem and Suggest'; +$lang->milestone->suggest = 'Suggest'; +$lang->milestone->needhelp = 'Does it require high-level support?'; +$lang->milestone->prodescr = 'Problem Description'; + +$lang->milestone->quality = new stdclass(); +$lang->milestone->quality->total = 'Total'; +$lang->milestone->quality->identify = 'Defect identification phase'; +$lang->milestone->quality->injection = 'Defect injection phase'; +$lang->milestone->quality->scale = 'Scale'; +$lang->milestone->quality->identifyRate = 'Defect recognition rate'; +$lang->milestone->quality->injectionRate = 'Defect injection rate'; + +$lang->milestone->options = 'Options'; diff --git a/module/workestimation/lang/en.php b/module/workestimation/lang/en.php new file mode 100644 index 0000000000..5b87b69d67 --- /dev/null +++ b/module/workestimation/lang/en.php @@ -0,0 +1,21 @@ +workestimation->common = 'Workload estimation'; +$lang->workestimation->budget = 'Estimate'; +$lang->workestimation->index = 'Overview'; +$lang->workestimation->scale = 'Scale'; +$lang->workestimation->productivity = 'Productivity'; +$lang->workestimation->duration = 'Estimated total man-hour'; +$lang->workestimation->unitLaborCost = 'Unit Labour cost'; +$lang->workestimation->totalLaborCost = 'Estimate labor costs'; +$lang->workestimation->dayHour = 'Daily working hours'; +$lang->workestimation->hour = 'Man-hour'; +$lang->workestimation->consumed = 'Man-hours consumed'; + +$lang->workestimation->programScaleTip = "Actual scale of current project：%s{$lang->hourCommon} use"; + +$lang->workestimation->placeholder = new stdclass(); +$lang->workestimation->placeholder->scale = ''; +$lang->workestimation->placeholder->productivity = ''; +$lang->workestimation->placeholder->duration = ''; +$lang->workestimation->placeholder->unitLaborCost = ''; +$lang->workestimation->placeholder->totalLaborCost = ''; From 784a002bc01f88437a6ee091405d53ca680e0d13 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 25 Aug 2020 17:38:19 +0800 Subject: [PATCH 07/14] * Fix bug. --- module/block/view/programteamblock.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/block/view/programteamblock.html.php b/module/block/view/programteamblock.html.php index 842fd44b24..da67cfe13f 100644 --- a/module/block/view/programteamblock.html.php +++ b/module/block/view/programteamblock.html.php @@ -24,7 +24,7 @@ $maxConsumed = 0;
-
+
teamCount;?>
From 7853944ceaeaaff87e916d101b5ec16acf8f7851 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Tue, 25 Aug 2020 18:51:53 +0800 Subject: [PATCH 08/14] * Add scrum overview block. --- module/block/view/scrumlistblock.html.php | 2 +- module/block/view/scrumoverallblock.html.php | 108 ++++++++++++------- 2 files changed, 68 insertions(+), 42 deletions(-) diff --git a/module/block/view/scrumlistblock.html.php b/module/block/view/scrumlistblock.html.php index 15da1f159d..dfa6fe4110 100644 --- a/module/block/view/scrumlistblock.html.php +++ b/module/block/view/scrumlistblock.html.php @@ -11,7 +11,7 @@ */ ?> -
" . $lang->project->create, '', "class='btn btn-primary'")?>
+
block->emptyTip;?>
diff --git a/module/block/view/scrumoverallblock.html.php b/module/block/view/scrumoverallblock.html.php index 8520ddf326..e080d16be8 100644 --- a/module/block/view/scrumoverallblock.html.php +++ b/module/block/view/scrumoverallblock.html.php @@ -13,48 +13,74 @@
" . $lang->project->create, '', "class='btn btn-primary'")?>
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
block->totalStory;?>block->totalBug;?>
allStories;?>allBugs;?>
teamCount;?>consumed;?> -
-
-
+ +
+
+
+
总投入
+
+
+
我的任务
+
96
-
-
-
-
+
+
+
已消耗工时
+
96
-
estimate;?>'.$totalData[$programID]->doneStories.'     '.$totalData[$programID]->leftStories;?>'.$totalData[$programID]->doneBugs.'     '.$totalData[$programID]->leftBugs;?>
+
+ 总预计 10 +
+
+
+
已花费
+
￥200,00 +
+
+ 预算 ￥1000,00 +
+
+
+
+
+
总需求
+
80
+
+
+
+
+ 已完成 + 0 +
+
+ 剩余 + 0 +
+
+
+
总Bug
+
80
+
+
+
+
+ 已完成 + 0 +
+
+ 剩余 + 0 +
+
+
From 89f8a86f3fa1d57713eb88b9571b9035a18e6f1f Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 26 Aug 2020 08:11:21 +0800 Subject: [PATCH 09/14] * Add judgment when the database is empty. --- module/design/control.php | 4 ++-- module/design/lang/en.php | 1 + module/design/lang/zh-cn.php | 1 + module/design/view/commit.html.php | 6 ++++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/module/design/control.php b/module/design/control.php index 2dc9931925..2a57875ef5 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -231,9 +231,9 @@ class design extends control $repos = $this->loadModel('repo')->getRepoPairs(); $repoID = $repoID ? $repoID : key($repos); - $repo = $this->loadModel('repo')->getRepoByID($repoID); + $repo = $repoID ? $this->loadModel('repo')->getRepoByID($repoID) : ''; - $revisions = $this->repo->getCommits($repo, '', 'HEAD', '', $pager, $begin, $end); + $revisions = $repo ? $this->repo->getCommits($repo, '', 'HEAD', '', $pager, $begin, $end) : ''; if($_POST) { diff --git a/module/design/lang/en.php b/module/design/lang/en.php index c51c12de1f..ca38242760 100644 --- a/module/design/lang/en.php +++ b/module/design/lang/en.php @@ -47,6 +47,7 @@ $lang->design->typeList['ADS'] = 'API'; $lang->design->range = 'Impact'; $lang->design->errorSelection = 'No record selected!'; $lang->design->noDesign = 'No record.'; +$lang->design->noCommit = 'No record commited.'; $lang->design->rangeList = array(); $lang->design->rangeList['all'] = 'All'; diff --git a/module/design/lang/zh-cn.php b/module/design/lang/zh-cn.php index 2f54df9741..25cca10d46 100644 --- a/module/design/lang/zh-cn.php +++ b/module/design/lang/zh-cn.php @@ -46,6 +46,7 @@ $lang->design->typeList['ADS'] = '接口设计'; $lang->design->range = '影响范围'; $lang->design->errorSelection = '还没有选中记录!'; $lang->design->noDesign = '暂时没有记录'; +$lang->design->noCommit = '暂时没有提交记录'; $lang->design->rangeList = array(); $lang->design->rangeList['all'] = '全部记录'; diff --git a/module/design/view/commit.html.php b/module/design/view/commit.html.php index c194f9c363..4951c04483 100644 --- a/module/design/view/commit.html.php +++ b/module/design/view/commit.html.php @@ -19,6 +19,11 @@ arrow . $lang->design->commit;?> + +
+

design->noCommit;?>

+
+
@@ -76,6 +81,7 @@ show('right', 'pagerjs');?> + From f73b8162808d39dc01d6bcb807e44295fb28cd1f Mon Sep 17 00:00:00 2001 From: Catouse Date: Wed, 26 Aug 2020 08:26:45 +0800 Subject: [PATCH 10/14] * improve UI of program cards view. --- module/program/css/browse.css | 11 ++++++++++- module/program/js/browse.js | 19 +++++++++++++++++-- module/program/view/browsebygrid.html.php | 20 ++++++++++++++++++++ 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/module/program/css/browse.css b/module/program/css/browse.css index e60eb9f6dd..071599a2ce 100644 --- a/module/program/css/browse.css +++ b/module/program/css/browse.css @@ -24,6 +24,15 @@ #cards .program-detail .progress {height: 4px;} #cards .program-detail .progress-text-left .progress-text {width: 50px; left: -50px;} #cards .pager {margin: 0; float: right;} -#cards .pager .btn{border: none} +#cards .pager .btn {border: none} +#cards .program-stages-container {margin: 0 -16px -16px -16px; padding: 0 4px; height: 46px; overflow-x: auto; position: relative;} +#cards .program-stages:after {content: ' '; width: 30px; display: block; right: -16px; top: 16px; bottom: -6px; z-index: 1; background: linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 100%); position: absolute;} +#cards .program-stages-row {position: relative; height: 30px; z-index: 0;} +#cards .program-stage-item {white-space: nowrap; position: absolute; top: 0; min-width: 48px; padding-top: 13px; color: #838A9D;} +#cards .program-stage-item > div {white-space: nowrap; overflow: visible; text-align: center; text-overflow: ellipsis;} +#cards .program-stage-item:before {content: ' '; display: block; width: 8px; height: 8px; border-radius: 50%; background: #D1D1D1; position: absolute; left: 50%; margin-left: -4px; top: 0; z-index: 1;} +#cards .program-stage-item + .program-stage-item:after {content: ' '; display: block; left: -50%; right: 50%; height: 2px; background-color: #D1D1D1; top: 3px; position: absolute; z-index: 0;} +#cards .program-stage-item.is-going {color: #333;} +#cards .program-stage-item.is-going::before {background-color: #0C64EB;} .w-240px{width:240px;} diff --git a/module/program/js/browse.js b/module/program/js/browse.js index fa840f3578..15637a62a3 100644 --- a/module/program/js/browse.js +++ b/module/program/js/browse.js @@ -7,7 +7,7 @@ $(function() window.location.reload(); }); - // Auto resize cards size + /* Auto resize cards size */ var minCardWidth = 280; var $cards = $('#cards'); var resizeCards = function() @@ -23,7 +23,22 @@ $(function() resizeCards(); $(window).on('resize', resizeCards); - // Make cards clickable + /* Auto resize stages */ + $cards.find('.program-stages-container').each(function() + { + var $container = $(this); + var $row = $container.children(); + var totalWidth = 0; + $row.children().each(function() + { + var $item = $(this); + $item.css('left', totalWidth); + totalWidth += $item.width(); + }); + $row.css('minWidth', totalWidth); + }); + + /* Make cards clickable */ $cards.on('click', '.panel', function(e) { if(!$(e.target).closest('.panel-actions').length) diff --git a/module/program/view/browsebygrid.html.php b/module/program/view/browsebygrid.html.php index 5934b4a48d..bbbe1f6c8e 100644 --- a/module/program/view/browsebygrid.html.php +++ b/module/program/view/browsebygrid.html.php @@ -35,7 +35,26 @@ template === 'cmmi'): ?>

program->ongoingStage; ?>

+ projects as $project) + { + if(!$project->parent) $programProjects[] = $project; + } + ?> +
project->statusList, $program->status);?>
+ +
+
+ +
'> +
name; ?>
+
+ +
+
+
projects ? current($program->projects) : '';?> @@ -58,6 +77,7 @@ +
show('right', 'pagerjs');?> From 00fe28cc807a262c3af2663e19e2996b448cd832 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 26 Aug 2020 08:33:11 +0800 Subject: [PATCH 11/14] * Unified button format. --- module/design/control.php | 2 +- module/design/view/browse.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/design/control.php b/module/design/control.php index 2a57875ef5..f2b748f22f 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -68,7 +68,7 @@ class design extends control * @access public * @return void */ - public function create($productID = 0, $prevModule = '', $prevID = 0) + public function create($productID = 0) { $productID = $this->loadModel('product')->saveState($productID, $this->product->getPairs('nocode')); $this->design->setProductMenu($productID); diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php index 08c2796dc8..e50b8687a0 100644 --- a/module/design/view/browse.html.php +++ b/module/design/view/browse.html.php @@ -27,7 +27,7 @@
" . $lang->design->batchCreate, '', "class='btn btn-primary'");?> - createLink('design', 'create', "productID=$productID&designID=0"), " {$lang->design->create}", '', "class='btn btn-primary'");?> + " . $lang->design->create, '', "class='btn btn-primary'");?>
From 76628a20a59485068e9f39ed0e14309c50a223e5 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 26 Aug 2020 09:02:43 +0800 Subject: [PATCH 12/14] * Add English lang file. --- module/custom/lang/en.php | 2 ++ module/holiday/lang/en.php | 7 +++++++ module/subject/lang/en.php | 6 ++++++ 3 files changed, 15 insertions(+) create mode 100644 module/subject/lang/en.php diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 12f36948d2..25c50283c0 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -199,3 +199,5 @@ $lang->custom->conceptOptions->story['1'] = 'Story'; $lang->custom->conceptOptions->hourPoint = array(); $lang->custom->conceptOptions->hourPoint['0'] = 'Hour'; $lang->custom->conceptOptions->hourPoint['1'] = 'Story Point'; +$lang->custom->conceptOptions->hourPoint['2'] = 'Function Ponit'; +$lang->custom->conceptOptions->hourPoint['3'] = 'Code Line'; diff --git a/module/holiday/lang/en.php b/module/holiday/lang/en.php index f88ae0b3ad..b22e4e0ea4 100644 --- a/module/holiday/lang/en.php +++ b/module/holiday/lang/en.php @@ -6,14 +6,21 @@ $lang->holiday->create = 'Create'; $lang->holiday->edit = 'Edit'; $lang->holiday->delete = 'Delete'; +$lang->holiday->createAction = 'Create Holiday'; +$lang->holiday->editAction = 'Edit Holiday'; +$lang->holiday->deleteAction = 'Delete Holiday'; + $lang->holiday->id = 'ID'; $lang->holiday->name = 'Name'; $lang->holiday->desc = 'Description'; $lang->holiday->type = 'Type'; $lang->holiday->begin = 'Begin'; $lang->holiday->end = 'End'; +$lang->holiday->all = 'All'; $lang->holiday->holiday = 'Holiday'; $lang->holiday->typeList['holiday'] = 'Holiday'; $lang->holiday->typeList['working'] = 'Working Day'; + +$lang->holiday->emptyTip = 'No Holiday'; diff --git a/module/subject/lang/en.php b/module/subject/lang/en.php new file mode 100644 index 0000000000..17a546f008 --- /dev/null +++ b/module/subject/lang/en.php @@ -0,0 +1,6 @@ +subject->common = 'Subject'; +$lang->subject->manage = 'Manage Subject'; +$lang->subject->manageChild = 'Manage Child Subject'; +$lang->subject->name = 'Subject Name'; +$lang->subject->browse = 'Browse Subject'; From 41ecce79d5e290f7ef122db1484ecd7c3a7e1266 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 26 Aug 2020 09:05:49 +0800 Subject: [PATCH 13/14] * Add comment. --- module/design/lang/en.php | 10 ++++++++++ module/design/lang/zh-cn.php | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/module/design/lang/en.php b/module/design/lang/en.php index ca38242760..2106dabc73 100644 --- a/module/design/lang/en.php +++ b/module/design/lang/en.php @@ -1,4 +1,14 @@ + * @package design + * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ + * @link http://www.zentao.net + */ $lang->design->common = 'Design'; $lang->design->browse = 'List'; $lang->design->commit = 'Link Commit'; diff --git a/module/design/lang/zh-cn.php b/module/design/lang/zh-cn.php index 25cca10d46..51880e9792 100644 --- a/module/design/lang/zh-cn.php +++ b/module/design/lang/zh-cn.php @@ -1,4 +1,14 @@ + * @package design + * @version $Id: zh-cn.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ + * @link http://www.zentao.net + */ $lang->design->common = '设计'; $lang->design->browse = '浏览列表'; $lang->design->commit = '关联提交'; From f4ccf99b1d9002c97f454537ef79eda4d7959a3b Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 26 Aug 2020 09:10:23 +0800 Subject: [PATCH 14/14] * Edit English lang file for user module. --- module/user/lang/en.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/user/lang/en.php b/module/user/lang/en.php index ab521245af..305d6bb547 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -11,6 +11,8 @@ */ $lang->user->common = 'User'; $lang->user->id = 'ID'; +$lang->user->inside = 'Inside Members'; +$lang->user->outside = 'Outside Members'; $lang->user->company = 'Company'; $lang->user->dept = 'Department'; $lang->user->account = 'Account';