i18n and better handling for invalid modules

src/_locales/de/messages.json

@@ -0,0 +1,53 @@
+{
+    "ectsPoints": {
+        "message": "ECTS-Punkte"
+    },
+    "moduleTypesSummary": {
+        "message": "Modultypen Übersicht"
+    },
+    "mark": {
+        "message": "Noten"
+    },
+    "moduleSummary": {
+        "message": "Modulübersicht"
+    },
+    "moduleName": {
+        "message": "Modul-Name"
+    },
+    "moduleType": {
+        "message": "Modul-Typ"
+    },
+    "evaluation": {
+        "message": "Bewertung"
+    },
+    "grade": {
+        "message": "Grad"
+    },
+    "quantity": {
+        "message": "Anzahl"
+    },
+    "distribution": {
+        "message": "Verteilung"
+    },
+    "majorModuleInformation": {
+        "message": "*Majormodule sind spezielle Erweiterungsmodule. Falls alle 24 ECTS eines Majors erreicht wurden, erhält man diesen."
+    },
+    "majorModule": {
+        "message": "Majormodul"
+    },
+    "coreModule": {
+        "message": "Kernmodul"
+    },
+    "projectModule": {
+        "message": "Projektmodul"
+    },
+    "additionalModule": {
+        "message": "Zusatzmodul"
+    },
+    "extensionModule": {
+        "message": "Erweiterungsmodul"
+    },
+    "passed": {
+        "message": "Bestanden"
+    }
+}

src/_locales/en/messages.json

@@ -0,0 +1,53 @@
+{
+    "ectsPoints": {
+        "message": "ECTS-Points"
+    },
+    "moduleTypesSummary": {
+        "message": "Module type summary"
+    },
+    "mark": {
+        "message": "Mark"
+    },
+    "moduleSummary": {
+        "message": "Summary of modules"
+    },
+    "moduleName": {
+        "message": "Module name"
+    },
+    "moduleType": {
+        "message": "Module type"
+    },
+    "evaluation": {
+        "message": "Evaluation"
+    },
+    "grade": {
+        "message": "Grade"
+    },
+    "quantity": {
+        "message": "Quantity"
+    },
+    "distribution": {
+        "message": "Distribution"
+    },
+    "majorModuleInformation": {
+        "message": "*Majorsmodules are a kinde of extensionmodules. If you got all 24 ETCS of a major, you get rewarded with a fancy title"
+    },
+    "majorModule": {
+        "message": "Major module"
+    },
+    "coreModule": {
+        "message": "Core module"
+    },
+    "projectModule": {
+        "message": "Project module"
+    },
+    "additionalModule": {
+        "message": "Additional module"
+    },
+    "extensionModule": {
+        "message": "Extension module"
+    },
+    "passed": {
+        "message": "passed"
+    }
+}

src/components/helpers.js

@@ -34,7 +34,7 @@ const Helpers = {
 
     /**
      * Checks if browser is Firefox or Chromium based
-     * 
+     *
      * @returns: true if the used browser is firefox and false if not
      */
     isFirefox: () => {
@@ -74,7 +74,7 @@ const Helpers = {
     /**
      * This Helper function returns the moduleList, specific to the used browser
      * Chome and Firefox have different APIs for this.
-     * 
+     *
      * @returns: moduleList
      */
     getModuleListFromLocalStorage: async () => {

src/components/i18n.js

@@ -0,0 +1,43 @@
+/**
+ * Component for localization functions.
+ */
+
+/**
+ * Returns the language of MyCampus
+ * @returns {string}
+ */
+const getMyCampusLanguage = () => {
+    languageLinks = document.getElementsByClassName("languagelink");
+    for (let i = 0; i < languageLinks.length; i++) {
+        const languageLink = languageLinks[i];
+        if (languageLink.classList.contains("active")) {
+            return languageLink.hreflang;
+        }
+    }
+
+    // fallback to default locale
+    if (Helpers.isFirefox()) {
+        return (browser.runtime.getManifest()).default_locale
+    }
+    else {
+        return (chrome.runtime.getManifest()).default_locale
+    }
+}
+
+const i18n = {
+
+    /**
+     * Returns the localized message
+     * @param {string} message wo should be localized
+     */
+    getMessage: async (message) => {
+        const language = getMyCampusLanguage();
+        const messages = await fetch(Helpers.getExtensionInternalFileUrl('_locales/' + language + '/messages.json'))
+            .then(response => response.json())
+        if (message in messages) {
+            return messages[message].message
+        }
+        return undefined
+    },
+}
+

src/components/module_parser.js

@@ -41,22 +41,28 @@ const ModuleParser = {
 
     /**
      * Calculate the semester.
-     * 
+     *
      * @param {string} hsluModuleName: is the 'anlassnumber',
      *  e.g. 'I.BA_BCHAIN.H1901'.
      */
     calculateSemester: (hsluModuleName, firstModule) => {
+        let semester = undefined;
 
         const startYear = new Date(firstModule.from).getFullYear();
         const isStartInAutumn = ModuleParser.isAutumnSemester(firstModule.anlassnumber);
 
         const lastPart = hsluModuleName.split('.')[2];
+        if (lastPart === undefined) {
+            // we need this early abort because of entries like 'I.WEIHNACHT_19'
+            // (which is not even a real module!)
+            return semester;
+        }
+
         const moduleYear = Number('20' + lastPart.substring(1, 3));
         const isModuleInAutumn = ModuleParser.isAutumnSemester(hsluModuleName);
 
         const yearDifference = (moduleYear - startYear)
 
-        let semester = undefined;
         if (isModuleInAutumn === undefined) {
             // we need this early abort because of entries like 'I.BA_PTA_b.1618'
             // (which is not even a real module!)
@@ -119,7 +125,19 @@ const ModuleParser = {
             return null;
         }
     },
-
+    /**
+     *  check if a module is valid
+     *  the modulename should look like this: I.BA_ANLS.F1901
+     */
+    validateModule: (hsluModule) => {
+        const moduleNameRegex = /^(\w+)\.(.+)\.[FH]\d{4}/g;
+        const creditsKey = 'ECTS-Punkte';
+        const hasCredits = (ModuleParser.getItemDetailsValueByKey(hsluModule.details, creditsKey));
+        if (moduleNameRegex.test(hsluModule.anlassnumber) && hasCredits) {
+            return true
+        }
+        return false
+    },
     /**
     * Generates an array of module objects using the API and the module type mapping json file.
     */
@@ -149,15 +167,29 @@ const ModuleParser = {
             .slice()
             .reverse()
             .find(modul => ModuleParser.isAutumnSemester(modul.anlassnumber) != undefined);
+        const passedMessage = await i18n.getMessage("passed");
 
         anlasslistApiResponse.items.forEach(item => {
 
+            if (!(ModuleParser.validateModule(item))) {
+                console.log("Not valid module: ", item.anlassnumber);
+                return;
+            }
             let parsedModule = {};
 
             let passed = item.prop1[0].text == 'Erfolgreich teilgenommen';
             parsedModule.passed = passed;
 
             parsedModule.mark = item.note === null ? 'n/a' : item.note;
+            if (item.note != null) {
+                parsedModule.mark = item.note;
+            }
+            else if (passed) {
+                parsedModule.mark = passedMessage;
+            }
+            else {
+                parsedModule.mark = 'n/a';
+            }
             parsedModule.grade = item.grade === null ? 'n/a' : item.grade;
             parsedModule.name = item.anlassnumber;
             parsedModule.from = item.from;