ladok3 3.7__py3-none-any.whl → 3.8__py3-none-any.whl

ladok3/report.nw

@@ -129,8 +129,8 @@ them.
 <<check that we got all positional arguments>>
 try:
   student = ladok.get_student(args.student_id)
-  course = student.courses(code=args.course_code)[0]
-  result = course.results(component=args.component_code)[0]
+  <<look up [[course]] from [[student]]>>
+  <<look up [[result]] from [[course]]>>
   result.set_grade(args.grade, args.date)
   if args.finalize:
     result.finalize()
@@ -139,9 +139,25 @@ except Exception as err:
     print(f"{student}: {err}")
   except ValueError as verr:
     print(f"{verr}: {args.student_id}: {err}")
-@ This means that we need the following command-line arguments.
-The option [[args.finalize]] is already set above, so we don't need to add that 
-one here.
+@ The option [[args.finalize]] is already set above, so we don't need to add 
+that one here.
+
+Both looking up the course and the component can yield index errors.
+We'd like to distinguish these.
+We will catch the exception, the reraise the same exception but with a better 
+error message.
+<<look up [[course]] from [[student]]>>=
+try:
+  course = student.courses(code=args.course_code)[0]
+except IndexError:
+  raise Exception("f{args.course_code}: No such course for {student}")
+<<look up [[result]] from [[course]]>>=
+try:
+  result = course.results(component=args.component_code)[0]
+except IndexError:
+  raise Exception(f"{args.component_code}: "
+                  f"No such component for {args.course_code}")
+@
 
 
 \section{Report many results given in standard input}
@@ -180,23 +196,14 @@ try:
   try:
     course = student.courses(code=course_code)[0]
   except IndexError:
-    raise Exception(f"{course_code}: no such course.")
+    raise Exception(f"{course_code}: No such course for {student}")
 
   try:
     component = course.results(component=component_code)[0]
   except IndexError:
-    raise Exception(f"{course_code} has no component {component_code}.")
+    raise Exception(f"{component_code}: no such component for {course_code}")
 
-  if not component.attested and component.grade != grade:
-    component.set_grade(grade, date)
-    component.finalize()
-    if args.verbose:
-      print(f"{course_code} {student}: reported "
-        f"{component.component} = {component.grade} ({date}).")
-  elif component.grade != grade:
-    print(f"{course_code} {student}: attested {component.component} "
-      f"result {component.grade} ({component.date}) "
-      f"is different from {grade} ({date}).")
+  <<set [[grade]] to [[component]], output if verbose>>
 except Exception as err:
   try:
     print(f"{course_code} {component_code}={grade} ({date}) {student}: {err}",
@@ -207,6 +214,30 @@ except Exception as err:
       file=sys.stderr)
 @
 
+Now, when we set the grade, there are a few cases that should be handled.
+If the grade isn't attested, we try to change it.
+(This might still fail if the grade is finalized but not attested.)
+If we've selected the verbose option, then we print what we have reported.
+
+If the grade was attested, then we check if it's different.
+If it's different, we output this.
+If it's the same, we silently ignore it.
+This is best for bulk reporting, because then we can always try to report for 
+all students.
+<<set [[grade]] to [[component]], output if verbose>>=
+if not component.attested and component.grade != grade:
+  component.set_grade(grade, date)
+  if args.finalize:
+    component.finalize()
+  if args.verbose:
+    print(f"{course_code} {student}: reported "
+      f"{component.component} = {component.grade} ({date}).")
+elif component.grade != grade:
+  print(f"{course_code} {student}: attested {component.component} "
+    f"result {component.grade} ({component.date}) "
+    f"is different from {grade} ({date}).")
+@
+
 
 \section{Determine which function to run}
 

ladok3/report.py

@@ -12,8 +12,15 @@ def report_one_result(ladok, args):
     sys.exit(1)
   try:
     student = ladok.get_student(args.student_id)
