Index: /trunk/src/grails-app/conf/BootStrap.groovy
===================================================================
--- /trunk/src/grails-app/conf/BootStrap.groovy	(revision 24)
+++ /trunk/src/grails-app/conf/BootStrap.groovy	(revision 25)
@@ -37,24 +37,49 @@
         //TypeOfPersonGroup
         new PersonGroupType(name:"Department").save()
-        println "PersonGroup = ${PersonGroupType.get(1)}"
         new PersonGroupType(name:"Contractor").save()
         new PersonGroupType(name:"ProjectTeam").save()
     
         //PersonGroup
-        new PersonGroup(PersonGroupType:PersonGroupType.findByName("Department"), name:"Electrical").save()
-        new PersonGroup(
-            PersonGroupType:PersonGroupType.get(2),
-            name:"Kewl AirCon Guys").save()
-        new PersonGroup(
-            PersonGroupType:PersonGroupType.get(3),
-            name:"openMim").save()
+        new PersonGroup(personGroupType:PersonGroupType.findByName("Department"),
+                        name:"Electrical").save()
+        new PersonGroup(personGroupType:PersonGroupType.get(2),
+                        name:"Kewl AirCon Guys").save()
+        new PersonGroup(personGroupType:PersonGroupType.get(3),
+                        name:"openMim").save()
             
         //Person
         new Person(personGroup:PersonGroup.get(1),
-            firstName:"FirstNameTech1",
-            lastName:"LastNameTech1").save()
+                   firstName:"FirstNameTech1",
+                   lastName:"LastNameTech1").save()
         new Person(personGroup:PersonGroup.get(2),
-                    firstName:"Joe",
-                    lastName:"Samples").save()
+                   firstName:"Joe",
+                   lastName:"Samples").save()
+                
+        //TaskGroup
+        new TaskGroup(name:"Engineering",
+                      description:"Engineering task group").save()
+        new TaskGroup(name:"Production",
+                      description:"Production task group").save()
+        new TaskGroup(name:"NewProject(s)",
+                      description:" ").save()
+                      
+        
+        //Task
+        new Task(taskGroup:TaskGroup.findByName("Engineering"),
+                 person:Person.get(1),
+                 name:"Check specific level sensor",
+                 description:"Has been noted as problematic, try recallibrating",
+                 scheduledDate: new Date(),
+                 targetDate: new Date() ).save()
+        new Task(taskGroup:TaskGroup.findByName("Production"),
+                 person:Person.get(2),
+                 name:"Production Report",
+                 description:"Production report for specific production run or shift",
+                 scheduledDate: new Date(),
+                 targetDate: new Date() ).save()
+
+        //EntryType
+        new EntryType(name:"Fault").save()
+        new EntryType(name:"WorkDone").save()
     
     }
Index: /trunk/src/grails-app/domain/Entry.groovy
===================================================================
--- /trunk/src/grails-app/domain/Entry.groovy	(revision 24)
+++ /trunk/src/grails-app/domain/Entry.groovy	(revision 25)
@@ -2,5 +2,6 @@
     Person person
     Task task
-    Date dateTime
+    EntryType entryType
+    Date date
     Integer duration
     String comments
@@ -11,9 +12,5 @@
 
     static constraints = {
-        person(blank:false)
-        task(blank:false)
-        dateTime(nullable:true)
-        duration(nullable:true)
-        comments(maxLength:500)
+        comments(maxSize:500)
     }
 }
