Merge remote-tracking branch 'upstream/main' into pr/26

Author: patudom

src/cds_portal/components/request_form.py

@@ -87,5 +87,3 @@ def _update_form_data(new_data):
                     type="error",
                     children=[f"{validation_message.value}"],
                 )
-
-            solara.Markdown(f"{form_data}")

src/cds_portal/components/setup_dialog.py

@@ -40,7 +40,10 @@ def InitialSetup():
 
     def _on_finished_clicked(*args):
         Ref(GLOBAL_STATE.fields.initial_setup_finished).set(True)
-        router.push("/student_classes")
+        if GLOBAL_STATE.value.user.user_type == UserType.student:
+            router.push("/student_classes")
+        else:
+            router.push("/manage_classes")
 
     with rv.Card():
         with rv.CardTitle():
@@ -175,7 +178,7 @@ def _on_join_clicked(*args):
 
                         student_response = BASE_API.create_new_student(class_code.value)
 
-                        if student_response.status_code != 200:
+                        if student_response.status_code != 201:
                             student_validation_message.set(student_response.reason)
                             return
 
@@ -192,7 +195,7 @@ def _on_submit_clicked(*args):
                             form_data.value
                         )
 
-                        if educator_response.status_code != 200:
+                        if educator_response.status_code != 201:
                             educator_validation_message.set(educator_response.reason)
                             return
 

src/cds_portal/pages/manage_classes/__init__.py

@@ -1,3 +1,4 @@
+from collections import defaultdict
 from datetime import datetime
 
 import solara
@@ -171,6 +172,104 @@ def _delete_button_clicked(*args):
     return dialog
 
 
+@solara.component
+def ClassActionsDialog(disabled: bool, class_data: list[dict]):
+    active, set_active = solara.use_state(False)
+    message, set_message = solara.use_state("")
+    message_color, set_message_color = solara.use_state("")
+
+    with rv.Dialog(
+        v_model=active,
+        on_v_model=set_active,
+        v_slots=[
+            {
+                "name": "activator",
+                "variable": "x",
+                "children": rv.Btn(
+                    v_on="x.on",
+                    v_bind="x.attrs",
+                    disabled=disabled,
+                    text=True,
+                    children=["Modify class"],
+                    elevation=0,
+                )
+            }
+        ],
+        max_width=600,
+    ):
+
+        def _update_snackbar(message: str, color: str):
+            set_message_color(color)
+            set_message(message)
+
+        def _reset_snackbar():
+            set_message("")
+
+        def close_dialog():
+            set_active(False)
+            _reset_snackbar()
+
+        classes_by_story = defaultdict(list)
+        for data in class_data:
+            classes_by_story[data["story"]].append(data)
+
+        with rv.Card(outlined=True):
+            rv.CardTitle(children=["Modify Class"])
+
+            with rv.CardText():
+                solara.Div("From this dialog you can make any necessary changes to the selected classes")
+
+            if "Hubble's Law" in classes_by_story:
+
+                hubble_classes = classes_by_story["Hubble's Law"]
+
+                override_statuses = [BASE_API.get_hubble_waiting_room_override(data["id"])["override_status"] for data in hubble_classes]
+                all_overridden = all(override_statuses)
+
+                def _on_override_button_pressed(*args):
+                    failures = []
+                    for data in hubble_classes:
+                        class_id = data["id"]
+                        response = BASE_API.set_hubble_waiting_room_override(class_id, True)
+                        success = response.status_code in (200, 201)
+                        if not success:
+                            failures.append(class_id)
+
+                    relevant_ids = failures if failures else [data["id"] for data in hubble_classes]
+                    classes_string = "class" if len(relevant_ids) == 1 else "classes"
+                    ids_string = ", ".join(str(cid) for cid in relevant_ids)
+                    message = f"There was an error updating the waiting room status for {classes_string} {ids_string}" if failures else \
+                              f"Updated waiting room status for {classes_string} {ids_string}"
+                    color = "error" if failures else "success"
+
+                    _update_snackbar(message=message, color=color)
+
+                with rv.Container():
+                    with rv.CardText():
+                        solara.Text("Set the small class override for the selected classes. If a class already has the override set, there will be no effect.")
+                    with solara.Row():
+                        no_override_count = len(hubble_classes) - sum(override_statuses)
+                        no_override_classes = "class" if no_override_count == 1 else "classes"
+                        solara.Button(label=f"Set override",
+                                      on_click=_on_override_button_pressed,
+                                      disabled=all_overridden)
+                        rv.Alert(children=[f"This will affect {no_override_count} {no_override_classes}"],
+                                 color="info",
+                                 outlined=True,
+                                 dense=True)
+
+                rv.Spacer()
+
+                with rv.CardActions():
+                    solara.Button("Cancel", on_click=close_dialog, elevation=0)
+
+        rv.Snackbar(v_model=bool(message),
+                    on_v_model=lambda *args: _reset_snackbar(),
+                    color=message_color,
+                    timeout=5000,
+                    children=[message])
+
+
 @solara.component
 def Page():
     data = solara.use_reactive([])
