Merge pull request #5 from TINF21CS1/dev

add Course Name

Author: JM-Lemmi

CampusNet.py

@@ -22,6 +22,7 @@ class Module:
 
 @dataclass
 class Exam:
+    name: Union[str, None]
     semester: str
     description: str
     grade: Union[float, None] = None
@@ -207,14 +208,18 @@ def get_exams_for_module(self, module: Module):
         soup = BeautifulSoup(response.text, 'html.parser')
         exam_table = soup.find('table', {'class': 'tb'})
         exams = []
+        current_heading = None
         for row in exam_table.find_all("tr"):
             cells = row.find_all('td')
+            if len(cells) == 1 and 'level02' in cells[0]["class"]:
+                current_heading = cells[0].text.strip() #variable to persist header into the next iteration
             if len(cells) == 6 and all("tbdata" in cell["class"] for cell in cells):
                 try:
                     grade = float(cells[3].text.strip().replace(",", "."))
                 except ValueError:
                     grade = None
                 exams.append(Exam(
+                    name=current_heading,
                     semester=cells[0].text.strip(),
                     description=cells[1].text.strip(),
                     grade=grade,

Readme.md

@@ -1,10 +1,47 @@
-## Example usage
+# CampusNet Python
+
+## Usage Examples
+
+### Exam Script
+
+The `print_exams_as_table.py` script that is included in this repository will easily retrieve all Exams for a user and print them in a pretty table. This makes a quick overview very easy.
+
+```
+PS > python .\print_exams_as_table.py
+Username (mit @!): [email protected]
+Password: 
+---------  ----------------------------------------  ------------------------------------------------------  ------------  --------------------------------------------  ---
+T3_1000    Praxisprojekt I                           T3_1000.1 Projektarbeit 1 (MA-TINF21CS1)                SoSe 2022     Projektarbeit (1%)
+T3_1000    Praxisprojekt I                           T3_1000.2 Wissenschaftliches Arbeiten 1 (MA-TINF21CS1)  SoSe 2022     Ablauf- und Reflexionsbericht (1%)
+T3INF1001  Mathematik I                              T3INF1001.1 Lineare Algebra (MA-TINF21CS1)              WiSe 2021/22  Klausurarbeit (50%)                           2.9
+T3INF1001  Mathematik I                              T3INF1001.2 Analysis (MA-TINF21CS1)                     SoSe 2022     Klausurarbeit (50%)                           3.1
+T3INF1002  Theoretische Informatik I (MA-TINF21CS1)  Modulabschlussleistungen                                SoSe 2022     Klausurarbeit (100%)
+T3INF1003  Theoretische Informatik II                Modulabschlussleistungen                                SoSe 2022     Klausurarbeit (100%)
+T3INF1004  Programmieren                             Modulabschlussleistungen                                SoSe 2022     Programmentwurf (100%)
+T3INF1005  Schlüsselqualifikationen                  Modulabschlussleistungen                                SoSe 2022     Klausurarbeit (< 50 %) (100%)
+T3INF4102  Einführung in die Kryptologie             Modulabschlussleistungen                                SoSe 2022     Klausur 75 % und Laborarbeit 25 % (100%)
+T3INF9000  Web and App Engineering                   Modulabschlussleistungen                                SoSe 2022     Klausur 50 % und Programmentwurf 50 % (100%)
+T3INF1006  Technische Informatik I                   Modulabschlussleistungen                                WiSe 2021/22  Klausurarbeit (100%)                          4
+T3INF9001  Cyber Security Basics                     Modulabschlussleistungen                                WiSe 2021/22  Hausarbeit (100%)                             2.1
+---------  ----------------------------------------  ------------------------------------------------------  ------------  --------------------------------------------  ---
+```
+
+### Python Package
+
+You can also use CampusNet.py as an imported Package to interact in detail with CampusNet.
 
 ```python
-$ python3 -i CampusNet.py
+$ python
+>>> from CampusNet import *
 >>> s = CampusNetSession("s***REMOVED***@student.dhbw-mannheim.de", "***REMOVED***")
 >>> s.modules
 [Module(num='T3_1000', name='Praxisprojekt I', credits=20.0, status='', semesters=['SoSe 2022'], id='381683598069776', grade=None), Module(num='T3INF1001', name='Mathematik I', credits=8.0, status='', semesters=['SoSe 2022', 'WiSe 2021/22'], id='380685560144022', grade=None), Module(num='T3INF1002', name='Theoretische Informatik I (MA-TINF21CS1)', credits=5.0, status='', semesters=['SoSe 2022'], id='382855008624547', grade=None), Module(num='T3INF1003', name='Theoretische Informatik II', credits=5.0, status='', semesters=['SoSe 2022'], id='382214102615788', grade=None), Module(num='T3INF1004', name='Programmieren', credits=9.0, status='', semesters=['SoSe 2022'], id='379974839816701', grade=None), Module(num='T3INF1005', name='Schlüsselqualifikationen', credits=5.0, status='', semesters=['SoSe 2022'], id='379974840574866', grade=None), Module(num='T3INF4102', name='Einführung in die Kryptologie', credits=5.0, status='', semesters=['SoSe 2022'], id='382214104541196', grade=None), Module(num='T3INF9000', name='Web and App Engineering', credits=5.0, status='', semesters=['SoSe 2022'], id='379974842066225', grade=None), Module(num='T3INF1006', name='Technische Informatik I', credits=5.0, status='bestanden', semesters=['WiSe 2021/22'], id='380703425164844', grade=1.2), Module(num='T3INF9001', name='Cyber Security Basics', credits=3.0, status='bestanden', semesters=['WiSe 2021/22'], id='379974841329087', grade=1.6)]
 >>> s.get_exams_for_module(s.modules[9])
 [Exam(semester='WiSe 2021/22', description='Hausarbeit (100%)', grade=1.6)]
 ```
+
+## Contribution
+
+This package is still work in progress. If you need data from CampusNet, that is currently not retrieved by it, please feel free to open an Issue or even PR for it.
+
+We are studying at DHBW Mannheim, so this package is tested with [https://dualis.dhbw.de](https://dualis.dhbw.de). But it should also be compatible with other CampusNet instances from other universities.

print_exams_as_table.py

@@ -11,6 +11,6 @@
 
 for module in s.modules:
     for exam in s.get_exams_for_module(module):
-        table.append([module.num, module.name, exam.semester, exam.description, exam.grade])
+        table.append([module.num, module.name, exam.name, exam.semester, exam.description, exam.grade])
 
 print(tabulate(table))