Changeset 821:158bfb360027 for src/mlx

Timestamp:

09/25/16 06:42:50 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

A flight can be marked for reflying (re #307).

Location:

src/mlx

Files:

• gui/flight.py (modified) (4 diffs)
• gui/flightlist.py (modified) (2 diffs)
• rpc.py (modified) (1 diff)
• web.py (modified) (2 diffs)

src/mlx/gui/flight.py

@@ -541 +541 @@
         self._flightList.addFlight(flight)
 
+    def _reflyFlight(self, flight):
+        """Refly the given flight."""
+        self._addFlight(flight)
+        self._setupHelp()
+        self._updatePendingButton()
+
     def _pendingClicked(self, button):
         """Called when the Pending flights button is clicked."""
@@ -5080 +5086 @@
         self._loginPage = LoginPage(self)
         self._pages.append(self._loginPage)
-        self._pages.append(FlightSelectionPage(self))
+        self._flightSelectionPage = FlightSelectionPage(self)
+        self._pages.append(self._flightSelectionPage)
         self._pages.append(GateSelectionPage(self))
         self._pages.append(RegisterPage(self))
@@ -5481 +5488 @@
         self.login(callback, None, None)
 
+    def reflyFlight(self, bookedFlight):
+        """Add the given booked flight to the flight selection page."""
+        self._removePendingFlight(bookedFlight)
+        self._flightSelectionPage._reflyFlight(bookedFlight)
+
     def cancelFlight(self, reloadCallback):
         """Cancel the flight.
@@ -5526 +5538 @@
             if page is not originator:
                 page.changeMETAR(metar)
+
+    def _removePendingFlight(self, flight):
+        """Remove the given pending flight from the login result."""
+        for flights in [self._loginResult.reportedFlights,
+                        self._loginResult.rejectedFlights]:
+            for f in flights:
+                if f.id==flight.id:
+                    flights.remove(f)
+                    return
 
     def _loginResultCallback(self, returned, result):

src/mlx/gui/flightlist.py

@@ -251 +251 @@
         self._reflyButton = gtk.Button(xstr("pendflt_refly_" + which))
         self._reflyButton.set_sensitive(False)
+        self._reflyButton.connect("clicked", self._reflyClicked)
         buttonBox.pack_start(self._reflyButton, False, False, 2)
 
@@ -284 +285 @@
         self._deleteButton.set_sensitive(sensitive)
 
+    def _reflyClicked(self, button):
+        """Called when the Refly button is clicked."""
+        gui = self._wizard.gui
+        gui.beginBusy(xstr("pendflt_refly_busy"))
+        self.set_sensitive(False)
+
+        flight = self._flights[self._flightList.selectedIndex]
+        gui.webHandler.reflyFlights(self._reflyResultCallback, [flight.id])
+
+    def _reflyResultCallback(self, returned, result):
+        """Called when the refly result is available."""
+        gobject.idle_add(self._handleReflyResult, returned, result)
+
+    def _handleReflyResult(self, returned, result):
+        """Handle the refly result."""
+
+        self.set_sensitive(True)
+        gui = self._wizard.gui
+        gui.endBusy()
+
+        print "PendingFlightsFrame._handleReflyResult", returned, result
+
+        if returned:
+            index = self._flightList.selectedIndex
+
+            flight = self._flights[index]
+
+            self._flightList.removeFlight(index)
+            del self._flights[index]
+
+            self._wizard.reflyFlight(flight)
+
+
 #-----------------------------------------------------------------------------
 

src/mlx/rpc.py

@@ -340 +340 @@
                           self._server.setCheckFlightPassed(sessionID, type))
 
+    def reflyFlights(self, flightIDs):
+        """Mark the flights with the given IDs for reflying."""
+        self._performCall(lambda sessionID:
+                          self._server.reflyFlights(sessionID, flightIDs))
+
     def _performCall(self, callFn, acceptResults = []):
         """Perform a call using the given call function.

src/mlx/web.py

@@ -1242 +1242 @@
 #------------------------------------------------------------------------------
 
+class ReflyFlights(RPCRequest):
+    """A request to mark certain flights for reflying."""
+    def __init__(self, client, callback, flightIDs):
+        """Construct the request."""
+        super(ReflyFlights, self).__init__(client, callback)
+        self._flightIDs = flightIDs
+
+    def run(self):
+        """Perform the update."""
+        self._client.reflyFlights(self._flightIDs)
+        return Result()
+
+#------------------------------------------------------------------------------
+
 class Handler(threading.Thread):
     """The handler for the web services.
@@ -1323 +1337 @@
                                               callback, aircraftType))
 
+    def reflyFlights(self, callback, flightIDs):
+        """Mark the flights with the given IDs for reflying."""
+        self._addRequest(ReflyFlights(self._rpcClient, callback, flightIDs))
+
     def run(self):
         """Process the requests."""