ladok3 5.1__py3-none-any.whl → 5.2__py3-none-any.whl

ladok3/data.nw

@@ -76,8 +76,8 @@ This way the user can deal with how to store the data.
 <<produce data about course specified in args>>=
 data_writer = csv.writer(sys.stdout, delimiter=args.delimiter)
 course_rounds = filter_rounds(
-  ladok.search_course_rounds(code=args.course_code),
-  args.rounds)
+                        ladok.search_course_rounds(code=args.course_code),
+                        args.rounds)
 
 if args.header:
   data_writer.writerow([
@@ -137,21 +137,24 @@ def extract_data_for_round(ladok, course_round, args):
   <<compute start and length of the course>>
   <<get the results for the course round>>
 
-  students = filter_students(course_round.participants(), args.students)
+  students = filter_students(course_round.participants(),
+                             args.students)
 
   for student in students:
-    student_results = filter_student_results(student, results)
+    student_results = filter_student_results(student,
+                                             results)
 
     <<determine if student should be included>>
 
-    components = filter_components(course_round.components(), args.components)
+    components = filter_components(course_round.components(),
+                                   args.components)
 
     for component in components:
       if len(student_results) < 1:
         result_data = None
       else:
-        result_data = filter_component_result(
-          component, student_results[0]["ResultatPaUtbildningar"])
+        result_data = filter_component_result(component,
+                                student_results[0]["ResultatPaUtbildningar"])
 
       if not result_data:
         grade = "-"
@@ -164,12 +167,21 @@ def extract_data_for_round(ladok, course_round, args):
 
 We want to yield the data in CSV form, so we simply yield a tuple.
 The date is either the normalized date or the date from the result data.
+The student's identifier will be either the LADOK ID or the student name and 
+personnummer, depending on the command line arguments.
 <<yield [[student, component, grade]] and date>>=
-if args.normalize_date:
-  yield student, component, grade, normalized_date
-elif result_data:
-  yield student, component, grade, result_data["Examinationsdatum"]
+yield student.ladok_id if args.ladok_id \
+                       else student, \
+      component, \
+      grade, \
+      normalized_date if args.normalize_date \
+                      else result_data["Examinationsdatum"] if result_data \
+                                                            else None
 <<add data command arguments to data parser>>=
+data_parser.add_argument("-l", "--ladok-id", action="store_true",
+                         help="Use the LADOK ID for the student, "
+                              "otherwise the student name and personnummer "
+                              "will be used.")
 data_parser.add_argument("-n", "--normalize-date", action="store_true",
                          help="Normalize the date to the start of the course, "
                               "otherwise the date is printed as is.")

ladok3/data.py

@@ -60,10 +60,11 @@ def extract_data_for_round(ladok, course_round, args):
                     grade = "-"
                     normalized_date = None
 
-            if args.normalize_date:
-                yield student, component, grade, normalized_date
-            elif result_data:
-                yield student, component, grade, result_data["Examinationsdatum"]
+            yield student.ladok_id if args.ladok_id else student, component, grade, (
+                normalized_date
+                if args.normalize_date
+                else result_data["Examinationsdatum"] if result_data else None
+            )
 
 
 def filter_student_results(student, results):
@@ -168,6 +169,14 @@ def add_command_options(parser):
         help="The round codes for the rounds to include, "
         "otherwise all rounds will be included.",
     )
+    data_parser.add_argument(
+        "-l",
+        "--ladok-id",
+        action="store_true",
+        help="Use the LADOK ID for the student, "
+        "otherwise the student name and personnummer "
+        "will be used.",
+    )
     data_parser.add_argument(
         "-n",
         "--normalize-date",

{ladok3-5.1.dist-info → ladok3-5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ladok3
-Version: 5.1
+Version: 5.2
 Summary: Python wrapper and CLI for the LADOK3 REST API.
 Home-page: https://github.com/dbosk/ladok3
 License: MIT

{ladok3-5.1.dist-info → ladok3-5.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-doc/ltxobj/ladok3.pdf,sha256=ffhkazbKXtrPNApa39g96qOlnuwK5QniFQkqAnj4eLc,2308912
+doc/ltxobj/ladok3.pdf,sha256=pw1hOWXramu6nDhQy0iwMaUHKdwHr2gE8dLVeV8GypE,2319370
 ladok3/.gitignore,sha256=R1rBunOQmdfni2mCHqmtU3vDQggAZdeu5qIdK89jRtE,90
 ladok3/Makefile,sha256=V1eijeRoVPOcl0QCoIVzc2d1p6goJfu3PNynINM-ZnU,715
 ladok3/__init__.py,sha256=2ySW9vSJ0joOV5TH9dtK_CAOdk1PByZ7jYfAwQxfAhc,87708
 ladok3/api.nw,sha256=o7ZWO6eplSG3ReS0Y-rzcrLP2yiFVwvQUtg6dPDXG5E,66716
 ladok3/cli.nw,sha256=sA5kevvAWBkzZHZ3UBkPEHoWvPw5yYtGYiPEnWMmjus,22864
 ladok3/cli.py,sha256=6R7B0XVvYFlHcMbv6E73KOeI3ZGQFeQN2-ojz12H1vU,12555
-ladok3/data.nw,sha256=NddmEnzfgaXZkYyaOLle67MNySy4YKWx4OXMWAOAMkA,12676
-ladok3/data.py,sha256=nLta8ZlSmgRqXZoCbJqtw6KlHH-EyZfImbDcPs74G2U,7324
+ladok3/data.nw,sha256=f-63BpPTO87WfnAlz7o2oN6xJ5ZGCf2GTRBT1Laakgc,13388
+ladok3/data.py,sha256=Y-JTg7qYElKtvMG_sv4BJgPSa6qBi8s8eXLZwbGxZvA,7592
 ladok3/ladok.bash,sha256=zGfTFdtos2zLjV13pzfK-1uCy2b_lF2qUKMoL2ExW7c,1441
 ladok3/ladok3.nw,sha256=mftysbBD9CLaKD8JgRcSO9KOnjV6koOd2dfmbSSJJi0,55594
 ladok3/report.nw,sha256=nmyP6TnSYBsMIeG2bdiVQ7LqQN_gEqyEfbDrrOR1afc,10068
@@ -15,8 +15,8 @@ ladok3/scripts.nw,sha256=BgKUOEUc1JeShPvGLV4OJLQwrmCOyxUoe7pAeW00d34,8906
 ladok3/student.nw,sha256=qgJN1IA6oIoI4RsfWsoTaO2yxdtB_y3mBNSmlccoE4Y,4395
 ladok3/student.py,sha256=a3z5dY18UXqxZh4WtEhgsUdHePhRNBiU5GaNNP6LKxI,2178
 ladok3/undoc.nw,sha256=rRAZ8fC44PD2hBDF8TeEg1hyge_-vd-ScRcojRXQycI,19841
-ladok3-5.1.dist-info/LICENSE,sha256=Oe-mWTBQ-MzuA4jGuRDPDxQtMe8SuP_YjSQl7SOtZ7Q,1155
-ladok3-5.1.dist-info/METADATA,sha256=wMSkWRA_WBSYjLyfODj60Q8t-u7u5HDArOtFpkalBWc,9370
-ladok3-5.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ladok3-5.1.dist-info/entry_points.txt,sha256=pi-KKP5Obo0AyuDjXQUpadS9kIvAY2_5ORhPgEYlJv8,41
-ladok3-5.1.dist-info/RECORD,,
+ladok3-5.2.dist-info/LICENSE,sha256=Oe-mWTBQ-MzuA4jGuRDPDxQtMe8SuP_YjSQl7SOtZ7Q,1155
+ladok3-5.2.dist-info/METADATA,sha256=-xtEG253nX5pnyh4k3XKNjrb3sP5__GMM84wVa1uhXc,9370
+ladok3-5.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ladok3-5.2.dist-info/entry_points.txt,sha256=pi-KKP5Obo0AyuDjXQUpadS9kIvAY2_5ORhPgEYlJv8,41
+ladok3-5.2.dist-info/RECORD,,