- 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

4 files changed, 55 insertions, 28 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 = ''
diff --git a/tools/mmd/MmdSession.py b/tools/mmd/MmdSession.py
index 93c0a63..d5bf96e 100644
--- a/tools/mmd/MmdSession.py
+++ b/tools/mmd/MmdSession.py
@@ -22,6 +22,7 @@ class Session:
     self.db = Db ()
     self.user = User ()
     self.satellite = Satellite ()
+    self.message = ''
     s = self.db.sessionFind (session_id)
     if not s:
       now = int (time.strftime ('%s'))
diff --git a/tools/mmd/MmdWidgets.py b/tools/mmd/MmdWidgets.py
index 02f1bef..37a3245 100644
--- a/tools/mmd/MmdWidgets.py
+++ b/tools/mmd/MmdWidgets.py
@@ -456,7 +456,7 @@ def indexWidget (rcol, lcol, status, debug_info = False):
    {2}
   </div>
   <div id="dev">
-   Development version!  Tracking <a href="http://www.arissat1.org/v3/">ARISSAT-1</a> for now ;)
+   Development version.  Kindly ignore everything below this line.
   </div>
    {3}
  </body>
@@ -465,6 +465,26 @@ def indexWidget (rcol, lcol, status, debug_info = False):
 
   return html
 
+def menuWidget (session):
+  html = '''
+   <div id="menu">
+    <div>
+     <a href="?cmd=submitForm">Submit</a> a report
+    </div>
+    <div>
+     View <a href="?cmd=viewlog">Log</a> of reports
+    </div>
+    <div>
+     Checkout the <a href="http://sat.mur.at/">project page</a>
+    </div>
+    <div>
+     {0}
+    </div>
+   </div>
+  '''.format (session.message)
+
+  return html
+
 def dataWidget (session):
   timestamp, longitude, latitude = session.satellite.getCurrentSSP ()
 
diff --git a/tools/mmd/mmd.css b/tools/mmd/mmd.css
index 9e85f3a..dcce983 100644
--- a/tools/mmd/mmd.css
+++ b/tools/mmd/mmd.css
@@ -47,7 +47,7 @@ html.tracker
     margin: 1px;
     padding: 0;
     float: left;
-    border: 1px solid black;
+    border: 0px solid black;
 }
 
 #osm
@@ -66,11 +66,11 @@ html.tracker
     background-color: white;
 }
 
-#datahead
+#menu
 {
-    font: 14pt courier, monospace;
-    background: white;
-    color: black;
+    font: 12pt arial, sans-serif;
+    background: auto;
+    color: white;
 }
 
 #status