Implements #135

ReedFamily · Sep 2, 2023 · 79e7137 · 79e7137
1 parent deab18c
commit 79e7137
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 9 deletions.
diff --git a/admin/index.html b/admin/index.html
@@ -65,6 +65,14 @@ <h5 class="modal-title" id="alert-editor-title">Alert bearbeitung</h5>
                                 </div>
                             </div>
                         </div>
+                        <div class="row">
+                            <div class="form-group col-12">
+                                <label for="alertLoc" class="dialog-form-label">Loc</label>
+                                <select name="alertLoc" id="alertLoc">
+
+                                </select>
+                            </div>
+                        </div>
                         <div class="row">
                             <div class="col-12 flex-grow-1">
                                 <textarea class="form-control h-100" name="alertContent" id="alertContent"></textarea>

diff --git a/admin/js/alerts.js b/admin/js/alerts.js
@@ -72,7 +72,7 @@ const newAlertEvent = function (event) {
   data.createdBy = $("#alertCreatedBy").val();
   data.createdDate = new Date().toISOString().slice(0, 19).replace("T", " ");
   data.level = $("input[name='alertLevel']:checked").val();
-  data.location = "home";
+  data.location = $("#alertLoc").val();
   data.permanent = 1;
   data.message = $("#alertContent").val();
 
@@ -131,7 +131,7 @@ const updateAlertEvent = function (event) {
   data.createdBy = $("#alertCreatedBy").val();
   data.createdDate = $("#alertCreatedDate").val();
   data.level = $("input[name='alertLevel']:checked").val();
-  data.location = "home";
+  data.location = $("#alertLoc").val();
   data.permanent = 1;
   data.message = $("#alertContent").val();
 
@@ -216,6 +216,7 @@ const editMessage = function (lnk) {
       $(key).prop("checked", true).trigger("change");
       $("#alert-editor-title").text("Bearbeitung Alert");
       $("#edit-alert-dialog").modal("show");
+      $("#alertLoc").val(res.message.location).change();
     } else {
       console.log(res);
     }

diff --git a/admin/js/site.js b/admin/js/site.js
@@ -10,6 +10,7 @@ const loadApp = function () {
       } else {
         $("#logout-link").removeClass("hidden");
         $("#logout-link").attr("data-userid", userid);
+        fillAlertLocs();
         buildSidebarNav();
         buildHome();
       }
@@ -34,6 +35,20 @@ const buildHome = function () {
   friconix_update();
 };
 
+const fillAlertLocs = function () {
+  var url = "../backend/rest.php?apiFunc=msgLoc";
+  $.get(url, function (res) {
+    if (res.status == 200) {
+      var locationsSelect = $("#alertLoc");
+      $.each(res.locations, function (index, val) {
+        locationsSelect.append(
+          $("<option />", { value: val, text: val, id: "opt-" + val })
+        );
+      });
+    }
+  });
+};
+
 const displayFailure = function (id) {
   $("#content-window").empty();
   var content = $(id).html();

diff --git a/backend/announcements_processor.php b/backend/announcements_processor.php
@@ -7,7 +7,7 @@
 
     class announcements_processor
     {
-        private $validLocations = array("home");
+        private $validLocations = array("home","kurse");
         private $levels = array("blue"=>"info", "yellow"=>"warning", "red"=>"danger");
 
         public function createAnnouncement($params){

diff --git a/index.html b/index.html
@@ -257,12 +257,27 @@ <h2>Wochenbett</h2>
     <section class="standard" id="kurse">
         <div class="container">
             <h1>Kurse</h1>
-            <div class="alert alert-warning" role="alert">Offene Sprechstunde/Babytreff findet <strong>ab März 2023
-                    wieder ohne Voranmeldung statt</strong> Das Alter der Kinder sollte die 7 Monate nicht übersteigen.
-                Die Teilnahme ist ausschließlich für gesunde Personen möglich. Mitzubringen: eigenes
-                Handtuch groß und klein, eigener Kugelschreiber,
-                Versichertenkarte
+            <div class="container" id="kurse-alerts">
+
+                <!--               
+                    <div class="alert alert-warning" role="alert">Offene Sprechstunde/Babytreff findet <strong>ab März 2023
+                        wieder ohne Voranmeldung statt</strong> Das Alter der Kinder sollte die 7 Monate nicht übersteigen.
+                    Die Teilnahme ist ausschließlich für gesunde Personen möglich. Mitzubringen: eigenes
+                    Handtuch groß und klein, eigener Kugelschreiber,
+                    Versichertenkarte
+                </div>
+                -->
+                <div id="kurse-high-alerts" class="danger-alerts-container site-message">
+
+                </div>
+                <div id="kurse-warn-alerts" class="warning-alerts-container site-message">
+
+                </div>
+                <div id="kurse-info-alerts" class="info-alerts-container site-message">
+
+                </div>
             </div>
+
             <p class="browsehappy iebanner">
                 Sie verwenden einen <strong>veralteten</strong> Webbrowser! Bitte<a href="https://bestvpn.org/outdatedbrowser/de"> aktualisieren Sie Ihren Browser</a> um die
                 Terminliste zu sehen und zu verwenden!

diff --git a/js/dynamic.js b/js/dynamic.js
@@ -93,7 +93,7 @@ const buildHomeAlerts = function (payload) {
       var alert = $("<div />", {
         class: "alert",
         role: "alert",
-        text: msg.message,
+        html: msg.message,
       });
       var clzz = "";
       switch (msg.level) {
@@ -143,7 +143,54 @@ const getStyleFromDescription = function (descript) {
   return "other";
 };
 
+const getKursAlerts = function () {
+  var url = "backend/rest.php?apiFunc=locMsgs&location=kurse";
+  jQuery.get(url, function (homeMsgRes) {
+    response1 = homeMsgRes;
+    if (response1.status == 200) {
+      buildKursAlerts(response1.messages);
+    } else {
+      console.log(response1);
+    }
+  });
+};
+
+const buildKursAlerts = function (payload) {
+  var msgSect = $("#kurse-alerts");
+  if (payload.length === 0) {
+    msgSect.remove();
+  } else {
+    var highAlertsCont = $("#kurse-high-alerts");
+    var warnAlertsCont = $("#kurse-warn-alerts");
+    var infoAlertsCont = $("#kurse-info-alerts");
+    $.each(payload, function (index, msg) {
+      var alert = $("<div />", {
+        class: "alert",
+        role: "alert",
+        html: msg.message,
+      });
+      var clzz = "";
+      switch (msg.level) {
+        case "red":
+          clzz = "alert-danger";
+          highAlertsCont.append(alert);
+          break;
+        case "yellow":
+          clzz = "alert-warning";
+          warnAlertsCont.append(alert);
+          break;
+        default:
+          clzz = "alert-info";
+          infoAlertsCont.append(alert);
+          break;
+      }
+      alert.addClass(clzz);
+    });
+  }
+};
+
 const getClassInfo = function () {
+  getKursAlerts();
   var url = "backend/rest.php?apiFunc=classes";
   jQuery.get(url, function (classRes) {
     if (classRes.status == 200) {