From 6ca01d1d23ecec8e58410e42d601b94db8ce5495 Mon Sep 17 00:00:00 2001 From: Mailine Nguyen Date: Thu, 13 Mar 2025 15:38:54 +0100 Subject: [PATCH] feat: exiting mid-edition now save data on remote --- .../ActivityOrRoutePlanner.tsx | 24 +++++-------------- src/service/navigation-service.ts | 2 +- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/pages/activity/activity-or-route-planner/ActivityOrRoutePlanner.tsx b/src/pages/activity/activity-or-route-planner/ActivityOrRoutePlanner.tsx index 14a9665d..0d65ad8e 100644 --- a/src/pages/activity/activity-or-route-planner/ActivityOrRoutePlanner.tsx +++ b/src/pages/activity/activity-or-route-planner/ActivityOrRoutePlanner.tsx @@ -129,10 +129,10 @@ const setAlertSnackbar = ( if (haveOverlaps) { setSnackbarText( t("page.activity-planner.start-alert") + - overlaps - .map(o => o?.prev?.concat(t("page.activity-planner.and"), o?.current ?? "")) - .join(", ") + - t("page.activity-planner.end-alert"), + overlaps + .map(o => o?.prev?.concat(t("page.activity-planner.and"), o?.current ?? "")) + .join(", ") + + t("page.activity-planner.end-alert"), ); if (!skip) setOpenSnackbar(true); } else { @@ -308,20 +308,6 @@ const openAddActivityOrRoute = ( } }; -// const init = ( -// idSurvey: string, -// setError: React.Dispatch>, -// setInitialized: (value: React.SetStateAction) => void, -// ) => { -// if (navigator.onLine && !isDemoMode()) { -// refreshSurvey(idSurvey, setError).finally(() => { -// setInitialized(true); -// }); -// } else { -// setInitialized(true); -// } -// }; - const updateSubChildDisplayed = ( isSubchildDisplayed: boolean, setIsSubChildDisplayed: React.Dispatch>, @@ -417,6 +403,8 @@ const ActivityOrRoutePlannerPage = () => { getLoopSize(idSurvey, LoopEnum.ACTIVITY_OR_ROUTE), ); setAlertSnackbar(setSnackbarText, setOpenSnackbar, skip, overlaps.length > 0, overlaps, t); + + saveData(idSurvey, { ...source, ...getData(idSurvey) }, false, true); }, []); useEffect(() => { diff --git a/src/service/navigation-service.ts b/src/service/navigation-service.ts index e589052e..e1393ec5 100644 --- a/src/service/navigation-service.ts +++ b/src/service/navigation-service.ts @@ -220,7 +220,7 @@ const saveAndNav = ( currentIteration?: number, ): void => { const mergedData = mergeObjects(getData(idSurvey), _callbackHolder.getData()); - saveData(idSurvey, mergedData).then(() => { + saveData(idSurvey, mergedData, false, true).then(() => { navToRouteOrRouteNotSelection(idSurvey, route, value, routeNotSelection, currentIteration); }); };