Changeset 1908 for trunk/web-app

Timestamp:

Jun 1, 2011, 4:05:21 PM (9 years ago)

Author:

robert@…

Message:

Improvements in querying in order to be able to refine searches in a module.

Location:

trunk/web-app

Files:

• css/buttons.css (modified) (1 diff)
• js/advancedQuery.js (modified) (2 diffs)
• js/advancedQueryResults.js (modified) (3 diffs)

trunk/web-app/css/buttons.css

@@ -49 +49 @@
         background-image: url(../plugins/famfamfam-1.0.1/images/icons/brick_go.png);
 }
+.options a.refineSearch {
+        background-image: url(../plugins/famfamfam-1.0.1/images/icons/magnifier.png);
+}
 .options a.excel {
         background-image: url(../plugins/famfamfam-1.0.1/images/icons/page_excel.png);

trunk/web-app/js/advancedQuery.js

@@ -154 +154 @@
 }
 
-
 /**
  * Shows a criterium on the screen
@@ -204 +203 @@
 
 function createInSearchElement( fieldname, fieldvalue ) {
-        var a  = $( '<a class="' + fieldname + '" href="' + baseUrl + '/advancedQuery/show/' + fieldvalue + '"></a>')
-        a.text( "Search " + fieldvalue );
+        var a  = $( '<a class="' + fieldname + '" href="' + fieldvalue.url  + '"></a>')
+        a.text( fieldvalue.description );
         
         var inputField = $( '<input type="hidden" name="criteria.' + criteriumId + '.' + fieldname + '" />' );
-        inputField.val( fieldvalue );
+        inputField.val( fieldvalue.id );
         
         a.append( inputField );

trunk/web-app/js/advancedQueryResults.js

@@ -58 +58 @@
 }
 
-function performAction( form, action, module, url ) {
+/**
+ * Submits the form with selected elements to a given URL
+ * 
+ * @param form                                  JQuery object representing the form to be submitted
+ * @param action                                Name of the action to perform
+ * @param module                                Name of the module to perform the action on
+ * @param url                                   Url to post the form to
+ * @param allIfNothingSelected  If set to true, the action will be performed on all elements if none is selected
+ */
+function performAction( form, action, module, url, allIfNothingSelected ) {
         // Make sure the data from the paginated table is submitted
         // This is performed with javascript, because otherwise
@@ -66 +75 @@
         if( url == undefined )
                 url = '/advancedQuery/performAction';
+
+        if( allIfNothingSelected == undefined )
+                allIfNothingSelected = false;
         
         // First remove all previously created inputs, in order to avoid any collissions
@@ -84 +96 @@
 
         if( !checked ) {
-                alert( "Please pick at least one result to perform this action on." );
-                return;
+                if( allIfNothingSelected ) {
+                        // Submit all search results, instead of nothing
+                        $('input', oTable.fnGetNodes()).each(function(idx,el) {
+                                var $el = $(el);
+                                if( $el.attr( 'name' ) == "uuid" ) {
+                                        checked = true;
+                                        form.append( $( '<input type="hidden" name="tokens" value="' + $el.attr( 'value' ) + '" class="created" />' ) );
+                                }
+                        })
+                } else {
+                        alert( "Please pick at least one result to perform this action on." );
+                        return;
+                }
         }