Changeset 824:599a3e9cb025

Timestamp:

09/25/16 07:34:11 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Pending flights can be deleted (re #307).

Files:

• locale/en/mlx.po (modified) (1 diff)
• locale/hu/mlx.po (modified) (1 diff)
• src/mlx/gui/flight.py (modified) (2 diffs)
• src/mlx/gui/flightlist.py (modified) (5 diffs)
• src/mlx/rpc.py (modified) (1 diff)
• src/mlx/web.py (modified) (2 diffs)

locale/en/mlx.po

@@ -2470 +2470 @@
 msgid "pendflt_refly_busy"
 msgstr "Marking flights(s) for reflying"
+
+msgid "flight_delete_question"
+msgstr "Are you sure to delete the selected flight(s)?"

locale/hu/mlx.po

@@ -2487 +2487 @@
 msgid "pendflt_refly_busy"
 msgstr "A járatok megjelölése újrarepülésre"
+
+msgid "flight_delete_question"
+msgstr "Biztosan törölni szerednéd a kiválasztott járato(ka)t?"

src/mlx/gui/flight.py

@@ -544 +544 @@
         """Refly the given flight."""
         self._addFlight(flight)
+        self._updatePending()
+
+    def _updatePending(self):
+        """Update the stuff depending on the set of pending flights."""
         self._setupHelp()
         self._updatePendingButton()
@@ -5492 +5496 @@
         self._removePendingFlight(bookedFlight)
         self._flightSelectionPage._reflyFlight(bookedFlight)
+
+    def deleteFlight(self, bookedFlight):
+        """Remove the given flight from the pending flight list."""
+        self._removePendingFlight(bookedFlight)
+        self._flightSelectionPage._updatePending()
 
     def cancelFlight(self, reloadCallback):

src/mlx/gui/flightlist.py

@@ -243 +243 @@
     ]
 
-    def __init__(self, which, wizard):
+    def __init__(self, which, wizard, window):
         """Construct the frame with the given title."""
         super(PendingFlightsFrame, self).__init__(xstr("pendflt_title_" + which))
@@ -249 +249 @@
         self._which = which
         self._wizard = wizard
+        self._window = window
 
         alignment = gtk.Alignment(xscale = 1.0, yscale = 1.0)
@@ -277 +278 @@
         self._deleteButton = gtk.Button(xstr("pendflt_delete_" + which))
         self._deleteButton.set_sensitive(False)
+        self._deleteButton.connect("clicked", self._deleteClicked)
         buttonBox.pack_start(self._deleteButton, False, False, 2)
 
@@ -340 +342 @@
                 self._wizard.reflyFlight(flight)
 
+    def _deleteClicked(self, button):
+        """Called when the Delete button is clicked."""
+        dialog = gtk.MessageDialog(parent = self._window,
+                                   type = MESSAGETYPE_QUESTION,
+                                   message_format = xstr("flight_delete_question"))
+
+        dialog.add_button(xstr("button_no"), RESPONSETYPE_NO)
+        dialog.add_button(xstr("button_yes"), RESPONSETYPE_YES)
+
+        dialog.set_title(WINDOW_TITLE_BASE)
+        result = dialog.run()
+        dialog.hide()
+
+        if result==RESPONSETYPE_YES:
+            gui = self._wizard.gui
+            gui.beginBusy(xstr("pendflt_refly_busy"))
+            self.set_sensitive(False)
+
+            flightIDs = [self._flights[i].id
+                        for i in self._flightList.selectedIndexes]
+            gui.webHandler.deleteFlights(self._deleteResultCallback, flightIDs)
+
+    def _deleteResultCallback(self, returned, result):
+        """Called when the deletion result is available."""
+        gobject.idle_add(self._handleDeleteResult, returned, result)
+
+    def _handleDeleteResult(self, returned, result):
+        """Handle the delete result."""
+
+        self.set_sensitive(True)
+        gui = self._wizard.gui
+        gui.endBusy()
+
+        print "PendingFlightsFrame._handleDeleteResult", returned, result
+
+        if returned:
+            indexes = self._flightList.selectedIndexes
+
+            flights = [self._flights[index] for index in indexes]
+
+            self._flightList.removeFlights(indexes)
+            for index in indexes[::-1]:
+                del self._flights[index]
+
+            for flight in flights:
+                self._wizard.deleteFlight(flight)
 
 #-----------------------------------------------------------------------------
@@ -364 +412 @@
         vbox = gtk.VBox()
 
-        self._reportedFrame = PendingFlightsFrame("reported", wizard)
+        self._reportedFrame = PendingFlightsFrame("reported", wizard, self)
         vbox.pack_start(self._reportedFrame, True, True, 2)
 
-        self._rejectedFrame = PendingFlightsFrame("rejected", wizard)
+        self._rejectedFrame = PendingFlightsFrame("rejected", wizard, self)
         vbox.pack_start(self._rejectedFrame, True, True, 2)
 

src/mlx/rpc.py

@@ -345 +345 @@
                           self._server.reflyFlights(sessionID, flightIDs))
 
+    def deleteFlights(self, flightIDs):
+        """Delete the flights with the given IDs."""
+        self._performCall(lambda sessionID:
+                          self._server.deleteFlights(sessionID, flightIDs))
+
     def _performCall(self, callFn, acceptResults = []):
         """Perform a call using the given call function.

src/mlx/web.py

@@ -1256 +1256 @@
 #------------------------------------------------------------------------------
 
+class DeleteFlights(RPCRequest):
+    """A request to delete certain flights."""
+    def __init__(self, client, callback, flightIDs):
+        """Construct the request."""
+        super(DeleteFlights, self).__init__(client, callback)
+        self._flightIDs = flightIDs
+
+    def run(self):
+        """Perform the update."""
+        self._client.deleteFlights(self._flightIDs)
+        return Result()
+
+#------------------------------------------------------------------------------
+
 class Handler(threading.Thread):
     """The handler for the web services.
@@ -1341 +1355 @@
         self._addRequest(ReflyFlights(self._rpcClient, callback, flightIDs))
 
+    def deleteFlights(self, callback, flightIDs):
+        """Delete the flights with the given IDs."""
+        self._addRequest(DeleteFlights(self._rpcClient, callback, flightIDs))
+
     def run(self):
         """Process the requests."""