ladok3 4.11__py3-none-any.whl → 4.13__py3-none-any.whl

ladok3/__init__.py

@@ -4462,13 +4462,20 @@ class CourseInstance(LadokRemoteData):
             self.__pull_attributes()
 
     def __assign_attr(self, data):
+        self.__components = []
         if "IngaendeMoment" in data:
-            self.__components = [
+            self.__components += [
                 CourseComponent(ladok=self.ladok, course=self, **component)
                 for component in data["IngaendeMoment"]
             ]
-        else:
-            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
 
         self.__name = data.pop("Benamning")
         self.__code = data.pop("Utbildningskod")
@@ -4493,13 +4500,20 @@ class CourseInstance(LadokRemoteData):
         self.__pull_attributes()
 
     def __assign_faux(self, data):
+        self.__components = []
         if "IngaendeMoment" in data:
-            self.__components = [
+            self.__components += [
                 CourseComponent(ladok=self.ladok, course=self, **component)
                 for component in data["IngaendeMoment"]
             ]
-        else:
-            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
 
         self.__name = data.pop("Benamning", None)
         self.__code = data.pop("Utbildningskod", None)
@@ -4748,8 +4762,8 @@ class CourseRegistration(CourseInstance):
             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(
@@ -4762,6 +4776,17 @@ class CourseRegistration(CourseInstance):
                 )
             except TypeError:
                 pass
+        try:
+            self.__results.append(
+                CourseResult(
+                    ladok=self.ladok,
+                    components=self.components(),
+                    student=self.__student,
+                    **response["VersionensKurs"],
+                )
+            )
+        except TypeError:
+            pass
         for component in self.components():
             if not list(filter_on_keys(self.__results, component=component.code)):
                 self.__results.append(

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/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/cli.py

@@ -255,7 +255,7 @@ def load_credentials(filename="config.json"):
             "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
@@ -265,7 +265,9 @@ def load_credentials(filename="config.json"):
         vars = {}
         for key in vars_keys.split(":"):
             try:
-                vars[key] = os.environ[key]
+                value = os.environ[key]
+                if value:
+                    vars[key] = value
             except KeyError:
                 warn(f"Variable {key} not set, ignoring.")
 

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>>=

{ladok3-4.11.dist-info → ladok3-4.13.dist-info}/METADATA

@@ -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.dist-info → ladok3-4.13.dist-info}/RECORD

@@ -1,21 +1,21 @@
-doc/ltxobj/ladok3.pdf,sha256=WZ3PoQ8-IPNLUNiOwv9P0pxsFHaRx2vTTgbQjtfGajo,1407824
+doc/ltxobj/ladok3.pdf,sha256=6JSedbZ1ut-2s25sn8xay3S3dRUbaxlowGTeE56_xsM,1414854
 ladok3/.gitignore,sha256=QOcCshtjIsFasi4vaqFcooBWPJkxVWaoYEWOBBtdY_w,81
 ladok3/Makefile,sha256=Jy6OFjoVLU9YivnVxctxI_zrUOK9ysEOiistJ3ST6Nw,557
-ladok3/__init__.py,sha256=3z1Lys2ygnuDyYFvm4O4Um6vgYud470W3xX4gYJ4bMc,245725
-ladok3/api.nw,sha256=pHFU8T2tr2N4kJfyo7uKzNd1lpkd7KICK8lHzV6b1-Y,43304
-ladok3/cli.nw,sha256=cwooD_hc9ZpgnRhQ9TebbeWp_ZjKDTWjcV9Qqiqxu28,22378
-ladok3/cli.py,sha256=pLAVt2XhaGJ50knOlRNX_lcS3NFExu5ChHPgItRRGvI,12093
+ladok3/__init__.py,sha256=9bZ_ktF7mg8QvQZcdN3t2AzY_k7g-9Zm-pPh-edMB3Y,246543
+ladok3/api.nw,sha256=P5MQa3AqaUVv-xL3R-AHcFnBWTpAAvzfwlCDKoNFw-M,43422
+ladok3/cli.nw,sha256=SD75vD-uSn-0yo6aOIUY4lgx9EjQf4M-HPHFZrNHMG0,22449
+ladok3/cli.py,sha256=1oUlrI9N7ooGfB-pYt1rkCCX9YKatb4MwP9ivGniK00,12186
 ladok3/data.nw,sha256=3o6-kmeMtCGoSJ5yL8qFCuIINQeym_WtW_2mhItuR-s,11785
 ladok3/data.py,sha256=kPRO9l5DTQb9lGnN2kU-YYPSyg31t0bq5HCw986hbPk,6747
 ladok3/ladok.bash,sha256=zGfTFdtos2zLjV13pzfK-1uCy2b_lF2qUKMoL2ExW7c,1441
-ladok3/ladok3.nw,sha256=6er9_eF1ErShimmpmNh4UkC-EHoLn0HGK8NjzEz_fVM,52289
+ladok3/ladok3.nw,sha256=QIpTOOGC-2p4_RUDJP_j-nMXM6DeSzWp3hJbWH_dq_k,53766
 ladok3/report.nw,sha256=Bp0-yNVb3NZ0WIj5xn9cpsnY6M60MWMzpX3BC9mXqN0,8972
 ladok3/report.py,sha256=1K7cRaedemiOGDDAMI9wqnctLeic5ZlMYHw5hzhnvQw,5627
 ladok3/student.nw,sha256=zayn9_b9jCKeMnZxSGS_EuSmF3ojOBHQDMUMMkpRssI,3747
 ladok3/student.py,sha256=TaYn2rpbQnzummB-8xz-sUEV31Gh0CUmU0QkF6VgEic,1703
 ladok3/undoc.nw,sha256=NyHuVIzrRqJPM39MyAlZNEE7PbXdUDJFQ2kJ0NfdwQI,180333
-ladok3-4.11.dist-info/LICENSE,sha256=s_C5qznXAvDRrzU7vRd4eqzshyIkAfPwGyVBihGeOdM,1155
-ladok3-4.11.dist-info/METADATA,sha256=b_1jNYsFOsiXR11udNkWFRzBZepydHwWfRAu9PTRlFo,8822
-ladok3-4.11.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
-ladok3-4.11.dist-info/entry_points.txt,sha256=pi-KKP5Obo0AyuDjXQUpadS9kIvAY2_5ORhPgEYlJv8,41
-ladok3-4.11.dist-info/RECORD,,
+ladok3-4.13.dist-info/LICENSE,sha256=s_C5qznXAvDRrzU7vRd4eqzshyIkAfPwGyVBihGeOdM,1155
+ladok3-4.13.dist-info/METADATA,sha256=5RRL2nWeocO_vqBUIaAhSyjOCQf7Egszw15-fb5lPns,8822
+ladok3-4.13.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
+ladok3-4.13.dist-info/entry_points.txt,sha256=pi-KKP5Obo0AyuDjXQUpadS9kIvAY2_5ORhPgEYlJv8,41
+ladok3-4.13.dist-info/RECORD,,