added: Delete columns in DataTable

fixed: Now more than one DataTable can be on a page

docs/changelog/7.x.x.txt

@@ -10,6 +10,8 @@
    not be imported, only the surveys themselves.
  - fixed #9028: Thingy fails when setting values containing single quotes
  - fixed #9047: Unable to reorder DataForm tabs
+ - added: Delete columns from DataTable
+ - fixed: Now more than one DataTable can be put on a page
 
 7.6.2
  - fixed: not allowed to add calendar events if in can edit group but not can add event group

lib/WebGUI/Asset/Wobject/DataTable.pm

@@ -220,7 +220,7 @@ sub prepareView {
     # TODO Use a WebGUI::DataSource
     my $dt = WebGUI::Form::DataTable->new(
         $session, {
-            name         => "data",
+            name         => $self->getId,
             value        => $self->get('data'),
             defaultValue => undef,
         }

lib/WebGUI/Form/DataTable.pm

@@ -161,7 +161,7 @@ sub getDataTableHtml {
     # Progressively enhance the bejesus out of it
     $html .= <<"ENDJS";
         <script type="text/javascript">
-            var myDataTable = WebGUI.Form.DataTable( "$id-container", $columnsJson, $optionsJson );
+            new WebGUI.Form.DataTable( "$id-container", $columnsJson, $optionsJson );
         </script>
 ENDJS
 

lib/WebGUI/i18n/English/Form_DataTable.pm

@@ -68,6 +68,12 @@ our $I18N = {
         context     => q{Format for a column with numbers},
     },
 
+    "format date" => {
+        message     => q{Date},
+        lastUpdated => 0,
+        context     => q{Format for a column with a date},
+    },
+
     "add column" => {
         message     => q{Add Column},
         lastUpdated => 0,
@@ -127,6 +133,12 @@ our $I18N = {
         lastUpdated => 0,
         context     => q{How to reorder columns. Shown in the help pop-up},
     },
+
+    "delete column" => {
+        message     => q{Delete},
+        lastUpdated => 0,
+        context     => q{Button to delete a column, shown in the Edit Schema dialog},
+    },
 };
 
 1;

www/extras/yui-webgui/build/form/datatable.js

@@ -322,10 +322,12 @@ WebGUI.Form.DataTable
                     "help",
                     "edit schema",
                     "delete confirm",
+                    "delete column",
                     "format text",
                     "format email",
                     "format link",
                     "format number",
+                    "format date",
                     "add column",
                     "cancel",
                     "ok",
@@ -346,7 +348,7 @@ WebGUI.Form.DataTable
         } );
     };
     // Run this automatically