-    course = student.courses(code=args.course_code)[0]
-    result = course.results(component=args.component_code)[0]
+    try:
+      course = student.courses(code=args.course_code)[0]
+    except IndexError:
+      raise Exception("f{args.course_code}: No such course for {student}")
+    try:
+      result = course.results(component=args.component_code)[0]
+    except IndexError:
+      raise Exception(f"{args.component_code}: "
+                      f"No such component for {args.course_code}")
     result.set_grade(args.grade, args.date)
     if args.finalize:
       result.finalize()
@@ -32,16 +39,17 @@ def report_many_results(ladok, args):
       try:
         course = student.courses(code=course_code)[0]
       except IndexError:
-        raise Exception(f"{course_code}: no such course.")
+        raise Exception(f"{course_code}: No such course for {student}")
 
       try:
         component = course.results(component=component_code)[0]
       except IndexError:
-        raise Exception(f"{course_code} has no component {component_code}.")
+        raise Exception(f"{component_code}: no such component for {course_code}")
 
       if not component.attested and component.grade != grade:
         component.set_grade(grade, date)
-        component.finalize()
+        if args.finalize:
+          component.finalize()
         if args.verbose:
           print(f"{course_code} {student}: reported "
             f"{component.component} = {component.grade} ({date}).")

ladok3/student.nw

@@ -63,6 +63,17 @@ student_parser.add_argument("-c", "--course",
 )
 @
 
+\subsection{A results flag}
+
+We also want a flag for specifying whether or not to include the results of 
+each course.
+<<add student command arguments to student parser>>=
+student_parser.add_argument("-r", "--results",
+  action="store_true", default=False,
+  help="Set to include results for each course listed."
+)
+@
+
 \section{Print the student data}
 
 Now that we have the student identifier, we can simply use that to fetch the 
@@ -80,7 +91,7 @@ print_student_data(student)
 
 if args.course:
   print()
-  print_course_data(student, args.course)
+  print_course_data(student, args)
 @
 
 \subsection{Printing personal student data}
@@ -102,13 +113,15 @@ def print_student_data(student):
 
 To print the student's course data, we simply filter the courses on the option 
 that the user supplies.
-We then print all results for each course.
+We then print all courses and, if the flag is set, we also print the results 
+for each course.
 <<functions>>=
-def print_course_data(student, course):
+def print_course_data(student, args):
   """Prints the courses"""
   print("Courses:")
-  for course in student.courses(code=course):
+  for course in student.courses(code=args.course):
     print(f"{course}")
-    for result in course.results():
-      print(f"  {result}")
+    if args.results:
+      for result in course.results():
+        print(f"  {result}")
 @

ladok3/student.py

@@ -9,13 +9,14 @@ def print_student_data(student):
   print(f"LADOK ID:     {student.ladok_id}")
   print(f"Alive:        {student.alive}")
   print(f"Suspended:    {student.suspensions}")
-def print_course_data(student, course):
+def print_course_data(student, args):
   """Prints the courses"""
   print("Courses:")
-  for course in student.courses(code=course):
+  for course in student.courses(code=args.course):
     print(f"{course}")
-    for result in course.results():
-      print(f"  {result}")
+    if args.results:
+      for result in course.results():
+        print(f"  {result}")
 
 def add_command_options(parser):
   student_parser = parser.add_parser("student",
@@ -34,6 +35,10 @@ def add_command_options(parser):
     help="A regular expression for which course codes to list, " \
       "use no value for listing all courses."
   )
+  student_parser.add_argument("-r", "--results",
+    action="store_true", default=False,
+    help="Set to include results for each course listed."
+  )
 
 def command(ladok, args):
   try:
@@ -46,4 +51,4 @@ def command(ladok, args):
 
   if args.course:
     print()
-    print_course_data(student, args.course)
+    print_course_data(student, args)

{ladok3-3.7.dist-info → ladok3-3.8.dist-info}/METADATA

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

