Changeset 21 for trunk/web-app

Timestamp:

Mar 22, 2011, 3:04:40 PM (9 years ago)

Author:

robert@…

Message:

Solved issues with fuzzy matching (#23)

Location:

trunk/web-app/js

Files:

• assay.show.enterTagsDialog.js (modified) (1 diff)
• enterTagsDialog.js (added)
• run.show.enterTagsDialog.js (modified) (1 diff)

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

@@ -1 @@
-$(function() {
-        $( "#enterTagsDialog" ).tabbedDialog({
-                height: 450,
-                width: 750,
-                modal: true,
-                autoOpen: false,
-                buttons: { 
-                        "Save": function() {
-                                var $tabs = $('#enterTagsDialog').tabs();
-                                var selectedTab = $tabs.tabs('option', 'selected' );
-                                
-                                if( selectedTab == 0 ) {                // Tab 'manual input' selected
-                                        $( 'form[name=updateTagsManually]' ).submit();
-                                } else if( selectedTab == 1 ) { // Tab 'excel input' selected
-                                        // Check whether we are in step 1 (uploading a file) or step 2 (matching columns)
-                                        // Step 1 has a form[name=uploadExcel], step 2 has a form[name=matchColumns]
-                                        if( $( 'form[name=uploadExcel]' ).length == 1 ) {
-                                                // Step 1: save shouldn't be used. The upload is handled in the onUpload handler of 
-                                                // the upload object. See also handleTagExcel method
-                                                return;
-                                        } else {
-                                                $( 'form[name=matchColumns]' ).submit();
-                                        }
-                                }
-                        },
-                        "Close": function() { $(this).dialog( "close" ) }
-                }               
-        });
-});
-
-function showEnterTagsDialog() {
-        $( "#enterTagsDialog" ).dialog( "open" );
-}
-
 /**
  * Handles the file upload of an excel file with tag data

trunk/web-app/js/run.show.enterTagsDialog.js

@@ -1 @@
-$(function() {
-        $( "#enterTagsDialog" ).tabbedDialog({
-                height: 450,
-                width: 750,
-                modal: true,
-                autoOpen: false,
-                buttons: { 
-                        "Save": function() {
-                                var $tabs = $('#enterTagsDialog').tabs();
-                                var selectedTab = $tabs.tabs('option', 'selected' );
-                                
-                                if( selectedTab == 0 ) {                // Tab 'manual input' selected
-                                        $( 'form[name=updateTagsManually]' ).submit();
-                                } else if( selectedTab == 1 ) { // Tab 'excel input' selected
-                                        // Check whether we are in step 1 (uploading a file) or step 2 (matching columns)
-                                        // Step 1 has a form[name=uploadExcel], step 2 has a form[name=matchColumns]
-                                        if( $( 'form[name=uploadExcel]' ).length == 1 ) {
-                                                // Step 1: save shouldn't be used. The upload is handled in the onUpload handler of 
-                                                // the upload object. See also handleTagExcel method
-                                                return;
-                                        } else {
-                                                $( 'form[name=matchColumns]' ).submit();
-                                        }
-                                }
-                        },
-                        "Close": function() { $(this).dialog( "close" ) }
-                }               
-        });
-});
-
-function showEnterTagsDialog() {
-        $( "#enterTagsDialog" ).dialog( "open" );
-}
-
 /**
  * Handles the file upload of an excel file with tag data