Merge pull request #439 from AltGr/fixes

A few fixes, in particular for student follow-up on new repos

Author: erikmd

Makefile

@@ -38,6 +38,7 @@ translations/$(LANGS:=.pot):
 	@for f in $(LANGS); do echo >> translations/$$f.po; done
 	@rm -f translations/*.pot
 	@${DUNE} clean ${DUNE_ARGS}
+	-rm -f ${INDEX_ODOC_PATH}
 	@DUMP_POT=1 ${DUNE} build ${DUNE_ARGS} -j 1
 	@for f in $(LANGS); do \
 	  mv translations/$$f.pot translations/$$f.pot.bak; \

src/app/learnocaml_exercise_main.ml

@@ -223,7 +223,8 @@ let () =
       Manip.Ev.onclick btn (fun _ -> Lwt.wakeup u () ; true) ;
       let div =
         Tyxml_js.Html5.(div ~a: [ a_class [ "dialog" ] ]
-                          [ txt [%i"Grading is taking a lot of time, "] ;
+                          [ txt [%i"Grading is taking a lot of time, \
+                                    maybe your code is looping? "] ;
                             btn ;
                             txt " ?" ]) in
       Manip.SetCss.opacity div (Some "0") ;
@@ -249,7 +250,7 @@ let () =
                Lwt.return_unit)
         in
         let abortion =
-          Lwt_js.sleep 5. >>= fun () ->
+          Lwt_js.sleep 15. >>= fun () ->
           Manip.SetCss.opacity abort_message (Some "1") ;
           aborted >>= fun () ->
           Lwt.return Learnocaml_report.[ Message ([ Text [%i"Grading aborted by user."] ], Failure) ] in

src/state/learnocaml_store.ml

@@ -203,7 +203,12 @@ module Exercise = struct
           List.iter (fun st -> Hashtbl.add tbl st.id st) l;
           tbl)
       @@ function
-      | Unix.Unix_error (Unix.ENOENT, _, _) -> Lwt.return tbl
+      | Unix.Unix_error (Unix.ENOENT, _, _) ->
+          Lazy.force !index >>= fun index ->
+          Exercise.Index.fold_exercises (fun () id _ ->
+              Hashtbl.add tbl id (Exercise.Status.default id))
+            () index;
+          Lwt.return tbl
       | e -> Lwt.fail e
     )
 

static/description.html

@@ -42,9 +42,8 @@
     <!-- Anything below could be recreated dynamically, but IDs must be kept. -->
     <div id="learnocaml-exo-toolbar">
         <div class="logo">
-            <img src="/icons/logo_ocaml.svg">
-            <span>Learn OCaml</span>
             <img src="/icons/logo_ocsf.svg">
+            <span>Learn OCaml</span>
         </div>
     </div>
     <div id="learnocaml-exo-tab-buttons">

static/exercise.html

@@ -39,9 +39,9 @@
     <div id="learnocaml-exo-toolbar">
       <a href="/">
       <div class ="logo">
-        <img src="/icons/logo_ocaml.svg">
-        <span>Learn OCaml</span>
         <img src="/icons/logo_ocsf.svg">
+        <!-- <img src="/icons/logo_ocaml.svg"> -->
+        <span>Learn OCaml</span>
       </div>
       </a>
       <!--

static/index.html

@@ -23,7 +23,7 @@
     </div>
     <div id="learnocaml-main-toolbar">
       <div class="logo">
-        <img src="/icons/logo_ocaml.svg">
+        <img src="/icons/logo_ocsf.svg">
         <span>Learn OCaml</span>
       </div>
     </div>

static/partition-view.html

@@ -38,9 +38,8 @@
     <!-- Anything below could be recreated dynamically, but IDs must be kept. -->
     <div id="learnocaml-exo-toolbar">
       <div class="logo">
-        <img src="/icons/logo_ocaml.svg">
-        <span>Learn OCaml</span>
         <img src="/icons/logo_ocsf.svg">
+        <span>Learn OCaml</span>
       </div>
       <div id="learnocaml-token">
       </div>

static/playground.html

@@ -38,9 +38,8 @@
     <div id="learnocaml-exo-toolbar">
       <a href="/">
       <div class ="logo">
-        <img src="/icons/logo_ocaml.svg">
-        <span>Learn OCaml</span>
         <img src="/icons/logo_ocsf.svg">
+        <span>Learn OCaml</span>
       </div>
       </a>
       <!--

static/student-view.html

@@ -38,9 +38,8 @@
     <!-- Anything below could be recreated dynamically, but IDs must be kept. -->
     <div id="learnocaml-exo-toolbar">
       <div class="logo">
-        <img src="/icons/logo_ocaml.svg">
-        <span>Learn OCaml</span>
         <img src="/icons/logo_ocsf.svg">
+        <span>Learn OCaml</span>
       </div>
       <!--
       <button id="learnocaml-exo-button-grade">

translations/fr.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: learn-ocaml ~dev\n"
-"PO-Revision-Date: 2021-10-01 01:00+0200\n"
+"PO-Revision-Date: 2021-10-11 15:30+0200\n"
 "Last-Translator: Louis Gesbert <[email protected]>\n"
 "Language-Team: OCamlPro\n"
 "Language: french\n"
@@ -747,23 +747,23 @@ msgstr "Noter!"
 msgid "abort"
 msgstr "abandonner"
 
-#: File "src/app/learnocaml_exercise_main.ml", line 226, characters 35-70
-msgid "Grading is taking a lot of time, "
-msgstr "La notation prend longtemps, "
+#: File "src/app/learnocaml_exercise_main.ml", lines 226-227, characters 35-65
+msgid "Grading is taking a lot of time, maybe your code is looping? "
+msgstr "La notation prend du temps, peut-être une boucle infinie dans votre code ? "
 
-#: File "src/app/learnocaml_exercise_main.ml", line 232, characters 35-57
+#: File "src/app/learnocaml_exercise_main.ml", line 233, characters 35-57
 msgid "Launching the grader"
 msgstr "Lancement de la notation"
 
-#: File "src/app/learnocaml_exercise_main.ml", line 255, characters 60-86
+#: File "src/app/learnocaml_exercise_main.ml", line 256, characters 60-86
 msgid "Grading aborted by user."
 msgstr "Notation annulée par l'utilisateur."
 
-#: File "src/app/learnocaml_exercise_main.ml", line 276, characters 38-59
+#: File "src/app/learnocaml_exercise_main.ml", line 277, characters 38-59
 msgid "Error in your code."
 msgstr "Erreur dans le code."
 
-#: File "src/app/learnocaml_exercise_main.ml", line 277, characters 27-85
+#: File "src/app/learnocaml_exercise_main.ml", line 278, characters 27-85
 msgid "Cannot start the grader if your code does not typecheck."
 msgstr "La notation ne peut être lancée si le code ne compile pas."