Skip to content

Commit

Permalink
fix(eslint): fix format
Browse files Browse the repository at this point in the history
  • Loading branch information
@lailabjil
lailabjil committed Dec 5, 2023
1 parent f21f91d commit c1c7b47
Show file tree
Hide file tree
Showing 9 changed files with 614 additions and 1,670 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,4 @@
"last 1 safari version"
]
}
}
}
2 changes: 1 addition & 1 deletion src/constants/constants.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const POINTS_REMOVE = {
POINTS_REMOVE_MISSING_TIME_2: 3,
POINTS_REMOVE_MISSING_TIME_3: 5,
POINTS_REMOVE_OVER_TIME: 1,
POINTS_REMOVE_OVER_TIME_2: 2
POINTS_REMOVE_OVER_TIME_2: 2,
};
export const PERCENT_MIN_THRESHOLD = {
PERCENT_MIN_THRESHOLD_SOMEONE: 20,
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/locales/fr/fr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -607,4 +607,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/pages/help/install/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
isIOS,
isMacOs,
isSafari,
isWindows
isWindows,
} from "react-device-detect";

export const getDevice = () => {
Expand Down
6 changes: 2 additions & 4 deletions src/pages/work-time/weekly-planner/WeeklyPlanner.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
getOrchestratorPage,
navFullPath,
saveAndNav,
setEnviro
setEnviro,
} from "service/navigation-service";
import { getLanguage } from "service/referentiel-service";
import { getData, getPrintedFirstName, getSurveyDate, saveData } from "service/survey-service";
Expand Down Expand Up @@ -162,8 +162,7 @@ const WeeklyPlannerPage = () => {
if (isPlaceWorkDisplayed && localStorage.getItem("HOURCHECKED_DISPLAYED") != "true") {
setDisplayDayOverview(true);
localStorage.setItem("HOURCHECKED_DISPLAYED", "false");
} else
setDisplayDayOverview(false);
} else setDisplayDayOverview(false);
} else {
console.log(localStorage.getItem("HOURCHECKED_DISPLAYED"));

Expand All @@ -178,7 +177,6 @@ const WeeklyPlannerPage = () => {
navFullPath(idSurvey, EdtRoutesNameEnum.EDIT_GLOBAL_INFORMATION, EdtRoutesNameEnum.WORK_TIME);
};


const onCloseHelpMenu = useCallback(() => {
setIsHelpMenuOpen(false);
}, [isHelpMenuOpen]);
Expand Down
21 changes: 10 additions & 11 deletions src/service/navigation-service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ const getCurrentNavigatePath = (
page = mappingPageOrchestrator.find(
link =>
link.surveyPage ===
(firstEmptyPage > Number(maxPage) ? maxPage : firstEmptyPage).toString() &&
(firstEmptyPage > Number(maxPage) ? maxPage : firstEmptyPage).toString() &&
link.parentPage === rootPage,
)?.page;
}
Expand Down Expand Up @@ -290,7 +290,7 @@ const navToActivityOrPlannerOrSummary = (
if (surveyIsEnvoyed) {
navigate(
getParameterizedNavigatePath(EdtRoutesNameEnum.ACTIVITY, idSurvey) +
getNavigatePath(EdtRoutesNameEnum.ACTIVITY_SUMMARY),
getNavigatePath(EdtRoutesNameEnum.ACTIVITY_SUMMARY),
);
} else {
const currentPathNav = getCurrentNavigatePath(
Expand Down Expand Up @@ -352,7 +352,7 @@ const navToWeeklyPlannerOrClose = (idSurvey: string, navigate: any, source: Luna
const navToActivitySummary = (idSurvey: string) => {
_navigate(
getParameterizedNavigatePath(EdtRoutesNameEnum.ACTIVITY, idSurvey) +
getNavigatePath(EdtRoutesNameEnum.ACTIVITY_SUMMARY),
getNavigatePath(EdtRoutesNameEnum.ACTIVITY_SUMMARY),
);
};

Expand Down Expand Up @@ -543,13 +543,13 @@ const onClose = (
const isActivity = isActivityPage();
const pathNav = isCloture
? getParameterizedNavigatePath(EdtRoutesNameEnum.ACTIVITY, idSurvey) +
getNavigatePath(EdtRoutesNameEnum.ACTIVITY_SUMMARY)
getNavigatePath(EdtRoutesNameEnum.ACTIVITY_SUMMARY)
: getCurrentNavigatePath(
idSurvey,
EdtRoutesNameEnum.ACTIVITY,
getOrchestratorPage(EdtRoutesNameEnum.ACTIVITY_OR_ROUTE_PLANNER),
source,
);
idSurvey,
EdtRoutesNameEnum.ACTIVITY,
getOrchestratorPage(EdtRoutesNameEnum.ACTIVITY_OR_ROUTE_PLANNER),
source,
);
const weeklyPlannerRoute = getCurrentNavigatePath(
idSurvey,
EdtRoutesNameEnum.WORK_TIME,
Expand Down Expand Up @@ -604,6 +604,5 @@ export {
validate,
validateAndNextLoopStep,
validateAndNextStep,
validateWithAlertAndNav
validateWithAlertAndNav,
};

84 changes: 59 additions & 25 deletions src/service/summary-service.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,54 +230,90 @@ const getQualityScore = (
let substractPoint = 0;

// 1 - num sleep (111,114) < 5h -> 3
const sleepActivities = activitiesRoutesOrGaps.filter(activityOrRoute =>
(activityOrRoute.activity?.activityCode ?? "") in SLEEPING_CATEGORIES_ACTIVITES_LIST)
const sleepActivities = activitiesRoutesOrGaps
.filter(
activityOrRoute =>
(activityOrRoute.activity?.activityCode ?? "") in SLEEPING_CATEGORIES_ACTIVITES_LIST,
)
.map(activityOrRoute => activityOrRoute.durationMinutes ?? 0);
substractPoint += getAllTime(sleepActivities) > (60 * MIN_THRESHOLD.MIN_THRESHOLD_SLEEP_ACTIVITES_HOURS) ? POINTS_REMOVE.POINTS_REMOVE_SLEEP_ACTIVITES_HOURS : 0;
substractPoint +=
getAllTime(sleepActivities) > 60 * MIN_THRESHOLD.MIN_THRESHOLD_SLEEP_ACTIVITES_HOURS
? POINTS_REMOVE.POINTS_REMOVE_SLEEP_ACTIVITES_HOURS
: 0;

// 2 - num eat (140) < 2h -> 3
const eatActivities = activitiesRoutesOrGaps.filter(activityOrRoute =>
(activityOrRoute.activity?.activityCode ?? "") in EAT_CATEGORIES_ACTIVITES_LIST)
const eatActivities = activitiesRoutesOrGaps
.filter(
activityOrRoute =>
(activityOrRoute.activity?.activityCode ?? "") in EAT_CATEGORIES_ACTIVITES_LIST,
)
.map(activityOrRoute => activityOrRoute.durationMinutes ?? 0);
substractPoint += getAllTime(eatActivities) > (60 * MIN_THRESHOLD.MIN_THRESHOLD_EAT_ACTIVITES_HOURS) ? POINTS_REMOVE.POINTS_REMOVE_EAT_ACTIVITES_HOURS : 0;
substractPoint +=
getAllTime(eatActivities) > 60 * MIN_THRESHOLD.MIN_THRESHOLD_EAT_ACTIVITES_HOURS
? POINTS_REMOVE.POINTS_REMOVE_EAT_ACTIVITES_HOURS
: 0;

// 3 - num routes <2 -> 2
//insufficient number of routes (at least MIN_THRESHOLD_ROUTE_HOURS)
substractPoint +=
activitiesRoutesOrGaps.filter(activityOrRoute => activityOrRoute.isRoute).length <= MIN_THRESHOLD.MIN_THRESHOLD_ROUTES
activitiesRoutesOrGaps.filter(activityOrRoute => activityOrRoute.isRoute).length <=
MIN_THRESHOLD.MIN_THRESHOLD_ROUTES
? POINTS_REMOVE.POINTS_REMOVE_ROUTES
: 0;

// 4 - pas d'activité en dehors du temps perso ou temps travail/etudes (codes commence par 3,4,5,6) -> aucune -> 3
substractPoint += activitiesRoutesOrGaps.filter(activityOrRoute =>
(activityOrRoute.activity?.activityCode?.charAt(1) ?? "") in MANDATORY_START_CODES_ACTIVIY).length == 0 ?
POINTS_REMOVE.POINTS_REMOVE_MANDATORY_START_CODES_ACTIVIY : 0;
substractPoint +=
activitiesRoutesOrGaps.filter(
activityOrRoute =>
(activityOrRoute.activity?.activityCode?.charAt(1) ?? "") in
MANDATORY_START_CODES_ACTIVIY,
).length == 0
? POINTS_REMOVE.POINTS_REMOVE_MANDATORY_START_CODES_ACTIVIY
: 0;

// 5 - nombre de boucles < 10 -> 5
substractPoint += numActivities < MIN_THRESHOLD.MIN_THRESHOLD_ACTIVITIES ? POINTS_REMOVE.POINTS_REMOVE_MIN_ACTIVITES : 0;
substractPoint +=
numActivities < MIN_THRESHOLD.MIN_THRESHOLD_ACTIVITIES
? POINTS_REMOVE.POINTS_REMOVE_MIN_ACTIVITES
: 0;

// 6 - nombre de boucles 10 - 15 -> 3
substractPoint += (numActivities >=
MIN_THRESHOLD.MIN_THRESHOLD_ACTIVITIES && numActivities < MIN_THRESHOLD.MIN_THRESHOLD_ACTIVITIES_2) ?
POINTS_REMOVE.POINTS_REMOVE_MIN_ACTIVITES_2 : 0;
substractPoint +=
numActivities >= MIN_THRESHOLD.MIN_THRESHOLD_ACTIVITIES &&
numActivities < MIN_THRESHOLD.MIN_THRESHOLD_ACTIVITIES_2
? POINTS_REMOVE.POINTS_REMOVE_MIN_ACTIVITES_2
: 0;

// 7 - minutes totals <60min manquants ->1
substractPoint += minutesUnderConsomed > MIN_THRESHOLD.MIN_THRESHOLD_MISSING_TIME ?
POINTS_REMOVE.POINTS_REMOVE_MISSING_TIME : 0;
substractPoint +=
minutesUnderConsomed > MIN_THRESHOLD.MIN_THRESHOLD_MISSING_TIME
? POINTS_REMOVE.POINTS_REMOVE_MISSING_TIME
: 0;

// 8 - minutes totals 1h -2h manquants -> 3
substractPoint += (minutesUnderConsomed >=
MIN_THRESHOLD.MIN_THRESHOLD_MISSING_TIME && minutesUnderConsomed <= MIN_THRESHOLD.MIN_THRESHOLD_MISSING_TIME_2) ?
POINTS_REMOVE.POINTS_REMOVE_MISSING_TIME_2 : 0;
substractPoint +=
minutesUnderConsomed >= MIN_THRESHOLD.MIN_THRESHOLD_MISSING_TIME &&
minutesUnderConsomed <= MIN_THRESHOLD.MIN_THRESHOLD_MISSING_TIME_2
? POINTS_REMOVE.POINTS_REMOVE_MISSING_TIME_2
: 0;

// 9 - minutes totals >2h manquants -> 5
substractPoint += (minutesUnderConsomed >= MIN_THRESHOLD.MIN_THRESHOLD_MISSING_TIME_2) ? POINTS_REMOVE.POINTS_REMOVE_MISSING_TIME_2 : 0;
substractPoint +=
minutesUnderConsomed >= MIN_THRESHOLD.MIN_THRESHOLD_MISSING_TIME_2
? POINTS_REMOVE.POINTS_REMOVE_MISSING_TIME_2
: 0;

// 10 - minutes totals <3h en plus -> 1
substractPoint += (minutesOverConsomed <= MIN_THRESHOLD.MIN_THRESHOLD_OVER_TIME) ? POINTS_REMOVE.POINTS_REMOVE_OVER_TIME : 0;
substractPoint +=
minutesOverConsomed <= MIN_THRESHOLD.MIN_THRESHOLD_OVER_TIME
? POINTS_REMOVE.POINTS_REMOVE_OVER_TIME
: 0;

// 11 - minutes totals >3h en plus -> 2
substractPoint += (minutesOverConsomed > MIN_THRESHOLD.MIN_THRESHOLD_OVER_TIME) ? POINTS_REMOVE.POINTS_REMOVE_OVER_TIME_2 : 0;
substractPoint +=
minutesOverConsomed > MIN_THRESHOLD.MIN_THRESHOLD_OVER_TIME
? POINTS_REMOVE.POINTS_REMOVE_OVER_TIME_2
: 0;

// 12 - nombre plages horaires manquants -> 1
//missing at least MIN_THRESHOLD_MISSING_HOURS hours
Expand Down Expand Up @@ -393,9 +429,7 @@ const missingVariablesMeanOfTransport = (activitiesRoutesOrGaps: ActivityRouteOr
);
const activitesMissingMeanOfTransport = activitesMandatory
.map(act => {
return (
act.meanOfTransportLabels == null || act.meanOfTransportLabels.length == 0
);
return act.meanOfTransportLabels == null || act.meanOfTransportLabels.length == 0;
})
.filter(act => act);

Expand Down
23 changes: 11 additions & 12 deletions src/service/survey-service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ const getRemoteSavedSurveysDatas = (
remoteSurveyData.stateData?.date > 0 &&
(localSurveyData === undefined ||
(localSurveyData.lastLocalSaveDate ?? 0) <
remoteSurveyData.stateData.date))
remoteSurveyData.stateData.date))
) {
return lunaticDatabase.save(surveyId, surveyData);
}
Expand Down Expand Up @@ -911,7 +911,7 @@ const addToSecondaryActivityReferentiel = (
currentData[referentiel].push(newItem);
currentData[ReferentielsEnum.ACTIVITYAUTOCOMPLETE].push({
id: newItem.value,
label: newItem.label
label: newItem.label,
});
saveReferentiels(currentData);
});
Expand Down Expand Up @@ -1341,15 +1341,15 @@ const createUserDataMap = (usersurvey: UserSurveys[]) => {
}
return data.questionnaireModelId == SourcesEnum.ACTIVITY_SURVEY
? {
data: data,
firstName: "zzzz " + (numInterviewer + 1),
num: numInterviewer + 1,
}
data: data,
firstName: "zzzz " + (numInterviewer + 1),
num: numInterviewer + 1,
}
: {
data: data,
firstName: "zzzzz " + index + 1,
num: index + 1,
};
data: data,
firstName: "zzzzz " + index + 1,
num: index + 1,
};
})
.sort((u1, u2) => u1.data.surveyUnitId.localeCompare(u2.data.surveyUnitId));
};
Expand Down Expand Up @@ -1707,6 +1707,5 @@ export {
toIgnoreForRoute,
userDatasMap,
validateAllEmptySurveys,
validateSurvey
validateSurvey,
};

Loading

0 comments on commit c1c7b47

Please sign in to comment.