From 05c98deef82eca523e67cc7b53cf4615452945bd Mon Sep 17 00:00:00 2001 From: Leo1212 <23333080+Leo1212@users.noreply.github.com> Date: Tue, 15 Feb 2022 19:16:30 +0100 Subject: [PATCH 1/2] added ignore module pattern to calculate the first semester, solves #95 --- src/components/module_parser.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/components/module_parser.js b/src/components/module_parser.js index 8c94cca..08026fe 100644 --- a/src/components/module_parser.js +++ b/src/components/module_parser.js @@ -9,6 +9,8 @@ const updateModuleTypeList = async (oldModuleTypeList, jsonFilePath) => { return Object.assign(oldModuleTypeList, patch); } + + const ModuleParser = { /** @@ -129,6 +131,22 @@ const ModuleParser = { } return false }, + /** + * list of modules that should be ignored to calculate the first semester + * check if moduleName matches ignore pattern + */ + shouldModuleBeIgnored: (hsluModuleName) => { + const ignoreModulePatterns = ['INFO_ABEND']; + let dontIgnore = true; + ignoreModulePatterns.forEach(ignorePattern => { + if(hsluModuleName.includes(ignorePattern)) { + console.log(`ignoring module ${hsluModuleName} for first semester calculation`) + dontIgnore = false; + } + }) + + return dontIgnore; + }, /** * Generates an array of module objects using the API and the module type mapping json file. */ @@ -157,6 +175,8 @@ const ModuleParser = { firstModule = anlasslistApiResponse.items .slice() .reverse() + //check if module is is in the ignore list + .filter(modul => ModuleParser.shouldModuleBeIgnored(modul.anlassnumber)) .find(modul => ModuleParser.isAutumnSemester(modul.anlassnumber) != undefined); const passedMessage = await i18n.getMessage("Bestanden"); @@ -202,7 +222,7 @@ const ModuleParser = { // sets the UseInStats to true by default parsedModule.UseInStats = true; if (ignoreInStatsModules != undefined && ignoreInStatsModules[parsedModule.name]) { - parsedModule.UseInStats = false; + parsedModule.UseInStats = false; } myCampusModulesList[parsedModule.name] = { acronym: parsedModule.name, From 25c5cfa7be6d7d37994d69769bd6326294ad80b9 Mon Sep 17 00:00:00 2001 From: Leo1212 <23333080+Leo1212@users.noreply.github.com> Date: Tue, 15 Feb 2022 19:23:25 +0100 Subject: [PATCH 2/2] cleanup --- src/components/module_parser.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/module_parser.js b/src/components/module_parser.js index 08026fe..d56c47c 100644 --- a/src/components/module_parser.js +++ b/src/components/module_parser.js @@ -9,8 +9,6 @@ const updateModuleTypeList = async (oldModuleTypeList, jsonFilePath) => { return Object.assign(oldModuleTypeList, patch); } - - const ModuleParser = { /**