Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 34 additions & 9 deletions src/actions/Tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { actionGeneralCalculation } from './Calculation';


const changeWrapper = ({ dispatch, form, field, payload, touch = true }) => {
dispatch({
return dispatch({
type: '@@redux-form/CHANGE',
meta: {
form,
Expand All @@ -24,10 +24,13 @@ const recalculateTime = (field, getState, selector, dispatch, form) => {
if (!field) return null;

const currentTask = selector(getState(), field);
const sumTasks = currentTask.tasks.filter(({ isChecked }) => isChecked).reduce((sum, item) => ({
min: sum.min + item.minimumMinutes,
max: sum.max + item.maximumMinutes,
}), { min: 0, max: 0 });
const { tasks, maximumMinutes, minimumMinutes } = currentTask;
const sumTasks = tasks ?
tasks.filter(({ isChecked }) => isChecked).reduce((sum, item) => ({
min: sum.min + item.minimumMinutes,
max: sum.max + item.maximumMinutes,
}), { min: 0, max: 0 })
: { min: minimumMinutes, max: maximumMinutes }

changeWrapper({ dispatch, form, field: `${field}.minimumMinutes`, payload: sumTasks.min });
changeWrapper({ dispatch, form, field: `${field}.maximumMinutes`, payload: sumTasks.max });
Expand All @@ -38,12 +41,34 @@ const recalculateTime = (field, getState, selector, dispatch, form) => {
};

export const actionToggleTask = ({ form, field }) =>
(dispatch, getState) => {
async (dispatch, getState) => {
const selector = formValueSelector(form);
const parentField = field.replace(/.?tasks\[\d+\]$/, '');

recalculateTime(parentField, getState, selector, dispatch, form);

// find out task index
const match = field.split('.');
const task = match && match[0];
const replaceExp = /(tasks\[)|(\])/g;
const taskIndex = parseInt(task.replace(replaceExp, ''), 10);
if (taskIndex >= 0 && match.length < 2) {
// toggle all subtasks
const task = getState().form['ESTIMATE_FORM'].values.tasks[taskIndex];
const subtasks = task && task.tasks
const subtaskCount = subtasks && subtasks.length;
if (subtaskCount) {
const { isChecked } = task;
const allChanges = [];
for(let i = 0; i < subtaskCount; i++ ) {
const subtaskField = `tasks[${taskIndex}].tasks[${i}]`;
const subTask = Object.assign({}, subtasks[i], { isChecked });
allChanges.push(changeWrapper({ dispatch, form, field: subtaskField , payload: subTask }))
}
await Promise.all(allChanges);
recalculateTime(`tasks[${taskIndex}].tasks[${0}]`, getState, selector, dispatch, form);

}
} else {
recalculateTime(parentField, getState, selector, dispatch, form);
}
dispatch(actionGeneralCalculation({ form }));
};

Expand Down
3 changes: 2 additions & 1 deletion src/components/Header/Task.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ class Task extends React.Component {
},
payload: checked,
});

const exp = /task(\[){1,1}[0-9]+\]{1,1}/;
const tasks = field.split('.')[0];
actionToggleTask({ form, field, checked });
}

Expand Down
2 changes: 2 additions & 0 deletions src/utils/spreadsheets/sheetHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const createTaskTable = (startRow ,tasks, moneyRate) => {
let totalMax = 0;

tasks.forEach((t,i) => {
if (!t.isChecked) return;
totalMin += t.minimumMinutes / 60;
totalMax += t.maximumMinutes / 60;
const { maximumMinutes , minimumMinutes, taskName } = t;
Expand All @@ -52,6 +53,7 @@ const createTaskTable = (startRow ,tasks, moneyRate) => {
// prink subtasks
if (t.tasks) {
t.tasks.forEach((subTask,j) => {
if (!subTask.isChecked) return;
const subTaskCells = [];
const { maximumMinutes , minimumMinutes, taskName } = subTask;
subTaskCells.push(formatCell(createCell(`${i+1}.${j+1}. ${taskName}`), subtaskNameOptions));
Expand Down