Changes in src/mlx/web.py [859:1e789c934953:908:fcf3c44650f1]

File:

• src/mlx/web.py (modified) (7 diffs)

src/mlx/web.py

@@ -73 +73 @@
                       "TU5"  : const.AIRCRAFT_T154,
                       "YK4"  : const.AIRCRAFT_YK40,
-                      "146"  : const.AIRCRAFT_B462 }
+                      "146"  : const.AIRCRAFT_B462,
+                      "IL6"  : const.AIRCRAFT_IL62 }
 
     TYPE2TYPECODE = { const.AIRCRAFT_B736  : "736",
@@ -92 +93 @@
                       const.AIRCRAFT_T154  : "TU5",
                       const.AIRCRAFT_YK40  : "YK4",
-                      const.AIRCRAFT_B462  : "146" }
+                      const.AIRCRAFT_B462  : "146",
+                      const.AIRCRAFT_IL62  : "IL6" }
 
     checkFlightTypes = [ const.AIRCRAFT_B736, const.AIRCRAFT_B737,
@@ -128 +130 @@
 
         flight.numPassengers = 0
+        flight.numCockpitCrew = 2
+        flight.numCabinCrew = 2
         flight.numCrew = 2
         flight.bagWeight = 0
@@ -246 +250 @@
                                                             arrivalTime)
 
+        self.numCockpitCrew = self.numCrew
+        self.numCabinCrew = 0
+
         d = dir(self)
         for attribute in ["callsign", "departureICAO", "arrivalICAO",
-                          "aircraftType", "tailNumber",
-                          "numPassengers", "numCrew",
+                          "aircraftType", "tailNumber", "numPassengers",
+                          "numCrew", "numCockpitCrew", "numCabinCrew",
                           "bagWeight", "cargoWeight", "mailWeight",
                           "route", "departureTime", "arrivalTime"]:
@@ -279 +286 @@
 
         self.aircraftType = \
-          self._decodeAircraftType(bookedFlightData["aircraftType"])
+          self._decodeAircraftICAOType(bookedFlightData["aircraftType"])
         self.tailNumber = bookedFlightData["tailNumber"]
         self.numPassengers = int(bookedFlightData["numPassengers"])
-        self.numCrew = int(bookedFlightData["numCrew"])
+        self.numCockpitCrew = int(bookedFlightData["numCockpitCrew"])
+        self.numCabinCrew = int(bookedFlightData["numCabinCrew"])
+        self.numCrew = self.numCockpitCrew + self.numCabinCrew
         self.bagWeight = int(bookedFlightData["bagWeight"])
         self.cargoWeight = int(bookedFlightData["cargoWeight"])
@@ -327 +336 @@
             raise Exception("Invalid aircraft type code: '" + typeCode + "'")
 
+    def _decodeAircraftICAOType(self, typeCode):
+        """Decode the aircraft type from the given typeCode."""
+        if typeCode in const.icao2Type:
+            return const.icao2Type[typeCode]
+        else:
+            raise Exception("Invalid aircraft type code: '" + typeCode + "'")
+
     def __repr__(self):
         """Get a representation of the flight."""
@@ -815 +831 @@
             result.types = loginResult[2]
             result.password = password
+
+            result.aircraftTypes = client.getTypes()
+
             flights = client.getFlights()
             result.flights = flights[0]
             result.reportedFlights = flights[1]
             result.rejectedFlights = flights[2]
+
             if result.rank=="STU":
                 reply = client.getEntryExamStatus()