Skip to content

Fix/lock survey reviewer mode #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MailineN merged 3 commits into from
Mar 20, 2025
Merged

Fix/lock survey reviewer mode #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bffa79e
fix: opening a non started planner no locker lock the planner
MailineN Mar 18, 2025
1825a1e
fix: missing dependencies in callback
MailineN Mar 20, 2025
41a92d1
Merge branch 'develop' into fix/lock-survey-reviewer-mode
MailineN Mar 20, 2025
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
142 changes: 109 additions & 33 deletions src/components/commons/SurveyPage/SurveyPageStep/SurveyPageStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import { useTranslation } from "react-i18next";
import { useNavigate, useOutletContext } from "react-router";
import { useLocation } from "react-router-dom";
import {
getNavigatePath,
getOrchestratorPage,
getParameterizedNavigatePath,
saveAndNav,
saveAndNavFullPath,
saveAndNavLocally,
Expand All @@ -28,6 +30,9 @@ import { surveyReadOnly } from "../../../../service/survey-activity-service";
import { getData, getPrintedFirstName, getPrintedSurveyDate } from "../../../../service/survey-service";
import { getSurveyIdFromUrl } from "../../../../utils/utils";
import SurveyPage from "../SurveyPage";
import { EdtUserRightsEnum } from "../../../../enumerations/EdtUserRightsEnum";
import { getUserRights } from "../../../../service/user-service";
import _ from "lodash";

export interface SurveyPageStepProps {
currentPage: EdtRoutesNameEnum;
Expand Down Expand Up @@ -63,11 +68,27 @@ const SurveyPageStep = (props: SurveyPageStepProps) => {
const idSurvey = getSurveyIdFromUrl(context, location);

const navigate = useNavigate();
const isReviewerMode = getUserRights() === EdtUserRightsEnum.REVIEWER;

useEffect(() => {
setEnviro(context, navigate, callbackHolder);
});

const validateAndNav = (
forceQuit: boolean,
setIsModalDisplayed: (value: SetStateAction<boolean>) => void,
): void => {
if (forceQuit) {
saveAndNav(idSurvey);
} else {
setIsModalDisplayed(true);
}
};

const navigateHome = useCallback(() => {
return navigate(getNavigatePath(EdtRoutesNameEnum.SURVEYED_HOME));
}, []);

const { classes, cx } = useStyles({
"isMobile": !isPwa(),
"isIOS": isIOS,
Expand Down Expand Up @@ -108,22 +129,58 @@ const SurveyPageStep = (props: SurveyPageStepProps) => {
const surveyPageStepProps = {
idSurvey: idSurvey,
onNavigateBack: useCallback(
() =>
specifiquesProps?.displayModal
? validateAndNav(false, setIsModalDisplayed)
: saveAndNavLocally(idSurvey),
[isModalDisplayed],
),
onNext: useCallback(
() =>
specifiquesProps?.displayModal
? validateAndNav(false, setIsModalDisplayed)
: saveAndNextStep(idSurvey, context.source, EdtRoutesNameEnum.ACTIVITY, currentPage),
[isModalDisplayed],
() => {
if (!isReviewerMode) {
if (specifiquesProps?.displayModal) {
validateAndNav(false, setIsModalDisplayed);
} else {
saveAndNavLocally(idSurvey);
}
}
navigateHome();
},
[isReviewerMode, isModalDisplayed, idSurvey, navigateHome, validateAndNav, saveAndNavLocally],
),
onNext: useCallback(() => {
if (!isReviewerMode) {
if (specifiquesProps?.displayModal) {
validateAndNav(false, setIsModalDisplayed);
} else {
saveAndNextStep(idSurvey, context.source, EdtRoutesNameEnum.ACTIVITY, currentPage);
}
}
}, [
isReviewerMode,
isModalDisplayed,
saveAndNextStep,
validateAndNav,
idSurvey,
context,
currentPage,
]),
onPrevious: useCallback(
() => (backRoute ? saveAndNavFullPath(idSurvey, backRoute) : saveAndNavLocally(idSurvey)),
[],
() => {
if (!isReviewerMode) {
backRoute
? saveAndNavFullPath(idSurvey, backRoute)
: saveAndNavLocally(idSurvey);
}
navigate(
backRoute
? getNavigatePath(backRoute)
: `${getParameterizedNavigatePath(
EdtRoutesNameEnum.ACTIVITY,
idSurvey,
)}${getNavigatePath(EdtRoutesNameEnum.ACTIVITY_SUMMARY)}`,
);
},
[
isReviewerMode,
backRoute,
idSurvey,
saveAndNavFullPath,
saveAndNavLocally
],
),
simpleHeader: true,
simpleHeaderLabel: t("page.complementary-questions.simple-header-label"),
Expand All @@ -142,35 +199,54 @@ const SurveyPageStep = (props: SurveyPageStepProps) => {
if (!validateButton) {
return;
}
validateButton();
if (nextRoute) {
saveAndNavFullPath(idSurvey, nextRoute);
} else {
saveAndNextStep(idSurvey, context.source, context.surveyRootPage, currentPage);
if (!isReviewerMode) {
validateButton();
if (nextRoute) {
saveAndNavFullPath(idSurvey, nextRoute);
} else {
saveAndNextStep(idSurvey, context.source, context.surveyRootPage, currentPage);
}
}
}, []),
}, [
isReviewerMode,
nextRoute,
saveAndNavFullPath,
saveAndNextStep,
idSurvey,
context,
currentPage,
]),
icon: errorIcon ? <IconError aria-label={t(errorAltIcon ?? "")} /> : undefined,
onNavigateBack: useCallback(() => saveAndNavLocally(idSurvey), []),
onNavigateBack: useCallback(() => {
if (!isReviewerMode) {
saveAndNavLocally(idSurvey);
}
navigateHome();
}, [isReviewerMode, saveAndNavLocally, idSurvey, navigateHome]),
onPrevious: useCallback(
() => (backRoute ? saveAndNavFullPath(idSurvey, backRoute) : saveAndNavLocally(idSurvey)),
[],
() => {
if (!isReviewerMode) {
backRoute
? saveAndNavFullPath(idSurvey, backRoute)
: saveAndNavLocally(idSurvey);
}
navigate(getNavigatePath(backRoute ?? EdtRoutesNameEnum.ACTIVITY));
},
[
isReviewerMode,
backRoute,
saveAndNavFullPath,
saveAndNavLocally,
idSurvey,
getNavigatePath,
],
),
firstName: getPrintedFirstName(idSurvey),
surveyDate: getPrintedSurveyDate(idSurvey, context.surveyRootPage),
disableNav: disableButton,
modifiable: modifiable,
};

const validateAndNav = (
forceQuit: boolean,
setIsModalDisplayed: (value: SetStateAction<boolean>) => void,
): void => {
if (forceQuit) {
saveAndNav(idSurvey);
} else {
setIsModalDisplayed(true);
}
};
const surveyPageProps = isStep ? surveyPageStepProps : surveyPageNotStepProps;
const surveyData = useMemo(() => getData(idSurvey), [idSurvey]);

Expand Down
14 changes: 10 additions & 4 deletions src/pages/day-of-survey/DayOfSurvey.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import {
setValue,
} from "../../service/survey-service";
import { getSurveyIdFromUrl } from "../../utils/utils";
import { getUserRights } from "../../service/user-service";
import { EdtUserRightsEnum } from "../../enumerations/EdtUserRightsEnum";

const DayOfSurveyPage = () => {
const context: OrchestratorContext = useOutletContext();
Expand Down Expand Up @@ -99,10 +101,14 @@ const DayOfSurveyPage = () => {
personAct?.data?.questionnaireModelId == SourcesEnum.WORK_TIME_SURVEY
? EdtRoutesNameEnum.WORK_TIME
: EdtRoutesNameEnum.ACTIVITY;
const dataUpdated = setSurveyDate(input);
saveData(idSurvey, dataUpdated, false, true).then(() => {
navigate(navToPlanner(idSurvey, surveyRootPage));
});

const isReviewerMode = getUserRights() == EdtUserRightsEnum.REVIEWER;
if (!isReviewerMode) {
const dataUpdated = setSurveyDate(input);
saveData(idSurvey, dataUpdated, false, true).then(() => {
navigate(navToPlanner(idSurvey, surveyRootPage));
})
}
}, []);

return (
Expand Down