From 82eef074d2baed3822721d8f2ab2bb96518c6d75 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <skylar@netsyms.com>
Date: Sun, 7 Jun 2020 20:53:13 -0600
Subject: [PATCH] Switch order of events and components on public tracking page

---
 public/index.php | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/public/index.php b/public/index.php
index c8191db..08735dc 100644
--- a/public/index.php
+++ b/public/index.php
@@ -246,6 +246,28 @@ if (isset($_GET["backgroundcolor"]) && !empty($_GET["backgroundcolor"]) && preg_
                             </div>
 
                             <?php
+                            $history = $machine->getEvents();
+
+                            if (count($history) > 0) {
+                                ?>
+                                <div class="col-sm-6 mb-3">
+                                    <h6>Events:</h6>
+                                    <div class="list-group">
+                                        <?php
+                                        foreach ($history as $h) {
+                                            echo "<div class=\"list-group-item\">\n";
+                                            echo "<b>" . $h->getName() . "</b> on " . date($SETTINGS["datetime_format"], strtotime($h->getDate())) . "<br />\n";
+                                            if (!empty($h->getPublicNotes())) {
+                                                echo "<div><b>Notes:</b><br /><div class=\"ml-3\">" . htmlspecialchars($h->getPublicNotes()) . "</div></div>";
+                                            }
+                                            echo "\n</div>\n";
+                                        }
+                                        ?>
+                                    </div>
+                                </div>
+                                <?php
+                            }
+                            
                             $components = $machine->getComponents();
 
                             if (count($components) > 0) {
@@ -309,29 +331,6 @@ if (isset($_GET["backgroundcolor"]) && !empty($_GET["backgroundcolor"]) && preg_
                                 </div>
                                 <?php
                             }
-
-
-                            $history = $machine->getEvents();
-
-                            if (count($history) > 0) {
-                                ?>
-                                <div class="col-sm-6 mb-3">
-                                    <h6>Events:</h6>
-                                    <div class="list-group">
-                                        <?php
-                                        foreach ($history as $h) {
-                                            echo "<div class=\"list-group-item\">\n";
-                                            echo "<b>" . $h->getName() . "</b> on " . date($SETTINGS["datetime_format"], strtotime($h->getDate())) . "<br />\n";
-                                            if (!empty($h->getPublicNotes())) {
-                                                echo "<div><b>Notes:</b><br /><div class=\"ml-3\">" . htmlspecialchars($h->getPublicNotes()) . "</div></div>";
-                                            }
-                                            echo "\n</div>\n";
-                                        }
-                                        ?>
-                                    </div>
-                                </div>
-                                <?php
-                            }
                             ?>
                         </div>
                     </div>