Changeset 756:673a9809df08

Timestamp:

01/11/16 15:56:23 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Implemented the basic GUI logic of the registration (re #285)

Files:

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

locale/en/mlx.po

@@ -2218 +2218 @@
 msgid "register_password_mismatch"
 msgstr "<span foreground=\"red\">Passwords differ</span>"
+
+msgid "register_busy"
+msgstr "Registering..."
+
+msgid "register_ok"
+msgstr "Registration successful."
+
+msgid "register_failed"
+msgstr "Registration failed!"
+
+msgid "register_info"
+msgstr ""
+"Congratulations! You are now a MAVA pilot\n"
+"in status STU (student).\n"
+"\n"
+"Your pilot ID is: <b>%s</b>.\n"
+"\n"
+"You will now be taken to the student page,\n"
+"where you can initiate the taking of the\n"
+"entrance exam or start your check flight.\n"
+"\n"
+"You can return to the page anytime later\n"
+"by starting the program, and logging in."
+
+msgid "register_nologin"
+msgstr ""
+"Congratulations! You are now a MAVA pilot\n"
+"in status STU (student).\n"
+"\n"
+"Your pilot ID is: <b>%s</b>.\n"
+"\n"
+"For some reason, we could not log you in\n"
+"(perhaps a server failure).\n"
+"\n"
+"You will now be taken to the login page,\n"
+"where you can try logging in again. You can,\n"
+"of course, start the program at any time\n"
+"later on and attempt logging in."
+
+msgid "register_email_already"
+msgstr "The given e-mail is already registered."
+
+msgid "register_invalid_data"
+msgstr ""
+"The program has sent invalid data to the server.\n"
+"This may be a program error. You may try to alter some\n"
+"data (e.g. accented characters), or send a bug report."
+
+msgid "register_error"
+msgstr ""
+"Some error, most likely in the server, has occured.\n"
+"Please, try again later."
+
+msgid "register_result_title"
+msgstr "Registration"

locale/hu/mlx.po

@@ -2232 +2232 @@
 msgid "register_password_mismatch"
 msgstr "<span foreground=\"red\">A két jelszó különbözik</span>"
+
+msgid "register_busy"
+msgstr "Regisztráció..."
+
+msgid "register_ok"
+msgstr "A regisztráció sikerült."
+
+msgid "register_failed"
+msgstr "A regisztráció nem sikerült!"
+
+msgid "register_info"
+msgstr ""
+"Gratulálunk! Ezennel a MAVA pilótája lettél\n"
+"STU (student - tanuló) státuszban.\n"
+"\n"
+"Pilóta azonosítód: <b>%s</b>.\n"
+"\n"
+"Most a tanulók oldala fog megjelenni,\n"
+"ahol kezdeményezheted a belépő teszt\n"
+"kitöltését vagy elindíthatod az ellenőrző\n"
+"repülést.\n"
+"\n"
+"A tanulók oldalára bármikor visszatérhetsz\n"
+"ha elindítod a programot és bejelentkezel."
+
+msgid "register_nologin"
+msgstr ""
+"Gratulálunk! Ezennel a MAVA pilótája lettél\n"
+"STU (student - tanuló) státuszban.\n"
+"\n"
+"Pilóta azonosítód: <b>%s</b>.\n"
+"\n"
+"Valamilyen oknál fogva a bejelentkezés viszont\n"
+"nem sikerült (talán szerverhiba).\n"
+"\n"
+"A bejelentkező oldal fog megjelenni,\n"
+"ahol megpróbálhatsz belépni. Természetesen\n"
+"a programot bármikor futtathatod és\n"
+"megpróbálhatod a belépést."
+
+msgid "register_email_already"
+msgstr "A megadott e-mail címmel már regisztráltak."
+
+msgid "register_invalid_data"
+msgstr ""
+"A program érvényelen adatokat küldött a szervernek.\n"
+"Ez programhiba lehet. Megpróbálhatsz megváltoztatni\n"
+"bizonyos adatokat (pl. az ékezetes karaktereket),\n"
+"vagy küldhetsz hibajelentést."
+
+msgid "register_error"
+msgstr ""
+"Valamilyen, valószínűleg szerverhiba történt.\n"
+"Kérlek, próbáld meg később."
+
+msgid "register_result_title"
+msgstr "Regisztráció"

src/mlx/gui/flight.py

@@ -1127 +1127 @@
         self._updateButtons()
 
+    @property
+    def name(self):
+        """Get the name entered."""
+        return self._name.get_text()
+
+    @property
+    def yearOfBirth(self):
+        """Get the year of birth."""
+        yearOfBirthText = self._yearOfBirth.get_text()
+        return int(yearOfBirthText) if yearOfBirthText else 0
+
+    @property
+    def emailAddress(self):
+        """Get the e-mail address."""
+        return self._emailAddress.get_text()
+
+    @property
+    def emailAddressPublic(self):
+        """Get the whether the e-mail address is public."""
+        return self._emailAddressPublic.get_active()
+
+    @property
+    def vatsimID(self):
+        """Get the VATSIM ID."""
+        return self._vatsimID.get_int()
+
+    @property
+    def ivaoID(self):
+        """Get the IVAO ID."""
+        return self._ivaoID.get_int()
+
+    @property
+    def phoneNumber(self):
+        """Get the phone number."""
+        return self._phoneNumber.get_text()
+
+    @property
+    def nationality(self):
+        """Get the nationality."""
+        return self._nationality.get_text()
+
+    @property
+    def password(self):
+        """Get the password."""
+        return self._password.get_text()
+
+    @property
+    def rememberPassword(self):
+        """Get whether the password should be remembered."""
+        return self._rememberButton.get_active()
+
     def activate(self):
         """Setup the route from the booked flight."""
@@ -1135 +1186 @@
     def _updateButtons(self, widget = None):
         """Update the sensitive state of the buttons"""
-        name = self._name.get_text()
+        name = self.name
         nameLength = len(name)
         nameSpacePosition = name.find(" ")
 
-        yearOfBirthText = self._yearOfBirth.get_text()
-        yearOfBirth = int(yearOfBirthText) if yearOfBirthText else 0
-
-        emailAddressText = self._emailAddress.get_text()
-        emailAddressMatch = RegisterPage._emailAddressRE.match(emailAddressText)
-
-        vatsimID = self._vatsimID.get_int()
-        ivaoID = self._ivaoID.get_int()
-
-        password = self._password.get_text()
+        yearOfBirth = self.yearOfBirth
+
+        emailAddress = self.emailAddress
+        emailAddressMatch = RegisterPage._emailAddressRE.match(emailAddress)
+
+        vatsimID = self.vatsimID
+        ivaoID = self.ivaoID
+
+        password = self.password
         password2 = self._password2.get_text()
         if not password:
@@ -1183 +1233 @@
     def _registerClicked(self, button):
         """Called when the Register button is clicked."""
+        registrationData = web.Registration(self.name, self.yearOfBirth,
+                                            self.emailAddress,
+                                            self.emailAddressPublic,
+                                            self.vatsimID, self.ivaoID,
+                                            self.phoneNumber, self.nationality,
+                                            self.password)
+        print "Registering with data:"
+        print "  name:", self.name, registrationData.name
+        print "  yearOfBirth:", self.yearOfBirth, registrationData.yearOfBirth
+        print "  emailAddress:", self.emailAddress, registrationData.emailAddress
+        print "  emailAddressPublic:", self.emailAddressPublic, registrationData.emailAddressPublic
+        print "  vatsimID:", self.vatsimID, registrationData.vatsimID
+        print "  ivaoID:", self.ivaoID, registrationData.ivaoID
+        print "  phoneNumber:", self.phoneNumber, registrationData.phoneNumber
+        print "  nationality:", self.nationality, registrationData.nationality
+
+        gui = self._wizard.gui
+        gui.beginBusy(xstr("register_busy"))
+        gui.webHandler.register(self._registerResultCallback, registrationData)
+
+    def _registerResultCallback(self, returned, result):
+        """Called when the registration result is available."""
+        gobject.idle_add(self._handleRegisterResult, returned, result)
+
+    def _handleRegisterResult(self, returned, result):
+        """Handle the registration result."""
+        gui = self._wizard.gui
+
+        gui.endBusy()
+
+        print "Registration result:"
+        print "  returned:", returned
+        if returned:
+            print "  registered:", result.registered
+            if result.registered:
+                print "  pilotID", result.pilotID
+                print "  loggedIn", result.loggedIn
+            print "  emailAlreadyRegistered:", result.emailAlreadyRegistered
+            print "  invalidData:", result.invalidData
+
+        registrationOK = returned and result.registered
+
+        message = xstr("register_ok") if registrationOK \
+                  else xstr("register_failed")
+        secondaryMessage = None
+        if registrationOK:
+            if result.loggedIn:
+                secondaryMessage = xstr("register_info") % (result.pilotID,)
+            else:
+                secondaryMessage = xstr("register_nologin") % (result.pilotID,)
+            messageType = MESSAGETYPE_INFO
+
+            config = gui.config
+            config.pilotID = result.pilotID
+            config.rememberPassword = self.rememberPassword
+            if config.rememberPassword:
+                config.password = self.password
+            else:
+                config.password = ""
+
+            config.save()
+        elif returned and result.emailAlreadyRegistered:
+            secondaryMessage = xstr("register_email_already")
+            messageType = MESSAGETYPE_ERROR
+        elif returned and result.invalidData:
+            secondaryMessage = xstr("register_invalid_data")
+            messageType = MESSAGETYPE_ERROR
+        else:
+            secondaryMessage = xstr("register_error")
+            messageType = MESSAGETYPE_ERROR
+
+        dialog = gtk.MessageDialog(parent = gui.mainWindow,
+                                   type = messageType,
+                                   message_format = message)
+        dialog.set_title(WINDOW_TITLE_BASE + " - " +
+                         xstr("register_result_title"))
+        dialog.format_secondary_markup(secondaryMessage)
+
+        dialog.add_button(xstr("button_ok"), 0)
+
+        dialog.run()
+        dialog.hide()
+
+        if registrationOK:
+            if result.loggedIn:
+                self._wizard.nextPage()
+            else:
+                self._wizard.jumpPage("login")
 
 #-----------------------------------------------------------------------------

src/mlx/rpc.py

@@ -125 +125 @@
 #---------------------------------------------------------------------------------------
 
+class Registration(object):
+    """Data for registration."""
+    def __init__(self, name, yearOfBirth, emailAddress, emailAddressPublic,
+                 vatsimID, ivaoID, phoneNumber, nationality, password):
+        """Construct the registration data."""
+        self.name = name
+        self.yearOfBirth = yearOfBirth
+        self.emailAddress = emailAddress
+        self.emailAddressPublic = 1 if emailAddressPublic is True else \
+          0 if emailAddressPublic is False else emailAddressPublic
+        self.vatsimID = "" if vatsimID is None else vatsimID
+        self.ivaoID = "" if ivaoID is None else ivaoID
+        self.phoneNumber = phoneNumber
+        self.nationality = nationality
+        self.password = password
+
+#---------------------------------------------------------------------------------------
+
 class RPCException(Exception):
     """An exception thrown by RPC operations."""
@@ -155 +173 @@
     RESULT_DATABASE_ERROR = 3
 
+    # Result code: invalid data
+    RESULT_INVALID_DATA = 4
+
     # Result code: the flight does not exist
     RESULT_FLIGHT_NOT_EXISTS = 101
@@ -160 +181 @@
     # Result code: the flight has already been reported.
     RESULT_FLIGHT_ALREADY_REPORTED = 102
+
+    # Result code: a user with the given e-mail address already exists
+    RESULT_EMAIL_ALREADY_REGISTERED = 103
 
     def __init__(self, getCredentialsFn):
@@ -189 +213 @@
         self._sessionID = None
 
+    def register(self, registrationData):
+        """Register with the given data.
+
+        Returns a tuple of:
+        - the error code,
+        - the PID if there is no error."""
+        reply = Reply(self._server.register(registrationData))
+
+        return (reply.result,
+                reply.value["pid"] if reply.result==Client.RESULT_OK else None)
+
     def login(self):
         """Login using the given previously set credentials.
@@ -194 +229 @@
         The session ID is stored in the object and used for later calls.
 
-        Returns a boolean indicating if login has succeeded."""
+        Returns the name of the pilot on success, or None on error."""
         self._sessionID = None
 

src/mlx/web.py

@@ -2 +2 @@
 import const
 import util
+from rpc import Registration
 import rpc
 import rpccommon
@@ -620 +621 @@
         super(RPCRequest, self).__init__(callback)
         self._client = client
+
+#------------------------------------------------------------------------------
+
+class Register(RPCRequest):
+    """A registration request."""
+    def __init__(self, client, callback, registrationData):
+        """Construct the request."""
+        super(Register, self).__init__(client, callback)
+        self._registrationData = registrationData
+
+    def run(self):
+        """Perform the registration."""
+
+        registrationData = self._registrationData
+
+        (resultCode, pilotID) = self._client.register(registrationData)
+        result = Result()
+        result.registered = resultCode==rpc.Client.RESULT_OK
+        if result.registered:
+            result.pilotID = pilotID
+
+            self._client.setCredentials(pilotID, registrationData.password)
+            loginResult = self._client.login()
+            result.loggedIn = loginResult is not None
+
+        result.invalidData = \
+          resultCode==rpc.Client.RESULT_INVALID_DATA
+        result.emailAlreadyRegistered = \
+          resultCode==rpc.Client.RESULT_EMAIL_ALREADY_REGISTERED
+
+        return result
 
 #------------------------------------------------------------------------------
@@ -1134 +1166 @@
             self._rpcClient.setCredentials(config.pilotID, config.password)
 
+    def register(self, callback, registrationData):
+        """Enqueue a registration request."""
+        self._addRequest(Register(self._rpcClient, callback, registrationData))
+
     def login(self, callback, pilotID, password, entranceExam = False):
         """Enqueue a login request."""