Index: /trunk/src/grails-app/domain/EntryType.groovy
===================================================================
--- /trunk/src/grails-app/domain/EntryType.groovy	(revision 24)
+++ /trunk/src/grails-app/domain/EntryType.groovy	(revision 25)
@@ -1,15 +1,10 @@
 class EntryType {
-    Entry entry
     String name
     String description = ""
-    boolean isActive
+    boolean isActive = true
 
-    static belongsTo = Entry
+    static hasMany = [entries: Entry]
     
     static contstraints = {
-        entry()
-        name(blank:false)
-        description()
-        isActive()
     }
 
Index: /trunk/src/grails-app/domain/ModificationType.groovy
===================================================================
--- /trunk/src/grails-app/domain/ModificationType.groovy	(revision 24)
+++ /trunk/src/grails-app/domain/ModificationType.groovy	(revision 25)
@@ -7,7 +7,4 @@
 
     static constraints = {
-        name()
-        description()
-        isActive()
     }
 
Index: /trunk/src/grails-app/domain/TaskGroup.groovy
===================================================================
--- /trunk/src/grails-app/domain/TaskGroup.groovy	(revision 24)
+++ /trunk/src/grails-app/domain/TaskGroup.groovy	(revision 25)
@@ -2,5 +2,5 @@
     String name
     String description
-    boolean isActive
+    boolean isActive = true
 
     static hasMany = [tasks : Task]
Index: /trunk/src/grails-app/views/entry/create.gsp
===================================================================
--- /trunk/src/grails-app/views/entry/create.gsp	(revision 24)
+++ /trunk/src/grails-app/views/entry/create.gsp	(revision 25)
@@ -29,4 +29,40 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="comments">Comments:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'comments','errors')}">
+                                    <textarea rows="5" cols="40" name="comments">${fieldValue(bean:entryInstance, field:'comments')}</textarea>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="date">Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'date','errors')}">
+                                    <g:datePicker name="date" value="${entryInstance?.date}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="duration">Duration:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'duration','errors')}">
+                                    <input type="text" id="duration" name="duration" value="${fieldValue(bean:entryInstance,field:'duration')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="entryType">Entry Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'entryType','errors')}">
+                                    <g:select optionKey="id" from="${EntryType.list()}" name="entryType.id" value="${entryInstance?.entryType?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="person">Person:</label>
                                 </td>
@@ -45,31 +81,4 @@
                             </tr> 
                         
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="dateTime">Date Time:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'dateTime','errors')}">
-                                    <g:datePicker name="dateTime" value="${entryInstance?.dateTime}" noSelection="['':'']"></g:datePicker>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="duration">Duration:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'duration','errors')}">
-                                    <input type="text" id="duration" name="duration" value="${fieldValue(bean:entryInstance,field:'duration')}" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="comments">Comments:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'comments','errors')}">
-                                    <input type="text" id="comments" name="comments" value="${fieldValue(bean:entryInstance,field:'comments')}"/>
-                                </td>
-                            </tr> 
-                        
                         </tbody>
                     </table>
Index: /trunk/src/grails-app/views/entry/edit.gsp
===================================================================
--- /trunk/src/grails-app/views/entry/edit.gsp	(revision 24)
+++ /trunk/src/grails-app/views/entry/edit.gsp	(revision 25)
@@ -31,8 +31,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="person">Person:</label>
+                                    <label for="comments">Comments:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'person','errors')}">
-                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${entryInstance?.person?.id}" ></g:select>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'comments','errors')}">
+                                    <textarea rows="5" cols="40" name="comments">${fieldValue(bean:entryInstance, field:'comments')}</textarea>
                                 </td>
                             </tr> 
@@ -40,17 +40,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="task">Task:</label>
+                                    <label for="date">Date:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'task','errors')}">
-                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${entryInstance?.task?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="dateTime">Date Time:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'dateTime','errors')}">
-                                    <g:datePicker name="dateTime" value="${entryInstance?.dateTime}" noSelection="['':'']"></g:datePicker>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'date','errors')}">
+                                    <g:datePicker name="date" value="${entryInstance?.date}" ></g:datePicker>
                                 </td>
                             </tr> 
@@ -67,8 +58,17 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="comments">Comments:</label>
+                                    <label for="entryType">Entry Type:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'comments','errors')}">
-                                    <input type="text" id="comments" name="comments" value="${fieldValue(bean:entryInstance,field:'comments')}"/>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'entryType','errors')}">
+                                    <g:select optionKey="id" from="${EntryType.list()}" name="entryType.id" value="${entryInstance?.entryType?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="person">Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'person','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${entryInstance?.person?.id}" ></g:select>
                                 </td>
                             </tr> 
