ladok3 4.11__tar.gz → 4.13__tar.gz

{ladok3-4.11 → ladok3-4.13}/PKG-INFO

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

{ladok3-4.11 → ladok3-4.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ladok3"
-version = "4.11"
+version = "4.13"
 description = "Python wrapper and CLI for the LADOK3 REST API."
 authors = [
   "Daniel Bosk <dbosk@kth.se>",

{ladok3-4.11 → ladok3-4.13}/src/ladok3/api.nw

@@ -889,6 +889,9 @@ Note that since this is a new result, we must provide the [[StudieresultatUID]]
 where we want to add the result.
 When we've done this, we'll get a [[ResultatUID]] back in the response.
 From then on, it's the [[ResultatUID]] that's interesting.
+
+Note also that we can use [[course_instance_id]] as [[component_id]], this will 
+set the result on the whole course.
 <<LadokSession data methods>>=
 def create_result_JSON(self,
       student_id, course_instance_id, component_id,

{ladok3-4.11 → ladok3-4.13}/src/ladok3/cli.nw

@@ -570,7 +570,7 @@ try:
     "username": os.environ["LADOK_USER"],
     "password": os.environ["LADOK_PASS"]
   }
-  if institution and vars:
+  if institution and vars["username"] and vars["password"]:
     return institution, vars
 except:
   pass
@@ -585,7 +585,9 @@ try:
   vars = {}
   for key in vars_keys.split(":"):
     try:
-      vars[key] = os.environ[key]
+      value = os.environ[key]
+      if value:
+        vars[key] = value
     except KeyError:
       <<print warning about missing variable in [[LADOK_VARS]]>>
 

{ladok3-4.11 → ladok3-4.13}/src/ladok3/ladok3.nw

@@ -1122,12 +1122,8 @@ By trial-and-error, it seems like the faux courses has none of the attributes
 that the real courses have.
 However, we try our best.
 <<assign common CourseInstance data to private attributes>>=
-if "IngaendeMoment" in data:
-  self.__components = [CourseComponent(
-      ladok=self.ladok, course=self,
-      **component) for component in data["IngaendeMoment"]]
-else:
-  self.__components = []
+self.__components = []
+<<add course components to [[self.__components]]>>
 <<assign CourseInstance data to private attributes>>=
 <<assign common CourseInstance data to private attributes>>
 
@@ -1203,6 +1199,33 @@ def components(self, /, **kwargs):
 @
 
 
+\subsection{Course components}
+
+We need to add the courses components to the course instance.
+That is things like LAB1 or EXA1 that make up the course in LADOK.
+<<add course components to [[self.__components]]>>=
+if "IngaendeMoment" in data:
+  self.__components += [CourseComponent(
+      ladok=self.ladok, course=self,
+      **component) for component in data["IngaendeMoment"]]
+@
+
+We also add the course itself as a component.
+This is to handle the grade on the course itself.
+Once all the components have a grade, the course itself will get a grade.
+This component represents that grade.
+It will get the course code as its code.
+<<add course components to [[self.__components]]>>=
+try:
+  course_component_data = data.copy()
+  course_component_data["ladok"] = self.ladok
+  self.__components.append(CourseComponent(course=self,
+                                           **course_component_data))
+except KeyError:
+  pass
+@
+
+
 \section{Course components}
 
 The [[CourseComponent]] class will make the attributes available.
@@ -1415,13 +1438,15 @@ We can pull these from LADOK as well.
 We construct [[CourseResult]] objects using a [[CourseRegistration]] object.
 From the response we get from LADOK, we construct [[CourseResult]] objects that 
 deal with the details.
+(It's a bit unclear why [[Kursversioner]] is a list, so far it has always 
+worked to take the first.)
 <<pull existing CourseResult objects from LADOK>>=
 response = self.ladok.student_results_JSON(
   self.__student.ladok_id, self.education_id
 )["Kursversioner"][0]
 
-#self.__results_id = response["Uid"]
 self.__results = []
+
 for result in response["VersionensModuler"]:
   try:
     self.__results.append(CourseResult(ladok=self.ladok,
@@ -1432,6 +1457,20 @@ for result in response["VersionensModuler"]:
     pass
 @
 
+As with the components, the course grade itself is a special case.
+That data is not in [[VersionensModuler]], but in [[VersionensKurs]].
+But we can do the same with it, just as we could with the components.
+(And this works since it's a component in [[self.components()]].)
+<<pull existing CourseResult objects from LADOK>>=
+try:
+  self.__results.append(CourseResult(ladok=self.ladok,
+                                     components=self.components(),
+                                     student=self.__student,
+                                     **response["VersionensKurs"]))
+except TypeError:
+  pass
+@
+
 Now we can see which components from [[self.components]] are missing from 
 [[self.__results]] and just add empty results for those.
 <<add new CourseResult objects for missing components>>=