Changeset 190 for trunk

Timestamp:

Nov 19, 2009, 1:47:55 PM (15 years ago)

Author:

gav

Message:

Switch creatDemoEntries to use the taskService.createEntry service.
Switch some findByName's to get(id).

Location:

trunk/grails-app

Files:

• controllers/TaskDetailedController.groovy (modified) (1 diff)
• services/CreateDataService.groovy (modified) (2 diffs)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -171 +171 @@
 
             def entryWorkDoneList = Entry.withCriteria {
-                                                                def entryType = EntryType.findByName("WorkDone")
-                                                                eq("entryType", entryType)
+                                                                eq("entryType", EntryType.get(2))
                                                                 eq("task", taskInstance)
                                                         }
 
             def entryFaultList = Entry.withCriteria {
-                                                                def entryType = EntryType.findByName("Fault")
-                                                                eq("entryType", entryType)
+                                                                eq("entryType", EntryType.get(1))
                                                                 eq("task", taskInstance)
                                                         }

trunk/grails-app/services/CreateDataService.groovy

@@ -560 +560 @@
         def entryTypeInstance
 
-        entryTypeInstance = new EntryType(name:"Fault")
+        entryTypeInstance = new EntryType(name:"Fault") // #1
         saveAndTest(entryTypeInstance)
 
-        entryTypeInstance = new EntryType(name:"WorkDone")
+        entryTypeInstance = new EntryType(name:"Work Done") // #2
         saveAndTest(entryTypeInstance)
 
-        entryTypeInstance = new EntryType(name:"Production Note")
+        entryTypeInstance = new EntryType(name:"Production Note") // #3
         saveAndTest(entryTypeInstance)
 
-        entryTypeInstance = new EntryType(name:"Work Request")
+        entryTypeInstance = new EntryType(name:"Work Request") // #4
         saveAndTest(entryTypeInstance)
     }
@@ -575 +575 @@
     def createDemoEntries() {
 
-        //Entry
-        def entryInstance
+        def entryResult
+        def p = [:]
 
         //Entry #1
-        entryInstance = new Entry(enteredBy: Person.get(3),
-                                                    task: Task.get(1),
-                                                    entryType: EntryType.findByName("Fault"),
-                                                    comment: "This level sensor is causing us trouble.",
-                                                    durationMinute: 20)
-        saveAndTest(entryInstance)
+        p = [task: Task.get(1),
+                entryType: EntryType.get(1),
+                comment: "This level sensor is causing us trouble.",
+                durationMinute: 20]
+
+        entryResult = taskService.createEntry(p)
 
         //Entry #2
-        entryInstance = new Entry(enteredBy: Person.get(4),
-                                                    task: Task.get(1),
-                                                    entryType: EntryType.findByName("WorkDone"),
-                                                    comment: "Cleaned sensor, see how it goes.",
-                                                    durationMinute: 30)
-        saveAndTest(entryInstance)
+        p = [task: Task.get(1),
+                entryType: EntryType.get(2),
+                comment: "Cleaned sensor, see how it goes.",
+                durationMinute: 30]
+
+        entryResult = taskService.createEntry(p)
 
         //Entry #3
-        entryInstance = new Entry(enteredBy: Person.get(4),
-                                                    task: Task.get(1),
-                                                    entryType: EntryType.findByName("WorkDone"),
-                                                    comment: "Checked up on it later and sensor is dropping out intermittently, created subTask to replace sensor.",
-                                                    durationMinute: 20)
-        saveAndTest(entryInstance)
+        p = [task: Task.get(1),
+                entryType: EntryType.get(2),
+                comment: "Checked up on it later and sensor is dropping out intermittently, created sub task to replace sensor.",
+                durationMinute: 20]
+
+        entryResult = taskService.createEntry(p)
     }