Changeset 764:8fd245311db5

Timestamp:

02/21/16 10:18:43 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The entry exam is called in the browser when requested and the status is displayed in text as well (re #285)

Files:

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

locale/en/mlx.po

@@ -2291 +2291 @@
 "and the check flight here."
 
+msgid "student_entry_exam_status"
+msgstr "Entry exam:"
+
+msgid "student_entry_exam_passed"
+msgstr "<span color=\"darkgreen\"><b>Passed</b></span>"
+
+msgid "student_entry_exam_not_passed"
+msgstr "<span color=\"orange\"><b>Not yet passed</b></span>"
+
 msgid "student_entry_exam"
 msgstr "Take the _entry exam"
@@ -2297 +2306 @@
 msgstr ""
 "Click this button to go to MAVA's training website in your browser and take "
-"the theoretical entry exam. If this button is greyed out, "
-"it means that you have already passed the exam earlier. Note, that "
-"its status is updated only a few minutes after passing the exam."
+"the theoretical entry exam. The website might ask you for login: you can "
+"use your MAVA pilot ID (PXXX) and password. "
+"If this button is greyed out, it means that you have already passed "
+"the exam earlier. Note, that its status is updated only a few minutes "
+"after passing the exam."

locale/hu/mlx.po

@@ -2307 +2307 @@
 "és az ellenőrző repülést."
 
+msgid "student_entry_exam_status"
+msgstr "Elméleti vizsga:"
+
+msgid "student_entry_exam_passed"
+msgstr "<span color=\"darkgreen\"><b>Sikeres</b></span>"
+
+msgid "student_entry_exam_not_passed"
+msgstr "<span color=\"orange\"><b>Még nem tetted le</b></span>"
+
 msgid "student_entry_exam"
 msgstr "_Elméleti vizsga"
@@ -2314 +2323 @@
 "Erre a gombra kattintva a MAVA oktatási weboldalára kerülsz "
 "böngésződben és kitöltheted az elméleti vizsga tesztjét. "
+"A weboldalon szükség lehet bejelentkezned: ebben az esetben "
+"használd a MAVA pilóta azonosítódat (PXXX) és jelszavadat. "
 "Ha a gomb inaktív, a vizsgát korábban már sikeresen teljesítetted. "
 "A gomb állapota csak néhány perccel a vizsga teljesítése után frissül."

src/mlx/gui/flight.py

@@ -21 +21 @@
 import threading
 import re
+import webbrowser
 
 #-----------------------------------------------------------------------------
@@ -1378 +1379 @@
                                   xscale = 0.5, yscale = 0.0)
 
-        table = gtk.Table(1, 1)
+        table = gtk.Table(2, 2)
         table.set_row_spacings(4)
         table.set_col_spacings(32)
+        table.set_homogeneous(False)
         alignment.add(table)
         self.setMainWidget(alignment)
 
         row = 0
+
+        labelAlignment = gtk.Alignment(xalign=0.0, yalign = 0.5,
+                                       xscale=0.0, yscale = 0.0)
+        label = gtk.Label(xstr("student_entry_exam_status"))
+        labelAlignment.add(label)
+        table.attach(labelAlignment, 0, 1, row, row + 1, xoptions = 0)
+
+        alignment = gtk.Alignment(xalign=0.0, yalign = 0.5,
+                                  xscale=1.0, yscale = 0.0)
+        self._entryExamStatus = gtk.Label()
+        self._entryExamStatus.set_use_markup(True)
+        self._entryExamStatus.set_alignment(0.0, 0.5)
+        alignment.add(self._entryExamStatus)
+        table.attach(alignment, 1, 2, row, row + 1)
+
+        row += 1
 
         buttonAlignment = gtk.Alignment(xalign=0.0, xscale=1.0)
@@ -1393 +1411 @@
 
         buttonAlignment.add(button)
-        table.attach(buttonAlignment, 0, 1, 0, 1)
+        table.attach(buttonAlignment, 0, 2, row, row + 1,
+                     ypadding = 4)
 
     def activate(self):
         """Activate the student page."""
         loginResult = self._wizard.loginResult
-        self._entryExamButton.set_sensitive(not loginResult.entryExamPassed)
+        self._entryExamLink = loginResult.entryExamLink
+
+        self._updateEntryExamStatus(loginResult.entryExamPassed)
+
         self._getEntryExamStatus()
 
     def _entryExamClicked(self, button):
         """Called when the entry exam button is clicked."""
+        webbrowser.open(self._entryExamLink)
 
     def _getEntryExamStatus(self):
@@ -1418 +1441 @@
         print "_handleEntryExamStatus", returned, result
         if returned:
-            self._entryExamButton.set_sensitive(not result.entryExamPassed)
+            self._entryExamLink = result.entryExamLink
+            self._updateEntryExamStatus(result.entryExamPassed)
             self._getEntryExamStatus()
+
+    def _updateEntryExamStatus(self, passed):
+        """Update the entry exam status display and button."""
+        self._entryExamStatus.set_text(xstr("student_entry_exam_passed")
+                                       if passed else
+                                       xstr("student_entry_exam_not_passed"))
+        self._entryExamStatus.set_use_markup(True)
+        self._entryExamButton.set_sensitive(not passed)
 
 #-----------------------------------------------------------------------------

src/mlx/rpc.py

@@ -261 +261 @@
         value = self._performCall(lambda sessionID:
                                   self._server.getEntryExamStatus(sessionID))
-        return (value["entryExamPassed"], value["checkFlightStatus"])
+        return (value["entryExamPassed"], value["entryExamLink"],
+                value["checkFlightStatus"])
 
     def getFleet(self):

src/mlx/web.py

@@ -739 +739 @@
                 reply = self._client.getEntryExamStatus()
                 result.entryExamPassed = reply[0]
-                result.checkFlightStatus = reply[1]
+                result.entryExamLink = reply[1]
+                result.checkFlightStatus = reply[2]
 
         return result
@@ -758 +759 @@
 
         result.entryExamPassed = reply[0]
-        result.checkFlightStatus = reply[1]
+        result.entryExamLink = reply[1]
+        result.checkFlightStatus = reply[2]
 
         return result