From 420dd6174a51104f89e3fbcb931181fe134529e6 Mon Sep 17 00:00:00 2001 From: Yanice Date: Sat, 9 Nov 2024 12:41:29 +0100 Subject: [PATCH] ed: small tweaks to make everything as smooth as possible bumped pawdirecte to account for: - message api changes => update initials rendering - now supports grades out of a decimal number => prevent gradetitle from rounding the outof --- package.json | 4 +++- src/utils/format/format_pronote_initials.ts | 17 +++++++++-------- src/views/account/Grades/Atoms/GradeTitle.tsx | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 6f7015698..f13a02b10 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "restore-app-icon": "cp -a ./AppIcon.appiconset.backup/. ios/Papillon/Images.xcassets/AppIcon.appiconset/" }, "dependencies": { + "@babel/runtime": "^7.26.0", "@birdwingo/react-native-reanimated-graph": "^1.1.3", "@candlefinance/app-icon": "^0.4.5", "@notifee/react-native": "^7.8.2", @@ -19,6 +20,7 @@ "@react-native-community/netinfo": "11.3.1", "@react-native-cookies/cookies": "^6.2.1", "@react-native-masked-view/masked-view": "0.3.1", + "@react-native/assets-registry": "^0.76.1", "@react-navigation/bottom-tabs": "^6.6.0", "@react-navigation/native": "^6.1.17", "@react-navigation/native-stack": "^6.9.26", @@ -68,7 +70,7 @@ "lottie-react-native": "^6.7.0", "lucide-react-native": "^0.378.0", "openid-client": "^5.7.0", - "pawdirecte": "^1.5.0", + "pawdirecte": "^1.6.0", "pawnilim": "^0.2.0", "pawnote": "^1.0.3", "pawrd": "^0.6.1", diff --git a/src/utils/format/format_pronote_initials.ts b/src/utils/format/format_pronote_initials.ts index 9b9d7dbb1..28b2a452d 100644 --- a/src/utils/format/format_pronote_initials.ts +++ b/src/utils/format/format_pronote_initials.ts @@ -1,12 +1,13 @@ -function parse_initials (content: string): string { - const initials = content.split(" ").map((word) => word[0].toUpperCase()).join(""); - let formattedInitials = initials.slice(1); - if (formattedInitials.length === 0) { - if (content.split(" ").length === 1) formattedInitials = content; - else formattedInitials = "??"; - } +function parse_initials (content: string) { + content = content.trimStart().trimEnd(); + if (content === "") return "??"; + let initials = content.split(" ").map((word) => word[0].toUpperCase()).join(""); - return formattedInitials; + if (initials.length === 0) { + if (content.split(" ").length === 1) initials = content; + else initials = "??"; + } else if (initials.length === 3) initials = initials.slice(1); // We assume it's in the format M. J. Dupont ou MMe. C. Dupont + return initials; } export default parse_initials; \ No newline at end of file diff --git a/src/views/account/Grades/Atoms/GradeTitle.tsx b/src/views/account/Grades/Atoms/GradeTitle.tsx index 22c36890b..84b1e7322 100644 --- a/src/views/account/Grades/Atoms/GradeTitle.tsx +++ b/src/views/account/Grades/Atoms/GradeTitle.tsx @@ -139,7 +139,7 @@ export const GradeTitle = ({ grade, subjectData }: GradeTitleProps) => { marginBottom: 1, }} > - /{parseFloat(grade.outOf.value?.toString() || "20").toFixed(0)} + /{parseFloat(grade.outOf.value?.toString() || "20")}