Changeset 851

Timestamp:

Mar 8, 2011, 6:33:40 PM (14 years ago)

Author:

gav

Message:

Complete and Flag buttons on ajax task entries, first draft.

Location:

trunk

Files:

• grails-app/services/TaskService.groovy (modified) (1 diff)
• grails-app/views/entryDetailed/_create.gsp (modified) (2 diffs)
• web-app/js/taskShow.js (modified) (1 diff)

trunk/grails-app/services/TaskService.groovy

@@ -388 +388 @@
                 return fail(field:"task", code:"task.failedToSave")
 
+
+            if(params.submitAction) {
+                def actionResult
+                def submit_andSetAttentionFlag = {
+                    actionResult = setAttentionFlag(taskInstance)
+                    if(actionResult.error)
+                        return fail(field:"task", code:actionResult.error.code)
+                }
+                def submit_andComplete = {
+                    actionResult = complete(taskInstance)
+                    if(actionResult.error)
+                        return fail(field:"task", code:actionResult.error.code)
+                }
+
+                switch (params.submitAction) {
+                    case "submit_default":
+                        break
+                    case "submit_andSetAttentionFlag":
+                        submit_andSetAttentionFlag()
+                        break
+                    case "submit_andComplete":
+                        submit_andComplete()
+                        break
+                    default:
+                        break
+                } // switch.
+                if(result.error)
+                    return result
+            } // params.submitAction
+
             // Success.
             return result

trunk/grails-app/views/entryDetailed/_create.gsp

@@ -13 +13 @@
         <g:hiddenField name="task.id" value="${entryInstance.task.id}" />
         <g:hiddenField name="entryType.id" value="${entryInstance.entryType.id}" />
+        <g:hiddenField name="submitAction" value="save" />
         <div class="dialog">
             <table>
@@ -105 +106 @@
         </div>
         <div class="buttons">
-            <span class="button"><input class="save" type="submit" value="Create" /></span>
+            <span class="button">
+                <input class="save" type="submit" value="Save" name="submit_default" />
+            </span>
+            <span class="button">
+                <input class="flag" type="button" value="Unresolved" name="submit_andSetAttentionFlag" />
+            </span>
+            <custom:helpBalloon code="task.status.unresolved" iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
+            <span class="button">
+                <g:if test="${entryInstance.task.attentionFlag}" >
+                    <input class="complete"
+                                type="button" 
+                                value="Resolved"
+                                onclick="return confirm('${message(code:'task.clear.attention.flag.on.completion.confirm')}');"
+                                name="submit_andComplete"/>
+                </g:if>
+                <g:else>
+                    <input class="complete" type="button" value="Resolved" name="submit_andComplete" />
+                </g:else>
+            </span>
+            <custom:helpBalloon code="task.status.resolved" iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
         </div>
     </g:form>

trunk/web-app/js/taskShow.js

@@ -8 +8 @@
             createContainer.find(':input[name="comment"]').focus();
         });
+        // Register 'submit_*' input button click handlers.
+        createContainer.find('input[name^="submit_"]').click(function(){
+            createContainer.find(':input[name="submitAction"]').val(jQuery(this).attr('name'));
+            createContainer.find('form:first').submit();
+        });
         // Hijack form submit to use our function.
-        var eventData = {listContainer:listContainer,createContainer:createContainer, button:button};
+        var eventData = {listContainer:listContainer, createContainer:createContainer, button:button};
         createContainer.find('form:first').submit(eventData, submitCreateEntryForm);
         // Register the close img click handler.