Hide tokens in partition-view.html

src/app/learnocaml_partition_view.ml

@@ -12,10 +12,10 @@ open Js_utils
 open Lwt
 open Learnocaml_data
 open Learnocaml_common
+open List
 
 module H = Tyxml_js.Html5
 module React = Lwt_react
-
 let find_tab name = (find_component ("learnocaml-exo-tab-" ^ name))
 
 let tab_select_signal, init_tab, select_tab =
@@ -34,10 +34,19 @@ let open_tok tok =
   let _win = window_open ("/student-view.html?token="^tok) "_blank" in
   false
 
-let list_of_tok =
+(*
+let selected_list =
   List.map @@ fun x ->
     let tok = Token.to_string x in
-    H.a ~a:[H.a_onclick (fun _ -> open_tok tok)] [H.txt (tok ^ " ")]
+    let choice = Manip.value (find_component "learnocaml-select-student-info") in
+    match choice with
+      |"tokens" -> 
+        H.a ~a:[H.a_ondblclick (fun _ -> open_tok tok)] [H.txt (tok ^ " ")]
+      |"nickname" ->
+        let nick = "toto" in (*trouver comment récupérer les pseudos*)
+        H.a ~a:[H.a_ondblclick (fun _ -> open_tok tok)] [H.txt (nick ^ " ")]
+      |_ -> failwith "Error" (*à modifier*)
+ *)
 
 let rec render_tree =
   let open Asak.Wtree in
@@ -80,7 +89,36 @@ let render_classes xs =
 
 let sum_with f = List.fold_left (fun acc x -> acc + f x) 0
 
-let exercises_tab part =
+let rec students_partition students part =
+  let open Student in
+  match part with
+    |[] -> []
+    |t::q -> let student_t = List.find (fun student -> student.token = t) students in
+             student_t :: students_partition students q
+
+let list_of_students_details students part=
+  let open Student in
+  let open Partition in
+  let bad_type_students = students_partition students part.bad_type in
+  let not_graded_students = students_partition students part.not_graded in
+  let rec create_div students_list id = match students_list with 
+    | [] -> []
+    | t::q -> let tok = Token.to_string t.token in
+              let nick = Option.value t.nickname ~default:"Student" in
+              H.a ~a:[
+                  H.a_ondblclick (fun _ -> open_tok tok);
+                  H.a_class ["student"];
+                  H.a_user_data "anon" ("Student " ^ string_of_int id ^ " ");
+                  H.a_user_data "token" (tok ^ " ");
+                  H.a_user_data "nickname" (nick ^ " ");
+                  (* i added the spaces here in the attribute,
+                     for now i don't see how to do it otherwise*)
+                ] []
+              :: (create_div q (id + 1))
+  in (create_div not_graded_students 1,
+      create_div bad_type_students (1 + List.length not_graded_students))
+
+let exercises_tab students part =
   let open Partition in
   let not_graded =
     string_of_int (List.length part.not_graded)
@@ -98,8 +136,9 @@ let exercises_tab part =
         part.partition_by_grade in
     string_of_int s
     ^ " codes implemented the function with the right type." in
-  H.p (H.txt not_graded :: list_of_tok part.not_graded)
-  :: H.p ( H.txt bad_type :: list_of_tok part.bad_type)
+  let (a,b) = list_of_students_details students part in
+  H.p (H.txt not_graded :: a)
+  :: H.p ( H.txt bad_type :: b)
   :: H.p [H.txt total_sum]
   :: render_classes part.partition_by_grade
 
@@ -136,6 +175,16 @@ let _class_selection_updater =
      Manip.replaceChildren (find_tab "details")
        [H.ul @@ mkfirst (List.hd xs) :: List.map mkelem (List.tl xs)]
 
+let set_classes s =
+  Manip.removeClass (find_tab "list") ("token-id");
+  Manip.removeClass (find_tab "list") ("anon-id");
+  Manip.removeClass (find_tab "list") ("nickname-id");
+  Manip.removeClass (find_tab "details") ("token-id");
+  Manip.removeClass (find_tab "details") ("anon-id");
+  Manip.removeClass (find_tab "details") ("nickname-id");
+  Manip.addClass (find_tab "list") (s ^ "-id");
+  Manip.addClass (find_tab "details") (s ^ "-id");true
+
 let main () =
   Learnocaml_local_storage.init ();
   (match Js_utils.get_lang() with Some l -> Ocplib_i18n.set_lang l | None -> ());
@@ -174,13 +223,28 @@ let main () =
       then update_repr_code id
       else true in
 
-  retrieve (Learnocaml_api.Partition (teacher_token, exercise_id, fun_id, prof))
-  >>= fun part ->
+  let fetch_students =
+    retrieve (Learnocaml_api.Students_list teacher_token)
+    >>= fun students_map ->
+    let students = students_map in
+    Lwt.return students
+  in
+  let fetch_part = 
+    retrieve (Learnocaml_api.Partition (teacher_token, exercise_id, fun_id, prof))
+    >>= fun partition ->
+    let part = partition in
+    Lwt.return part
+  in
+  Lwt.both fetch_students fetch_part >>= fun (students, part) -> 
   hide_loading ~id:"learnocaml-exo-loading" ();
-  Manip.replaceChildren (find_tab "list") (exercises_tab part);
+  Manip.replaceChildren (find_tab "list") (exercises_tab students part);
   init_tab ();
   Manip.Ev.onclick (find_component "learnocaml-exo-button-answer")
     (fun _ -> select_tab "answer"; update_repr_code (React.S.value selected_repr_signal));
+  Manip.Ev.onchange_select (find_component "learnocaml-select-student-info")
+    (fun _ ->let choice = Manip.value (find_component "learnocaml-select-student-info") in
+             set_classes choice
+    );
   Lwt.return_unit
 
 let () = run_async_with_log  main

src/state/learnocaml_data.ml

@@ -280,7 +280,7 @@ module Student = struct
     results: (float * int option) SMap.t;
     creation_date: float;
     tags: SSet.t;
-  }
+    }
 
   let enc =
     let open Json_encoding in

