Changeset 4 for trunk/web-app

Timestamp:

Jan 17, 2011, 3:49:20 PM (12 years ago)

Author:

robert@…

Message:

Implemented trash in order to prevent deletion of data

Location:

trunk/web-app

Files:

• css/metagenomics.css (modified) (1 diff)
• images/icons (deleted)
• js/assay.show.runDialogs.js (modified) (2 diffs)
• js/assay.show.showRunDialog.js (modified) (1 diff)
• js/assay.show.showSampleDialog.js (modified) (1 diff)
• js/paginate.js (modified) (1 diff)
• js/trash.js (added)

trunk/web-app/css/metagenomics.css

@@ -473 +473 @@
     display: none;
 }
+
+.disabled { 
+        opacity: 0.5;
+        -moz-opacity:0.5;
+        -khtml-opacity:0.5;
+        filter:alpha(opacity=50);
+}
+
+.ui-dialog a:link, .ui-dialog a:visited, .ui-dialog a:hover {
+        color: #006dba;
+        text-decoration: none;
+}

trunk/web-app/js/assay.show.runDialogs.js

@@ -42 +42 @@
         
         // Initialize date picker for add run dialog
-        $( "#run_date, #edit_run_date" ).datepicker({
+        $( "#run_date" ).datepicker({
                 changeMonth: true,
                 changeYear: true,
@@ -66 +66 @@
  */
 function showEditRunDialog(id, name, date, machine, supplier, parameterFile) {
-        $( '#edit_run_id' ).val( id );
-        
-        $( '#edit_run_name' ).val( name );
-        $( '#edit_run_date' ).val( date );
-        $( '#edit_run_machine' ).val( machine );
-        $( '#edit_run_supplier' ).val( supplier );
-        
-        editFile( 'editParameterFile', parameterFile)
-        $( "#editRunDialog" ).dialog( "open" );
+        $( "#editRunDialog" ).load( baseUrl + "/run/editForm/" + id + "?assayId=" + assayId, [], function() {
+                // Initialize date picker for add run dialog
+                $( "#edit_run_date" ).datepicker({
+                        changeMonth: true,
+                        changeYear: true,
+                        dateFormat: 'yy-mm-dd'
+                });     
+                
+                $( "#editRunDialog" ).dialog( "open" );
+        } );
 }
 

trunk/web-app/js/assay.show.showRunDialog.js

@@ -15 +15 @@
  */
 function showRun( id ) {
-        $( '#showRunDialog div.showRun' ).hide()
-        $( '#showRunDialog div#showRun_' + id ).show()
-        
-        var titleEl = $( '#showRunDialog div#showRun_' + id + ' h2' ).first();
-        titleEl.hide();
-        $( "#showRunDialog" ).dialog( "option", "title", "Run " + titleEl.text() );
-        $( "#showRunDialog" ).dialog( "open" );
+        $( "#showRunDialog" ).load( baseUrl + "/run/show/" + id + "?assayId=" + assayId, [], function() {
+                var titleEl = $( '#showRunDialog h2' ).first();
+                titleEl.hide();
+                
+                initializeUploadedFiles( '#showRunDialog' );
+                initializePagination( '#showRunDialog' );
+                                
+                $( "#showRunDialog" ).dialog( "option", "title", "Run " + titleEl.text() );
+                $( "#showRunDialog" ).dialog( "open" );
+        } );
 }

trunk/web-app/js/assay.show.showSampleDialog.js

@@ -15 +15 @@
  */
 function showSample( id ) {
-        $( '#showSampleDialog div.showSample' ).hide()
-        $( '#showSampleDialog div#showSample_' + id ).show()
-        
-        var titleEl = $( '#showSampleDialog div#showSample_' + id + ' h2' ).first();
-        titleEl.hide();
-        $( "#showSampleDialog" ).dialog( "option", "title", "Sample " + titleEl.text() );
-        $( "#showSampleDialog" ).dialog( "open" );
+        $( "#showSampleDialog" ).load( baseUrl + "/assaySample/show/" + id, [], function() {
+                var titleEl = $( '#showSampleDialog h2' ).first();
+                titleEl.hide();
+                
+                initializeUploadedFiles( "#showSampleDialog" );
+                initializePagination( "#showSampleDialog" );
+                                
+                $( "#showSampleDialog" ).dialog( "option", "title", "Sample " + titleEl.text() );
+                $( "#showSampleDialog" ).dialog( "open" );
+        } );
 }

trunk/web-app/js/paginate.js

@@ -1 @@
-        $(function() {
-                $('.paginate').each(function(idx, el) {
-                        var $el = $(el);
-                        $el.dataTable({ 
-                                bJQueryUI: true, 
-                                bFilter: false, 
-                                bLengthChange: false, 
-                                iCookieDuration: 86400,                         // Save cookie one day
-                                sPaginationType: 'full_numbers',
-                                iDisplayLength: 10,                                     // Number of items shown on one page.
-                                aoColumnDefs: [
-                                        { "bSortable": false, "aTargets": ["nonsortable"] }     // Disable sorting on all columns with th.nonsortable
-                                ]                                               
-                        });
-                });
-                
-                // Remove the top bar of the datatable and hide pagination with only one page
-                $(".dataTables_wrapper").each(function(idx, el) {
-                        var $el = $(el);
-                        
-                        // Hide pagination if only one page is present (that is: if no buttons can be clicked)
-                        if($el.find('span span.ui-state-default:not(.ui-state-disabled)').size() == 0 ){
-                                $el.find('div.fg-toolbar').css( 'display', 'none' );
-                        } else {
-                                $el.find('div.fg-toolbar').css( 'display', 'block' );
-                                $el.find( 'div.ui-toolbar' ).first().hide();
-                                
-                                // Check whether a h1, h2 or h3 is present above the table, and move it into the table
-                                /*
-                                var $previousElement = $el.prev();
-                                if( $previousElement != undefined && $previousElement.get(0) != undefined ) {
-                                        var tagName = $previousElement.get(0).tagName.toLowerCase();
-                                        if( tagName == "h1" || tagName == "h2" || tagName == "h3" ) {
-                                                // Put the margin that was on the title onto the table
-                                                $el.css( "margin-top", $previousElement.css( "margin-top" ) );
-                                                $previousElement.css( "margin-top", '4px' );
-                                                $previousElement.css( "marginBottom", '4px' );
-
-                                                // If so, move the element into the table
-                                                $previousElement.remove();
-                                                $el.find( 'div.ui-toolbar' ).first().append( $previousElement );
-                                        }
-                                }
-                                */                                              
-                        }
+function initializePagination( selector ) {
+        if( selector == undefined ) {
+                selector = ''
+        }
+        
+        $( selector + ' .paginate').each(function(idx, el) {
+                var $el = $(el);
+                $el.dataTable({ 
+                        bJQueryUI: true, 
+                        bFilter: false, 
+                        bLengthChange: false, 
+                        iCookieDuration: 86400,                         // Save cookie one day
+                        sPaginationType: 'full_numbers',
+                        iDisplayLength: 10,                                     // Number of items shown on one page.
+                        aoColumnDefs: [
+                                { "bSortable": false, "aTargets": ["nonsortable"] }     // Disable sorting on all columns with th.nonsortable
+                        ]                                               
                 });
         });
+        
+        // Remove the top bar of the datatable and hide pagination with only one page
+        $( selector + " .dataTables_wrapper").each(function(idx, el) {
+                var $el = $(el);
+                
+                // Hide pagination if only one page is present (that is: if no buttons can be clicked)
+                if($el.find('span span.ui-state-default:not(.ui-state-disabled)').size() == 0 ){
+                        $el.find('div.fg-toolbar').css( 'display', 'none' );
+                } else {
+                        $el.find('div.fg-toolbar').css( 'display', 'block' );
+                        $el.find( 'div.ui-toolbar' ).first().hide();
+                        
+                        // Check whether a h1, h2 or h3 is present above the table, and move it into the table
+                        /*
+                        var $previousElement = $el.prev();
+                        if( $previousElement != undefined && $previousElement.get(0) != undefined ) {
+                                var tagName = $previousElement.get(0).tagName.toLowerCase();
+                                if( tagName == "h1" || tagName == "h2" || tagName == "h3" ) {
+                                        // Put the margin that was on the title onto the table
+                                        $el.css( "margin-top", $previousElement.css( "margin-top" ) );
+                                        $previousElement.css( "margin-top", '4px' );
+                                        $previousElement.css( "marginBottom", '4px' );
+
+                                        // If so, move the element into the table
+                                        $previousElement.remove();
+                                        $el.find( 'div.ui-toolbar' ).first().append( $previousElement );
+                                }
+                        }
+                        */                                              
+                }
+        });
+        
+}
+
+$(function() { initializePagination(); });