@@ -90,4 +90,13 @@
                             </tr> 
                         
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="task">Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'task','errors')}">
+                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${entryInstance?.task?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
                         </tbody>
                     </table>
Index: /trunk/src/grails-app/views/entry/list.gsp
===================================================================
--- /trunk/src/grails-app/views/entry/list.gsp	(revision 24)
+++ /trunk/src/grails-app/views/entry/list.gsp	(revision 25)
@@ -24,14 +24,14 @@
                    	        <g:sortableColumn property="id" title="Id" />
                         
-                   	        <th>Person</th>
-                   	    
-                   	        <th>Task</th>
-                   	    
-                   	        <g:sortableColumn property="dateTime" title="Date Time" />
+                   	        <g:sortableColumn property="comments" title="Comments" />
+                        
+                   	        <g:sortableColumn property="date" title="Date" />
                         
                    	        <g:sortableColumn property="duration" title="Duration" />
                         
-                   	        <g:sortableColumn property="comments" title="Comments" />
-                        
+                   	        <th>Entry Type</th>
+                   	    
+                   	        <th>Person</th>
+                   	    
                         </tr>
                     </thead>
@@ -42,13 +42,13 @@
                             <td><g:link action="show" id="${entryInstance.id}">${fieldValue(bean:entryInstance, field:'id')}</g:link></td>
                         
-                            <td>${fieldValue(bean:entryInstance, field:'person')}</td>
+                            <td>${fieldValue(bean:entryInstance, field:'comments')}</td>
                         
-                            <td>${fieldValue(bean:entryInstance, field:'task')}</td>
-                        
-                            <td>${fieldValue(bean:entryInstance, field:'dateTime')}</td>
+                            <td>${fieldValue(bean:entryInstance, field:'date')}</td>
                         
                             <td>${fieldValue(bean:entryInstance, field:'duration')}</td>
                         
-                            <td>${fieldValue(bean:entryInstance, field:'comments')}</td>
+                            <td>${fieldValue(bean:entryInstance, field:'entryType')}</td>
+                        
+                            <td>${fieldValue(bean:entryInstance, field:'person')}</td>
                         
                         </tr>
Index: /trunk/src/grails-app/views/entry/show.gsp
===================================================================
--- /trunk/src/grails-app/views/entry/show.gsp	(revision 24)
+++ /trunk/src/grails-app/views/entry/show.gsp	(revision 25)
@@ -31,21 +31,14 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Person:</td>
+                            <td valign="top" class="name">Comments:</td>
                             
-                            <td valign="top" class="value"><g:link controller="person" action="show" id="${entryInstance?.person?.id}">${entryInstance?.person?.encodeAsHTML()}</g:link></td>
+                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'comments')}</td>
                             
                         </tr>
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Task:</td>
+                            <td valign="top" class="name">Date:</td>
                             
-                            <td valign="top" class="value"><g:link controller="task" action="show" id="${entryInstance?.task?.id}">${entryInstance?.task?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Date Time:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'dateTime')}</td>
+                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'date')}</td>
                             
                         </tr>
@@ -59,7 +52,14 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Comments:</td>
+                            <td valign="top" class="name">Entry Type:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'comments')}</td>
+                            <td valign="top" class="value"><g:link controller="entryType" action="show" id="${entryInstance?.entryType?.id}">${entryInstance?.entryType?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Person:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="person" action="show" id="${entryInstance?.person?.id}">${entryInstance?.person?.encodeAsHTML()}</g:link></td>
                             
                         </tr>
@@ -69,4 +69,11 @@
                             
                             <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'persons')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="task" action="show" id="${entryInstance?.task?.id}">${entryInstance?.task?.encodeAsHTML()}</g:link></td>
                             
                         </tr>
Index: /trunk/src/grails-app/views/entryType/create.gsp
===================================================================
--- /trunk/src/grails-app/views/entryType/create.gsp	(revision 24)
+++ /trunk/src/grails-app/views/entryType/create.gsp	(revision 25)
@@ -38,13 +38,4 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="entry">Entry:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:entryTypeInstance,field:'entry','errors')}">
-                                    <g:select optionKey="id" from="${Entry.list()}" name="entry.id" value="${entryTypeInstance?.entry?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
                                     <label for="isActive">Is Active:</label>
                                 </td>
