From 913303522d3d030239708465579012f59d91ed5f Mon Sep 17 00:00:00 2001
From: Matei Martin <mat4school@gmail.com>
Date: Thu, 21 Sep 2023 07:25:11 -0400
Subject: [PATCH] Fix program selection for profile page (#846) (#852)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix program selection for profile page (#846)

* Ajout code programe baccalaureat informatique distribuée

* define program by the number of registered credits

* Sort list entries to have main program first.

* fix pipeline please

* [BOT] Applying version.

---------

Co-authored-by: mataai <mataai@users.noreply.github.com>
---
 lib/core/constants/programs_credits.dart   |  4 +---
 lib/core/viewmodels/profile_viewmodel.dart | 18 +++++++++++++-----
 lib/l10n/intl_en.arb                       |  2 +-
 pubspec.yaml                               |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/core/constants/programs_credits.dart b/lib/core/constants/programs_credits.dart
index 186b4aed7..c065f205a 100644
--- a/lib/core/constants/programs_credits.dart
+++ b/lib/core/constants/programs_credits.dart
@@ -7,9 +7,7 @@ class ProgramCredits {
     "6556": 117,
     "6557": 118,
     "7086": 116,
-    // TODO: Ajouter le code lorsque le programme sera en vigeur
-    // (https://www.etsmtl.ca/etudes/premier-cycle/Baccalaureat-informatique-distribuee)
-    // "À venir" : 90",
+    "6646": 90,
     "5766": 30,
     "4567": 30,
     "4412": 30,
diff --git a/lib/core/viewmodels/profile_viewmodel.dart b/lib/core/viewmodels/profile_viewmodel.dart
index 853cd9754..7128d93ca 100644
--- a/lib/core/viewmodels/profile_viewmodel.dart
+++ b/lib/core/viewmodels/profile_viewmodel.dart
@@ -51,21 +51,27 @@ class ProfileViewModel extends FutureViewModel<List<Program>> {
     int percentage = 0;
 
     if (programList.isNotEmpty) {
+      Program currentProgram = programList.first;
+      for (final program in programList) {
+        if (int.parse(program.registeredCredits) >
+            int.parse(currentProgram.registeredCredits)) {
+          currentProgram = program;
+        }
+      }
       final int numberOfCreditsCompleted =
-          int.parse(programList[programList.length - 1].accumulatedCredits);
-      final String code = programList[programList.length - 1].code;
+          int.parse(currentProgram.accumulatedCredits);
+      final String code = currentProgram.code;
       bool foundMatch = false;
 
       programCredits.programsCredits.forEach((key, value) {
-        if (key == code ||
-            programList[programList.length - 1].name.startsWith(key)) {
+        if (key == code || currentProgram.name.startsWith(key)) {
           percentage = (numberOfCreditsCompleted / value * 100).round();
           foundMatch = true;
         }
       });
 
       if (!foundMatch) {
-        final String programName = programList[programList.length - 1].name;
+        final String programName = currentProgram.name;
         analyticsService.logEvent("profile_view",
             'The program $programName (code: $code) does not match any program');
         percentage = 0;
@@ -91,6 +97,8 @@ class ProfileViewModel extends FutureViewModel<List<Program>> {
     }
 
     _programList.sort((a, b) => b.status.compareTo(a.status));
+    _programList
+        .sort((a, b) => a.registeredCredits.compareTo(b.registeredCredits));
 
     return _programList;
   }
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 9e26dfeeb..a23a593df 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -1 +1 @@
-{}
\ No newline at end of file
+{­}
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index ab708fcf4..e72117d56 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,7 +5,7 @@ description: The 4th generation of ÉTSMobile, the main gateway between the Éco
 # pub.dev using `pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 4.25.2+1
+version: 4.25.3+1
 
 environment:
   sdk: ">=2.10.0 <3.0.0"