Changeset 544 for trunk/grails-app

Timestamp:

May 24, 2010, 3:48:53 AM (14 years ago)

Author:

gav

Message:

Improvements to Immediate Callout Report.

Location:

trunk/grails-app

Files:

• controllers/ReportController.groovy (modified) (2 diffs)
• services/TaskReportService.groovy (modified) (5 diffs)
• views/appCore/start.gsp (modified) (2 diffs)

trunk/grails-app/controllers/ReportController.groovy

@@ -48 +48 @@
         params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
         params.currentUser = authService.currentUser
-
-        if(params.startDate == 'struct')
-            params.startDate = dateUtilService.makeDate(params.startDate_year, params.startDate_month, params.startDate_day)
-        else
-            params.startDate = dateUtilService.today-7
         params.startDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: params.startDate)
-
-        if(params.endDate == 'struct')
-            params.endDate = dateUtilService.makeDate(params.endDate_year, params.endDate_month, params.endDate_day)
-        else
-            params.endDate = dateUtilService.today
         params.endDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: params.endDate)
 
@@ -71 +61 @@
         params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
         params.currentUser = authService.currentUser
-
-        if(params.startDate == 'struct')
-            params.startDate = dateUtilService.makeDate(params.startDate_year, params.startDate_month, params.startDate_day)
-        else
-            params.startDate = dateUtilService.today-7
         params.startDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: params.startDate)
-
-        if(params.endDate == 'struct')
-            params.endDate = dateUtilService.makeDate(params.endDate_year, params.endDate_month, params.endDate_day)
-        else
-            params.endDate = dateUtilService.today
         params.endDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: params.endDate)
 

trunk/grails-app/services/TaskReportService.groovy

@@ -13 +13 @@
 //     def messageSource
 
-//     def g = new org.codehaus.groovy.grails.plugins.web.taglib.ApplicationTagLib()
+    def g = new org.codehaus.groovy.grails.plugins.web.taglib.ApplicationTagLib()
 
     def paramsMax = 100000
@@ -174 +174 @@
 
         result.taskQuery = "select distinct task " + result.taskQuery
-        result.taskList = Task.executeQuery(result.taskQuery, namedParams)
-        result.taskCount = result.taskList.size()
+        result.taskQueryList = Task.executeQuery(result.taskQuery, namedParams)
+        result.taskCount = result.taskQueryList.size()
 
         // Assets on Tasks Count.
         result.totalAssetsOnTasksCount = 0
+        result.totalDownTime = [total: 0, hours: 0, minutes:0]
         result.assetList = []
 
-        // Add or update asset details in assetList.
-        def addAssetToList = { asset, task ->
+        // Task Details
+        result.taskList = []
+
+        // Add or update lists.
+        def addToLists = { asset, task ->
 
             def downTime = 0
             def faultEntries = Entry.findAllByTaskAndEntryType(task, EntryType.read(1))
+            def causeEntries = Entry.findAllByTaskAndEntryType(task, EntryType.read(2))
+            def workDoneEntries = Entry.findAllByTaskAndEntryType(task, EntryType.read(3))
+            def taskDetails = 'Task #'+task.id+' - '+task.description+'\n'
+            faultEntries.each(){
+                taskDetails += '    Faults: '+it.comment+' - '+it.enteredBy+', '+g.formatDate(format: "EEE, dd-MMM-yyyy", date: it.dateDone)+'.\n'
+            }
+            causeEntries.each(){
+                taskDetails += '    Causes: '+it.comment+' - '+it.enteredBy+', '+g.formatDate(format: "EEE, dd-MMM-yyyy", date: it.dateDone)+'.\n'
+            }
+            workDoneEntries.each(){
+                taskDetails += '    Work Done: '+it.comment+' - '+it.enteredBy+', '+g.formatDate(format: "EEE, dd-MMM-yyyy", date: it.dateDone)+'.\n'
+            }
+
             faultEntries.each() { downTime += (it.durationHour*60 + it.durationMinute) }
+            result.totalDownTime.total += downTime
 
             def assetDetails = result.assetList.find { it.id == asset.id }
             if(assetDetails) {
                 assetDetails.immediateCalloutCount++
-                assetDetails.immediateCalloutTaskList.add(task.toString())
+                assetDetails.downTime += downTime
+                assetDetails.tasks += taskDetails
             }
             else {
@@ -198 +217 @@
                                             immediateCalloutCount: 1,
                                             downTime: downTime,
-                                            immediateCalloutTaskList: [task.toString()]]
+                                            tasks: taskDetails]
 
                 result.assetList << assetDetails
             }
-        } // addAssetToList
+        } // addAToLists
 
         // Summary Of Calculations.
@@ -213 +232 @@
 
         result.summaryOfCalculationMethod += 'totalAssetsOnTasksCount = A count of unique assets on each task. \n'
-        result.taskList.each() { task ->
+        result.taskQueryList.each() { task ->
             if(task.primaryAsset) {
                 result.totalAssetsOnTasksCount++
-                addAssetToList(task.primaryAsset, task)
+                addToLists(task.primaryAsset, task)
             }
             task.associatedAssets.each() { associatedAsset ->
                 if(associatedAsset.id != task.primaryAsset?.id) {
                     result.totalAssetsOnTasksCount++
-                    addAssetToList(associatedAsset, task)
+                    addToLists(associatedAsset, task)
                 }
             }
@@ -227 +246 @@
         } // each() task
 
-        // Sort by callout count.
+        // Sort assetList by callout count.
         result.assetList.sort {a, b -> b.immediateCalloutCount.compareTo(a.immediateCalloutCount)}
+
+        // Calculate hours and minutes.
+        result.totalDownTime.hours = (result.totalDownTime.total / 60).toInteger()
+        result.totalDownTime.minutes = result.totalDownTime.total % 60
 
         // Success.

trunk/grails-app/views/appCore/start.gsp

@@ -107 +107 @@
                                                                             name="Reactive Ratio"
                                                                             format="PDF, XLS">
-                                                <richui:dateChooser name="startDate" format="dd-MM-yyyy" value="${new Date()-7}" />
+                                                <richui:dateChooser name="startDate" id="reactiveRatio_startDate" format="dd-MM-yyyy" value="${new Date()-7}" />
                                                 to
-                                                <richui:dateChooser name="endDate" format="dd-MM-yyyy" value="${new Date()}" />
+                                                <richui:dateChooser name="endDate" id="reactiveRatio_endDate" format="dd-MM-yyyy" value="${new Date()}" />
                                             </g:jasperReport>
                                             <br />
@@ -117 +117 @@
                                                                             name="Immediate Callouts"
                                                                             format="PDF, XLS">
-                                                <richui:dateChooser name="startDate" format="dd-MM-yyyy" value="${new Date()-7}" />
+                                                <richui:dateChooser name="startDate" id="immediateCallouts_startDate" format="dd-MM-yyyy" value="${new Date()-7}" />
                                                 to
-                                                <richui:dateChooser name="endDate" format="dd-MM-yyyy" value="${new Date()}" />
+                                                <richui:dateChooser name="endDate" id="immediateCallouts_endDate" format="dd-MM-yyyy" value="${new Date()}" />
                                             </g:jasperReport>
                                             <br />