Changeset 544 for trunk/web-app

Timestamp:

Jun 9, 2010, 12:46:22 PM (11 years ago)

Author:

roberth

Message:

Template editor is now able to add, edit, move and delete fields. Also fixed bug #90 (searching publications in IE didn't work because fetching XML from another domain was not allowed)

Location:

trunk/web-app

Files:

• css/templateEditor.css (modified) (1 diff)
• js/publication-chooser.js (modified) (1 diff)
• js/publication-chooser.pubmed.js (modified) (4 diffs)
• js/templateEditor.js (modified) (7 diffs)

trunk/web-app/css/templateEditor.css

@@ -18 +18 @@
 }
 
-.templateField_form { display: none; }
+#templateFields .empty { opacity: 0.6; padding: 5px 25px; }
+
+.templateField_form { display: none; margin: 5px; padding-top: 8px; border-top: 1px solid #BBD; }
+.templateField_form .templateFieldButtons { margin-top: 8px; padding-top: 8px; border-top: 1px solid #BBD; }
 .templateField_form label { width: 100px; float: left; display: block; }
+.templateField_form textarea {width: 240px; height: 100px;  }
+
+#addNew {
+        width: 388px;
+        line-height: 16px;
+        background-color: #EBF9D7;
+        border:1px solid #D0EAAE;
+        color:#79AA27;
+        font-weight:bold;
+
+        margin: 10px 5px;
+        padding: 0px;
+}
+
+#addNew.ui-state-disabled { opacity:0.35; }
+#addNew a {
+        display: block;
+        padding: 7px 25px;
+        cursor: pointer;
+        color:#79AA27;
+        text-decoration: none;
+}
+
+#addNew form{
+        margin-left: 10px; margin-right: 10px;
+}

trunk/web-app/js/publication-chooser.js

@@ -244 +244 @@
                 // check whether there are results or nog
                 var improvedResponse = function( objects ) {
-                    if( objects.length == 0 ) {
+                    if( objects == null ) {
+                                                objects = new Array();
+                                        }
+                                        if( objects.length == 0 ) {
                         $( '#' + inputElement.attr( 'id' ) + '_spinner' ).hide();
                         $( '#' + inputElement.attr( 'id' ) + '_notfound' ).show();

trunk/web-app/js/publication-chooser.pubmed.js

@@ +1 @@
+function _createURL( utility, params ) {
+        return baseUrl + "/wizard/entrezProxy?_utility=" + utility + "&" + params;
+}
 sourcePubMed = function( chooserObject, searchterm, response ) {
     // Search for every term in both title and author fields
@@ -7 +10 @@
     }
 
-    var url = "http://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi?db=pubmed&term=" + searchFor.join( " AND " ) + "&usehistory=y";
+    // The fetching of the data is done using a proxy, because in IE it is not allowed to retrieve
+    // XML data from another domain.
+    var utility = 'esearch.fcgi';
+    var params = "db=pubmed&term=" + searchFor.join( " AND " ) + "&usehistory=y";
+    var url = _createURL( utility, params );
 
     // Fetch it from Pubmed
@@ -19 +26 @@
                 var query_key = $("QueryKey", xmlDoc ).text();
 
+                var utility = 'esummary.fcgi';
+                var params = "db=pubmed&retmax=" + chooserObject.maxResults + "&query_key=" + query_key + "&WebEnv=" + WebEnv;
+                var url = _createURL( utility, params );
+
                 $.ajax({
-                    url: "http://eutils.ncbi.nlm.nih.gov/entrez/eutils/esummary.fcgi?db=pubmed&retmax=" + chooserObject.maxResults + "&query_key=" + query_key + "&WebEnv=" + WebEnv,
+                    url: url,
                     dataType: "xml",
                     success: function(summaryResponse) {
@@ -31 +42 @@
                         // Return it to jquery
                         response( parsedData );
+                    },
+                    error: function() {
+                            response( null );
                     }
                 })
+            },
+            error: function() {
+                response( null );
             }
     })

trunk/web-app/js/templateEditor.js

@@ -19 +19 @@
  */
 function showTemplateFormEvent(e) {
-    // Show the form is this item is not disabled
-    if( !formOpened ) {
-        formOpened = true;
-        showTemplateFieldForm( e.target.id );
-    }
+    showTemplateFieldForm( e.target.id );
 }
 
