v1.1.3 - banner bug fixes | fixes #25

brian-mckeown · Nov 24, 2023 · b255274 · b255274
1 parent e2bc9c5
commit b255274
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
@@ -57,7 +57,7 @@
             </a>
             <div ng-show="showFlightStatBanner" class="text-white d-flex align-items-center ms-2">
                 <p class="mb-0">
-                    {{callSign}} {{departureIcao}}/{{arrivalIcao}}
+                    {{callSign}} {{departureIcao}}->{{arrivalIcao}}
                 <a ng-show="currentFlightStatus == 'Idle'" class="text-white text-decoration-none"> | Boarding in: <span id="boardingCountdown">{{boardingHours}}h {{boardingMinutes}}m {{boardingSeconds}}s</span>
                     <span class="badge" ng-class="{'bg-success': boardingStatus == 'ON TIME', 'bg-warning': boardingStatus == 'DELAYED'}">{{ boardingStatus }}</span> | <span ng-show="showPassengersBanner">Checked In: <i class="fa-solid fa-user"></i> {{passengersCheckedIn.length}}/{{numberOfPassengers}} <i class="fa-solid fa-suitcase"></i> {{bagsCheckedIn.length}}</span>
                 </a>
@@ -71,7 +71,7 @@
                     <span class="badge" ng-class="{'bg-success': arrivalStatus == 'ON TIME', 'bg-warning': arrivalStatus == 'DELAYED'}">{{ arrivalStatus }}</span>
                 </a>
                 <a ng-show="currentFlightStatus == 'Arrived'" class="text-white text-decoration-none"> | <span class="badge bg-success" >ARRIVED AT GATE</span> | {{ getDifference(estimateGateArrivalDateTime, actualGateArrivalDateTime) }}
-                    <span class="badge" ng-class="{'bg-success': arrivalStatus == 'ON TIME', 'bg-warning': arrivalStatus == 'DELAYED'}">{{ arrivalStatus }}</span>  | <span ng-show="showPassengersBanner">Deboarding: <i class="fa-solid fa-user"></i> {{passengersSeated.length}}/{{numberOfPassengers}} <i class="fa-solid fa-suitcase"></i> {{bagsLoaded.length}}</span>
+                    <span class="badge" ng-class="{'bg-success': finalArrivalStatus == 'ON TIME', 'bg-warning': finalArrivalStatus == 'DELAYED'}">{{ finalArrivalStatus }}</span>  | <span ng-show="showPassengersBanner">Deboarding: <i class="fa-solid fa-user"></i> {{passengersSeated.length}}/{{numberOfPassengers}} <i class="fa-solid fa-suitcase"></i> {{bagsLoaded.length}}</span>
                 </a>
                 </p>
             </div>

diff --git a/src/main/resources/static/script.js b/src/main/resources/static/script.js
@@ -6,7 +6,7 @@ var app = angular.module('checklistApp', []);
 app.controller('ChecklistController', ['$scope', '$sce', '$timeout', '$http', '$document', '$interval', function($scope, $sce, $timeout, $http, $document, $interval) {
 
 
-    $scope.versionNumber = '1.1.2'; 
+    $scope.versionNumber = '1.1.3'; 
 
     $scope.state = 'Idle';
     $scope.messages = [];
@@ -669,6 +669,7 @@ $scope.arrivalIcao = '';
 $scope.showFlightStatBanner = false;
 $scope.showPassengersBanner = false;
 $scope.currentFlightStatus = 'Idle';
+$scope.finalArrivalStatus = '';
 $scope.scheduledBoardingDateTime = '';
 $scope.scheduledDepartureDateTime = '';
 $scope.estimateArrivalDateTime = '';
@@ -696,6 +697,11 @@ $scope.setFlightStatus = function(status) {
             break;
         case 'Arrived':
             $scope.actualGateArrivalDateTime = currentTimestamp;
+            if ($scope.arrivalStatus === 'ON TIME') {
+                $scope.finalArrivalStatus = 'ON TIME';
+            } else if ($scope.arrivalStatus === 'DELAYED') {
+                $scope.finalArrivalStatus = 'DELAYED';
+            }
             break;
         case 'Idle':
             $scope.actualBoardingDateTime = '';