Index: /trunk/src/grails-app/views/entryType/edit.gsp
===================================================================
--- /trunk/src/grails-app/views/entryType/edit.gsp	(revision 24)
+++ /trunk/src/grails-app/views/entryType/edit.gsp	(revision 25)
@@ -40,8 +40,15 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="entry">Entry:</label>
+                                    <label for="entries">Entries:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:entryTypeInstance,field:'entry','errors')}">
-                                    <g:select optionKey="id" from="${Entry.list()}" name="entry.id" value="${entryTypeInstance?.entry?.id}" ></g:select>
+                                <td valign="top" class="value ${hasErrors(bean:entryTypeInstance,field:'entries','errors')}">
+                                    
+<ul>
+<g:each var="e" in="${entryTypeInstance?.entries?}">
+    <li><g:link controller="entry" action="show" id="${e.id}">${e?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="entry" params="['entryType.id':entryTypeInstance?.id]" action="create">Add Entry</g:link>
+
                                 </td>
                             </tr> 
Index: /trunk/src/grails-app/views/entryType/list.gsp
===================================================================
--- /trunk/src/grails-app/views/entryType/list.gsp	(revision 24)
+++ /trunk/src/grails-app/views/entryType/list.gsp	(revision 25)
@@ -26,6 +26,4 @@
                    	        <g:sortableColumn property="description" title="Description" />
                         
-                   	        <th>Entry</th>
-                   	    
                    	        <g:sortableColumn property="isActive" title="Is Active" />
                         
@@ -41,6 +39,4 @@
                         
                             <td>${fieldValue(bean:entryTypeInstance, field:'description')}</td>
-                        
-                            <td>${fieldValue(bean:entryTypeInstance, field:'entry')}</td>
                         
                             <td>${fieldValue(bean:entryTypeInstance, field:'isActive')}</td>
Index: /trunk/src/grails-app/views/entryType/show.gsp
===================================================================
--- /trunk/src/grails-app/views/entryType/show.gsp	(revision 24)
+++ /trunk/src/grails-app/views/entryType/show.gsp	(revision 25)
@@ -38,7 +38,13 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Entry:</td>
+                            <td valign="top" class="name">Entries:</td>
                             
-                            <td valign="top" class="value"><g:link controller="entry" action="show" id="${entryTypeInstance?.entry?.id}">${entryTypeInstance?.entry?.encodeAsHTML()}</g:link></td>
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="e" in="${entryTypeInstance.entries}">
+                                    <li><g:link controller="entry" action="show" id="${e.id}">${e?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
                             
                         </tr>
Index: /trunk/src/grails-app/views/modificationType/create.gsp
===================================================================
--- /trunk/src/grails-app/views/modificationType/create.gsp	(revision 24)
+++ /trunk/src/grails-app/views/modificationType/create.gsp	(revision 25)
@@ -29,13 +29,4 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="name">Name:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:modificationTypeInstance,field:'name','errors')}">
-                                    <input type="text" id="name" name="name" value="${fieldValue(bean:modificationTypeInstance,field:'name')}"/>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
                                     <label for="description">Description:</label>
                                 </td>
@@ -54,4 +45,13 @@
                             </tr> 
                         
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationTypeInstance,field:'name','errors')}">
+                                    <input type="text" id="name" name="name" value="${fieldValue(bean:modificationTypeInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
                         </tbody>
                     </table>
Index: /trunk/src/grails-app/views/modificationType/edit.gsp
===================================================================
--- /trunk/src/grails-app/views/modificationType/edit.gsp	(revision 24)
+++ /trunk/src/grails-app/views/modificationType/edit.gsp	(revision 25)
@@ -28,13 +28,4 @@
                     <table>
                         <tbody>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="name">Name:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:modificationTypeInstance,field:'name','errors')}">
-                                    <input type="text" id="name" name="name" value="${fieldValue(bean:modificationTypeInstance,field:'name')}"/>
-                                </td>
-                            </tr> 
                         
                             <tr class="prop">
@@ -72,4 +63,13 @@
                             </tr> 
                         
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:modificationTypeInstance,field:'name','errors')}">
+                                    <input type="text" id="name" name="name" value="${fieldValue(bean:modificationTypeInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
                         </tbody>
                     </table>
Index: /trunk/src/grails-app/views/modificationType/list.gsp
===================================================================
--- /trunk/src/grails-app/views/modificationType/list.gsp	(revision 24)
+++ /trunk/src/grails-app/views/modificationType/list.gsp	(revision 25)
@@ -24,9 +24,9 @@
                    	        <g:sortableColumn property="id" title="Id" />
                         
-                   	        <g:sortableColumn property="name" title="Name" />
-                        
                    	        <g:sortableColumn property="description" title="Description" />
                         
                    	        <g:sortableColumn property="isActive" title="Is Active" />
+                        
+                   	        <g:sortableColumn property="name" title="Name" />
                         
                         </tr>
@@ -38,9 +38,9 @@
                             <td><g:link action="show" id="${modificationTypeInstance.id}">${fieldValue(bean:modificationTypeInstance, field:'id')}</g:link></td>
                         
-                            <td>${fieldValue(bean:modificationTypeInstance, field:'name')}</td>
-                        
                             <td>${fieldValue(bean:modificationTypeInstance, field:'description')}</td>
                         
                             <td>${fieldValue(bean:modificationTypeInstance, field:'isActive')}</td>
+                        
+                            <td>${fieldValue(bean:modificationTypeInstance, field:'name')}</td>
                         
                         </tr>
