- saving progress;

This commit is contained in:
Vitalii Kiiko
2024-11-06 08:48:21 +01:00
parent 12cf11b1cb
commit 793a0c53ac
4 changed files with 42 additions and 36 deletions

View File

@@ -19,7 +19,7 @@ body {
color: var(--global-textColor); color: var(--global-textColor);
}*/ }*/
h2, h3, p, label, .appPageSection__hr { h2, h3, p, label, .appPageSection__hr, li {
color: var(--global-textColor); color: var(--global-textColor);
} }

View File

@@ -324,6 +324,9 @@ const BandoApplication = () => {
].includes(cur)) { ].includes(cur)) {
acc.user[cur] = userData[cur]; acc.user[cur] = userData[cur];
} }
if (['dateOfBirth'].includes(cur)) {
acc.user[cur] = new Date(userData[cur]);
}
return acc; return acc;
}, dynamicData); }, dynamicData);

View File

@@ -76,9 +76,9 @@ const BandoEdit = () => {
BandoService.validateBando(id, validateCallback, errValidateCallback); BandoService.validateBando(id, validateCallback, errValidateCallback);
} }
const validateCallback = (data) => { const validateCallback = (resp) => {
if (data.status === 'SUCCESS') { if (resp.status === 'SUCCESS') {
setData({ ...data, status: data.data.status }); setData(resp.data);
if (bandoMsgs.current) { if (bandoMsgs.current) {
bandoMsgs.current.show([ bandoMsgs.current.show([
{ {
@@ -100,11 +100,11 @@ const BandoEdit = () => {
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
const errValidateCallback = (data) => { const errValidateCallback = (resp) => {
if (data.status === 'VALIDATION_ERROR') { if (resp.status === 'VALIDATION_ERROR') {
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
if (bandoMsgs.current) { if (bandoMsgs.current) {
bandoMsgs.current.show(data.data.map((v, i) => ({ bandoMsgs.current.show(resp.data.map((v, i) => ({
id: i, id: i,
sticky: true, severity: 'error', summary: '', sticky: true, severity: 'error', summary: '',
detail: v, detail: v,
@@ -112,14 +112,14 @@ const BandoEdit = () => {
}))); })));
} }
if (toast.current) { if (toast.current) {
toast.current.show(data.data.map((v, i) => ({ toast.current.show(resp.data.map((v, i) => ({
severity: 'error', severity: 'error',
summary: '', summary: '',
detail: v detail: v
}))); })));
} }
} else { } else {
standardErrCallback(data); standardErrCallback(resp);
} }
} }
@@ -129,8 +129,8 @@ const BandoEdit = () => {
BandoService.updateBandoStatus(id, publishCallback, errPublishCallback, [['status', 'PUBLISH']]); BandoService.updateBandoStatus(id, publishCallback, errPublishCallback, [['status', 'PUBLISH']]);
} }
const publishCallback = (data) => { const publishCallback = (resp) => {
if (data.status === 'SUCCESS') { if (resp.status === 'SUCCESS') {
if (bandoMsgs.current) { if (bandoMsgs.current) {
bandoMsgs.current.show([ bandoMsgs.current.show([
{ {
@@ -148,31 +148,31 @@ const BandoEdit = () => {
detail: __('Pubblicato!', 'gepafin') detail: __('Pubblicato!', 'gepafin')
}); });
} }
if (data.data.docs) { if (resp.data.docs) {
data.data.docs = data.data.docs resp.data.docs = resp.data.docs
.filter(o => o.source === 'CALL' && o.type === 'DOCUMENT'); .filter(o => o.source === 'CALL' && o.type === 'DOCUMENT');
} }
setData(data.data); setData(resp.data);
} }
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
const errPublishCallback = (data) => { const errPublishCallback = (resp) => {
standardErrCallback(data); standardErrCallback(resp);
} }
const getCallback = (data) => { const getCallback = (resp) => {
if (data.status === 'SUCCESS') { if (resp.status === 'SUCCESS') {
if (!isNil(data.data.dates) && data.data.dates.length) { if (!isNil(resp.data.dates) && resp.data.dates.length) {
if (data.data.dates[0]) { if (resp.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] : ''); 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]) { if (resp.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] : ''); 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.clear();
bandoMsgs.current.show([ bandoMsgs.current.show([
{ {
@@ -182,7 +182,7 @@ const BandoEdit = () => {
closable: false closable: false
} }
]); ]);
} else if (data.data.status === 'DRAFT') { } else if (resp.data.status === 'DRAFT') {
if (bandoMsgs.current) { if (bandoMsgs.current) {
bandoMsgs.current.clear(); bandoMsgs.current.clear();
bandoMsgs.current.show([ bandoMsgs.current.show([
@@ -195,26 +195,26 @@ const BandoEdit = () => {
]); ]);
} }
} }
if (data.data.docs) { if (resp.data.docs) {
data.data.docs = data.data.docs resp.data.docs = resp.data.docs
.filter(o => o.source === 'CALL' && o.type === 'DOCUMENT'); .filter(o => o.source === 'CALL' && o.type === 'DOCUMENT');
} }
setData(data.data); setData(resp.data);
} }
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
const errGetCallback = (data) => { const errGetCallback = (resp) => {
set404FromErrorResponse(data); set404FromErrorResponse(resp);
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
const standardErrCallback = (data) => { const standardErrCallback = (resp) => {
if (bandoMsgs.current && data.message) { if (bandoMsgs.current && resp.message) {
bandoMsgs.current.show([ bandoMsgs.current.show([
{ {
sticky: true, severity: 'error', summary: '', sticky: true, severity: 'error', summary: '',
detail: data.message, detail: resp.message,
closable: true closable: true
} }
]); ]);
@@ -222,9 +222,9 @@ const BandoEdit = () => {
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
const getFormsCallback = (data) => { const getFormsCallback = (resp) => {
if (data.status === 'SUCCESS') { if (resp.status === 'SUCCESS') {
setForms(data.data); setForms(resp.data);
} }
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }

View File

@@ -248,6 +248,7 @@ const BandoFormsEdit = () => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
const criteria = pathOr([], ['data', 'criteria'], data); const criteria = pathOr([], ['data', 'criteria'], data);
const criteriaOptions = criteria.map(o => ({value: o.id, label: o.value})); const criteriaOptions = criteria.map(o => ({value: o.id, label: o.value}));
console.log('criteriaOptions', criteriaOptions);
storeSet.main.bandoCriteria(criteriaOptions); storeSet.main.bandoCriteria(criteriaOptions);
} }
} }
@@ -267,6 +268,8 @@ const BandoFormsEdit = () => {
if (bandoFormId) { if (bandoFormId) {
storeSet.main.setAsyncRequest(); storeSet.main.setAsyncRequest();
FormsService.getFormById(bandoFormId, getFormCallback, errGetFormCallbacks); FormsService.getFormById(bandoFormId, getFormCallback, errGetFormCallbacks);
}
if (bandoId) {
BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback); BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback);
} }