Changeset 1514

Timestamp:

10-02-11 16:30:16 (4 years ago)

Author:

t.w.abma@…

Message:

- removed popup solution for properties and changed it into simple "save" method to step 2 of importer wizard

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (2 diffs)
• views/importer/common/_on_page.gsp (modified) (3 diffs)
• views/importer/common/_properties_horizontal.gsp (modified) (2 diffs)

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

@@ -152 +152 @@
                         }
             on("refresh") {
-                if (params.savepropertymapping) println "saved properties"
+                // a name was given to the current property mapping, try to store it
+                if (params.mappingname) {
+                    flash['mappingname'] = params.mappingname
+                    propertiesSaveImportMappingPage(flow, flash, params)
+                }
                 flow.importer_fuzzymatching="true"
                                 success()
@@ -365 +369 @@
         return false
         }
+
+    /**
+     * Save the properties as an import mapping.
+     *
+     * @param Map LocalAttributeMap (the flow scope)
+         * @param Map GrailsParameterMap (the flow parameters = form data)
+         * @returns boolean true if correctly validated, otherwise false
+         */
+    boolean propertiesSaveImportMappingPage(flow, flash, params) {
+        flash.wizardErrors = [:]
+
+                // Find actual Template object from the chosen template name
+                def template = Template.get(flow.importer_template_id)
+        //def im = new ImportMapping(name:params.mappingname).save()
+
+                params.columnproperty.index.each { columnindex, property ->
+                        // Create an actual class instance of the selected entity with the selected template
+                        // This should be inside the closure because in some cases in the advanced importer, the fields can have different target entities
+                        def entityClass = Class.forName(flow.importer_header[columnindex.toInteger()].entity.getName(), true, this.getClass().getClassLoader())
+                        def entityObj = entityClass.newInstance(template: template)
+            def dontimport = (property == "dontimport") ? true : false
+
+            def mc = new MappingColumn (property:property, templatefieldtype:entityObj.giveFieldType(property), dontimport: dontimport )
+
+                        // Store the selected property for this column into the column map for the ImporterService
+                        /*flow.importer_header[columnindex.toInteger()].property = property
+
+                        // Look up the template field type of the target TemplateField and store it also in the map
+                        flow.importer_header[columnindex.toInteger()].templatefieldtype = entityObj.giveFieldType(property)
+
+                        // Is a "Don't import" property assigned to the column?
+                        flow.importer_header[columnindex.toInteger()].dontimport = (property == "dontimport") ? true : false
+
+                        //if it's an identifier set the mapping column true or false
+                        entityObj.giveFields().each {
+                                (it.preferredIdentifier && (it.name == property)) ? flow.importer_header[columnindex.toInteger()].identifier = true : false
+                        }*/
+                }
+    }
 
         /**

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

@@ -49 +49 @@
           });
 
-          $('#savepropertiesbutton').click(function() {            
-            var width = 800
-            var height = 400
+          $('#savepropertiesbutton').click(function() {
+            var width = 500
+            var height = 200
+            var vars = ""
+
+            $("#savemapping").toggle("scale")
+
+            if ($("#mappingname").val()) refreshFlow();
 
             // get all properties
             //$('select[name^=columnproperty.index.]').each ( function() {
-            //}
+            //}           
             
-            $('<iframe frameborder="0" src="' + baseUrl + "/importer/propertiesManager" + '" sanbox="allow-same-origin" seamless />').dialog({
-                    title       : "Properties manager",                    
-                    autoOpen    : true,                
+            /*$('#propertiesManager').dialog({
+                    title       : "Properties manager",
+                    autoOpen    : true,
                     width       : width,
+                    vars        : vars,
                     height      : height,
                     modal       : true,
                     position    : 'center',
                     buttons     : {
-                                    Close  : function() { $(this).dialog('close'); }
+                                    Save  : function() {
+                                                          //alert($(this).parent().$('input[name="mappingname"]').val())
+                                                          alert($(this))
+                                                          var p = $(this).parent().parent().parent()
+                                                          console.log(p.('input[name="mappingname"]').val())
+                                                          //alert(vars)
+                                                          $(this).dialog('close'); }
                                   },
                     close       : function() {
@@ -72 +84 @@
                                   }
                 }).width(width - 10).height(height)
+              */
 
           });
@@ -165 +178 @@
 
 </script>
-

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

@@ -15 +15 @@
 %>
 
+
 <!-- saveproperties action was defined in the form -->
+  ${flash.mappingname}
     <table>
           <g:each var="stdentity" in ="${GdtService.cachedEntities}">
@@ -22 +24 @@
               <tr><td colspan="3"><h4>${stdentity.name}</h4></td></tr>
                 <tr>
-            <td class="header" width="25px">
+            <td class="header" width="55px">
               <input class="buttonsmall" id="clearselect" type="button" value="Clear" name="clearselect">
               <input class="buttonsmall" id="fuzzymatchselect" type="button" value="Match" name="fuzzymatchselect">
-              <!-- <input class="buttonsmall" id="savepropertiesbutton" type="button" value="Save" name="savepropertiesbutton"> -->
+              <input class="buttonsmall" id="savepropertiesbutton" type="button" value="Save" name="savepropertiesbutton">
+              <div id="savemapping" style="display:none">
+                Give current mapping a name and press Save:
+                <input type="text" name="mappingname" size="20" id="mappingname">
+              </div>
             </td>
             <g:each var="selentity" in="${importer_selectedentities}">