Changeset 8507

Timestamp:

10/08/12 15:32:06 (9 years ago)

Author:

mnagni

Message:

Incomplete - # 22534: Add versiojn number to the gui page
 http://team.ceda.ac.uk/trac/ceda/ticket/22534

Location:

mauRepo/MolesManager/trunk

Files:

• cedaMoles/MolesManager/molesSessionMiddleware.py (modified) (3 diffs)
• cedaMoles/MolesManager/static/templates/base.html (modified) (1 diff)
• cedaMoles/MolesManager/views/cedaObservationView.py (modified) (2 diffs)
• cedaMoles/MolesManager/views/cedaSearch.py (modified) (2 diffs)
• cedaMoles/MolesManager/views/moles2gui/__init__.py (modified) (3 diffs)
• docs/source/src/index.rst (modified) (1 diff)

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/molesSessionMiddleware.py

@@ -42 +42 @@
 from django.core.context_processors import csrf
 from django.shortcuts import render_to_response
+from cedaMoles import __version__
 
 
@@ -89 +90 @@
     def process_response(self, request, response):
         if hasattr(request, "moles3EPB"):            
-            request.moles3EPB.close()
-            
+            request.moles3EPB.close()            
         return response
 
@@ -102 +102 @@
     if runMigration and not MolesSessionMiddleware._migrationThread.isAlive():
         #t.setDaemon(False)
-        MolesSessionMiddleware._migrationThread.start()        
+        MolesSessionMiddleware._migrationThread.start()    
+        
+
+def mm_render_to_response(request, context, page_to_render):
+    """
+    Exploit a 'render_to_response' action. The advantage of this method
+    is to contains a number of operations that are expected to be  called
+    for each page rendering, for example passing the application version number
+     
+    **Parameters**            
+        * HttpRequest_ **request**
+            a django HttpRequest instance       
+        * `dict` **context**
+            a dictionary where to pass parameter to the rendering function   
+        * `string` **page_to_render**
+            the html page to render                         
+    """
+    if context is None or not isinstance(context, dict):
+        raise Exception("Cannot render an empty context")
+    
+    context['version'] = __version__
+    context.update(csrf(request))
+    return render_to_response(page_to_render, context)            

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/templates/base.html

@@ -149 +149 @@
                         </div> <!-- End div footerLogos-->
                         <div class="grid_6 push_3 whiteFill omega" id="footerStatements">
-                                <p>Copyright &copy; 2011 STFC&nbsp;&nbsp;|&nbsp;&nbsp;All Rights Reserved</p>
+                                <p>Copyright &copy; 2011 STFC&nbsp;&nbsp;|&nbsp;&nbsp;All Rights Reserved - Version {{ version }} </p>
           
                                 <p class="credits">Based on 960.gs with design elements from <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a> </p>

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaObservationView.py

@@ -36 +36 @@
 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation
 from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json
+from cedaMoles.MolesManager.molesSessionMiddleware import mm_render_to_response
 
 
@@ -50 +51 @@
     
 def _finalizeResponse(request, record):
-    c = {}
+    context = {}
     if record:
-        c['coObs'] = encodeToJSON(record)
+        context['coObs'] = encodeToJSON(record)
         
-        #c['new_coObs'] = encodeCedaMoles2Json(record)
+        context['new_coObs'] = encodeCedaMoles2Json(record)
         
         guid = request.moles3EPB.retrieveGUIDFromInstance(record)
         if guid:
-            c['guid'] = guid.id
-            print c['guid']
-        print c['coObs'] 
-    
-    c.update(csrf(request))
-    return render_to_response('cedaObservation.html', c)
+            context['guid'] = guid.id
+            print context['guid']
+        print context['coObs'] 
+        
+    return mm_render_to_response(request, 'cedaObservation.html', context)
 
 def _getCedaObservation(request, obs_id):    

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaSearch.py

@@ -9 +9 @@
 import cedaObservationView
 import cedaObservationCollectionView
+from cedaMoles.MolesManager.molesSessionMiddleware import mm_render_to_response
 
 def getResponseByGuid(request, guid):
@@ -48 +49 @@
 
 def coSearch(request):
-    c = {}    
+    context = {}    
     if 'searchTerm' in request.POST:
-        c['searchResults'] = __doSearch(request, request.POST['searchTerm'])
+        context['searchResults'] = __doSearch(request, request.POST['searchTerm'])
             
-    c.update(csrf(request))
-    if c == {} :
-        return render_to_response('cedaObservation.html', c)  
+    context.update(csrf(request))
+    if context == {} :
+        return render_to_response('cedaObservation.html', context)  
     else :
         found = False
     try:
-        a = c['searchResults']
+        a = context['searchResults']
         found = True
     except Exception, ex:
         pass
     if not found:
-            return render_to_response('cedaSearch.html', c)
-    return render_to_response('cedaSearchResults.html', c)
+            return mm_render_to_response(request, context, 'cedaSearch.html')
+    return mm_render_to_response(request, context, 'cedaSearchResults.html')

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/__init__.py

@@ -95 +95 @@
         if type(cedaObject) in cls.acceptedTypes:       
             for item in cls.mapper.items():
-                setattr(instance, item[0], getData(cedaObject, item[1]))
+                if item[0] == 'resultTime' and item[1] == 'resultTime':
+                    print item[0]
+                try:                        
+                    setattr(instance, item[0], getData(cedaObject, item[1]))
+                except Exception as e:
+                    print e
 
     @classmethod
@@ -146 +151 @@
         setattr(adapter, '_adapter_module', adapter.__module__)        
         setattr(adapter, '_adapter_clazz', adapter.__class__.__name__)
-            
         cls._cedaObjToAdapterMapping(adapter, cedaObject)
         adapter.postCedaObjToAdapterMapping(cedaObject)
@@ -318 +322 @@
         encoder = dynamicallyLoadClass(module, clazz)
         return encoder.cedaObjToAdapter(cedaObj)
+
     
     # Then is a non mapped class

mauRepo/MolesManager/trunk/docs/source/src/index.rst

@@ -2 +2 @@
 Ceda Moles3 API
 ===============
+.. _HttpRequest: https://docs.djangoproject.com/en/dev/ref/request-response/#django.http.HttpRequest
 
 .. toctree::