| class="w-20px" style="border-right: 0; border-left: 0; background: #32C5FF;"> | - -style="border-left: 0px;">product->unclosedProduct;?> | ->product->unexpiredPlan;?> | ->product->doing;?> | ->product->normalRelease;?> | -||
|---|---|---|---|---|---|---|
| product->doingProject;?> | -product->doingExecution;?> | -|||||
| - - | - - " . html::a($this->createLink('product', 'browse', "productID=$productID"), $productList[$productID]->name, '', "title={$productList[$productID]->name}") . '';?> - - name}>{$productList[$productID]->name}";?> - - | -
-
-
- $plan):?>
-
-
-
- createLink('productplan', 'view', "planID=$planID"), $plan->title, '', "title={$plan->title}");?>
-
- title}>{$plan->title}"?>
-
-
-
-
- |
- systemMode == 'new'):?>
-
-
- $project):?>
-
-
- delay) ? 'border-left: 3px solid red' : 'border-left: 3px solid #0bd986';?>
-
-
-
-
-
-
-
-
-
- createLink('project', 'index', "projectID=$projectID"), $projectList[$projectID]->name, '', "title={$projectList[$projectID]->name}");?>
-
- name}>{$projectList[$projectID]->name}"?>
-
-
-
-
-
-
-
-
- hours->progress);?>
- |
-
-
- $project):?>
-
- end);
- $borderStyle = $delay > 0 ? 'border-left: 3px solid red' : 'border-left: 3px solid #0bd986';
- }
- ?>
-
- id : 0;?>
- name : ''?>
-
-
-
-
-
-
-
-
-
-
- createLink('execution', 'task', "executionID=$executionID"), $executionName, '', "title={$executionName}");?>
-
- $executionName";?>
-
-
-
-
-
-
-
-
-
-
-
-
- progress);?>
- |
-
- systemMode == 'classic'):?>
-
-
-
- $execution):?>
- end);
- $borderStyle = $delay > 0 ? 'border-left: 3px solid red' : 'border-left: 3px solid #0bd986';
- ?>
-
-
-
-
-
-
-
-
-
- createLink('execution', 'task', "executionID=$executionID"), $execution->name, '', "title={$execution->name} class='text-ellipsis'");?>
-
- name}>{$execution->name}"?>
-
-
-
-
-
-
-
-
-
- progress);?>
- |
-
-
-
-
- $release):?>
-
-
-
- createLink('release', 'view', "releaseID=$releaseID"), $release->name, '', "title={$release->name} class='text-ellipsis'");?>
-
- name}>{$release->name}"?>
-
- marker) echo " ";?>
-
-
-
- |
-
-
-
-
- $programs):?>
-
- noData;?>
-
-
-
-
-
-
+
+
+
+
-
+ $kanbanColumns['doingProject'] = array('name' => $lang->product->doingProject, 'type' => 'doingProject');
+ $kanbanColumns['doingExecution'] = array('name' => $lang->product->doingExecution, 'type' => 'doingExecution');
+}
+else
+{
+ $kanbanColumns['doingExecution'] = array('name' => $lang->product->doing, 'type' => 'doingExecution');
+}
+$kanbanColumns['normalRelease'] = array('name' => $lang->product->normalRelease, 'type' => 'normalRelease');
+$userPrivs = array();
+$userPrivs['product'] = common::hasPriv('product', 'browse');
+$userPrivs['productplan'] = common::hasPriv('productplan', 'view');
+$userPrivs['project'] = common::hasPriv('project', 'index');
+$userPrivs['execution'] = common::hasPriv('execution', 'task');
+$userPrivs['release'] = common::hasPriv('release', 'view');
+js::set('kanbanColumns', $kanbanColumns);
+js::set('userPrivs', $userPrivs);
+js::set('kanbanList', $kanbanList);
+js::set('programList', $programList);
+js::set('productList', $productList);
+js::set('planList', $planList);
+js::set('projectList', $projectList);
+js::set('projectProduct', $projectProduct);
+js::set('latestExecutions', $latestExecutions);
+js::set('releaseList', $releaseList);
+js::set('hourList', $hourList);
+js::set('doingText', $lang->product->doing);
+?>
+
diff --git a/module/program/js/common.js b/module/program/js/common.js
index b12b02cfa1..f34e41c406 100644
--- a/module/program/js/common.js
+++ b/module/program/js/common.js
@@ -104,13 +104,8 @@ function computeEndDate(delta)
if(delta == 999)
{
$('#end').val(longTime);
- $('#end').attr('disabled', 'disabled');
return false;
}
- else
- {
- $('#end').removeAttr('disabled');
- }
beginDate = convertStringToDate(beginDate);
if((delta == 7 || delta == 14) && (beginDate.getDay() == 1))
diff --git a/module/program/js/edit.js b/module/program/js/edit.js
index d69473ebad..df353f8db3 100644
--- a/module/program/js/edit.js
+++ b/module/program/js/edit.js
@@ -78,4 +78,8 @@ $(function()
$('#exchangeRate').val(exchangeRate);
$('#changeUnitTip').modal('hide');
})
+
+ /* If end is longtime, set the default date to today */
+ var today = $.zui.formatDate(new Date(), 'yyyy-MM-dd');
+ if($('#end').val() == longTime) $('#end').val(today).datetimepicker('update').val(longTime);
});
diff --git a/module/program/js/kanban.js b/module/program/js/kanban.js
new file mode 100644
index 0000000000..7429511136
--- /dev/null
+++ b/module/program/js/kanban.js
@@ -0,0 +1,109 @@
+/**
+ * Process kanban data
+ * @param {string} key Kanban key, used as kanban id
+ * @param {Object} programsData Programs data
+ * @returns {Object} kanban data
+ */
+function processKanbanData(key, programsData)
+{
+ var kanbanId = key;
+
+ /* Generate columns */
+ var columns = [];
+ $.each(kanbanColumns, function(_, column)
+ {
+ columns.push($.extend({}, column,
+ {
+ kanban: kanbanId,
+ id: kanbanId + '-' + column.type,
+ }));
+ });
+
+ /* Format lanes data */
+ var lanes = [];
+ $.each(programsData, function(programId, program)
+ {
+ var subLanes = [];
+
+ $.each(program.products, function(productID, product)
+ {
+ var items = {};
+
+ /* unclosed products */
+ var productItem = {id: 'product-' + productID, _id: productID, name: product.name};
+ items.unclosedProduct = [productItem];
+
+ /* plans */
+ items.unexpiredPlan = [];
+ var plans = product.plans;
+ if(plans)
+ {
+ $.each(plans, function(planID, plan)
+ {
+ items.unexpiredPlan.push($.extend({}, plan, {id: 'plan-' + planID, _id: planID}));
+ });
+ }
+
+ /* wait projects */
+ items.waitProject = [];
+ var waitProjects = product.projects && product.projects.wait;
+ if(waitProjects)
+ {
+ $.each(waitProjects, function(projectID, project)
+ {
+ var projectItem = $.extend({}, project, {id: 'project-' + projectID, _id: projectID});
+ items.waitProject.push(projectItem);
+ });
+ }
+
+ /* doing projects and executions */
+ items.doingProject = [];
+ items.doingExecution = [];
+ var doingProjects = product.projects && product.projects.doing;
+ if(doingProjects)
+ {
+ $.each(doingProjects, function(projectID, project)
+ {
+ var projectItem = $.extend({}, project, {id: 'project-' + projectID, _id: projectID});
+ items.doingProject.push(projectItem);
+
+ var execution = project.execution;
+ if(!execution) return;
+ var executionItem = $.extend({}, execution, {id: 'execution-' + execution.id, _id: execution.id});
+ items.doingExecution.push(executionItem);
+ });
+ }
+
+ /* normal release */
+ items.normalRelease = [];
+ var releases = product.releases;
+ if(releases)
+ {
+ $.each(releases, function(releaseID, release)
+ {
+ if(!release) return;
+ var releaseItem = $.extend({}, release, {id: 'release-' + releaseID, _id: releaseID});
+ items.normalRelease.push(releaseItem);
+ });
+ }
+
+ subLanes.push({id: kanbanId + '-' + programId + '-' + productID, items: items});
+ });
+
+ var programItem = $.extend({}, program, {id: programId, kanban: kanbanId, subLanes: subLanes});
+ lanes.push(programItem);
+ });
+
+ return {id: kanbanId, columns: columns, lanes: lanes};
+}
+
+$(function()
+{
+ /* Init all kanbans */
+ $.each(kanbanGroup, function(key, programsData)
+ {
+ var $kanban = $('#kanban-' + key);
+ if(!$kanban.length) return;
+ $kanban.kanban({data: processKanbanData(key, programsData)});
+ });
+});
diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php
index 810baaa9fd..06fe71d320 100644
--- a/module/program/view/edit.html.php
+++ b/module/program/view/edit.html.php
@@ -75,9 +75,8 @@
begin, "class='form-control form-date' placeholder='" . $lang->project->begin . "' required");?>
project->to;?>
end == LONG_TIME ? 'disabled' : '';
- $end = $program->end == LONG_TIME ? $lang->program->longTime : $program->end;
- echo html::input('end', $end, "class='form-control form-date' $disabledEnd placeholder='" . $lang->project->end . "' required");
+ $end = $program->end == LONG_TIME ? $lang->program->longTime : $program->end;
+ echo html::input('end', $end, "class='form-control form-date' placeholder='" . $lang->project->end . "' required");
?>
noData;?>