KASJ - Refactoring

kni-kernel · Jun 10, 2020 · 05f2352 · 05f2352
1 parent bb259df
commit 05f2352
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/dataStructure.txt b/dataStructure.txt
@@ -1,9 +1,10 @@
 collections:
     name: name of subject
     ects: ects points
+    academicYear: start of the academic year (eg. 2017-2018) 
+    level: level of fieldOfStudy
     fieldOfStudy: name of field of study
     semester: number of semester (0 if elective)
-    academicYear: start of the academic year for given subject (eg. 2017-2018) 
     hours: {
         lectures: hours,
         auditorium classes: hours,

diff --git a/getdata.py b/getdata.py
@@ -61,7 +61,6 @@ def insert(self, post):
                     name = s['url'].split('/')
                     nameMain = name[len(name) - 1]
                     courseName.append({'name': nameMain, 'shortName': s['name']})
-                    print()
                 levelsName.append({'level': l['level'], 'courseName': courseName})
             coursesForDownload[w] = levelsName
 
@@ -71,8 +70,6 @@ def insert(self, post):
         for i,singleLevel in enumerate(item):
             for j,k in enumerate(singleLevel['courseName']):
                 urlP = urlBase + '{}/study_plans/{}'.format(key, k['name'])
-                print(urlP)
-                sys.exit()
                 responseP = requests.get(urlP, headers=headers)
                 dataP = json.loads(responseP.text) if responseP.text is not None else None
                 lSem = len(dataP['syllabus']['study_plan']['semesters'])
@@ -84,8 +81,8 @@ def insert(self, post):
                             lMod = len(g['modules'])
                             for mi, m in enumerate(g['modules']):
                                 subjectForCourse.append({'name': m['name'], 'ects': m['ects_credits'],
+                                    'level': singleLevel['level'], 'academicYear': year,
                                     'fieldOfStudy': k['shortName'], 'semester': sem['number'],
-                                    'academicYear': year,
                                     'hours': {h['name'].lower():h['classes_hours'] for h in m['form_of_classes']}})
                         elif 'groups' in g.keys():
                             for go in g['groups']: