fix(default-status): update and generalize default status

ild-thl · Jul 25, 2024 · 5999cbf · 5999cbf
1 parent 8f7f796
commit 5999cbf
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 37 deletions.
diff --git a/classes/data/course.php b/classes/data/course.php
@@ -36,7 +36,7 @@ class course {
     public static function get_all_courses_of_user_current_semester(int $userid): array {
         global $DB;
         $now = (new DateTime())->format("U");
-        $sql = "SELECT c.instanceid AS courseid, cr.fullname AS coursename, cr.enddate AS coursetimestamp
+        $sql = "SELECT c.instanceid AS courseid, cr.fullname AS coursename, cr.enddate AS enddate
             FROM {context} c
             JOIN {role_assignments} ra ON c.id = ra.contextid
             JOIN {user} u ON ra.userid = u.id
@@ -52,7 +52,7 @@ public static function get_all_courses_of_user_current_semester(int $userid): ar
         ];
         $data = $DB->get_records_sql($sql, $params);
         return array_filter($data, function($item) use ($now) {
-            if ($item->enddate == 0) {
+            if ($item->enddate && $item->enddate == 0) {
                 return true;
             }
             $end = DateTime::createFromFormat("U", $item->enddate)->add(new DateInterval("P1M"));

diff --git a/classes/view/assignment_view.php b/classes/view/assignment_view.php
@@ -136,7 +136,7 @@ protected function get_module_output(): void {
             }
         } else {
             $this->output["no_table"] = 'yes';
-            $this->output['info'] = 'View a Course with assignments to see assignment information here.';
+            $this->output['info'] = get_string('nodata', 'block_disealytics');
         }
 
         if (count(assignment::block_disealytics_get_course_assignments($COURSE->id)) > 3) {

diff --git a/classes/view/success_chance_view.php b/classes/view/success_chance_view.php
@@ -74,10 +74,10 @@ protected function get_module_output(): void {
                 $this->output['charts'][] = ['chartdata' => json_encode($chartdatastatus),
                         'uniqid' => uniqid('block_disealytics_')];
             } else {
-                $this->output['nodata'] = get_string('success-chance-no-data', 'block_disealytics');
+                $this->output['nodata'] = get_string('nodata', 'block_disealytics');
             }
         } else {
-            $this->output['nodata'] = get_string('success-chance-no-data', 'block_disealytics');
+            $this->output['nodata'] = get_string('nodata', 'block_disealytics');
         }
         $this->output["info_summary"] = get_string('success-chance_info_summary', 'block_disealytics');
     }

diff --git a/lang/de/block_disealytics.php b/lang/de/block_disealytics.php
@@ -263,7 +263,6 @@
 $string['success-chance_info_text'] = 'Betrachten Sie die PVL-Wahrscheinlichkeit: Die PVL-Wahrscheinlichkeit zeigt Ihnen, wie viele Bewertungspunkte Sie erhalten haben.';
 $string['success-chance_info_text_expanded'] = 'Die PVL-Wahrscheinlichkeit zeigt Ihnen den Status der Einsendeaufgaben an.';
 $string['pvl_success-chance-chart-text'] = 'PVL-Wahrscheinlichkeit';
-$string['success-chance-no-data'] = 'Keine Daten zur Anzeige der Erfolgschance in diesem Kurs vohanden.';
 $string['success-chance-label-failed'] = 'PVL-Wahrscheinlichkeit';
 
 $string['pvl_assignment_info_text_summary_modul'] = 'Im laufenden Modul sieht Ihre Bilanz wie folgt aus:';
@@ -291,7 +290,7 @@
 $string['activity_view_expanded_subtitle'] = "Anmeldungen im Monat";
 $string['study-progress_expanded_info_text'] = 'Die "Aufgabengewichtung" wird anhand der bereitgestellten Aufgaben in diesem Kurs berechnet. Jeder Aufgabe wird ein Wert zugewiesen, der sich nach dem Status richtet: "negativ (rotes X)", "neutral (grauer Kreis oder gelbes Dreieck)" oder "positiv (grünes Häkchen)".';
 
-$string['nodata'] = 'Keine Daten vorhanden';
+$string['nodata'] = 'Es sind keine Daten zu dieser Karte im Kurs vorhanden.';
 $string['activity_view_refresh'] = "Letzte Aktualisierung";
 
 $string['task_tasktransform'] = 'Tasktransformation';

diff --git a/lang/en/block_disealytics.php b/lang/en/block_disealytics.php
@@ -264,7 +264,6 @@
 $string['success-chance_info_text'] = 'Look at the PVL-Probability: The PVL-Probability shows you how many assessment points you have received.';
 $string['success-chance_info_text_expanded'] = 'The PVL-Probability shows you the status of the submitted assignments.';
 $string['pvl_success-chance-chart-text'] = 'PVL-Probability';
-$string['success-chance-no-data'] = 'No data available to indicate the chance of success in this course.';
 $string['success-chance-label-failed'] = 'PVL-Probability';
 
 $string['pvl_assignment_info_text_summary_modul'] = 'Your PVL-Probability for the current module is as follows:';
@@ -293,7 +292,7 @@
 $string['activity_view_expanded_subtitle'] = "Monthly logins";
 $string['study-progress_expanded_info_text'] = "The 'assignment rating' is calculated based on the assignments provided in this course. Each assignment is given a value depending on its status: 'negative (red X)', 'neutral (grey circle or yellow triangle)' or 'positive (green checkmark)'.";
 
-$string['nodata'] = 'No data available';
+$string['nodata'] = 'There is no data available in the course for this card.';
 $string['activity_view_refresh'] = "Last update";
 
 $string['task_tasktransform'] = 'Task transformation';

diff --git a/templates/assignment-view.mustache b/templates/assignment-view.mustache
@@ -103,7 +103,7 @@
             {{/table}}
 
             {{#no_table}}
-                {{info}}
+                <p>{{info}}</p>
             {{/no_table}}
 
 

diff --git a/templates/study-progress-view.mustache b/templates/study-progress-view.mustache
@@ -122,7 +122,7 @@
             </div>
         {{/data}}
         {{#nodata}}
-            {{nodata}}
+            <p>{{nodata}}</p>
         {{/nodata}}
 
         <div class="block_disealytics-expandable block_disealytics-expandable-{{view_type}}"
@@ -209,7 +209,7 @@
             </div>
         {{/data}}
         {{#nodata}}
-            {{nodata}}
+            <p>{{nodata}}</p>
         {{/nodata}}
 
         <div class="block_disealytics-expandable block_disealytics-expandable-{{view_type}}"
@@ -296,7 +296,7 @@
             </div>
         {{/data}}
         {{#nodata}}
-            {{nodata}}
+            <p>{{nodata}}</p>
         {{/nodata}}
 
         <div class="block_disealytics-expandable block_disealytics-expandable-{{view_type}}"

diff --git a/templates/success-chance-view.mustache b/templates/success-chance-view.mustache
@@ -79,6 +79,7 @@
     </div>
 
     <div class="panel-body">
+        {{^nodata}}
         <br>
         <div id="pvl-doughnut">
             <p class="pvl-probability">{{pvlProbability}} %</p>
@@ -96,7 +97,11 @@
             <p class="disea-orange text-small text-semibold">{{assignment_info_text_incomplete}}</p>
             <p class="disea-red text-small text-semibold">{{assignment_info_text_failed}}</p>
         </div>
+        {{/nodata}}
 
+        {{#nodata}}
+            <p>{{nodata}}</p>
+        {{/nodata}}
 
         <div class="block_disealytics-expandable block_disealytics-expandable-{{view_type}} show-when-expanded"
              data-container="block_disealytics/expandable-{{view_type}}">
@@ -127,10 +132,6 @@
 
         </div>
 
-        {{#nodata}}
-            <p>{{nodata}}</p>
-        {{/nodata}}
-
     </div>
 
 
@@ -159,27 +160,29 @@
                 </div>
             </div>
         </div>
-            <div class="block_disealytics-expandable block_disealytics-expandable-{{view_type}} show-when-expanded"
-                 data-container="block_disealytics/expandable-{{view_type}}">
-                <p>{{#str}}success-chance_info_text_expanded, block_disealytics {{/str}}</p>
-            </div>
+        <div class="block_disealytics-expandable block_disealytics-expandable-{{view_type}} show-when-expanded"
+             data-container="block_disealytics/expandable-{{view_type}}">
+            <p>{{#str}}success-chance_info_text_expanded, block_disealytics {{/str}}</p>
+        </div>
 
-            <div id="pvl-doughnut">
-                <p class="pvl-probability">{{pvlProbability}} %</p>
-                {{#charts}}
-                    {{> core/chart }}
-                {{/charts}}
-            </div>
-            <br>
-            <div class="success-chance-assignments">
-                <p>{{#str}}pvl_assignment_info_text_summary_semester, block_disealytics {{/str}}</p>
-                <p class="disea-green text-small text-semibold">{{assignment_info_text_okay}}</p>
-                <p class="disea-green text-small text-semibold">{{assignment_info_text_submitted}}</p>
-                <p class="disea-gray text-small text-semibold">{{assignment_info_text_selfcheck}}</p>
-                <p class="disea-orange text-small text-semibold">{{assignment_info_text_notsubmitted}}</p>
-                <p class="disea-orange text-small text-semibold">{{assignment_info_text_incomplete}}</p>
-                <p class="disea-red text-small text-semibold">{{assignment_info_text_failed}}</p>
-            </div>
+        {{^nodata}}
+        <div id="pvl-doughnut">
+            <p class="pvl-probability">{{pvlProbability}} %</p>
+            {{#charts}}
+                {{> core/chart }}
+            {{/charts}}
+        </div>
+        <br>
+        <div class="success-chance-assignments">
+            <p>{{#str}}pvl_assignment_info_text_summary_semester, block_disealytics {{/str}}</p>
+            <p class="disea-green text-small text-semibold">{{assignment_info_text_okay}}</p>
+            <p class="disea-green text-small text-semibold">{{assignment_info_text_submitted}}</p>
+            <p class="disea-gray text-small text-semibold">{{assignment_info_text_selfcheck}}</p>
+            <p class="disea-orange text-small text-semibold">{{assignment_info_text_notsubmitted}}</p>
+            <p class="disea-orange text-small text-semibold">{{assignment_info_text_incomplete}}</p>
+            <p class="disea-red text-small text-semibold">{{assignment_info_text_failed}}</p>
+        </div>
+        {{/nodata}}
 
         <div class="block_disealytics-expandable block_disealytics-expandable-{{view_type}} show-when-expanded"
              data-container="block_disealytics/expandable-{{view_type}}">
@@ -254,6 +257,7 @@
             <p>{{#str}}success-chance_info_text_expanded, block_disealytics {{/str}}</p>
         </div>
 
+        {{^nodata}}
         <div id="pvl-doughnut">
             <p class="pvl-probability">{{pvlProbability}} %</p>
             {{#charts}}
@@ -270,6 +274,7 @@
             <p class="disea-orange text-small text-semibold">{{assignment_info_text_incomplete}}</p>
             <p class="disea-red text-small text-semibold">{{assignment_info_text_failed}}</p>
         </div>
+        {{/nodata}}
 
         <div class="block_disealytics-expandable block_disealytics-expandable-{{view_type}} show-when-expanded"
              data-container="block_disealytics/expandable-{{view_type}}">