@@ -179,20 +278,19 @@ def Page():
     def _retrieve_classes():
         classes_dict = BASE_API.load_educator_classes()
 
-        new_classes = []
-
-        for cls in classes_dict["classes"]:
-            new_class = {
+        new_classes = [
+            {
                 "name": cls["name"],
-                "date": datetime.fromisoformat(cls["created"]).strftime("%m/%d/%Y"),
+                "date": datetime.fromisoformat(cls["created"].removesuffix("Z")).strftime("%m/%d/%Y"),
                 "story": "Hubble's Law",
                 "code": cls["code"],
                 "id": cls["id"],
                 "expected_size": cls["expected_size"],
+                "small_class": cls["small_class"],
                 "asynchronous": cls["asynchronous"],
             }
-
-            new_classes.append(new_class)
+            for cls in classes_dict["classes"]
+        ]
 
         data.set(new_classes)
 
@@ -205,7 +303,6 @@ def _create_class_callback(class_info):
     def _delete_class_callback():
         for row in selected_rows.value:
             BASE_API.delete_class(row["code"])
-
         _retrieve_classes()
 
     with solara.Row(classes=["fill-height"]):
@@ -232,8 +329,11 @@ def _delete_class_callback():
                             elevation=0,
                             disabled=len(selected_rows.value) != 1,
                         )
+                        ClassActionsDialog(
+                            len(selected_rows.value) == 0, selected_rows.value
+                        )
 
-                classes_table = rv.DataTable(
+                rv.DataTable(
                     items=data.value,
                     single_select=False,
                     show_select=True,
@@ -252,6 +352,5 @@ def _delete_class_callback():
                         {"text": "ID", "value": "id", "align": " d-none"},
                         {"text": "Expected size", "value": "expected_size"},
                         {"text": "Asynchronous", "value": "asynchronous"},
-                        # {"text": "Actions", "value": "actions", "align": "end"},
-                    ],
+                    ]
                 )

src/cds_portal/pages/manage_students/__init__.py

@@ -80,10 +80,10 @@ def _retrieve_students():
                         "class_id": cls["id"],
                         "username": student["username"],
                         "created": datetime.fromisoformat(
-                            student["profile_created"]
+                            student["profile_created"].removesuffix("Z")
                         ).strftime("%m/%d/%Y"),
                         "last_visit": datetime.fromisoformat(
-                            student["last_visit"]
+                            student["last_visit"].removesuffix("Z")
                         ).strftime("%m/%d/%Y"),
                         "class": cls["name"],
                         "story": "Hubble's Law",

src/cds_portal/pages/student_classes/__init__.py

@@ -81,6 +81,7 @@ def Page():
     selected_rows, set_selected_rows = solara.use_state([])
 
     def _retrieve_classes():
+        print(BASE_API.load_student_info())
         classes_response = BASE_API.load_student_classes()
         formatted_classes = []
 
@@ -91,7 +92,7 @@ def _retrieve_classes():
                 "name": cls["name"],
                 "code": cls["code"],
                 "educator": f"{educator_response['first_name']} {educator_response['last_name']}",
-                "date": datetime.fromisoformat(cls["created"]).strftime("%m/%d/%Y"),
+                "date": datetime.fromisoformat(cls["created"].removesuffix("Z")).strftime("%m/%d/%Y"),
             }
 
             formatted_classes.append(cls_fmt)

src/cds_portal/remote.py

@@ -225,6 +225,23 @@ def remove_student_from_class(self, student_id: int, class_id: int) -> Response:
 
         return r
 
+    def get_hubble_waiting_room_override(self, class_id: int) -> dict:
+        r = self.request_session.get(
+            f"{self.API_URL}/hubbles_law/waiting-room-override/{class_id}"
+        )
+
+        return r.json()
+
+    def set_hubble_waiting_room_override(self, class_id: int, value: bool) -> Response:
+        method = self.request_session.put if value else self.request_session.delete
+        r = method(
+            f"{self.API_URL}/hubbles_law/waiting-room-override",
+            json={"class_id": class_id},
+        )
+
+        return r
+
+
     @staticmethod
     def clear_user(state: Reactive[GlobalState]):
         Ref(state.fields.student.id).set(0)