Merge pull request #55 from jekhokie/add-pass-conflict-indicator

Add Pass Conflict Indicator
jekhokie · Feb 11, 2021 · 50e629b · 50e629b
2 parents f17b02c + c5ecc7d
commit 50e629b
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 2 deletions.
diff --git a/webpanel/App/Lang/ar.php b/webpanel/App/Lang/ar.php
@@ -19,6 +19,7 @@
   "cancel" => "إلغاء",
   "fail_delete_missing_id" => "فشل الحذف - معلمة "id" مفقودة",
   "successful_delete_capture" => "تم حذف الالتقاط بنجاح",
+  "conflicting_pass" => "التعارض مع التمريرة السابقة",
 );
 ?>
 
diff --git a/webpanel/App/Lang/de.php b/webpanel/App/Lang/de.php
@@ -19,5 +19,6 @@
   "cancel" => "Stornieren",
   "fail_delete_missing_id" => "Fehler beim Löschen - fehlender 'id'-Parameter",
   "successful_delete_capture" => "Capture erfolgreich gelöscht",
+  "conflicting_pass" => "Konflikt mit vorherigem Pass",
 );
 ?>
diff --git a/webpanel/App/Lang/en.php b/webpanel/App/Lang/en.php
@@ -20,5 +20,6 @@
   "cancel" => "Cancel",
   "fail_delete_missing_id" => "Failed to delete - missing 'id' parameter",
   "successful_delete_capture" => "Successfully deleted capture",
+  "conflicting_pass" => "Conflict with previous pass",
 );
 ?>
diff --git a/webpanel/App/Lang/es.php b/webpanel/App/Lang/es.php
@@ -19,5 +19,6 @@
   "cancel" => "Cancelar",
   "fail_delete_missing_id" => "Error al eliminar: falta el parámetro 'id'",
   "successful_delete_capture" => "Captura eliminada con éxito",
+  "conflicting_pass" => "Conflicto con pase anterior",
 );
 ?>
diff --git a/webpanel/App/Lang/sr.php b/webpanel/App/Lang/sr.php
@@ -19,5 +19,6 @@
   "cancel" => "Poništiti, otkazati",
   "fail_delete_missing_id" => "Brisanje nije uspelo - nedostaje parametar „id“",
   "successful_delete_capture" => "Snimanje je uspešno izbrisano",
+  "conflicting_pass" => "Sukob sa prethodnom prolaskom",
 );
 ?>
diff --git a/webpanel/App/Views/Passes/index.html b/webpanel/App/Views/Passes/index.html
@@ -34,14 +34,22 @@
           {% set pass_end = pass.pass_end|date('H:i:s') %}
 
           <tr {% if pass.is_active == false or pass_end < now %} class="inactive" {% endif %}>
-            <td scope="row">{{ pass.sat_name }}</td>
+            <td scope="row" class="{% if prev_pass_end >= pass.pass_start %}conflict{% endif %}">
+              {% if prev_pass_end >= pass.pass_start %}<i class="fa fa-exclamation-triangle conflict-icon" data-toggle="tooltip" data-placement="right" title="{{ lang['conflicting_pass'] }}"></i>{% endif %} {{ pass.sat_name }}
+            </td>
             <td scope="row" class="text-center">{{ pass_start }}</td>
             <td scope="row" class="text-center">{{ pass_end }}</td>
             <td scope="row" class="text-center">{{ pass.max_elev }}</td>
           </tr>
+
+          {% set prev_pass_end = pass.pass_end %}
         {% endfor %}
       {% endif %}
     </tbody>
   </table>
 
 {% endblock %}
+
+{% block js_includes %}
+  <script src="/assets/js/tooltips.js"></script>
+{% endblock %}
diff --git a/webpanel/App/Views/base.html b/webpanel/App/Views/base.html
@@ -13,6 +13,9 @@
 
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
                            integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.0/css/all.css"
+                           integrity="sha384-lZN37f5QGtY3VHgisS14W3ExzMWZxybE1SJSEsQp9S+oqd12jhcu+A56Ebc1zFSJ" crossorigin="anonymous">
+
     <title>Raspberry NOAA V2</title>
 
     <link rel="shortcut icon" href="assets/web_img/favicon.ico" type="image/x-icon"/>
@@ -49,7 +52,7 @@
     </div>
 
     <footer class="footer text-center">
-      <div class="contaienr">
+      <div class="container">
         <a href="https://github.com/jekhokie/raspberry-noaa-v2"><img class="img-footer" src="/assets/web_img/logo-small-v2.png"></a>
       </div>
     </footer>

diff --git a/webpanel/public/assets/css/pass_list.css b/webpanel/public/assets/css/pass_list.css
@@ -9,6 +9,14 @@ div#satvis iframe {
   height: 100%;
 }
 
+table#passes tr td.conflict i.conflict-icon {
+  color: #ec5645;
+}
+
+table#passes tr.inactive td.conflict i.conflict-icon {
+  color: lightgray;
+}
+
 table#passes tr.inactive {
   color: lightgray;
 }

diff --git a/webpanel/public/assets/js/tooltips.js b/webpanel/public/assets/js/tooltips.js
@@ -0,0 +1,3 @@
+$(function () {
+  $('[data-toggle="tooltip"]').tooltip()
+})