{ladok3-3.7.dist-info → ladok3-3.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-doc/ltxobj/ladok3.pdf,sha256=icIbzJ8YAOai3DhC7XrIMphm7LGkclZHwxGzPl3u_-E,1334876
+doc/ltxobj/ladok3.pdf,sha256=c0iYxLo-08604cbpbqH0H2kPY7C0r__Zde1B9T53yEM,1335740
 ladok3/.gitignore,sha256=QOcCshtjIsFasi4vaqFcooBWPJkxVWaoYEWOBBtdY_w,81
 ladok3/Makefile,sha256=Jy6OFjoVLU9YivnVxctxI_zrUOK9ysEOiistJ3ST6Nw,557
 ladok3/__init__.py,sha256=bdFgx0CHaosa5hDqmLbIGjq6IoVHkXqO--yaIpuOOGU,228872
@@ -10,14 +10,14 @@ ladok3/data.py,sha256=mCHySFtQL_oh6mkfMbgRM4T1bnM8HR45eumgoKFwomk,5893
 ladok3/kth.py,sha256=aoodYd2bLQcPNQiFwyP0mppJO399UcqUgUhN9wzVwBA,3720
 ladok3/ladok.bash,sha256=zGfTFdtos2zLjV13pzfK-1uCy2b_lF2qUKMoL2ExW7c,1441
 ladok3/ladok3.nw,sha256=UoiEJAIihPNrHuMHWjoNoz7pl2hDEkziGE3B6X6zbk0,50144
-ladok3/report.nw,sha256=_PUV9Qrg1aUuxiqcQg3VNOApOY3oDdTEJSCOdRiluyc,7303
-ladok3/report.py,sha256=rNCIiPTd9egw8iXSSKsmyrcF3NebqinpuRxfphcyIjo,4082
-ladok3/student.nw,sha256=RFS3Uo-l_dYsmm41Psh4EPO3LpJQ2ipDSLBsFhlkTco,3356
-ladok3/student.py,sha256=3YRf6WXimFBusH-sBiWKJhEJ_W-qfzqVPox2sLJNFCI,1531
+ladok3/report.nw,sha256=DuJWJuslBxo8n2hxWZvao_nRWQO1TIAlJLF0BMc-Mto,8461
+ladok3/report.py,sha256=PwLeoB2MXDlVPI5zNs4hICchKVPMmQlMIRHiBKW0xn4,4387
+ladok3/student.nw,sha256=zayn9_b9jCKeMnZxSGS_EuSmF3ojOBHQDMUMMkpRssI,3747
+ladok3/student.py,sha256=TaYn2rpbQnzummB-8xz-sUEV31Gh0CUmU0QkF6VgEic,1703
 ladok3/test.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ladok3/undoc.nw,sha256=NyHuVIzrRqJPM39MyAlZNEE7PbXdUDJFQ2kJ0NfdwQI,180333
-ladok3-3.7.dist-info/LICENSE,sha256=s_C5qznXAvDRrzU7vRd4eqzshyIkAfPwGyVBihGeOdM,1155
-ladok3-3.7.dist-info/METADATA,sha256=Jelc3ichBPu0MfSaO58NbteMHOAuenpMG4Z6-X95NEc,8098
-ladok3-3.7.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
-ladok3-3.7.dist-info/entry_points.txt,sha256=pi-KKP5Obo0AyuDjXQUpadS9kIvAY2_5ORhPgEYlJv8,41
-ladok3-3.7.dist-info/RECORD,,
+ladok3-3.8.dist-info/LICENSE,sha256=s_C5qznXAvDRrzU7vRd4eqzshyIkAfPwGyVBihGeOdM,1155
+ladok3-3.8.dist-info/METADATA,sha256=uFSCD7Y5d9z6rv6BuE7EXBb0Exk9AxKodSY3mQnc4ug,8098
+ladok3-3.8.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
+ladok3-3.8.dist-info/entry_points.txt,sha256=pi-KKP5Obo0AyuDjXQUpadS9kIvAY2_5ORhPgEYlJv8,41
+ladok3-3.8.dist-info/RECORD,,