-    YAHOO.util.Event.onDOMReady( this.initI18N, undefined, this );
+    YAHOO.util.Event.onContentReady( this.containerId, this.initI18N, undefined, this );
 
     /************************************************************************
      * showHelp ( event )
@@ -382,58 +384,144 @@ WebGUI.Form.DataTable
      */
     this.showSchemaDialog
     = function ( e ) {
-        var dg  = new YAHOO.widget.Dialog( "editSchemaDialog", {
-            modal           : true,
-            fixedcenter     : true
-        });
-        dg.setHeader( this.i18n.get( "Form_DataTable", "edit schema" ) );
         
-        var body    = '<form>';
+        // Function to remove a column
-        var cols    = this.dataTable.getColumnSet().keys;
+        var removeColumn = function ( e, colId ) {
-        for ( var i = 0; i < cols.length; i++ ) {
+            var form    = this.element.getElementsByTagName( "form" )[0];
-            body = body
+            // Add to deleteCols
-                + '<input name="oldKey_' + i + '" type="hidden" value="' + cols[ i ].key + '" />'
+            var deleteCols  = YAHOO.lang.JSON.parse( form.elements[ "deleteCols" ].value );
-                + '<input name="newKey_' + i + '" value="' + cols[ i ].key + '"/>'
+            deleteCols.push( form.elements[ "oldKey_" + colId ].value );
-                + '<select name="format_' + i + '">'
+            form.elements[ "deleteCols" ].value 
-                + '<option value="text"' + ( cols[ i ].formatter == "text" ? ' selected="selected"' : '' ) + '>' 
+                = YAHOO.lang.JSON.stringify( deleteCols );
-                + this.i18n.get( "Form_DataTable", "format text" ) + '</option>'
+            // Remove column from dialog
-                + '<option value="number"' + ( cols[ i ].formatter == "number" ? ' selected="selected"' : '' ) + '>'
+            var div = document.getElementById( "col_" + colId );
-                + this.i18n.get( "Form_DataTable", "format number" ) + '</option>'
+            div.parentNode.removeChild( div );
-                + '<option value="link"' + ( cols[ i ].formatter == "link" ? ' selected="selected"' : '' ) + '>' 
+        };
-                + this.i18n.get( "Form_DataTable", "format link" ) + '</option>'
-                + '<option value="email"' + ( cols[ i ].formatter == "email" ? ' selected="selected"' : '' ) + '>' 
-                + this.i18n.get( "Form_DataTable", "format email" ) + '</option>'
-                + '</select><br/>'
-        }
-        body        += '</form>';
-        dg.setBody( body );
 
         // Function to add a column
         var addColumn   = function ( e ) {
             // this is the dialog
             var form    = this.element.getElementsByTagName( "form" )[0];
 
+            // Find the last indexed column
             var newIdx  = 0;
             while ( form.elements[ "oldKey_" + newIdx ] ) { newIdx++; }
             
+            var div     = document.createElement( "div" );
+            div.id      = "col_" + newIdx;
+            
+            var button  = form.elements[ "removeColumn_" + (newIdx - 1) ].cloneNode(true);
+            button.id   = "removeColumn_" + newIdx;
+            var del     = new YAHOO.widget.Button( "removeColumn_" + newIdx, {
+                    type        : "push",
+                    container   : div,
+                    onclick     : {
+                        fn          : function () { removeColumn( i ) },
+                        scope       : this
+                    }
+            } );
+
             var oldKey  = form.elements[ "oldKey_" + (newIdx - 1) ].cloneNode(true); 
             oldKey.name     = "oldKey_" + newIdx;
             oldKey.value    = "";
-            form.appendChild( oldKey );
+            div.appendChild( oldKey );
 
             var newKey  = form.elements[ "newKey_" + (newIdx - 1) ].cloneNode(true); 
             newKey.name     = "newKey_" + newIdx;
             newKey.value    = "New Column " + newIdx;
-            form.appendChild( newKey );
+            div.appendChild( newKey );
 
             var format  = form.elements[ "format_" + (newIdx - 1) ].cloneNode(true); 
             format.name             = "format_" + newIdx;
             format.selectedIndex    = 0;
-            form.appendChild( format );
+            div.appendChild( format );
 
-            form.appendChild( document.createElement( "br" ) );
+            form.appendChild( div );
         };
         
+        var dg  = new YAHOO.widget.Dialog( "editSchemaDialog", {
+            modal           : true,
+            fixedcenter     : true
+        });
+        dg.setHeader( this.i18n.get( "Form_DataTable", "edit schema" ) );
+
+        var body    = document.createElement( 'form' );
+        var cols    = this.dataTable.getColumnSet().keys;
+        for ( var i = 0; i < cols.length; i++ ) {
+            //TODO: Refactor this to be a function, like addColumn above
+            var div = document.createElement( 'div' );
+            div.className   = "yui-skin-sam";
+            div.id          = "col_" + i;
+
+            var del     = new YAHOO.widget.Button( {
+                    type        : "push",
+                    label       : this.i18n.get( "Form_DataTable", "delete column" ),
+                    container   : div,
+                    onclick     : {
+                        fn          : removeColumn,
+                        obj         : i,
+                        scope       : dg
+                    }
+            } );
+
+            var oldKey  = document.createElement( "input" );
+            oldKey.type     = "hidden";
+            oldKey.name     = "oldKey_" + i;
+            oldKey.value    = cols[i].key;
+            div.appendChild( oldKey );
+
+            var newKey  = document.createElement( "input" );
+            newKey.type     = "text";
+            newKey.name     = "newKey_" + i;
+            newKey.value    = cols[i].key;
+            div.appendChild( newKey );
+
+            var format  = document.createElement('select');
+            format.name             = "format_" + i;
+            var availableFormats    = [
+                { 
+                    "value" : "text",
+                    "label" : this.i18n.get( "Form_DataTable", "format text" ) 
+                },
+                {
+                    "value" : "number",
+                    "label" : this.i18n.get( "Form_DataTable", "format number" ) 
+                },
+                {
+                    "value" : "email",
+                    "label" : this.i18n.get( "Form_DataTable", "format email" ) 
+                },
+                {
+                    "value" : "link", 
+                    "label" : this.i18n.get( "Form_DataTable", "format link" ) 
+                },
+                {
+                    "value" : "date", 
+                    "label" : this.i18n.get( "Form_DataTable", "format date" ) 
+                }
+            ];
+            for ( var x = 0; x < availableFormats.length; x++ ) {
+                var opt = new Option(
+                    availableFormats[x].label, 
+                    availableFormats[x].value,
+                    cols[i].formatter == availableFormats[x].value
+                );
+                format.appendChild( opt );
+            }
+            div.appendChild( format );
+
+            body.appendChild( div );
+        }
+
+        // Columns to delete
+        var deleteCols = document.createElement( "input" );
+        deleteCols.type = "hidden";
+        deleteCols.name = "deleteCols";
+        deleteCols.value = "[]";
+        body.appendChild( deleteCols );
+
+        dg.setBody( body );
+        
         dg.cfg.queueProperty( "buttons", [ 
             { text: this.i18n.get( "Form_DataTable", "add column" ), handler: addColumn },
             { text: this.i18n.get( "Form_DataTable", "cancel" ), handler: { fn: this.hideSchemaDialog, scope: this } },
@@ -520,8 +608,17 @@ WebGUI.Form.DataTable
      */
     this.updateSchema
     = function () {
-        var i       = 0;
+        var data        = this.schemaDialog.getData();
-        var data    = this.schemaDialog.getData();
+        
+        // First delete columns
+        var deleteCols  = YAHOO.lang.JSON.parse( data[ "deleteCols" ] );
+        for ( var x = 0; x < deleteCols.length; x++ ) {
+            var col = this.dataTable.getColumn( deleteCols[x] ); 
+            this.dataTable.removeColumn( col );
+        }
+
+        // Update columns
+        var i           = 0;
         while ( data[ "newKey_" + i ] ) {
             var oldKey  = data[ "oldKey_" + i ];
             var newKey  = data[ "newKey_" + i ];

www/extras/yui-webgui/build/i18n/i18n.js

@@ -43,7 +43,10 @@ YAHOO.lang.augmentProto( WebGUI.i18n, YAHOO.util.EventProvider );
 WebGUI.i18n.prototype.get
 = function ( ns, key ) {
     if ( typeof this.namespaces[ ns ][ key ] == "undefined" ) {
-        this.load( ns, [ key ] );
+        var obj = {};
+        obj[ns] = [ key ];
+        this.load( obj );
+        // TODO: Return placeholder that will get auto-updated
     }
     return this.namespaces[ ns ][ key ];
 };