Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix cards count incorrect on some kanbans.

Browse Source
This commit is contained in:
Hao Sun
2021-12-06 11:18:49 +08:00
parent 2ed3d819e8
commit 8d08be2f57
4 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
module/common/view/kanban.html.php
View File

@@ -436,21 +436,6 @@ $.extend($.fn.kanban.Constructor.DEFAULTS,
var color = kanbanColorList[lane.$index % kanbanColorList.length];
$name.css('background-color', color);
},
onRenderKanban: function($kanban, kanbanData)
{
/* Update project count and execution count */
var doingProjectCount = 0;
var doingExecutionCount = 0;
var $doingProjectItems = $kanban.find('.kanban-lane-col[data-type="doingProject"] > .kanban-lane-items');
if($doingProjectItems.length)
{
doingProjectCount = $doingProjectItems.find('.project-item').length;
doingExecutionCount = $doingProjectItems.find('.execution-item').length;
}
$kanban.find('.kanban-header-col[data-type="doingProject"] > .title > .count').text(doingProjectCount || 0);
$kanban.find('.kanban-header-col[data-type="doingExecution"] > .title > .count').text(doingExecutionCount || 0);
},
onCreate: function(kanban)
{
kanban.$.on('scroll', tryUpdateKanbanAffix);

24
module/product/js/kanban.js
View File

@@ -9,14 +9,22 @@ function processKanbanData(key, programsData)
var kanbanId = key;
/* Generate columns */
var columns = [];
var columns = [];
var hasDoingProject = false;
var executionsCol;
$.each(kanbanColumns, function(_, column)
{
var colType = column.type;
if(colType === 'doingProject') hasDoingProject = true;
column = $.extend({}, column,
{
kanban: kanbanId,
id: kanbanId + '-' + colType,
parentType: (hasDoingProject && (colType === 'doingProject' || colType === 'doingExecution')) ? 'doing' : false,
});
if(colType === 'doingProject')
{
hasDoingProject = true;
columns.push(
{
kanban: kanbanId,
@@ -27,12 +35,12 @@ function processKanbanData(key, programsData)
count: ''
});
}
columns.push($.extend({}, column,
else if(colType === 'doingExecution')
{
kanban: kanbanId,
id: kanbanId + '-' + colType,
parentType: (hasDoingProject && (colType === 'doingProject' || colType === 'doingExecution')) ? 'doing' : false,
}));
executionsCol = column;
executionsCol.count = 0;
}
columns.push(column);
});
/* Format lanes data */
@@ -76,6 +84,8 @@ function processKanbanData(key, programsData)
var execution = latestExecutions[projectID];
if(!execution || !execution.id) return;
executionsCol.count++;
projectItem.execution = $.extend({}, execution, {id: 'execution-' + execution.id, _id: execution.id});
});
}

21
module/program/js/kanban.js
View File

@@ -10,9 +10,17 @@ function processKanbanData(key, programsData)
/* Generate columns */
var columns = [];
var executionsCol;
$.each(kanbanColumns, function(_, column)
{
var colType = column.type;
column = $.extend({}, column,
{
kanban: kanbanId,
id: kanbanId + '-' + column.type,
parentType: (colType === 'doingProject' || colType === 'doingExecution') ? 'doing' : false,
});
if(colType === 'doingProject')
{
columns.push(
@@ -25,13 +33,12 @@ function processKanbanData(key, programsData)
count: ''
});
}
columns.push($.extend({}, column,
else if(colType === 'doingExecution')
{
kanban: kanbanId,
id: kanbanId + '-' + column.type,
parentType: (colType === 'doingProject' || colType === 'doingExecution') ? 'doing' : false,
}));
executionsCol = column;
executionsCol.count = 0;
}
columns.push(column);
});
/* Format lanes data */
@@ -87,6 +94,8 @@ function processKanbanData(key, programsData)
var execution = project.execution;
if(!execution || !execution.id) return;
executionsCol.count++;
projectItem.execution = $.extend({}, execution, {id: 'execution-' + execution.id, _id: execution.id});
});
}

21
module/project/js/kanban.js
View File

@@ -10,9 +10,17 @@ function processKanbanData(key, programGroup)
/* Generate columns */
var columns = [];
var executionsCol;
$.each(kanbanColumns, function(_, column)
{
var colType = column.type;
column = $.extend({}, column,
{
kanban: kanbanId,
id: kanbanId + '-' + column.type,
parentType: (colType === 'doingProject' || colType === 'doingExecution') ? 'doing' : false,
});
if(colType === 'doingProject')
{
columns.push(
@@ -25,13 +33,13 @@ function processKanbanData(key, programGroup)
count: ''
});
}
columns.push($.extend({}, column,
else if(colType === 'doingExecution')
{
kanban: kanbanId,
id: kanbanId + '-' + column.type,
parentType: (colType === 'doingProject' || colType === 'doingExecution') ? 'doing' : false,
}));
executionsCol = column;
executionsCol.count = 0;
}
columns.push(column);
});
/* Format lanes data */
var lanes = [];
@@ -58,6 +66,7 @@ function processKanbanData(key, programGroup)
var execution = latestExecutions[projectID];
if(execution && execution.id)
{
executionsCol.count++;
projectItem.execution = $.extend({}, execution, {id: 'execution-' + execution.id, _id: execution.id});
}
}