Merge pull request #137 from layer5io/fix-and-enhance-test-states

Fix and enhance test states

Author: aabidsofi19

layouts/partials/common-curricula-properties.html

@@ -14,4 +14,10 @@
 "permalink": {{ $page.Permalink | jsonify }},
 "type": {{ $type | jsonify }},
 "prerequisites": {{ partial "test/collect-prerequisites.html" $page | jsonify }},
-"reading_time": {{ $page.ReadingTime | jsonify }}
+"reading_time": {{ $page.ReadingTime | jsonify }},
+"competencies": {{ $page.Params.competencies | jsonify }},
+"objectives": {{ $page.Params.objectives | jsonify }},
+"audience": {{ $page.Params.audience | jsonify }},
+"prerequisite_knowledge": {{ $page.Params.prerequisite_knowledge | jsonify }},
+"related_resources": {{ $page.Params.related_resources | jsonify }}
+

layouts/partials/learning-path.json.html

@@ -36,7 +36,12 @@
     "total_tests": {{ len (where .Pages "Type" "test") }},
     "total_modules": {{ len (where .Pages "Type" "module") }},
     "total_pages": {{ len (where .Pages "Type" "page") }},
-
+    "competencies": {{ .Params.competencies | jsonify }},
+    "objectives": {{ .Params.objectives | jsonify }},
+    "audience": {{ .Params.audience | jsonify }},
+    "prerequisite_knowledge": {{ .Params.prerequisite_knowledge | jsonify }},
+    "related_resources": {{ .Params.related_resources | jsonify }},
+    "additional_attributes": {{ .Params.additional_attributes | jsonify }},
     "children": [
       {{- range $j, $c := .Pages }}
         {{- if $j }},{{ end }}

layouts/test/single.html

@@ -376,19 +376,24 @@ <h3 class="mb-3">Test details</h6>
 
                     <div
                         style="margin-bottom: 1.5rem; display: flex; gap: 0.5rem; justify-content: end; flex-wrap: wrap;">
-                        <button class="btn btn-primary button" id="start-test-btn">
-                            <i class="bi bi-play-fill me-1"></i>
-                            Start Test
-                        </button>
-                        <button class="btn btn-outline-secondary  me-2 button" id="view-submission-btn">
+ 
+                        
+                        <button class="btn   me-2 button" id="view-submission-btn">
                             View Submission
                         </button>
-                        <button class="btn btn-outline-secondary me-2 button" id="hide-submission-btn">
+                        <button class="btn  me-2 button" id="hide-submission-btn">
                             Hide Submission
                         </button>
-                        <button class="btn btn-primary button" id="retry-test-btn">
+                        <button class="btn btn-outline-secondary button" id="retry-test-btn">
                             <i class="bi bi-arrow-clockwise me-1"></i>
-                            Retry
+                            Retake Test
+                        </button>
+                       <button class="btn btn-outline-secondary button" id="go-to-overview-btn">
+                            Go to Overview
+                        </button>
+                       <button class="btn btn-primary button" id="start-test-btn">
+                            <i class="bi bi-play-fill me-1"></i>
+                            Start Test
                         </button>
 
                     </div>
@@ -489,6 +494,7 @@ <h3 class="mb-3">Test details</h6>
             case 'new_test':
                 document.querySelector('.overview-card').style.display = 'block';
                 document.getElementById('start-test-btn').style.display = 'block';
+
                 break;
 
             case 'taking_test':
@@ -510,6 +516,10 @@ <h3 class="mb-3">Test details</h6>
                 document.getElementById('retry-test-btn').style.display = 'block';
                 document.getElementById('view-submission-btn').style.display = 'block';
 
+                // set oveview-btn as primary button
+                document.getElementById('go-to-overview-btn').classList.add('btn-primary');
+                document.getElementById('go-to-overview-btn').classList.remove('btn-outline-secondary');
+
 
                 RenderSubmissionResult(data);
                 break;
@@ -742,12 +752,13 @@ <h3 class="mb-3">Test details</h6>
             alert("Error submitting quiz: " + err.message);
         } finally {
             HideLoadingState(loadingEl, submitBtn);
+            window.academyContext?.refreshData();
         }
     }
 
     // Event Listeners
     function HandleGoBack() {
-        window.history.back();
+        window.academyContext?.Router?.back();
     }
 
     document.getElementById("go-back").addEventListener("click", HandleGoBack);
@@ -761,6 +772,10 @@ <h3 class="mb-3">Test details</h6>
         showState('submitted_test');
     });
 
+    document.getElementById("go-to-overview-btn").addEventListener("click", () => {
+        window.academyContext?.Router?.back();
+    });
+
 
     // get the prod build param 
     const isProdBuild = build === "production"