Changeset 908:fcf3c44650f1

Timestamp:

05/21/18 14:15:25 (6 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Basic functions work with the new website (re #332)

Location:

src/mlx

Files:

• common.py (modified) (1 diff)
• gui/flight.py (modified) (1 diff)
• pirep.py (modified) (3 diffs)
• rpc.py (modified) (5 diffs)
• web.py (modified) (4 diffs)

src/mlx/common.py

@@ -18 +18 @@
 #---------------------------------------------------------------------------------------
 
-MAVA_BASE_URL = os.environ.get("MAVA_BASE_URL", "http://virtualairlines.hu")
+#MAVA_BASE_URL = os.environ.get("MAVA_BASE_URL", "http://virtualairlines.hu")
+MAVA_BASE_URL = os.environ.get("MAVA_BASE_URL", "http://oldmava.mavasystems.hu")
 
 #-------------------------------------------------------------------------------

src/mlx/gui/flight.py

@@ -2275 +2275 @@
         aircraft = self._wizard.gui._flight.aircraft
 
-        numCrew = bookedFlight.numCrew
-        numCockpitCrew = min(numCrew, aircraft.dowCockpit)
-        numCabinCrew = numCrew - numCockpitCrew
+        numCockpitCrew = bookedFlight.numCockpitCrew
+        numCabinCrew = bookedFlight.numCabinCrew
+        numCrew = numCockpitCrew + numCabinCrew
 
         self._numCockpitCrew.set_int(numCockpitCrew)

src/mlx/pirep.py

@@ -136 +136 @@
         self.bookedFlight = flight.bookedFlight
 
+        self.numCockpitCrew = flight.numCockpitCrew
+        self.numCabinCrew = flight.numCabinCrew
         self.numCrew = flight.numCrew
         self.numPassengers = flight.numPassengers
@@ -182 +184 @@
         self.bookedFlight = bookedFlight
 
-        self.numCrew = int(pirepData["numCrew"])
+        self.numCockpitCrew = int(pirepData["numCockpitCrew"])
+        self.numCabinCrew = int(pirepData["numCabinCrew"])
+        self.numCrew = self.numCockpitCrew + self.numCabinCrew
         self.numPassengers = int(pirepData["numPassengers"])
         self.bagWeight = int(pirepData["bagWeight"])
@@ -381 +385 @@
         attrs["arrivalICAO"] = self.bookedFlight.arrivalICAO
         attrs["numPassengers"] = self.numPassengers
+        attrs["numCockpitCrew"] = self.numCockpitCrew
+        attrs["numCabinCrew"] = self.numCabinCrew
         attrs["numCrew"] = self.numCrew
         attrs["cargoWeight"] = self.cargoWeight

src/mlx/rpc.py

@@ -236 +236 @@
     def _decodeAircraftType(typeCode):
         """Decode the aircraft type from the given typeCode."""
-        if typeCode in BookedFlight.TYPECODE2TYPE:
-            return BookedFlight.TYPECODE2TYPE[typeCode]
+        if typeCode in const.icao2Type:
+            return const.icao2Type[typeCode]
         else:
             raise Exception("Invalid aircraft type code: '" + typeCode + "'")
@@ -277 +277 @@
     _instructions = {
         "numPassengers" : int,
-        "numCrew" : int,
+        "numCockpitCrew" : int,
+        "numCabinCrew" : int,
         "bagWeight" : int,
         "cargoWeight" : int,
@@ -309 +310 @@
         print >> f, "tail_nr=%s" % (self.tailNumber,)
         print >> f, "passenger=%d" % (self.numPassengers,)
-        print >> f, "crew=%d" % (self.numCrew,)
+        print >> f, "crew=%d" % (self.numCockpitrew + self.numCabinCrew,)
         print >> f, "bag=%d" % (self.bagWeight,)
         print >> f, "cargo=%d" % (self.cargoWeight,)
@@ -518 +519 @@
             self._sessionID = reply.value["sessionID"]
 
-            types = [BookedFlight.TYPECODE2TYPE[typeCode]
+            types = [const.icao2Type[typeCode]
                      for typeCode in reply.value["typeCodes"]]
 
@@ -626 +627 @@
         of type codes, if any."""
         typeCodes = None if types is None else \
-            [BookedFlight.TYPE2TYPECODE[type] for type in types]
+          [const.icaoCodes[type] for type in types]
 
         values = self._performCall(lambda sessionID:

src/mlx/web.py

@@ -130 +130 @@
 
         flight.numPassengers = 0
+        flight.numCockpitCrew = 2
+        flight.numCabinCrew = 2
         flight.numCrew = 2
         flight.bagWeight = 0
@@ -248 +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"]:
@@ -281 +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"])
@@ -326 +333 @@
         if typeCode in self.TYPECODE2TYPE:
             return self.TYPECODE2TYPE[typeCode]
+        else:
+            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 + "'")