Changeset 474 for trunk

Timestamp:

Mar 31, 2010, 1:42:00 PM (15 years ago)

Author:

gav

Message:

Scroll month feature to task search calendar.
Add reasoning, asset and sub item columns on procedure tab of task show view.

Location:

trunk/grails-app

Files:

• controllers/TaskDetailedController.groovy (modified) (3 diffs)
• services/DateUtilService.groovy (modified) (1 diff)
• views/taskDetailed/searchCalendar.gsp (modified) (1 diff)
• views/taskDetailed/show.gsp (modified) (2 diffs)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -122 +122 @@
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
     def searchCalendar = {
-        params.max = 30
+
+        if(session.taskSearchParamsMax)
+            params.max = session.taskSearchParamsMax
+
+        // Protect filterPane.
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+
+        // Set the month to show.
+        def showMonth = new Date()
+        if(session.taskSearchCalendarShowMonth)
+            showMonth = session.taskSearchCalendarShowMonth
+
+        if(params.nextMonth)
+            showMonth = dateUtilService.getNextMonth(showMonth)
+        else if(params.previousMonth)
+            showMonth = dateUtilService.getPreviousMonth(showMonth)
+        session.taskSearchCalendarShowMonth = showMonth
 
         // Quick Search:
@@ -155 +171 @@
                 params.quickSearch = "searchTodays"
             }
-            return[taskInstanceList: taskInstanceList, taskInstanceTotal: taskInstanceList.totalCount, filterParams: params]
+            return[taskInstanceList: taskInstanceList, taskInstanceTotal: taskInstanceList.totalCount, showMonth: showMonth, filterParams: params]
         }
         // filterPane:
@@ -163 +179 @@
             taskInstanceTotal: taskInstanceTotal,
             filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
+            showMonth: showMonth,
             params:params ]
     }

trunk/grails-app/services/DateUtilService.groovy

@@ -77 +77 @@
 
     /**
+    * Get the date one month in the future.
+    * @param date The Date object to start with.
+    * @returns A Date object one month in the future.
+    */
+    public static Date getNextMonth(Date date) {
+        use(TimeCategory) {
+            date + 1.months
+        }
+    }
+
+    /**
+    * Get the date one month ago.
+    * @param date The Date object to start with.
+    * @returns A Date object one month ago.
+    */
+    public static Date getPreviousMonth(Date date) {
+        use(TimeCategory) {
+            date - 1.months
+        }
+    }
+
+    /**
     * Make a date object from supplied year, month, day values.
     * The Calendar.getInstance() or Calendar.instance factory returns a new calendar instance, usually

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

@@ -40 +40 @@
                 </span>
             </div>
+
+            <br />
+            <g:link action="searchCalendar" params="[previousMonth:'true']">
+                < Previous
+            </g:link>
+            <span style="font-size: 17px; font-weight: bold;">
+                <g:formatDate date="${showMonth}" format="MMMM"/>
+            </span>
+            <g:link action="searchCalendar" params="[nextMonth:'true']">
+                Next >
+            </g:link>
+            <br />
+            <br />
+
             <g:if test="${taskInstanceList.size() > 0}">
                 <richui:calendarMonthView items="${taskInstanceList}"
                                                                         createLink="true"
                                                                         constraintDateFields="['targetStartDate']"
-                                                                        month="${new Date()}"
+                                                                        month="${showMonth}"
                                                                         controller="taskDetailed"
                                                                         action="show"

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

@@ -503 +503 @@
                                             <th>Step</th>
                                             <th>Description</th>
+                                            <th>Reasoning</th>
+                                            <th>Asset</th>
+                                            <th>Sub Item</th>
                                         </tr>
                                     </thead>
@@ -515 +518 @@
                                                 <td  valign="top" style="text-align:left;" class="value">
                                                     ${maintenanceAction?.description}
+                                                </td>
+
+                                                <td  valign="top" style="text-align:left;" class="value">
+                                                    ${maintenanceAction?.reasoning}
+                                                </td>
+
+                                                <td  valign="top" style="text-align:left;" class="value">
+                                                    ${maintenanceAction?.asset}
+                                                </td>
+
+                                                <td  valign="top" style="text-align:left;" class="value">
+                                                    ${maintenanceAction?.assetSubItem}
                                                 </td>