Changeset 601

Timestamp:

Jun 20, 2010, 2:28:29 PM (15 years ago)

Author:

gav

Message:

Add default.please.select.text and default.none.select.text messages.
Update Task views and service to use new messages.

Location:

trunk/grails-app

Files:

• i18n/messages.properties (modified) (1 diff)
• services/TaskService.groovy (modified) (1 diff)
• views/taskDetailed/create.gsp (modified) (4 diffs)
• views/taskDetailed/createImmediateCallout.gsp (modified) (2 diffs)
• views/taskDetailed/createUnscheduled.gsp (modified) (2 diffs)
• views/taskDetailed/edit.gsp (modified) (2 diffs)

trunk/grails-app/i18n/messages.properties

@@ -222 +222 @@
 default.none.text=None
 default.all.text=All
+default.please.select.text=--Please-Select--
+default.none.select.text=--None--
 
 # Rich UI plugin - Calendar

trunk/grails-app/services/TaskService.groovy

@@ -97 +97 @@
             }
 
-            // Default status to "not started" if not supplied.
-            params.taskStatus = params.taskStatus ?: TaskStatus.get(1)
-
-            // Set budgetStatus.
-            if(params.taskType?.id?.toLong() == 1 || params.taskType?.id?.toLong() == 2) // Immediate Callout or Unsheduled Breakin.
-                params.taskBudgetStatus = params.taskBudgetStatus ?: TaskBudgetStatus.get(1) // Unplanned.
-            else
-                params.taskBudgetStatus = params.taskBudgetStatus ?: TaskBudgetStatus.get(2) // Planned.
-
             def taskInstance = new Task(params)
             result.taskInstance = taskInstance
+
+            // Set taskStatus if not supplied.
+            if(!params.taskStatus)
+                taskInstance.taskStatus = TaskStatus.read(1) // Not Started
+
+            // Set budgetStatus if not supplied.
+            if(!params.taskBudgetStatus) {
+                if(taskInstance.taskType?.id == 1 || taskInstance.taskType?.id == 2) // Immediate Callout or Unsheduled Breakin.
+                    taskInstance.taskBudgetStatus = TaskBudgetStatus.read(1) // Unplanned.
+                else
+                    taskInstance.taskBudgetStatus = TaskBudgetStatus.read(2) // Planned.
+            }
 
             if(result.taskInstance.parentTask?.trash)

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

@@ -87 +87 @@
                                                         name="primaryAsset.id"
                                                         value="${taskInstance?.primaryAsset?.id}"
-                                                        noSelection="['null':'--None--']" >
+                                                        noSelection="['null':/${g.message(code:'default.none.select.text')}/]">
                                     </g:select>
                                     <g:helpBalloon code="task.primaryAsset" />
@@ -101 +101 @@
                                                     from="${Asset.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
                                                     size="5" multiple="yes" optionKey="id"
-                                                    value="${taskInstance?.associatedAssets?.id}"  noSelection="['':'--None--']" >
+                                                    value="${taskInstance?.associatedAssets?.id}"
+                                                    noSelection="['':/${g.message(code:'default.none.select.text')}/]">
                                     </g:select>
                                     <g:helpBalloon code="task.associatedAssets" />
@@ -128 +129 @@
                                                         from="${TaskGroup.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
                                                         name="taskGroup.id"
-                                                        value="${taskInstance?.taskGroup?.id}" noSelection="['':'--None--']" >
+                                                        value="${taskInstance?.taskGroup?.id}"
+                                                        noSelection="['null':/${g.message(code:'default.please.select.text')}/]">
                                     </g:select>
                                 </td>
@@ -141 +143 @@
                                                         from="${scheduledTaskTypes}"
                                                         name="taskType.id"
-                                                        value="${taskInstance?.taskType?.id}" >
+                                                        value="${taskInstance?.taskType?.id}"
+                                                        noSelection="['null':/${g.message(code:'default.please.select.text')}/]">
                                     </g:select>
                                 </td>

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

@@ -66 +66 @@
                                                     from="${Asset.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
                                                     name="primaryAsset.id" value="${taskInstance?.primaryAsset?.id}"
-                                                    noSelection="['null':'--None--']">
+                                                    noSelection="['null':/${g.message(code:'default.none.select.text')}/]">
                                     </g:select>
                                     <g:helpBalloon code="task.primaryAsset" />
@@ -81 +81 @@
                                                         name="entryFault.productionReference.id"
                                                         value="${entryFaultInstance?.productionReference?.id}"
-                                                        noSelection="['null':'--None--']">
+                                                        noSelection="['null':/${g.message(code:'default.none.select.text')}/]">
                                     </g:select>
                                     <g:helpBalloon code="entry.productionReference.fault" />

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

@@ -89 +89 @@
                                                         name="primaryAsset.id"
                                                         value="${taskInstance?.primaryAsset?.id}"
-                                                        noSelection="['null':'--None--']"></g:select>
+                                                        noSelection="['null':/${g.message(code:'default.none.select.text')}/]">
+                                        </g:select>
                                     <g:helpBalloon code="task.primaryAsset" />
                                 </td>
@@ -115 +116 @@
                                                         from="${TaskGroup.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
                                                         name="taskGroup.id"
-                                                        value="${taskInstance?.taskGroup?.id}" noSelection="['':'--None--']" >
+                                                        value="${taskInstance?.taskGroup?.id}"
+                                                        noSelection="['null':/${g.message(code:'default.please.select.text')}/]">
                                     </g:select>
                                 </td>

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

@@ -103 +103 @@
                                                         name="primaryAsset.id"
                                                         value="${taskInstance?.primaryAsset?.id}"
-                                                        noSelection="['null':'--None--']">
+                                                        noSelection="['null':/${g.message(code:'default.none.select.text')}/]">
                                     </g:select>
                                     <g:helpBalloon code="task.primaryAsset" />
@@ -119 +119 @@
                                                     optionKey="id" size="5" multiple="yes" 
                                                     value="${taskInstance?.associatedAssets.id}"
-                                                    noSelection="['':'--None--']" >
+                                                    noSelection="['':/${g.message(code:'default.none.select.text')}/]" >
                                     </g:select>
                                     <g:helpBalloon  class="helpballoon" code="task.associatedAssets" />