diff --git a/src/assets/scss/components/layout.scss b/src/assets/scss/components/layout.scss index 714504e..d4e3572 100644 --- a/src/assets/scss/components/layout.scss +++ b/src/assets/scss/components/layout.scss @@ -19,7 +19,7 @@ body { color: var(--global-textColor); }*/ - h2, h3, p, label, .appPageSection__hr { + h2, h3, p, label, .appPageSection__hr, li { color: var(--global-textColor); } diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js index cee9155..f4a86d6 100644 --- a/src/pages/BandoApplication/index.js +++ b/src/pages/BandoApplication/index.js @@ -324,6 +324,9 @@ const BandoApplication = () => { ].includes(cur)) { acc.user[cur] = userData[cur]; } + if (['dateOfBirth'].includes(cur)) { + acc.user[cur] = new Date(userData[cur]); + } return acc; }, dynamicData); diff --git a/src/pages/BandoEdit/index.js b/src/pages/BandoEdit/index.js index 40c18af..b7f3ee6 100644 --- a/src/pages/BandoEdit/index.js +++ b/src/pages/BandoEdit/index.js @@ -76,9 +76,9 @@ const BandoEdit = () => { BandoService.validateBando(id, validateCallback, errValidateCallback); } - const validateCallback = (data) => { - if (data.status === 'SUCCESS') { - setData({ ...data, status: data.data.status }); + const validateCallback = (resp) => { + if (resp.status === 'SUCCESS') { + setData(resp.data); if (bandoMsgs.current) { bandoMsgs.current.show([ { @@ -100,11 +100,11 @@ const BandoEdit = () => { storeSet.main.unsetAsyncRequest(); } - const errValidateCallback = (data) => { - if (data.status === 'VALIDATION_ERROR') { + const errValidateCallback = (resp) => { + if (resp.status === 'VALIDATION_ERROR') { storeSet.main.unsetAsyncRequest(); if (bandoMsgs.current) { - bandoMsgs.current.show(data.data.map((v, i) => ({ + bandoMsgs.current.show(resp.data.map((v, i) => ({ id: i, sticky: true, severity: 'error', summary: '', detail: v, @@ -112,14 +112,14 @@ const BandoEdit = () => { }))); } if (toast.current) { - toast.current.show(data.data.map((v, i) => ({ + toast.current.show(resp.data.map((v, i) => ({ severity: 'error', summary: '', detail: v }))); } } else { - standardErrCallback(data); + standardErrCallback(resp); } } @@ -129,8 +129,8 @@ const BandoEdit = () => { BandoService.updateBandoStatus(id, publishCallback, errPublishCallback, [['status', 'PUBLISH']]); } - const publishCallback = (data) => { - if (data.status === 'SUCCESS') { + const publishCallback = (resp) => { + if (resp.status === 'SUCCESS') { if (bandoMsgs.current) { bandoMsgs.current.show([ { @@ -148,31 +148,31 @@ const BandoEdit = () => { detail: __('Pubblicato!', 'gepafin') }); } - if (data.data.docs) { - data.data.docs = data.data.docs + if (resp.data.docs) { + resp.data.docs = resp.data.docs .filter(o => o.source === 'CALL' && o.type === 'DOCUMENT'); } - setData(data.data); + setData(resp.data); } storeSet.main.unsetAsyncRequest(); } - const errPublishCallback = (data) => { - standardErrCallback(data); + const errPublishCallback = (resp) => { + standardErrCallback(resp); } - const getCallback = (data) => { - if (data.status === 'SUCCESS') { - if (!isNil(data.data.dates) && data.data.dates.length) { - if (data.data.dates[0]) { - data.data.startDate = is(String, data.data.dates[0]) ? new Date(data.data.dates[0]) : (data.data.dates[0] ? data.data.dates[0] : ''); + const getCallback = (resp) => { + if (resp.status === 'SUCCESS') { + if (!isNil(resp.data.dates) && resp.data.dates.length) { + if (resp.data.dates[0]) { + resp.data.startDate = is(String, resp.data.dates[0]) ? new Date(resp.data.dates[0]) : (resp.data.dates[0] ? resp.data.dates[0] : ''); } - if (data.data.dates[1]) { - data.data.endDate = is(String, data.data.dates[1]) ? new Date(data.data.dates[1]) : (data.data.dates[1] ? data.data.dates[1] : ''); + if (resp.data.dates[1]) { + resp.data.endDate = is(String, resp.data.dates[1]) ? new Date(resp.data.dates[1]) : (resp.data.dates[1] ? resp.data.dates[1] : ''); } } - if (data.data.status === 'READY_TO_PUBLISH') { + if (resp.data.status === 'READY_TO_PUBLISH') { bandoMsgs.current.clear(); bandoMsgs.current.show([ { @@ -182,7 +182,7 @@ const BandoEdit = () => { closable: false } ]); - } else if (data.data.status === 'DRAFT') { + } else if (resp.data.status === 'DRAFT') { if (bandoMsgs.current) { bandoMsgs.current.clear(); bandoMsgs.current.show([ @@ -195,26 +195,26 @@ const BandoEdit = () => { ]); } } - if (data.data.docs) { - data.data.docs = data.data.docs + if (resp.data.docs) { + resp.data.docs = resp.data.docs .filter(o => o.source === 'CALL' && o.type === 'DOCUMENT'); } - setData(data.data); + setData(resp.data); } storeSet.main.unsetAsyncRequest(); } - const errGetCallback = (data) => { - set404FromErrorResponse(data); + const errGetCallback = (resp) => { + set404FromErrorResponse(resp); storeSet.main.unsetAsyncRequest(); } - const standardErrCallback = (data) => { - if (bandoMsgs.current && data.message) { + const standardErrCallback = (resp) => { + if (bandoMsgs.current && resp.message) { bandoMsgs.current.show([ { sticky: true, severity: 'error', summary: '', - detail: data.message, + detail: resp.message, closable: true } ]); @@ -222,9 +222,9 @@ const BandoEdit = () => { storeSet.main.unsetAsyncRequest(); } - const getFormsCallback = (data) => { - if (data.status === 'SUCCESS') { - setForms(data.data); + const getFormsCallback = (resp) => { + if (resp.status === 'SUCCESS') { + setForms(resp.data); } storeSet.main.unsetAsyncRequest(); } diff --git a/src/pages/BandoFormsEdit/index.js b/src/pages/BandoFormsEdit/index.js index 107483d..fa0865d 100644 --- a/src/pages/BandoFormsEdit/index.js +++ b/src/pages/BandoFormsEdit/index.js @@ -248,6 +248,7 @@ const BandoFormsEdit = () => { if (data.status === 'SUCCESS') { const criteria = pathOr([], ['data', 'criteria'], data); const criteriaOptions = criteria.map(o => ({value: o.id, label: o.value})); + console.log('criteriaOptions', criteriaOptions); storeSet.main.bandoCriteria(criteriaOptions); } } @@ -267,6 +268,8 @@ const BandoFormsEdit = () => { if (bandoFormId) { storeSet.main.setAsyncRequest(); FormsService.getFormById(bandoFormId, getFormCallback, errGetFormCallbacks); + } + if (bandoId) { BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback); }