Changeset 536 for trunk/grails-app

Timestamp:

May 18, 2010, 7:23:46 AM (15 years ago)

Author:

gav

Message:

Improvements to Reactive Ratio Report.

File:

• trunk/grails-app/services/TaskReportService.groovy (modified) (3 diffs)

trunk/grails-app/services/TaskReportService.groovy

@@ -49 +49 @@
         result.taskCount = result.taskList.size()
 
-        // Counts
+        // Assets on Tasks Count.
         result.totalAssetsOnTasksCount = 0
         result.immediateCalloutCount = 0
@@ -80 +80 @@
         } // each() task
 
-        // Percentages
+        // Percentage of counts.
         result.immediateCalloutPercentage = 0
         result.totalPreventativePercentage = 0
@@ -93 +93 @@
         }
         catch(ArithmeticException e) {
-            log.error "Could not calculate percentages: "+e
+            log.error "Could not calculate: Assets on Tasks Percentages: "+e
+        }
+
+        // Work Done.
+        result.immediateCalloutWorkDone = [total:0, hours:0, minutes:0, percentage:0]
+        result.unscheduledBreakinWorkDone = [total:0, hours:0, minutes:0]
+        result.preventativeMaintenanceWorkDone = [total:0, hours:0, minutes:0]
+        result.totalPreventativeWorkDone = [total:0, hours:0, minutes:0, percentage:0]
+        result.totalWorkDone = [total:0, hours:0, minutes:0]
+
+        result.taskList.each() { task ->
+            task.entries.each() { entry ->
+                // Has assets assigned and is Work Done.
+                if( (task.primaryAsset || task.associatedAssets) && entry.entryType.id == 3L ) {
+                        if(task.taskType == namedParams.immediateCallout)
+                            result.immediateCalloutWorkDone.total += (entry.durationHour*60) + entry.durationMinute
+                        if(task.taskType == namedParams.unscheduledBreakin)
+                            result.unscheduledBreakinWorkDone.total += (entry.durationHour*60) + entry.durationMinute
+                        if(task.taskType == namedParams.preventativeMaintenance)
+                            result.preventativeMaintenanceWorkDone.total += (entry.durationHour*60) + entry.durationMinute
+                }
+            } // each() entry
+        } // each() task
+
+        // Work Done hours and minutes.
+        result.immediateCalloutWorkDone.hours = (result.immediateCalloutWorkDone.total / 60).toInteger()
+        result.immediateCalloutWorkDone.minutes = result.immediateCalloutWorkDone.total % 60
+
+        result.unscheduledBreakinWorkDone.hours = (result.unscheduledBreakinWorkDone.total / 60).toInteger()
+        result.unscheduledBreakinWorkDone.minutes = result.unscheduledBreakinWorkDone.total % 60
+
+        result.preventativeMaintenanceWorkDone.hours = (result.preventativeMaintenanceWorkDone.total / 60).toInteger()
+        result.preventativeMaintenanceWorkDone.minutes = result.preventativeMaintenanceWorkDone.total % 60
+
+        // Work Done Totals.
+        result.totalPreventativeWorkDone.total = result.unscheduledBreakinWorkDone.total + result.preventativeMaintenanceWorkDone.total
+        result.totalPreventativeWorkDone.hours = (result.totalPreventativeWorkDone.total / 60).toInteger()
+        result.totalPreventativeWorkDone.minutes = result.totalPreventativeWorkDone.total % 60
+
+        result.totalWorkDone.total = result.immediateCalloutWorkDone.total + result.totalPreventativeWorkDone.total
+        result.totalWorkDone.hours = (result.totalWorkDone.total / 60).toInteger()
+        result.totalWorkDone.minutes = result.totalWorkDone.total % 60
+
+        // Work Done Percentages.
+        try {
+            result.immediateCalloutWorkDone.percentage = (result.immediateCalloutWorkDone.total / result.totalWorkDone.total)*100
+            result.totalPreventativeWorkDone.percentage = (result.totalPreventativeWorkDone.total / result.totalWorkDone.total)*100
+        }
+        catch(ArithmeticException e) {
+            log.error "Could not calculate: Work Done Percentages: "+e
         }