From df2847f6615da3f9bdcc65b4312752e0605c81a8 Mon Sep 17 00:00:00 2001
From: Ivan Milovanovic <iggim@live.com>
Date: Fri, 11 Nov 2022 00:15:43 +0100
Subject: [PATCH] Update airport.js

---
 airport.js | 111 +++++++++++++++++++++++++----------------------------
 1 file changed, 52 insertions(+), 59 deletions(-)

diff --git a/airport.js b/airport.js
index 187dd0c..9ed3c79 100644
--- a/airport.js
+++ b/airport.js
@@ -1,107 +1,100 @@
 "use strict";
 
-(function (){
-    console.log("a");
-}) ();
+// main execution
+(function () {
+    // builder functions
+    function createFlight(relation, date) {
+        return new Flight(relation, date);
+    }
+    function createPassenger(firstName, lastName, seatNumber, category) {
+        return new Passenger(
+            new Person(firstName, lastName),
+            new Seat(seatNumber, category)
+        );
+    }
+
+    //
+    var airportNikolaTesla = new Airport();
+
+    var flightNewYork = createFlight("Belgrade - New York", "Oct 25 2017");
+    flightNewYork.addPassenger(createPassenger("John", "Snow", 1, "b"));
+
+    airportNikolaTesla.addFlight(flightNewYork);
+
+    console.log(airportNikolaTesla.getData());
+})();
+
+
+// -- Classes --
 
-function Person (name,surname) {
+function Person(name, surname) {
     this.name = name;
     this.surname = surname;
-    this.getData = function() {
+
+    this.getData = function () {
         return this.name + " " + this.surname;
     }
-    
 }
 
-function Seat (number, category = "e") {
+function Seat(number, category = "e") {
     this.number = number || Math.floor(Math.random() * 90) + 10;
     this.category = category;
+
     this.getData = function () {
         return `${this.number}, ${(this.category).toLocaleUpperCase()}`;
     }
 }
 
-function Passenger (person, seat) {
-    
+function Passenger(person, seat) {
     if (person instanceof Person) {
-    this.person = person; }
+        this.person = person;
+    }
     if (seat instanceof Seat) {
-    this.seat = seat; }
+        this.seat = seat;
+    }
+
     this.getData = function () {
-        return seat.getData() + ", " + person.getData(); 
+        return this.seat.getData() + ", " + this.person.getData();
     }
 }
 
-function Flight (relation, date, listOfPassenger = []) {
+function Flight(relation, date, listOfPassenger = []) {
     this.relation = relation;
     this.listOfPassenger = listOfPassenger;
     this.date = date;
-    // function() {
-       
-    //     var datum = new Date();
-
-    //     var day = datum.getDate();
-    //     var month = datum.getMonth() + 1;
-    //     var year = datum.getFullYear();
 
-    //     var currentDate = `${day}.${month}.${year}`;
-    //     return currentDate;
-
-    // } ;
     this.addPassenger = function (passenger) {
-        if(passenger instanceof Passenger) {
-        return this.listOfPassenger.push(passenger);
+        if (passenger instanceof Passenger) {
+            return this.listOfPassenger.push(passenger);
         }
     }
-    this.getData = function() {
+    this.getData = function () {
         var str = "";
         for (var i = 0; i < this.listOfPassenger.length; i++) {
             // obrati paznju
-            str = str + "\t \t" + this.listOfPassenger[i].getData() + "\n" ;
+            str = str + "\t \t" + this.listOfPassenger[i].getData() + "\n";
         }
         return `${this.date}, ${this.relation} \n ${str} `;
     }
 }
 
-function Airport (){ 
+function Airport() {
     this.name = "Nikola Tesla";
     this.listOfFlights = [];
-    
-    this.addFlight = function(flight) { 
+
+    this.addFlight = function (flight) {
         if (flight instanceof Flight) {
-        return this.listOfFlights.push(flight);
+            return this.listOfFlights.push(flight);
         }
     }
-    this.getData = function() {
+    this.getData = function () {
         var flightsData = "";
         var passengersCount = 0;
-        for (var i = 0; i < this.listOfFlights.length; i++) {
-            flightsData += this.listOfFlights[i].getData() + "\n" ;
-            passengersCount += this.listOfFlights[i].listOfPassenger.length;
+        for (const flight of this.listOfFlights) {
+            flightsData += flight.getData() + "\n";
+            passengersCount += flight.listOfPassenger.length;
         }
 
-        return `Airport: ${this.name}, total passengers: ${passengersCount} \n ${flightsData}`;
+        return `Airport: ${this.name}, total passengers: ${passengersCount} \n${flightsData}`;
     }
 }
-
-function createFlight(relation, date) {
-
-    return new Flight(relation, date);
-}
-
-function createPassenger (firstName, lastName,  seatNumber, category) {
-
-    var person = new Person (firstName, lastName);
-    var seat = new Seat (seatNumber, category);
-
-
-    return new Passenger (person,  seat);
-}
-
-var aerodrom = new Airport();
-
-var flight1 = createFlight("Belgrade - New York", "Oct 25 2017");
-flight1.addPassenger(createPassenger("John", "Snow", 1, "b"));
-
-aerodrom.addFlight(flight1);
-console.log(aerodrom.getData());