From eb01c7c203618913fed288d8261b87d48eea9f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 16 Nov 2023 14:22:52 +0100 Subject: [PATCH] Export: on filter "action by type goals, and results", restore the fields when editing a saved export --- .../unreleased/Fixed-20231116-142207.yaml | 6 ++ .../vuejs/ExportFormActionGoalResult/App.vue | 97 ++++++++++++------- .../vuejs/ExportFormActionGoalResult/api.js | 20 +--- 3 files changed, 71 insertions(+), 52 deletions(-) create mode 100644 .changes/unreleased/Fixed-20231116-142207.yaml diff --git a/.changes/unreleased/Fixed-20231116-142207.yaml b/.changes/unreleased/Fixed-20231116-142207.yaml new file mode 100644 index 000000000..9f3d927ef --- /dev/null +++ b/.changes/unreleased/Fixed-20231116-142207.yaml @@ -0,0 +1,6 @@ +kind: Fixed +body: 'Export: on filter "action by type goals, and results", restore the fields when + editing a saved export' +time: 2023-11-16T14:22:07.968973002+01:00 +custom: + Issue: "141" diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/App.vue index 0d91bbbf0..3c91a5f40 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/App.vue @@ -150,14 +150,40 @@ export default { } }, }, - mounted() { - this.getSocialActionsList(); + async mounted() { + await this.getSocialActionsList(); - this.actions.hiddenField.value = ''; - this.goals.hiddenField.value = ''; - this.results.hiddenField.value = ''; + if ('' !== this.actions.hiddenField.value) { + const actionIds = this.actions.hiddenField.value.split(','); + for (const aid of actionIds) { + let action = this.actions.options.find(a => Number.parseInt(aid) === a.id); + if (undefined !== action) { + this.action.push(action); + await this.selectAction(action); + } + } + } - //console.log(this.actions.hiddenField, this.goals.hiddenField, this.results.hiddenField); + if ('' !== this.goals.hiddenField.value) { + const goalsIds = this.goals.hiddenField.value.split(',').map(s => Number.parseInt(s)); + for (const gid of goalsIds) { + let goal = this.goals.options.find(g => gid === g.id); + if (undefined !== goal) { + this.goal.push(goal); + await this.selectGoal(goal); + } + } + } + + if ('' !== this.results.hiddenField.value) { + const resultsIds = this.results.hiddenField.value.split(',').map(s => Number.parseInt(s)); + for (const rid of resultsIds) { + let result = this.results.options.find(r => rid === r.id); + if (undefined !== result) { + this.result.push(result); + } + } + } }, methods: { async getSocialActionsList() { @@ -179,6 +205,8 @@ export default { return 1; }) + + return Promise.resolve(); }, formatSocialAction({text, issue}) { @@ -189,54 +217,51 @@ export default { * Select/unselect in Action Multiselect * @param value */ - selectAction(value) { + async selectAction(value) { //console.log('----'); console.log('select action', value.id); let children = this.getChildrensFromParent(value); this.addSelectedElement('actions', children); let parentAndChildren = [...[value], ...children]; + const promises = []; parentAndChildren.forEach(elem => { - getGoalByAction(elem.id).then(response => new Promise((resolve, reject) => { - this.addElementInData('goals', response.results); - resolve(); - })).catch; - getResultByAction(elem.id).then(response => new Promise((resolve, reject) => { - this.addElementInData('results', response.results); - resolve(); - })).catch; + promises.push(getGoalByAction(elem.id).then(goals => { + this.addElementInData('goals', goals); + return Promise.resolve(); + })); + promises.push(getResultByAction(elem.id).then(results => { + this.addElementInData('results', results); + return Promise.resolve(); + })); }); + + await Promise.all(promises); + return Promise.resolve(); }, unselectAction(value) { - //console.log('----'); console.log('unselect action', value.id); - getGoalByAction(value.id).then(response => new Promise((resolve, reject) => { - [ this.goals.options, this.goals.value ] = this.removeElementInData('goals', response.results); - resolve(); - })).catch; - getResultByAction(value.id).then(response => new Promise((resolve, reject) => { - [ this.results.options, this.results.value ] = this.removeElementInData('results', response.results); - resolve(); - })).catch; + getGoalByAction(value.id).then(goals => { + [this.results.options, this.results.value ] = this.removeElementInData('goals', goals); + }); + getResultByAction(value.id).then(results => { + [this.results.options, this.results.value ] = this.removeElementInData('results', results); + }); }, /** * Select/unselect in Goal Multiselect * @param value */ - selectGoal(value) { - //console.log('----'); console.log('select goal', value.id); - getResultByGoal(value.id).then(response => new Promise((resolve, reject) => { - this.addElementInData('results', response.results); - resolve(); - })).catch; + async selectGoal(value) { + return getResultByGoal(value.id).then(results => { + this.addElementInData('results', results); + }) }, unselectGoal(value) { - //console.log('----'); console.log('unselect goal', value.id); - getResultByGoal(value.id).then(response => new Promise((resolve, reject) => { - [ this.results.options, this.results.value ] = this.removeElementInData('results', response.results); - resolve(); - })).catch; + getResultByGoal(value.id).then(results => { + [ this.results.options, this.results.value ] = this.removeElementInData('results', results); + }).catch; }, /** @@ -284,7 +309,7 @@ export default { if (dump.length > 0) { //console.log('push ' + dump.length + ' elems in', target, dump); } - data.sort(); + data.options.sort(); }, /** diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/api.js index afcece4f4..0c02c21f0 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/api.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/api.js @@ -8,29 +8,17 @@ const getSocialActions = () => fetchResults( const getGoalByAction = (id) => { let url = `/api/1.0/person/social-work/goal/by-social-action/${id}.json`; - return fetch(url) - .then(response => { - if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); - }); + return fetchResults(url); }; const getResultByAction = (id) => { let url = `/api/1.0/person/social-work/result/by-social-action/${id}.json`; - return fetch(url) - .then(response => { - if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); - }); + return fetchResults(url); }; const getResultByGoal = (id) => { let url = `/api/1.0/person/social-work/result/by-goal/${id}.json`; - return fetch(url) - .then(response => { - if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); - }); + return fetchResults(url); }; export { @@ -38,4 +26,4 @@ export { getGoalByAction, getResultByAction, getResultByGoal, -} \ No newline at end of file +}