Changeset 831 for trunk

Timestamp:

Feb 27, 2011, 11:46:55 PM (14 years ago)

Author:

gav

Message:

Refactor taskShow.js.

Location:

trunk

Files:

• grails-app/views/taskDetailed/_showProcedureTab.gsp (modified) (1 diff)
• web-app/js/taskShow.js (modified) (1 diff)

trunk/grails-app/views/taskDetailed/_showProcedureTab.gsp

@@ -25 +25 @@
         <br />
 
-        <div id="maintenanceEntryContainer"></div>
+        <div id="pmEntryContainer"></div>
 
-        <div style="text-align:right;" id="maintenanceEntryButton">
+        <div style="text-align:right;" id="pmEntryButton">
             <span class="buttons">
                 <input type="button"
                             class="add"
-                            value="Add Maintenance Entry"
-                            onclick="getMaintenanceEntryForm(${taskInstance?.id}, 6)" />
+                            value="Add PM Entry"
+                            onclick="loadEntryForm(jQuery('#pmEntryContainer'),
+                                                                    jQuery('#pmEntryButton'),
+                                                                    {taskId: ${taskInstance?.id}, entryTypeId: 6})" />
             </span>
         </div>

trunk/web-app/js/taskShow.js

@@ -1 +1 @@
 
-function getMaintenanceEntryForm(taskId, entryTypeId) {
-
-    var p = {};
-    for (var i = 0, j = arguments.length; i < j; i++){
-        p[i] = arguments[i];
-    }
+// Load an Entry from via AJAX.
+// @container Container object to load response into.
+// @button Button object used to trigger this function.
+// @args Params map to pass to actionUrl.
+function loadEntryForm(container, button, params) {
 
     var actionUrl = getContextPath()+"/entryDetailed/ajaxCreate/";
-    var container = jQuery('#maintenanceEntryContainer');
-    var button = jQuery('#maintenanceEntryButton');
-    var params = {taskId: taskId, entryTypeId: entryTypeId};
 
     function success(data, textStatus, jqXHR){