From f0ed0e519c1b68e4fa564ef168332bb5b035e654 Mon Sep 17 00:00:00 2001
From: dario-cfpt <dario.gng@eduge.ch>
Date: Tue, 28 Jan 2020 15:35:52 +0100
Subject: [PATCH] Add classes for the comparator page

---
 mobile/www/js/comparator.js | 106 +++++++++++++++++++++++++++---------
 mobile/www/js/routes.js     |   9 ++-
 server/dist/index.js        |   6 +-
 server/dist/index.js.map    |   2 +-
 server/src/index.ts         |   6 +-
 5 files changed, 100 insertions(+), 29 deletions(-)

diff --git a/mobile/www/js/comparator.js b/mobile/www/js/comparator.js
index 6598b03..17acc86 100644
--- a/mobile/www/js/comparator.js
+++ b/mobile/www/js/comparator.js
@@ -4,6 +4,8 @@ Description : Allow the user to compare multiple characters
  */
 
 const GRAPH_CONTAINER_COMPARATOR_ID = "container-comparator";
+const ID_GENDER_NON_RESTRICTED = 1;
+const BUTTON_ACTIVE_CLASS_NAME = "button-active";
 let smartComparator;
 let selectedCharacters = [];
 
@@ -47,10 +49,51 @@ function displayComparedCharacters() {
     $$("#table-comparator-content").empty();
 
     selectedCharacters.forEach(char => {
+        // Get all available classes for the character
+        const availableClasses = [];
+
+        feData.classes.forEach(feClass => {
+            if (feClass.isAvailableForAll && (feClass.idGender == ID_GENDER_NON_RESTRICTED || feClass.idGender == char.idGender)) {
+                availableClasses.push(feClass);
+            } else {
+                if (feData.restrictedClasses.find(x => x.idClass == feClass.id && x.idCharacter == char.id)) {
+                    availableClasses.push(feClass);
+                }
+            }
+        });
+
+        // Create the select of available classes
+        const selectContainer = $$("<div class='item-input-wrap input-dropdown-wrap'></div>");
+        const select = $$("<select>");
+        const defaultOption = $$("<option value='-1'>None</option>");
+        select.append(defaultOption);
+
+        availableClasses.forEach(feClass => {
+            const option = $$("<option>");
+            option.val(feClass.id);
+            option.text(feClass.name);
+            select.append(option);
+        });
+        selectContainer.append(select);
+
+        if (char.idClassSelected != null) {
+            // select the previous class selected
+            select.val(char.idClassSelected);
+        } else {
+            // select the first element
+            select.val(-1);
+        }
+
+        select.on("change", (e) => {
+            char.idClassSelected = Number($$(e.target).val());
+            displayCurrentGraph();
+        });
+
         // Fill the table
         const tr = $$("<tr>");
         const tdName = $$("<td>" + char.firstName + "</td>");
-        const tdClass = $$("<td>" + "none" + "</td>");
+        const tdClass = $$("<td>");
+        tdClass.append(selectContainer);
         tr.append(tdName);
         tr.append(tdClass);
         $$("#table-comparator-content").append(tr);
@@ -72,20 +115,8 @@ function compareWithColumnGraph() {
     const charactersData = [];
 
     selectedCharacters.forEach(char => {
-        // Create the graph
-        const statsValues = [];
-        const charGrowthRates = feData.charGrowthRates.map(x => (x.idCharacter == char.id) ? x : null).filter((x) => x != null);
-        const charData = {
-            name: char.firstName,
-            stack: char.id,
-        };
-
-        charGrowthRates.forEach(gr => {
-            statsValues.push(gr.value);
-        });
-        charData.data = statsValues;
-
-        charactersData.push((charData));
+        const charData = computeCharacterGrowthRatesWithClass(char);
+        charactersData.push(charData);
     });
 
     displayColumnChart(GRAPH_CONTAINER_COMPARATOR_ID, statsNames, charactersData);
@@ -95,23 +126,48 @@ function compareWithPolarSpider() {
     const charactersData = [];
     const statsNames = feData.stats.map(x => x.name);
 
-
     selectedCharacters.forEach(char => {
-        const charGrowthRates = feData.charGrowthRates.map(x => (x.idCharacter == char.id) ? x : null).filter((x) => x != null);
-        const statsValues = charGrowthRates.map(x => x.value);
-        const charData = {
-            name: char.firstName,
-            data: statsValues,
-        };
-
+        const charData = computeCharacterGrowthRatesWithClass(char);
         charactersData.push(charData);
     });
 
     displayPolarSpider(GRAPH_CONTAINER_COMPARATOR_ID, statsNames, charactersData);
 }
 
+function computeCharacterGrowthRatesWithClass(char) {
+    const charGrowthRates = feData.charGrowthRates.map(x => (x.idCharacter == char.id) ? x : null).filter(x => x != null);
+    const statsValues = [];
+    const charData = {
+        stack: char.id,
+    };
+
+    let charName = char.firstName;
+    let classGrowthRates = null;
+    if (char.idClassSelected != null && char.idClassSelected > 0) {
+        // Get the selected class of the character
+        classGrowthRates = feData.classGrowthRates.map(x => (x.idClass == char.idClassSelected) ? x : null).filter(x => x != null);
+        charName += " (" + feData.classes.find(x => x.id == char.idClassSelected).name + ")";
+    }
+    charData.name = charName;
+
+    charGrowthRates.forEach(gr => {
+        let grValue = gr.value;
+        if (classGrowthRates != null) {
+            // Compute the growth rates of the character with the growth rates of the class
+            let classGr = classGrowthRates.find(x => x.idStat == gr.idStat);
+            if (classGr != null) {
+                grValue += classGr.value;
+            }
+        }
+        statsValues.push(grValue);
+    });
+
+    charData.data = statsValues;
+    return charData;
+}
+
 function switchGraph(event) {
-    $$(".button-active").removeClass("button-active");
-    $$(event.target).addClass("button-active");
+    $$("." + BUTTON_ACTIVE_CLASS_NAME).removeClass(BUTTON_ACTIVE_CLASS_NAME);
+    $$(event.target).addClass(BUTTON_ACTIVE_CLASS_NAME);
     displayCurrentGraph();
 }
diff --git a/mobile/www/js/routes.js b/mobile/www/js/routes.js
index d90cb03..59b5da9 100644
--- a/mobile/www/js/routes.js
+++ b/mobile/www/js/routes.js
@@ -38,6 +38,7 @@ routes = [
         }
     },
     {
+        name: 'comparator',
         path: '/comparator/',
         templateUrl: './pages/comparator.html',
         on: {
@@ -52,7 +53,13 @@ routes = [
             // We must use the pageAfterIn event in order to open the smartselect directly
             pageAfterIn: (e, page) => {
                 configureSmartSelectOfCharacters();
-            }
+            },
+            pageBeforeRemove: function (e, page) {
+                // Reset the classes selected when exiting the page
+                feData.characters.forEach(char => {
+                    char.idClassSelected = null;
+                });
+            },
         }
     },
     {
diff --git a/server/dist/index.js b/server/dist/index.js
index be592d0..75274ce 100644
--- a/server/dist/index.js
+++ b/server/dist/index.js
@@ -77,7 +77,11 @@ class FE_Charts {
     static getAllGenders() {
         return __awaiter(this, void 0, void 0, function* () {
             let genders = null;
-            yield Gender.findAll().then(results => {
+            yield Gender.findAll({
+                order: [
+                    ["id", "ASC"]
+                ]
+            }).then(results => {
                 genders = results;
             }).catch(err => FE_Charts.logError(err));
             return genders;
diff --git a/server/dist/index.js.map b/server/dist/index.js.map
index 133e21e..5b2372f 100644
--- a/server/dist/index.js.map
+++ b/server/dist/index.js.map
@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/server/src/index.ts b/server/src/index.ts
index 5c96ee2..2bc3616 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -67,7 +67,11 @@ abstract class FE_Charts {
 
     static async getAllGenders() {
         let genders = null;
-        await Gender.findAll().then(results => {
+        await Gender.findAll({
+            order: [
+                ["id", "ASC"]
+            ]
+        }).then(results => {
             genders = results
         }).catch(err => FE_Charts.logError(err));
         return genders;