Index: trunk/src/grails-app/views/entry/create.gsp
===================================================================
--- trunk/src/grails-app/views/entry/create.gsp	(revision 21)
+++ 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 21)
+++ 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 21)
+++ 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 21)
+++ 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>