Merge pull request 'dev' (#1) from fedora42/convert_xml_plan_to_json:dev into main

Reviewed-on: GuzhavinAleksey/convert_xml_plan_to_json#1

src/parser/index.ts

@@ -36,106 +36,7 @@ const result = {
         zach: 0, // ЗАЧ - 143
         sr: 0, // СР - 107
         kontrol: 0, // Контроль - 108
-    },
-    courses: {
-        '1': {  // 1 Курс
-            '1': { // 1 Семестр
-                zE: 0,
-                aud: 0,
-                sr: 0,
-                kontorl: 0, //Непонятно отуда берется, как проеряется , где то ест ьгде то нет
-
-            },
-            '2': { // 2 Семестр
-                zE: 0,
-                aud: 0,
-                sr: 0,
-                kontorl: 0,
-            }
-
-        },
-        '2': {
-            '1': {
-                zE: 0,
-                aud: 0,
-                sr: 0,
-                kontorl: 0,
-
-            },
-            '2': {
-                zE: 0,
-                aud: 0,
-                sr: 0,
-                kontorl: 0,
-            }
-        },
-        '3': {
-            '1': {
-                zE: 0,
-                aud: 0,
-                sr: 0,
-                kontorl: 0,
-
-            },
-            '2': {
-                zE: 0,
-                aud: 0,
-                sr: 0,
-                kontorl: 0,
-            }
-        },
-        '4': {
-            '1': {
-                zE: 0,
-                aud: 0,
-                sr: 0,
-                kontorl: 0,
-
-            },
-            '2': {
-                zE: 0,
-                aud: 0,
-                sr: 0,
-                kontorl: 0,
-            }
-        },
-        '5': {
-            '1': {
-                zE: 0,
-                aud: 0,
-                sr: 0,
-                kontorl: 0,
-
-            },
-            '2': {
-                zE: 0,
-                aud: 0,
-                sr: 0,
-                kontorl: 0,
-            }
-        },
-        '6': {
-            '1': {
-                zE: 0,
-                aud: 0,
-                sr: 0,
-                kontorl: 0,
-
-            },
-            '2': {
-                zE: 0,
-                aud: 0,
-                sr: 0,
-                kontorl: 0,
-            }
-        },
-    },
-    kafedra: {
-        index: null,
-        code: null,
-        name: null,
-    },
-    competition: null,
+    }
 }
 
 
@@ -154,7 +55,6 @@ async function getDisciplineCode(data, discipline) {
     result.disciplineName = filteredData[0]['@']['Дисциплина'];
     result.ectsCredits = filteredData[0]['@']['ЗЕТфакт'];
     result.totalAcademicHours.byPlan = filteredData[0]['@']['ЧасовПоПлану'];
-    result.kafedra.index = filteredData[0]['@']['КодКафедры'];
     return filteredData[0]['@']['Код'];
 }
 
@@ -162,25 +62,13 @@ async function getDisciplineCode(data, discipline) {
 async function getHours(disciplineCode, data) {
     const filteredData = data['diffgr:diffgram']['dsMMISDB']['ПланыНовыеЧасы'].filter(item => item['@']['КодОбъекта'] === disciplineCode);
 
-    // console.log(filteredData)
+     console.log(filteredData)
     return filteredData
 }
 
-async function getKafedraData(kafedraCode, data){
-    const filteredData = data['diffgr:diffgram']['dsMMISDB']['Кафедры'].filter(item => item['@']['Код'] === kafedraCode);
-    result.kafedra.code = filteredData[0]['@']['Номер'];
-    result.kafedra.name = filteredData[0]['@']['Название'];
-
-    return filteredData
-
-}
-
 async function countHours(hoursArray) {
 
     hoursArray.forEach(item => {
-        const course = item['@']["Курс"];
-        const semestr = item['@']["Семестр"];
-
         switch (item['@']["КодВидаРаботы"]) {
             case "1":
                 result.formOfInterimAssessment.exam = Number(item['@']["Количество"])
@@ -198,16 +86,13 @@ async function countHours(hoursArray) {
                 result.totalAcademicHours.lab = result.totalAcademicHours.lab + Number(item['@']["Количество"])
                 break;
             case "103":
-
                 result.totalAcademicHours.pr = result.totalAcademicHours.pr + Number(item['@']["Количество"])
                 break;
             case "104":
                 result.totalAcademicHours.sem = result.totalAcademicHours.sem + Number(item['@']["Количество"])
                 break;
             case "107":
-                result.courses[course][semestr].aud = Number(item['@']["Количество"])*2;
-                result.courses[course][semestr].sr = Number(item['@']["Количество"]);
-                result.totalAcademicHours.sr = result.totalAcademicHours.sr + Number(item['@']["Количество"]);
+                result.totalAcademicHours.sr = result.totalAcademicHours.sr + Number(item['@']["Количество"])
                 break;
             case "108":
                 result.totalAcademicHours.kontrol = result.totalAcademicHours.kontrol + Number(item['@']["Количество"])
@@ -227,14 +112,6 @@ async function countHours(hoursArray) {
             case "143":
                 result.totalAcademicHours.zach = result.totalAcademicHours.zach + Number(item['@']["Количество"])
                 break;
-
-            //Для семестров
-            case "6":
-                result.courses[course][semestr].kontorl = Number(item['@']["Количество"]);
-                break;
-            case "50":
-                result.courses[course][semestr].zE = Number(item['@']["Количество"]);
-                break;
         }
 
 
@@ -245,11 +122,10 @@ async function countHours(hoursArray) {
 
 async function main() {
     const json = await getJSON();
-    const disciplineCode = await getDisciplineCode(json, 'Физическая подготовка');
+    const disciplineCode = await getDisciplineCode(json, 'Правоведение');
     const hoursArray = await getHours(disciplineCode, json);
-    const cafedra = await getKafedraData(result.kafedra.index, json);
     countHours(hoursArray)
     result.totalAcademicHours.contRab = result.totalAcademicHours.lec + result.totalAcademicHours.lab + result.totalAcademicHours.pr + result.totalAcademicHours.sem + result.totalAcademicHours.gz + result.totalAcademicHours.tz + result.totalAcademicHours.ksu + result.totalAcademicHours.kl + result.totalAcademicHours.zach;
-    console.log(JSON.stringify(result))
+    console.log(result)
 }
 main();