Changeset 6896

Timestamp:

27/05/10 16:19:04 (11 years ago)

Author:

astephen

Message:

added and fixed stuff for new UI

Location:

cows_wps/trunk/cows_wps

Files:

• controllers/jobviewer.py (added)
• controllers/submit.py (modified) (2 diffs)
• controllers/submitter.py (added)
• public/ajax.html (added)
• public/js/ui/ajax.js (added)
• public/js/ui/jobviewer_utils.js (added)
• public/js/ui/submit_utils.js (modified) (1 diff)
• templates/FileDetails_template.xml (deleted)
• templates/wps_execute_response.xml (modified) (1 diff)

cows_wps/trunk/cows_wps/controllers/submit.py

@@ -4 +4 @@
 from pylons import request, response, session, tmpl_context as c
 from pylons.controllers.util import abort, redirect_to
+from routes import url_for
 
 from cows_wps.renderer.ui_renderer import *
@@ -57 +58 @@
         wps_request = wps_request[:-1]
 
-        return redirect_to(wps_request) 
+        submitter_url = url_for(controller='/submitter', wps_request_url = wps_request,
+                                proc_id = proc_id)
+        #return redirect_to(wps_request) 
+        #return "%s" % submitter_url
+        return redirect_to(submitter_url)
 
     def _handleTextAreaInput(self, value):

cows_wps/trunk/cows_wps/public/js/ui/submit_utils.js

@@ -40 +40 @@
 }
 
+/*
+ function makeWPSRequest:
+  * Makes a request to the WPS using Jquery AJAX
+ Dependencies:
+  * Jquery
+*/
+function makeWPSRequest(wps_url, info_div_id) {
+        // Inform that request is being made
+        $("#" + info_div_id).append("Your request is being submitted to the WPS...");
+
+        // Set up AJAX call
+        $.ajax({
+                type: "GET",
+                url: wps_url,
+                dataType: "xml",
+                success:  parseWPSResponse
+        });      
+}
+
+function parseWPSResponse(xml)
+{
+    var items = ["FileSize", "FileInfo"];
+    for (var i = 0; i < items.length; i++) {
+        item = items[i];
+
+        $(xml).find(item).each(function()
+        {
+             $("#wps_response_div").append(item + ": " + $(this).text() + "<br />");
+        });
+
+    }
+}
+
+

cows_wps/trunk/cows_wps/templates/wps_execute_response.xml

@@ -50 +50 @@
                                     value = input_dict[arg]
                                     if type(value) not in (unicode, str):
-                                        value = ','.join(value)
+                                        value = ','.join([str(i) for i in value])
                                 ?>
                                 <ows:Identifier>$arg</ows:Identifier>