@@ -30 +26 @@
  */
 function showTemplateFieldForm( list_item_id ) {
-    // Show the form
-    $( '#' + list_item_id + '_form' ).show();
-    
-    // Disable all other listitems
-    $( '#templateFields li:not(#' + list_item_id + ')').addClass( 'ui-state-disabled' );
+    // Show the form is this item is not disabled
+    if( !formOpened ) {
+        formOpened = true;
 
+                // Show the form
+                $( '#' + list_item_id + '_form' ).show();
+
+                // Disable all other listitems
+                $( '#templateFields li:not(#' + list_item_id + ')').addClass( 'ui-state-disabled' );
+
+                if( list_item_id != 'templateField_new' ) {
+                        // Disable add new
+                        $( '#addNew').addClass( 'ui-state-disabled' );
+                }
+        }
 }
 
@@ -46 +51 @@
     // Enable all other listitems
     $( '#templateFields li:not(#templateField_' + id + ')').removeClass( 'ui-state-disabled' );
+        $( '#addNew').removeClass( 'ui-state-disabled' );
 
     formOpened = false;
@@ -65 +71 @@
 
     // Create a URL to call and call it
-    var url = baseUrl + '/templateEditor/move?template=' + templateId + '&templateField=' + templateFieldId + '&position=' + newposition;
+    var url = baseUrl + '/templateEditor/move';
 
     // Disable sorting until this move has been saved (in order to prevent collisions
@@ -73 +79 @@
     $.ajax({
         url: url,
+                data: 'template=' + templateId + '&templateField=' + templateFieldId + '&position=' + newposition,
+                dataType: 'json',
+                type: 'POST',
         success: function(data, textStatus, request) {
+            updateListItem( templateFieldId, data.html );
             $( '#templateFields' ).sortable( 'enable' );
         },
         error: function() {
             alert( "Could not move template field" );
+        }
+    });
+}
+
+/**
+ * Adds a new template field using AJAX
+ */
+function addTemplateField( id ) {
+    var formEl = $( '#templateField_' + id + '_form' );
+        var templateId = $('#templateSelect').val();
+
+    // Update the field
+    $.ajax({
+        url:        baseUrl + '/templateEditor/' + formEl.attr( 'action' ),
+        data:       "template=" + templateId + "&" + formEl.serialize(),
+                dataType: 'json',
+        type:       "POST",
+        success:    function(data, textStatus, request) {
+            hideTemplateFieldForm( id );
+            addListItem( data.id, data.html );
+        },
+        error:      function() {
+            alert( "Could not add template field" );
         }
     });
@@ -91 +124 @@
     $.ajax({
         url:        baseUrl + '/templateEditor/' + formEl.attr( 'action' ),
+                dataType: 'json',
         data:       formEl.serialize(),
         type:       "POST",
         success:    function(data, textStatus, request) {
             hideTemplateFieldForm( id );
-            updateListItemTitle( id );
+            updateListItem( id, data.html );
         },
         error:      function() {
@@ -103 +137 @@
 }
 
-// Updates the visible text on the listitem when a field is updated
-function updateListItemTitle( id ) {
+/**
+ * Deletes a template field using AJAX
+ */
+function deleteTemplateField( id ) {
+        var templateId = $('#templateSelect').val();
+
+    // Update the field
+    $.ajax({
+        url:        baseUrl + '/templateEditor/delete',
+        data:       'template=' + templateId + '&templateField=' + id,
+        type:       "POST",
+        success:    function(data, textStatus, request) {
+            hideTemplateFieldForm( id );
+            deleteListItem( id );
+        },
+        error:      function() {
+            alert( "Could not delete template field" );
+        }
+    });
+}
+
+
+// Adds a new listitem when a field has been added
+function addListItem( id, newHTML ) {
+        // Create a new listitem
+        var li = $( '<li></li>' );
+        li.attr( 'id', 'templateField_' + id );
+        li.addClass( "ui-state-default" );
+        
+        // Insert the right HTML
+        li.html( newHTML );
+
+        // Append the listitem to the list
+        $( '#templateFields li:last').after( li );
+
+        // Hide the 'empty' listitem
+        $( '#templateFields .empty' ).hide();
+}
+
+// Updates the contents of the listitem when something has changed
+function updateListItem( id, newHTML ) {
+        var li = $( '#templateField_' + id );
+        li.html( newHTML );
+}
+
+// Removes a listitem when the template field has been deleted
+function deleteListItem( id ) {
+        var li = $( '#templateField_' + id );
+        li.remove();
+
+        // Show the 'empty' listitem if the last item is deleted
+        if( $( '#templateFields li:not(.empty)' ).length == 0 ) {
+                $( '#templateFields .empty' ).show();
+        }
 
 }