Changeset 241 for trunk/grails-app/services

Timestamp:

Dec 23, 2009, 3:05:12 PM (15 years ago)

Author:

gav

Message:

Undo the AssignedGroup implementation by reverse merge r240:r239.

Location:

trunk/grails-app/services

Files:

• CreateDataService.groovy (modified) (2 diffs)
• TaskService.groovy (modified) (1 diff)

trunk/grails-app/services/CreateDataService.groovy

@@ -110 +110 @@
         createDemoTasks()
         createDemoEntries()
-        createDemoAssignedGroups()
+        createDemoAssignedPersons()
         createDemoTaskRecurringSchedules()
 
@@ -655 +655 @@
     }
 
-    def createDemoAssignedGroups() {
-
-        //AssignedGroup
-        def assignedGroupInstance
-
-        //AssignedGroup #1
-        assignedGroupInstance = new AssignedGroup(personGroup: PersonGroup.get(4),
+    def createDemoAssignedPersons() {
+
+        //AssignedPerson
+        def assignedPersonInstance
+
+        //AssignedPerson #1
+        assignedPersonInstance = new AssignedPerson(person: Person.get(4),
                                                                                         task: Task.get(1),
                                                                                         estimatedHour: 1,
                                                                                         estimatedMinute: 20)
-        saveAndTest(assignedGroupInstance)
-
-        //AssignedGroup #2
-        assignedGroupInstance = new AssignedGroup(personGroup: PersonGroup.get(5),
+        saveAndTest(assignedPersonInstance)
+
+        //AssignedPerson #2
+        assignedPersonInstance = new AssignedPerson(person: Person.get(5),
                                                                                         task: Task.get(1),
                                                                                         estimatedHour: 3,
                                                                                         estimatedMinute: 30)
-        saveAndTest(assignedGroupInstance)
+        saveAndTest(assignedPersonInstance)
     }
 

trunk/grails-app/services/TaskService.groovy

@@ -97 +97 @@
         if(params.taskProcedure) p.taskProcedure = params.taskProcedure
 
-                    //Set the assignedGroups
-//                     taskInstance.assignedGroups.each() {
+                    //Set the assignedPersons
+//                     taskInstance.assignedPersons.each() {
 // 
-//                     def assignedGroup = new AssignedGroup(person: it.person,
+//                     def assignedPerson = new AssignedPerson(person: it.person,
 //                                                                                             task: subTaskInstance,
 //                                                                                             estimatedHour: it.estimatedHour,