Index: trunk/src/grails-app/conf/BootStrap.groovy
===================================================================
--- trunk/src/grails-app/conf/BootStrap.groovy (revision 38)
+++ trunk/src/grails-app/conf/BootStrap.groovy (revision 39)
@@ -5,19 +5,15 @@
def init = { servletContext ->
- println "**** BootStrap; GrailsUtil.environment: ${GrailsUtil.environment}"
+ println "**** BootStrap GrailsUtil.environment = ${GrailsUtil.environment}"
switch (GrailsUtil.environment)
{
case "development":
- println "**** BootStrap detected development"
- configureForDevelopment()
+ bootStrapDemoData()
break
case "test":
- println "**** BootStrap detected test"
- configureForTest()
break
case "production":
- println "**** BootStrap detected production"
- configureForProduction()
+ bootStrapDemoData()
break
}
@@ -27,11 +23,9 @@
def destroy = {
}
-
- /*
- Tasks to do when Grails is running in each environment.
- */
- void configureForDevelopment()
+
+ //Insert some demo/startup data.
+ void bootStrapDemoData()
{
- println "BootStrap configureForDevelopment() called"
+ println "BootStrapping demo data..."
//TypeOfPersonGroup
@@ -50,9 +44,12 @@
//Person
new Person(personGroup:PersonGroup.get(1),
- firstName:"FirstNameTech1",
- lastName:"LastNameTech1").save()
+ firstName:"Craig",
+ lastName:"SuperTech").save()
new Person(personGroup:PersonGroup.get(2),
firstName:"Joe",
lastName:"Samples").save()
+ new Person(personGroup:PersonGroup.get(1),
+ firstName:"Production",
+ lastName:"Mann").save()
//TaskGroup
@@ -82,4 +79,5 @@
new EntryType(name:"Fault").save()
new EntryType(name:"WorkDone").save()
+ new EntryType(name:"Production Report").save()
//ModificationType
@@ -93,19 +91,7 @@
new ModificationType(name:"AssignedToModified").save()
new ModificationType(name:"NameModified").save()
-
-
+
+ println "BootStrapping demo data...completed."
- }
-
- //---------------------------------------------------------
- void configureForTest()
- {
- println "BootStrap configureForTest() called"
- }
-
- //---------------------------------------------------------
- void configureForProduction()
- {
- println "BootStrap configureForProduction() called"
}
Index: trunk/src/grails-app/conf/DataSource.groovy
===================================================================
--- trunk/src/grails-app/conf/DataSource.groovy (revision 38)
+++ trunk/src/grails-app/conf/DataSource.groovy (revision 39)
@@ -10,5 +10,9 @@
cache.provider_class='com.opensymphony.oscache.hibernate.OSCacheProvider'
}
-// environment specific settings
+
+//environment specific settings
+//create-drop: drop tables and data between sessions, then insert from Bootstrap.
+//create: drop data between sessions, can't explain the rest.
+//update: keep data, update tables as required, keeps inserting from BootStrap.
environments {
development {
@@ -26,6 +30,8 @@
production {
dataSource {
- dbCreate = "update"
- url = "jdbc:hsqldb:file:prodDb;shutdown=true"
+ //Delete dbCreate line after setup!
+ dbCreate = "create-drop"
+ //url = "jdbc:hsqldb:file:prodDb;shutdown=true"
+ url = "jdbc:hsqldb:mem:devDB"
}
}
Index: trunk/src/grails-app/domain/Entry.groovy
===================================================================
--- trunk/src/grails-app/domain/Entry.groovy (revision 38)
+++ trunk/src/grails-app/domain/Entry.groovy (revision 39)
@@ -4,13 +4,17 @@
EntryType entryType
Date date
- Integer duration
+ Integer durationHours = 0
+ Integer durationMinutes = 0
String comments
-
- static hasMany = [persons: Person]
static belongsTo = [EntryType, Task, Person]
static constraints = {
+ task()
comments(maxSize:500)
+ date()
+ durationHours(min:0)
+ durationMinutes(min:0,max:59)
+
}
}
Index: trunk/src/grails-app/views/entry/create.gsp
===================================================================
--- trunk/src/grails-app/views/entry/create.gsp (revision 38)
+++ trunk/src/grails-app/views/entry/create.gsp (revision 39)
@@ -29,4 +29,13 @@
|
+
+ |
+
+
+ |
+
+
+
+ |
|
@@ -47,8 +56,17 @@
|
-
+
|
-
-
+ |
+
+ |
+
+
+
+ |
+
+ |
+
+
|
@@ -72,13 +90,4 @@
-
- |
-
- |
-
-
- |
-
-
Index: trunk/src/grails-app/views/entry/edit.gsp
===================================================================
--- trunk/src/grails-app/views/entry/edit.gsp (revision 38)
+++ trunk/src/grails-app/views/entry/edit.gsp (revision 39)
@@ -31,4 +31,13 @@
|
+
+ |
+
+
+ |
+
+
+
+ |
|
@@ -49,8 +58,17 @@
|
-
+
|
-
-
+ |
+
+ |
+
+
+
+ |
+
+ |
+
+
|
@@ -74,29 +92,4 @@
-
- |
-
- |
-
-
-
-
- - ${p?.encodeAsHTML()}
-
-
-Add Person
-
- |
-
-
-
- |
-
- |
-
-
- |
-
-
Index: trunk/src/grails-app/views/entry/list.gsp
===================================================================
--- trunk/src/grails-app/views/entry/list.gsp (revision 38)
+++ trunk/src/grails-app/views/entry/list.gsp (revision 39)
@@ -24,14 +24,14 @@
+ Task |
+
-
+
- Entry Type |
-
- Person |
-
+
+
@@ -42,13 +42,13 @@
${fieldValue(bean:entryInstance, field:'id')} |
+ ${fieldValue(bean:entryInstance, field:'task')} |
+
${fieldValue(bean:entryInstance, field:'comments')} |
${fieldValue(bean:entryInstance, field:'date')} |
- ${fieldValue(bean:entryInstance, field:'duration')} |
+ ${fieldValue(bean:entryInstance, field:'durationHours')} |
- ${fieldValue(bean:entryInstance, field:'entryType')} |
-
- ${fieldValue(bean:entryInstance, field:'person')} |
+ ${fieldValue(bean:entryInstance, field:'durationMinutes')} |
Index: trunk/src/grails-app/views/entry/show.gsp
===================================================================
--- trunk/src/grails-app/views/entry/show.gsp (revision 38)
+++ trunk/src/grails-app/views/entry/show.gsp (revision 39)
@@ -31,4 +31,11 @@
+ | Task: |
+
+ ${entryInstance?.task?.encodeAsHTML()} |
+
+
+
+
| Comments: |
@@ -45,7 +52,14 @@
- | Duration: |
+ Duration Hours: |
- ${fieldValue(bean:entryInstance, field:'duration')} |
+ ${fieldValue(bean:entryInstance, field:'durationHours')} |
+
+
+
+
+ | Duration Minutes: |
+
+ ${fieldValue(bean:entryInstance, field:'durationMinutes')} |
@@ -65,18 +79,4 @@
-
- | Persons: |
-
- ${fieldValue(bean:entryInstance, field:'persons')} |
-
-
-
-
- | Task: |
-
- ${entryInstance?.task?.encodeAsHTML()} |
-
-
-