Changeset 1171

Timestamp:

Nov 18, 2010, 3:20:10 PM (13 years ago)

Author:

t.w.abma@…

Message:

• added add / modify to date template chooser
• added some JS to handle select boxes, when choosing study the study chooser dropdown disappears
• added encryption to select box, necessary to let the template add/remove popup work correctly
• added "encrypted" variable to Config, used by the date template dropdown

Location:

trunk/grails-app

Files:

• conf/Config.groovy (modified) (1 diff)
• controllers/dbnp/importer/ImporterController.groovy (modified) (5 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (1 diff)
• views/importer/common/_properties_horizontal.gsp (modified) (1 diff)
• views/importer/index_simple.gsp (modified) (4 diffs)

trunk/grails-app/conf/Config.groovy

@@ -187 +187 @@
                 // @see ImporterController
                 importableEntities: [
-                        event: [name: 'Event', entity: 'dbnp.studycapturing.Event'],
-                        sample: [name: 'Sample', entity: 'dbnp.studycapturing.Sample'],
-                        study: [name: 'Study', entity: 'dbnp.studycapturing.Study'],
-                        subject: [name: 'Subject', entity: 'dbnp.studycapturing.Subject'],
-                        samplingevent: [name: 'SamplingEvent', entity: 'dbnp.studycapturing.SamplingEvent']
+                        event: [name: 'Event', entity: 'dbnp.studycapturing.Event', encrypted:''],
+                        sample: [name: 'Sample', entity: 'dbnp.studycapturing.Sample', encrypted:''],
+                        study: [name: 'Study', entity: 'dbnp.studycapturing.Study', encrypted:''],
+                        subject: [name: 'Subject', entity: 'dbnp.studycapturing.Subject', encrypted:''],
+                        samplingevent: [name: 'SamplingEvent', entity: 'dbnp.studycapturing.SamplingEvent', encrypted:'']
 
                 ]

trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

@@ -29 +29 @@
 import grails.plugins.springsecurity.Secured
 
+import cr.co.arquetipos.crypto.Blowfish
+
 @Secured(['IS_AUTHENTICATED_REMEMBERED'])
 class ImporterController {
@@ -41 +43 @@
         // should do a check what is in the url, strip it?
         session.import_referer = params.redirectTo
+
+        grailsApplication.config.gscf.domain.importableEntities.each {            
+            it.value.encrypted = 
+                                Blowfish.encryptBase64(
+                                        it.value.entity.toString().replaceAll(/^class /, ''),
+                                        grailsApplication.config.crypto.shared.secret
+                                )
+        }
+
         render(view:"index_simple",
                model:[studies:Study.findAllWhere(owner:AuthenticationService.getLoggedInUser()),
@@ -81 +92 @@
         def wb = handleUpload('importfile')
         def selectedentities = []
-        def entity = grailsApplication.config.gscf.domain.importableEntities.get(params.entity).entity
-        def entityClass = Class.forName(entity, true, this.getClass().getClassLoader())
-
+        //def entity = grailsApplication.config.gscf.domain.importableEntities.get(params.entity).entity
+        def entityName = Blowfish.decryptBase64(
+                            params.entity,
+                            grailsApplication.config.crypto.shared.secret
+                         )
+
+        def entityClass = Class.forName(entityName, true, this.getClass().getClassLoader())
+        
         // Initialize some session variables
         session.importer_workbook = wb
         session.importer_study = Study.get(params.study.id.toInteger())
-        
+
         // Is the current logged in user allowed to write to this study?
         if (session.importer_study.canWrite(AuthenticationService.getLoggedInUser())) {
@@ -103 +119 @@
         
             // Initialize 'selected entities', used to show entities above the columns
-            session.importer_header.each {
-                selectedentities.add([name:params.entity, columnindex:it.key.toInteger()])
+            session.importer_header.each {                
+                selectedentities.add([name:entityName, columnindex:it.key.toInteger()])
             }
 
@@ -328 +344 @@
     * @return JSON object containing the found templates
     */
-    def ajaxGetTemplatesByEntity = {
-        def entityClass = grailsApplication.config.gscf.domain.importableEntities.get(params.entity).entity
-        
+    def ajaxGetTemplatesByEntity = {        
+        def entityName = Blowfish.decryptBase64(
+                        params.entity,
+                        grailsApplication.config.crypto.shared.secret
+                    )
+
+        //def entityClass = grailsApplication.config.gscf.domain.importableEntities.get(params.entity).entity
+        def entityClass = entityName
 
         // fetch all templates for a specific entity

trunk/grails-app/services/dbnp/importer/ImporterService.groovy

@@ -345 +345 @@
                                                break
                         case Event          :  break
-                        case Sample         :  break
+                        case Sample         :
+                                               break
                         case SamplingEvent  :  break
                         default             :  // unknown entity

trunk/grails-app/views/importer/common/_properties_horizontal.gsp

@@ -15 +15 @@
 <g:form name="propertiesform" action="saveProperties">
     <table>
-          <g:each var="stdentity" in ="${standardentities}">          
-              
-              <% if (selectedentities.any { it.name.toLowerCase() == stdentity.value.name.toLowerCase() } && stdentity.value.name!="") { %>
+          <g:each var="stdentity" in ="${standardentities}">            
+              <% if (selectedentities.any { it.name.toLowerCase() == stdentity.value.entity.toLowerCase() } && stdentity.value.entity!="") { %>
               <tr><td colspan="2"><h4>${stdentity.value.name}</h4></td></tr>          
                 <tr>
                 <g:each var="selentity" in="${selectedentities}">                   
-                    <g:if test="${selentity.name.toLowerCase()==stdentity.value.name.toLowerCase()}">
+                    <g:if test="${selentity.name.toLowerCase()==stdentity.value.entity.toLowerCase()}">
                             <td class="header" width="200px">
                                 <b>${header[selentity.columnindex.toInteger()].name}</b>

trunk/grails-app/views/importer/index_simple.gsp

@@ -35 +35 @@
     var items = data
 
-    // If a study has been selected, don't show the "Choose study" field, otherwise do
-    if ($('#'+'entity').val() == 'study')
+    // If a study has been selected, don't show the "Choose study" field, otherwise do    
+    if ($('#'+'entity :selected').text() == 'Study')
       $('#studyfield').hide();
     else $('#studyfield').show();
 
     // set the entity name for the data template chooser
-    //alert ( "das" + $('select[name=template_id]').attr('entity') )
+    //if ($('#'+'entity').val() == 'event')
 
     //$('select[name=template_id]').attr('entity', $('#'+'entity').val());
+    $('select[name=template_id]').attr('entity', $('#'+'entity').val());
+
 
     if (items) {
@@ -72 +74 @@
        rel     : 'typetemplate',
        url     : '/gscf/templateEditor',
-       vars    : 'thentity', // can be a comma separated list of variable names to pass on
+       vars    : 'entity', // can be a comma separated list of variable names to pass on
        label   : 'add / modify ...',
        style   : 'modify',
@@ -162 +164 @@
                 from="${entities}"              
                 optionValue="${{it.value.name}}"
-                optionKey="key"
+                optionKey="${{it.value.encrypted}}"
                 noSelection="['':'-Choose type of data-']"
                 onChange="${remoteFunction( controller: 'importer',
@@ -175 +177 @@
             </td>
             <td>
-                <g:select rel="typetemplate" entity="hoi" name="template_id" optionKey="id" optionValue="name" from="[]" />
+                <g:select rel="typetemplate" entity="none" name="template_id" optionKey="id" optionValue="name" from="[]" />
             </td>
         </tr>