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 @@
+
+ |
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+
|
@@ -45,31 +81,4 @@
-
-
-
- |
-
-
- |
-
-
-
-
-
- |
-
-
- |
-
-
-
-
-
- |
-
-
-
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 @@
-
+
|
-
-
+ |
@@ -40,17 +40,8 @@
-
+
|
-
-
- |
-
-
-
-
-
- |
-
-
+ |
+
|
@@ -67,8 +58,17 @@
-
+
|
-
+
+ |
+
+
+
+
+
+ |
+
+
|
@@ -90,4 +90,13 @@
+
+
+
+ |
+
+
+ |
+
+
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 @@
- Person |
-
- Task |
-
-
+
+
+
-
-
+ Entry Type |
+
+ Person |
+
@@ -42,13 +42,13 @@
${fieldValue(bean:entryInstance, field:'id')} |
- ${fieldValue(bean:entryInstance, field:'person')} |
+ ${fieldValue(bean:entryInstance, field:'comments')} |
- ${fieldValue(bean:entryInstance, field:'task')} |
-
- ${fieldValue(bean:entryInstance, field:'dateTime')} |
+ ${fieldValue(bean:entryInstance, field:'date')} |
${fieldValue(bean:entryInstance, field:'duration')} |
- ${fieldValue(bean:entryInstance, field:'comments')} |
+ ${fieldValue(bean:entryInstance, field:'entryType')} |
+
+ ${fieldValue(bean:entryInstance, field:'person')} |
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 @@
- Person: |
+ Comments: |
- ${entryInstance?.person?.encodeAsHTML()} |
+ ${fieldValue(bean:entryInstance, field:'comments')} |
- Task: |
+ Date: |
- ${entryInstance?.task?.encodeAsHTML()} |
-
-
-
-
- Date Time: |
-
- ${fieldValue(bean:entryInstance, field:'dateTime')} |
+ ${fieldValue(bean:entryInstance, field:'date')} |
@@ -59,7 +52,14 @@
- Comments: |
+ Entry Type: |
- ${fieldValue(bean:entryInstance, field:'comments')} |
+ ${entryInstance?.entryType?.encodeAsHTML()} |
+
+
+
+
+ Person: |
+
+ ${entryInstance?.person?.encodeAsHTML()} |
@@ -69,4 +69,11 @@
${fieldValue(bean:entryInstance, field:'persons')} |
+
+
+
+
+ Task: |
+
+ ${entryInstance?.task?.encodeAsHTML()} |
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 @@
-
- |
-
-
- |
-
-
-
-
|
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 @@
-
+
|
-
-
+ |
+
+
+
+ - ${e?.encodeAsHTML()}
+
+
+Add Entry
+
|
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 @@
- Entry |
-
@@ -41,6 +39,4 @@
${fieldValue(bean:entryTypeInstance, field:'description')} |
-
- ${fieldValue(bean:entryTypeInstance, field:'entry')} |
${fieldValue(bean:entryTypeInstance, field:'isActive')} |
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 @@
- Entry: |
+ Entries: |
- ${entryTypeInstance?.entry?.encodeAsHTML()} |
+
+
+
+ - ${e?.encodeAsHTML()}
+
+
+ |
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 @@
-
- |
-
-
- |
-
-
-
-
|
@@ -54,4 +45,13 @@
+
+
+
+ |
+
+
+ |
+
+
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 @@
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 @@
-
-
+
+
@@ -38,9 +38,9 @@
${fieldValue(bean:modificationTypeInstance, field:'id')} |
- ${fieldValue(bean:modificationTypeInstance, field:'name')} |
-
${fieldValue(bean:modificationTypeInstance, field:'description')} |
${fieldValue(bean:modificationTypeInstance, field:'isActive')} |
+
+ ${fieldValue(bean:modificationTypeInstance, field:'name')} |
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 @@
- Name: |
-
- ${fieldValue(bean:modificationTypeInstance, field:'name')} |
-
-
-
-
Description: |
@@ -64,4 +57,11 @@
+
+ Name: |
+
+ ${fieldValue(bean:modificationTypeInstance, field:'name')} |
+
+
+
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 @@
-
+
|
-
-
+ |
+
|
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 @@
+
+ |
+
+
+ |
+
+
+
+
|
@@ -72,13 +81,4 @@
-
-
-
- |
-
-
- |
-
-
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 @@
- Type Of Person Group |
+ Person Group Type |
@@ -46,5 +46,5 @@
${fieldValue(bean:personGroupInstance, field:'name')} |
- ${fieldValue(bean:personGroupInstance, field:'typeOfPersonGroup')} |
+ ${fieldValue(bean:personGroupInstance, field:'personGroupType')} |
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 @@
- Persons: |
+ Person Group Type: |
- ${fieldValue(bean:personGroupInstance, field:'persons')} |
+ ${personGroupInstance?.personGroupType?.encodeAsHTML()} |
- Type Of Person Group: |
+ Persons: |
- ${personGroupInstance?.typeOfPersonGroup?.encodeAsHTML()} |
+ ${fieldValue(bean:personGroupInstance, field:'persons')} |