static/css/learnocaml_common.css

@@ -14,6 +14,20 @@ code, pre, textarea {
   font-size: 18px;
   line-height: 18px;
 }
+
+div.anon-id a.student::before {
+  content: attr(data-anon);
+}
+
+div.token-id a.student::before {
+  content: attr(data-token);
+}
+
+div.nickname-id a.student::before {
+  content: attr(data-nickname);
+}
+
+
 /* -------------------- fix browser's CSSs ------------------------ */
 button > img {
   vertical-align: -10%;

static/partition-view.html

@@ -40,6 +40,11 @@
       <div class="logo">
         <img src="/icons/logo_ocsf.svg">
         <span>Learn OCaml</span>
+        <select id="learnocaml-select-student-info">
+          <option value="anon" selected="selected">Hide PII<option>
+          <option value="nickname">Show nicknames</option>
+          <option value="token">Show tokens</option>
+        </select>
       </div>
       <div id="learnocaml-token">
       </div>
@@ -54,8 +59,8 @@
       <button id="learnocaml-exo-button-answer">Answer</button>
     </div>
     <div id="learnocaml-exo-tabs">
-      <div id="learnocaml-exo-tab-details" class="front-tab"></div>
-      <div id="learnocaml-exo-tab-list"></div>
+      <div id="learnocaml-exo-tab-details" class="front-tab anon-id"></div>
+      <div id="learnocaml-exo-tab-list" class="anon-id"></div>
       <div id="learnocaml-exo-tab-answer">
         <div id="learnocaml-exo-answer-pane" class="pane"></div>
         <div id="learnocaml-exo-answer-toolbar" class="buttons">