Fixing intern view of completed tasks
This commit is contained in:
parent
badd08f151
commit
0be87a1e9d
35
index.html
35
index.html
@ -3277,19 +3277,30 @@
|
|||||||
return `${year}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
|
return `${year}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
|
||||||
}
|
}
|
||||||
function markTaskAsCompleted() {
|
function markTaskAsCompleted() {
|
||||||
getConfirmation('Mark this task as completed?', { confirmText: 'Mark as completed' }).then(res => {
|
getConfirmation('Mark this task as completed?', { confirmText: 'Mark as completed' }).then(res => {
|
||||||
if (res) {
|
if (!res) return;
|
||||||
RIBC.admin.putTaskStatus('completed', appState.params.id, appState.params.branch, currentTask.dataset.taskId)
|
|
||||||
// remove task from displayed list
|
RIBC.admin.putTaskStatus('completed', appState.params.id, appState.params.branch, currentTask.dataset.taskId);
|
||||||
const taskId = `${appState.params.id}_${appState.params.branch}_${currentTask.dataset.taskId}`;
|
|
||||||
const filteredTasks = RIBC.getDisplayedTasks().filter(task => task !== taskId)
|
const taskId = `${appState.params.id}_${appState.params.branch}_${currentTask.dataset.taskId}`;
|
||||||
RIBC.admin.setDisplayedTasks(filteredTasks)
|
|
||||||
renderBranchTasks()
|
// safer lookup before calling
|
||||||
adminDataChanged();
|
const getAssigned = RIBC.getAssignedInterns || RIBC.admin?.getAssignedInterns;
|
||||||
notify('Task marked as completed', 'success')
|
const assignedInterns = (typeof getAssigned === 'function' ? getAssigned(taskId) : []) || [];
|
||||||
}
|
const completionDate = Date.now();
|
||||||
})
|
|
||||||
|
assignedInterns.forEach(internId => {
|
||||||
|
RIBC.admin.addCompletedTask(internId, taskId, 0, { completionDate });
|
||||||
|
});
|
||||||
|
|
||||||
|
const filteredTasks = RIBC.getDisplayedTasks().filter(task => task !== taskId);
|
||||||
|
RIBC.admin.setDisplayedTasks(filteredTasks);
|
||||||
|
renderBranchTasks();
|
||||||
|
adminDataChanged();
|
||||||
|
notify('Task marked as completed', 'success');
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function saveTaskChanges() {
|
function saveTaskChanges() {
|
||||||
const changedDetails = {
|
const changedDetails = {
|
||||||
title: getRef('edit_task_title').value.trim(),
|
title: getRef('edit_task_title').value.trim(),
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user