Index: /trunk/src/grails-app/views/modificationType/show.gsp
===================================================================
--- /trunk/src/grails-app/views/modificationType/show.gsp	(revision 24)
+++ /trunk/src/grails-app/views/modificationType/show.gsp	(revision 25)
@@ -31,11 +31,4 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Name:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:modificationTypeInstance, field:'name')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
                             <td valign="top" class="name">Description:</td>
                             
@@ -64,4 +57,11 @@
                         </tr>
                     
+                        <tr class="prop">
+                            <td valign="top" class="name">Name:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:modificationTypeInstance, field:'name')}</td>
+                            
+                        </tr>
+                    
                     </tbody>
                 </table>
Index: /trunk/src/grails-app/views/personGroup/create.gsp
===================================================================
--- /trunk/src/grails-app/views/personGroup/create.gsp	(revision 24)
+++ /trunk/src/grails-app/views/personGroup/create.gsp	(revision 25)
@@ -56,8 +56,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="typeOfPersonGroup">Type Of Person Group:</label>
+                                    <label for="personGroupType">Person Group Type:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:personGroupInstance,field:'typeOfPersonGroup','errors')}">
-                                    <g:select optionKey="id" from="${TypeOfPersonGroup.list()}" name="typeOfPersonGroup.id" value="${personGroupInstance?.typeOfPersonGroup?.id}" ></g:select>
+                                <td valign="top" class="value ${hasErrors(bean:personGroupInstance,field:'personGroupType','errors')}">
+                                    <g:select optionKey="id" from="${PersonGroupType.list()}" name="personGroupType.id" value="${personGroupInstance?.personGroupType?.id}" ></g:select>
                                 </td>
                             </tr> 
Index: /trunk/src/grails-app/views/personGroup/edit.gsp
===================================================================
--- /trunk/src/grails-app/views/personGroup/edit.gsp	(revision 24)
+++ /trunk/src/grails-app/views/personGroup/edit.gsp	(revision 25)
@@ -58,4 +58,13 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="personGroupType">Person Group Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:personGroupInstance,field:'personGroupType','errors')}">
+                                    <g:select optionKey="id" from="${PersonGroupType.list()}" name="personGroupType.id" value="${personGroupInstance?.personGroupType?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="persons">Persons:</label>
                                 </td>
@@ -72,13 +81,4 @@
                             </tr> 
                         
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="typeOfPersonGroup">Type Of Person Group:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:personGroupInstance,field:'typeOfPersonGroup','errors')}">
-                                    <g:select optionKey="id" from="${TypeOfPersonGroup.list()}" name="typeOfPersonGroup.id" value="${personGroupInstance?.typeOfPersonGroup?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
                         </tbody>
                     </table>
Index: /trunk/src/grails-app/views/personGroup/list.gsp
===================================================================
--- /trunk/src/grails-app/views/personGroup/list.gsp	(revision 24)
+++ /trunk/src/grails-app/views/personGroup/list.gsp	(revision 25)
@@ -30,5 +30,5 @@
                    	        <g:sortableColumn property="name" title="Name" />
                         
-                   	        <th>Type Of Person Group</th>
+                   	        <th>Person Group Type</th>
                    	    
                         </tr>
@@ -46,5 +46,5 @@
                             <td>${fieldValue(bean:personGroupInstance, field:'name')}</td>
                         
-                            <td>${fieldValue(bean:personGroupInstance, field:'typeOfPersonGroup')}</td>
+                            <td>${fieldValue(bean:personGroupInstance, field:'personGroupType')}</td>
                         
                         </tr>
Index: /trunk/src/grails-app/views/personGroup/show.gsp
===================================================================
--- /trunk/src/grails-app/views/personGroup/show.gsp	(revision 24)
+++ /trunk/src/grails-app/views/personGroup/show.gsp	(revision 25)
@@ -52,14 +52,14 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Persons:</td>
+                            <td valign="top" class="name">Person Group Type:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:personGroupInstance, field:'persons')}</td>
+                            <td valign="top" class="value"><g:link controller="personGroupType" action="show" id="${personGroupInstance?.personGroupType?.id}">${personGroupInstance?.personGroupType?.encodeAsHTML()}</g:link></td>
                             
                         </tr>
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Type Of Person Group:</td>
+                            <td valign="top" class="name">Persons:</td>
                             
-                            <td valign="top" class="value"><g:link controller="typeOfPersonGroup" action="show" id="${personGroupInstance?.typeOfPersonGroup?.id}">${personGroupInstance?.typeOfPersonGroup?.encodeAsHTML()}</g:link></td>
+                            <td valign="top" class="value">${fieldValue(bean:personGroupInstance, field:'persons')}</td>
                             
                         </tr>