- fixed error when trying to register a known user/email

- rearranged layout
- dropped dataWidget


git-svn-id: https://svn.spreadspace.org/mur.sat@221 7de4ea59-55d0-425e-a1af-a3118ea81d4c

1 files changed, 28 insertions, 22 deletions

diff --git a/tools/mmd/MmdCommands.py b/tools/mmd/MmdCommands.py
index 03edb4b..2b5db42 100644
--- a/tools/mmd/MmdCommands.py
+++ b/tools/mmd/MmdCommands.py
@@ -10,31 +10,33 @@ def loginForm (session):
   """
   display the login form
   """
-  return indexWidget (dataWidget (session), loginFormWidget (), statusWidget (session), session)
+  return indexWidget (menuWidget (session), loginFormWidget (), statusWidget (session), session)
 
 def login (session):
   """
   evaluate data from loginForm
   """
   if not session.user.load (session.getQsEmail ()):
-    error_message = {'error': 'Login', 'description': 'Login failed.'}
-    return indexWidget (dataWidget (session), errorWidget (error_message), statusWidget (session), session)
+    session.message = 'Login failed (E013).'
+    return indexWidget (menuWidget (session), osmWidget (session), statusWidget (session), session)
   if not session.user.checkPassword (session.getQsPassword ()):
-    error_message = {'error': 'Login', 'description': 'Login failed.'}
-    return indexWidget (dataWidget (session), errorWidget (error_message), statusWidget (session), session)
+    session.message = 'Login failed (E113).'
+    return indexWidget (menuWidget (session), osmWidget (session), statusWidget (session), session)
   session.setStatus ('auth')
-  return indexWidget (dataWidget (session), loginWidget (session.user), statusWidget (session), session)
+  session.message = 'Welcome {0} {1}!'.format (session.user.firstname, session.user.lastname)
+  return indexWidget (menuWidget (session), osmWidget (session), statusWidget (session), session)
 
 def logout (session):
   session.user.email = 'Anonymous'
   session.setStatus ()
-  return indexWidget (dataWidget (session), logoutWidget (), statusWidget (session), session)
+  session.message = 'You have logged out successfully.'
+  return indexWidget (menuWidget (session), osmWidget (session), statusWidget (session), session)
 
 def registerForm (session):
   """
   display the register form
   """
-  return indexWidget (dataWidget (session), registerFormWidget (), statusWidget (session), session)
+  return indexWidget (menuWidget (session), registerFormWidget (), statusWidget (session), session)
 
 def register (session):
   """
@@ -53,11 +55,15 @@ def register (session):
 
   if password != confirm:
     error_message = {'error': 'Password', 'description': 'Passwords do not match.'}
-    return indexWidget (dataWidget (session), errorWidget (error_message), statusWidget (session), session)
+    return indexWidget (menuWidget (session), errorWidget (error_message), statusWidget (session), session)
 
   user = User ()
   code = user.create (session.session_id, firstname, lastname, email, callsign, password)
 
+  if not code:
+    error_message = {'error': 'Register', 'description': 'Registration failed.'}
+    return indexWidget (menuWidget (session), errorWidget (error_message), statusWidget (session), session)
+
   if longitude != '' and latitude != '' and location_name != '':
     user.addLocation (location_name, longitude, latitude, altitude, 'yes')
 
@@ -80,64 +86,64 @@ MURSAT1 team
 
   if not user.sendEmail (message):
     error_message = {'error': 'Email', 'description': 'Email could not be sent.'}
-    return indexWidget (dataWidget (session), errorWidget (error_message), statusWidget (session), session)
+    return indexWidget (menuWidget (session), errorWidget (error_message), statusWidget (session), session)
 
-  return indexWidget (dataWidget (session), registerWidget (), statusWidget (session), session)
+  return indexWidget (menuWidget (session), registerWidget (), statusWidget (session), session)
 
 def completeRegistration (session):
   code = session.getQsCode ()
   if not session.user.findPending (code):
     error_message = {'error': 'Registration', 'description': 'Registration Failed.'}
-    return indexWidget (dataWidget (session), errorWidget (error_message), statusWidget (session), session)
-  return indexWidget (dataWidget (session), completeRegistrationWidget (code), statusWidget (session), session)
+    return indexWidget (menuWidget (session), errorWidget (error_message), statusWidget (session), session)
+  return indexWidget (menuWidget (session), completeRegistrationWidget (code), statusWidget (session), session)
 
 def confirmRegistration (session):
   code = session.getQsCode ()
   if not session.user.findPending (code):
     error_message = {'error': 'Registration', 'description': 'Registration Failed.'}
-    return indexWidget (dataWidget (session), errorWidget (error_message), statusWidget (session), session)
+    return indexWidget (menuWidget (session), errorWidget (error_message), statusWidget (session), session)
   session.user.confirm (code)
   session.setStatus ('auth')
-  return indexWidget (dataWidget (session), confirmRegistrationWidget (session.user), statusWidget (session), session)
+  return indexWidget (menuWidget (session), confirmRegistrationWidget (session.user), statusWidget (session), session)
 
 def cancelRegistration (session):
   code = session.getQsCode ()
   if not session.user.findPending (code):
     error_message = {'error': 'Registration', 'description': 'Canceling failed.'}
-    return indexWidget (dataWidget (session), errorWidget (error_message), statusWidget (session), session)
+    return indexWidget (menuWidget (session), errorWidget (error_message), statusWidget (session), session)
   session.user.cancel (code)
-  return indexWidget (dataWidget (session), cancelRegistrationWidget (), statusWidget (session), session)
+  return indexWidget (menuWidget (session), cancelRegistrationWidget (), statusWidget (session), session)
 
 def mmdCredits (session):
   '''
   display a page with credits/thanks
   '''
-  return indexWidget (dataWidget (session), creditsWidget (), statusWidget (session))
+  return indexWidget (menuWidget (session), creditsWidget (), statusWidget (session))
 
 def submitForm (session):
   """
   display the form for data submission
   """
-  return indexWidget (dataWidget (session), submitFormWidget (), statusWidget (session), session)
+  return indexWidget (menuWidget (session), submitFormWidget (), statusWidget (session), session)
 
 def submit (session):
   """
   evaluate data from submitForm
   """
-  return indexWidget (dataWidget (session), submitWidget (), statusWidget (session), session)
+  return indexWidget (menuWidget (session), submitWidget (), statusWidget (session), session)
 
 def viewlog (session):
   """
   show latest log entries/submissions
   """
-  return indexWidget (dataWidget (session), logWidget (), statusWidget (session), session)
+  return indexWidget (menuWidget (session), logWidget (), statusWidget (session), session)
 
 def index (session):
   """
   display the index page
   """
   satellite = {'longitude': 15.4426, 'latitude': 47.06576}
-  return indexWidget (dataWidget (session), osmWidget (session), statusWidget (session), session)
+  return indexWidget (menuWidget (session), osmWidget (session), statusWidget (session), session)
 
 def mmdtest (env, cookie):
   body = ''