Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions airport.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function Passenger (person, seat) {
if (seat instanceof Seat) {
this.seat = seat; }
this.getData = function () {
return seat.gatData() + ", " + person.getData();
return seat.getData() + ", " + person.getData();
}
}

Expand Down Expand Up @@ -59,7 +59,7 @@ function Flight (relation, date, listOfPassenger = []) {
// obrati paznju
str = str + "\t \t" + this.listOfPassenger[i].getData() + "\n" ;
}
return currentDate + `, ${this.relation} \n ${str} `;
return `${this.date}, ${this.relation} \n ${str} `;
}
}

Expand All @@ -73,7 +73,14 @@ function Airport (){
}
}
this.getData = function() {
return `Airport: ${this.name}, \n ${flight.getData}` //total passengers: ${}
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;
}

return `Airport: ${this.name}, total passengers: ${passengersCount} \n ${flightsData}`;
}
}

Expand All @@ -91,8 +98,10 @@ function createPassenger (firstName, lastName, 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"));

Airport.addFlight(flight1);
console.log(airport.getData());
aerodrom.addFlight(flight1);
console.log(aerodrom.getData());