Changeset 1511

Timestamp:

Feb 9, 2011, 8:55:29 PM (9 years ago)

Author:

t.w.abma@…

Message:

• added initial property manager (load/save import mappings) just in case

Location:

trunk

Files:

• grails-app/controllers/dbnp/importer/ImporterController.groovy (modified) (2 diffs)
• grails-app/taglib/dbnp/importer/ImporterTagLib.groovy (modified) (1 diff)
• grails-app/views/importer/common/_on_page.gsp (modified) (2 diffs)
• grails-app/views/importer/common/_propertiesManager.gsp (added)
• grails-app/views/importer/common/_properties_horizontal.gsp (modified) (2 diffs)
• web-app/css/importer.css (modified) (1 diff)

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

@@ -152 +152 @@
                         }
             on("refresh") {
+                if (params.savepropertymapping) println "saved properties"
                 flow.importer_fuzzymatching="true"
                                 success()
@@ -270 +271 @@
                 }
         }
+
+    def propertiesManager = {
+        render (view:"common/_propertiesManager")
+    }
 
         /**

trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy

@@ -18 +18 @@
 import org.dbnp.gdt.*
 
+import org.dbnp.gdt.*
+
 import org.apache.poi.ss.usermodel.Cell
 import org.apache.poi.ss.usermodel.DataFormatter

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

@@ -44 +44 @@
                 });
 
+         // attach event to apply fuzzy matching
          $('#fuzzymatchselect').click(function() {
             refreshFlow()
+          });
+
+          $('#savepropertiesbutton').click(function() {            
+            var width = 800
+            var height = 400
+
+            // 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,                
+                    width       : width,
+                    height      : height,
+                    modal       : true,
+                    position    : 'center',
+                    buttons     : {
+                                    Close  : function() { $(this).dialog('close'); }
+                                  },
+                    close       : function() {
+                                    //onClose(this);
+                                    refreshFlow()
+                                  }
+                }).width(width - 10).height(height)
+
           });
 
@@ -55 +82 @@
             $(this).val($('option:first', this).val());
             });
+          });
+
+          // attach change event function to prevent duplicate selection of properties
+          $('select[name^=columnproperty.index.]').each ( function() {
+          $(this).bind('change', function(e) {
+              //console.log($(this).val())
+              var selection = $(this)
+
+              $('select[name^=columnproperty.index.] option:selected').each ( function() {
+                var selector = $(this)
+
+                if (selection.attr('id') != selector.parent().attr('id') && (selection.val()!="dontimport"))
+                  if ($(this).val() == selection.val()) {
+                    selection.val($('option:first', selection).val());
+
+                    alert("Property is already set for an other column, please choose a different property.")
+                    return false
+                  }
+              });
+          });
           });
         }

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

@@ -14 +14 @@
          */
 %>
-<script type="text/javascript">
 
-// for each select field on the page
-$(document).ready(function() {
-
-$('select[name^=columnproperty.index.]').each ( function() {
-
-  $(this).bind('change', function(e) {
-      //console.log($(this).val())      
-      var selection = $(this)
-
-      $('select[name^=columnproperty.index.] option:selected').each ( function() {
-        var selector = $(this)
-        
-        if (selection.attr('id') != selector.parent().attr('id') && (selection.val()!="dontimport"))
-          if ($(this).val() == selection.val()) {
-            selection.val($('option:first', selection).val());
-
-            alert("Property is already set for an other column, please choose a different property.")
-            return false
-          }
-      });      
-   
-  });
- 
-});
-
-
-
-});
-</script>
 <!-- saveproperties action was defined in the form -->
     <table>
@@ -52 +22 @@
               <tr><td colspan="3"><h4>${stdentity.name}</h4></td></tr>
                 <tr>
-            <td class="header" width="25px"><input id="clearselect" type="button" value="Clear" name="clearselect">
-              <input id="fuzzymatchselect" type="button" value="Match" name="fuzzymatchselect">
+            <td class="header" width="25px">
+              <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"> -->
             </td>
             <g:each var="selentity" in="${importer_selectedentities}">

trunk/web-app/css/importer.css

@@ -20 +20 @@
 .selectsmall {
     font-size: 10px;
+}
+
+.buttonsmall {
+    font-size: 10px;    
 }