Changeset 809:4da4f80a2ab4 for src/mlx/rpc.py

Timestamp:

09/08/16 07:32:45 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

The past, pending flights are retrieved (re #307)

File:

• src/mlx/rpc.py (modified) (4 diffs)

src/mlx/rpc.py

@@ -73 +73 @@
             raise Exception("Invalid aircraft type code: '" + typeCode + "'")
 
+    @staticmethod
+    def _decodeStatus(status):
+        """Decode the status from the status string."""
+        if status=="booked":
+            return BookedFlight.STATUS_BOOKED
+        elif status=="reported":
+            return BookedFlight.STATUS_REPORTED
+        elif status=="accepted":
+            return BookedFlight.STATUS_ACCEPTED
+        elif status=="rejected":
+            return BookedFlight.STATUS_REJECTED
+        else:
+            raise Exception("Invalid flight status code: '" + status + "'")
+
     # FIXME: copied from web.BookedFlight
     @staticmethod
@@ -79 +93 @@
         return datetime.datetime.strptime(date + " " + time,
                                           "%Y-%m-%d %H:%M:%S")
+
+    # FIXME: copied from web.BookedFlight
+    STATUS_BOOKED = 1
+
+    # FIXME: copied from web.BookedFlight
+    STATUS_REPORTED = 2
+
+    # FIXME: copied from web.BookedFlight
+    STATUS_ACCEPTED = 3
+
+    # FIXME: copied from web.BookedFlight
+    STATUS_REJECTED = 4
 
     # The instructions for the construction
@@ -87 +113 @@
         "cargoWeight" : int,
         "mailWeight" : int,
-        "aircraftType" : lambda value: BookedFlight._decodeAircraftType(value)
+        "aircraftType" : lambda value: BookedFlight._decodeAircraftType(value),
+        "status" : lambda value: BookedFlight._decodeStatus(value)
         }
 
@@ -246 +273 @@
     def getFlights(self):
         """Get the flights available for performing."""
-        flights = []
+        bookedFlights = []
+        reportedFlights = []
+        rejectedFlights = []
 
         value = self._performCall(lambda sessionID:
                                   self._server.getFlights(sessionID))
         for flightData in value:
-            flights.append(BookedFlight(flightData))
-
-        flights.sort(cmp = lambda flight1, flight2:
-                     cmp(flight1.departureTime, flight2.departureTime))
-
-        return flights
+            flight = BookedFlight(flightData)
+            if flight.status == BookedFlight.STATUS_BOOKED:
+                bookedFlights.append(flight)
+            elif flight.status == BookedFlight.STATUS_REPORTED:
+                reportedFlights.append(flight)
+            elif flight.status == BookedFlight.STATUS_REJECTED:
+                rejectedFlights.append(flight)
+
+        for flights in [bookedFlights, reportedFlights, rejectedFlights]:
+            flights.sort(cmp = lambda flight1, flight2:
+                         cmp(flight1.departureTime, flight2.departureTime))
+
+        return (bookedFlights, reportedFlights, rejectedFlights)
 
     def getEntryExamStatus(self):