Exercise Mode Editing Capabilities

src/haz3lschool/Gradescope.re

@@ -37,7 +37,7 @@ type report = {
 };
 [@deriving (sexp, yojson)]
 type section = {
-  name: string,
+  id: Id.t,
   report,
 };
 
@@ -108,18 +108,24 @@ module Main = {
     let hw = name_to_exercise_export(hw_path);
     let export_chapter =
       hw.exercise_data
-      |> List.map(~f=(((name, _) as key, persistent_state)) => {
-           switch (find_key_opt(key, specs)) {
+      |> List.map(~f=((id, persistent_state)) => {
+           switch (find_id_opt(id, specs)) {
            | Some((_n, spec)) =>
              let exercise =
                unpersist_state(
                  persistent_state,
                  ~settings,
                  ~spec,
                  ~instructor_mode=true,
+                 ~editing_title=false,
+                 ~editing_prompt=false,
+                 ~editing_test_val_rep=false,
+                 ~editing_mut_test_rep=false,
+                 ~editing_impl_grd_rep=false,
+                 ~editing_module_name=false,
                );
              let report = exercise |> gen_grading_report;
-             {name, report};
+             {id, report};
            | None => failwith("Invalid spec")
            //  | None => (key |> yojson_of_key |> Yojson.Safe.to_string, "?")
            }

src/haz3lweb/Editors.re

@@ -1,4 +1,5 @@
 open Util;
+// open Virtual_dom.Vdom;
 open Haz3lcore;
 
 [@deriving (show({with_path: false}), sexp, yojson)]
@@ -39,6 +40,27 @@ let put_editor = (ed: Editor.t, eds: t): t =>
     Exercises(n, specs, Exercise.put_editor(exercise, ed))
   };
 
+let obtain_new_prov_tests =
+    (eds: t, results: ModelResults.t, ~settings: CoreSettings.t): int =>
+  switch (eds) {
+  | Exercises(_, _, exercise) =>
+    let stitched_dynamics =
+      Exercise.stitch_dynamic(
+        settings,
+        exercise,
+        settings.dynamics ? Some(results) : None,
+      );
+    let test_results =
+      ModelResult.test_results(stitched_dynamics.test_validation.result);
+    let new_prov_test =
+      switch (test_results) {
+      | Some(test_results) => test_results.total
+      | None => 0
+      };
+    new_prov_test;
+  | _ => 0
+  };
+
 let update = (f: Editor.t => Editor.t, editors: t): t =>
   editors |> get_editor |> f |> put_editor(_, editors);
 
@@ -115,6 +137,144 @@ let set_instructor_mode = (editors: t, instructor_mode: bool): t =>
     )
   };
 
+let set_editing_title = (editors: t, editing: bool): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(n, specs, Exercise.set_editing_title(exercise, editing))
+  };
+
+let update_exercise_title = (editors: t, new_title: string): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(n, specs, Exercise.update_exercise_title(exercise, new_title))
+  };
+
+let add_buggy_impl = (~settings: CoreSettings.t, editors: t, ~editing_title) => {
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(
+      n,
+      specs,
+      Exercise.add_buggy_impl(~settings, exercise, ~editing_title),
+    )
+  };
+};
+
+let delete_buggy_impl = (editors: t, index: int) => {
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(n, specs, Exercise.delete_buggy_impl(exercise, index))
+  };
+};
+
+let set_editing_prompt = (editors: t, editing: bool): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(n, specs, Exercise.set_editing_prompt(exercise, editing))
+  };
+
+let update_exercise_prompt = (editors: t, new_prompt: string): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(
+      n,
+      specs,
+      Exercise.update_exercise_prompt(exercise, new_prompt),
+    )
+  };
+
+let set_editing_test_val_rep = (editors: t, editing: bool): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(n, specs, Exercise.set_editing_test_val_rep(exercise, editing))
+  };
+
+let update_test_val_rep = (editors: t, new_test_num: int, new_dist: int): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(
+      n,
+      specs,
+      Exercise.update_test_val_rep(exercise, new_test_num, new_dist),
+    )
+  };
+
+let set_editing_mut_test_rep = (editors: t, editing: bool): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(n, specs, Exercise.set_editing_mut_test_rep(exercise, editing))
+  };
+
+let update_mut_test_rep = (editors: t, new_dist: int): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(n, specs, Exercise.update_mut_test_rep(exercise, new_dist))
+  };
+
+let set_editing_impl_grd_rep = (editors: t, editing: bool): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(n, specs, Exercise.set_editing_impl_grd_rep(exercise, editing))
+  };
+
+let update_impl_grd_rep = (editors: t, new_dist: int): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(n, specs, Exercise.update_impl_grd_rep(exercise, new_dist))
+  };
+
+let set_editing_module_name = (editors: t, editing: bool): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(n, specs, Exercise.set_editing_module_name(exercise, editing))
+  };
+
+let update_module_name = (editors: t, new_module_name: string): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(
+      n,
+      specs,
+      Exercise.update_module_name(exercise, new_module_name),
+    )
+  };
+
+let update_prov_tests = (editors: t, new_prov_tests: int): t =>
+  switch (editors) {
+  | Scratch(_)
+  | Documentation(_) => editors
+  | Exercises(n, specs, exercise) =>
+    Exercises(n, specs, Exercise.update_prov_tests(exercise, new_prov_tests))
+  };
+
 let reset_nth_slide = (~settings: CoreSettings.t, n, slides): list(Editor.t) => {
   let (_, init_editors, _) = Init.startup.scratch;
   let data = List.nth(init_editors, n);

src/haz3lweb/Export.re

@@ -55,12 +55,24 @@ let import_all = (data, ~specs) => {
   let settings = Store.Settings.import(all.settings);
   Store.ExplainThisModel.import(all.explainThisModel);
   let instructor_mode = settings.instructor_mode;
+  let editing_title = settings.editing_title;
+  let editing_prompt = settings.editing_prompt;
+  let editing_test_val_rep = settings.editing_test_val_rep;
+  let editing_mut_test_rep = settings.editing_mut_test_rep;
+  let editing_impl_grd_rep = settings.editing_impl_grd_rep;
+  let editing_module_name = settings.editing_module_name;
   Store.Scratch.import(~settings=settings.core, all.scratch);
   Store.Exercise.import(
     ~settings=settings.core,
     all.exercise,
     ~specs,
     ~instructor_mode,
+    ~editing_title,
+    ~editing_prompt,
+    ~editing_test_val_rep,
+    ~editing_mut_test_rep,
+    ~editing_impl_grd_rep,
+    ~editing_module_name,
   );
   Log.import(all.log);
 };