Index: trunk/grails-app/conf/BootStrap.groovy =================================================================== --- trunk/grails-app/conf/BootStrap.groovy (revision 136) +++ trunk/grails-app/conf/BootStrap.groovy (revision 137) @@ -358,5 +358,5 @@ //Entry #1 - entryInstance = new Entry(enteredBy: Person.get(6), + entryInstance = new Entry(enteredBy: Person.get(3), task: Task.get(1), entryType: EntryType.findByName("Fault"), @@ -611,5 +611,5 @@ //MaintenanceAction #1 - maintenanceActionInstance = new MaintenanceAction(description: "Check all E-stops, active E-stop S1-S12 and ensure machine cannot run", + maintenanceActionInstance = new MaintenanceAction(description: "Check all E-stops, activate E-stops S1-S12 and ensure machine cannot run", procedureStepNumber: 1, maintenancePolicy: MaintenancePolicy.get(1), Index: trunk/grails-app/controllers/TaskDetailedController.groovy =================================================================== --- trunk/grails-app/controllers/TaskDetailedController.groovy (revision 136) +++ trunk/grails-app/controllers/TaskDetailedController.groovy (revision 137) @@ -31,4 +31,16 @@ params.order = "desc" params.sort = "id" + + def entryWorkDoneList = Entry.withCriteria { + def entryType = EntryType.findByName("WorkDone") + eq("entryType", entryType) + eq("task", taskInstance) + } + + def entryFaultList = Entry.withCriteria { + def entryType = EntryType.findByName("Fault") + eq("entryType", entryType) + eq("task", taskInstance) + } def subTaskInstanceList = Task.findAllByParentTask(taskInstance, params) @@ -53,5 +65,7 @@ } - return [ taskInstance : taskInstance, + return [ taskInstance: taskInstance, + entryWorkDoneList: entryWorkDoneList, + entryFaultList: entryFaultList, taskProcedureInstance: taskProcedureInstance, taskProcedureExits: taskProcedureExits, Index: trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy =================================================================== --- trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy (revision 136) +++ trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy (revision 137) @@ -1,7 +1,10 @@ import org.codehaus.groovy.grails.plugins.springsecurity.Secured import org.codehaus.groovy.runtime.TimeCategory +import java.text.SimpleDateFormat class TaskRecurringScheduleDetailedController extends BaseController { + def dateUtilService + def index = { redirect(action:list,params:params) } @@ -51,36 +54,61 @@ } else { - return [ taskRecurringScheduleInstance : taskRecurringScheduleInstance ] + return [ taskRecurringScheduleInstance : taskRecurringScheduleInstance] } } def update = { - def taskRecurringScheduleInstance = TaskRecurringSchedule.get( params.id ) - if(taskRecurringScheduleInstance) { - if(params.version) { - def version = params.version.toLong() - if(taskRecurringScheduleInstance.version > version) { + TaskRecurringSchedule.withTransaction { status -> + + def taskRecurringScheduleInstance = TaskRecurringSchedule.get( params.id ) + if(taskRecurringScheduleInstance) { + + if(params.version) { + def version = params.version.toLong() + if(taskRecurringScheduleInstance.version > version) { + taskRecurringScheduleInstance.errors.rejectValue("version", "taskRecurringSchedule.optimistic.locking.failure", "Another user has updated this TaskRecurringSchedule while you were editing.") + render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) + return + } + } + + Date originalDate = taskRecurringScheduleInstance.startDate + taskRecurringScheduleInstance.properties = params // Domain object is now 'dirty'. + Date newDate = taskRecurringScheduleInstance.startDate + + // If user changes startDate then ensure it is in the future, otherwise it's ok to keep the original date. + if(originalDate.getTime() != newDate.getTime()) + { + if(newDate < dateUtilService.getToday()) + { + status.setRollbackOnly() // Only allow the transaction to Rollback, preventing flush due to 'dirty'. + taskRecurringScheduleInstance.errors.rejectValue("startDate", "taskRecurring.startDate.NotInTheFuture") + render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) + return + } + } + + taskRecurringScheduleInstance.nextTargetStartDate = taskRecurringScheduleInstance.startDate + taskRecurringScheduleInstance.setNextGenerationDate() + taskRecurringScheduleInstance.setNextTargetCompletionDate() - taskRecurringScheduleInstance.errors.rejectValue("version", "taskRecurringSchedule.optimistic.locking.failure", "Another user has updated this TaskRecurringSchedule while you were editing.") - render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) - return - } - } -// taskRecurringScheduleInstance.properties = params - setUpdateProperties() - - if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) { - flash.message = "TaskRecurringSchedule ${params.id} updated" - redirect(action:show,id:taskRecurringScheduleInstance.id) - } - else { - render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) - } - } - else { - flash.message = "TaskRecurringSchedule not found with id ${params.id}" - redirect(action:edit,id:params.id) - } - } + if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) + { + flash.message = "TaskRecurringSchedule ${params.id} updated" + redirect(action:show,id:taskRecurringScheduleInstance.id) + } + else + { + render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) + } + } + else + { + flash.message = "TaskRecurringSchedule not found with id ${params.id}" + redirect(action:edit,id:params.id) + } + + } // end withTransaction + } // end update() def create = { @@ -95,5 +123,5 @@ redirect(controller:"taskDetailed", action:"list") } - } + } // end create() def save = { @@ -106,4 +134,8 @@ } else { + + if(taskRecurringScheduleInstance.startDate < dateUtilService.getToday()) { + taskRecurringScheduleInstance.errors.rejectValue("startDate", "taskRecurring.startDate.NotInTheFuture") + } if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) { @@ -125,48 +157,5 @@ } - } - - private setUpdateProperties() { - def originalStartDate = taskRecurringScheduleInstance.startDate - - if(taskRecurringScheduleInstance.startDate == params.startDate) { - taskRecurringScheduleInstance.properties = params - } - else { - taskRecurringScheduleInstance.properties = params - taskRecurringScheduleInstance.nextTargetStartDate = params.startDate - } - - } + } // end save() -/* - private Date calculateNextDueDate(recurEvery, period, startDate) { - def nextDue = new Date() - - switch (period) { - case "Day(s)": - use(TimeCategory) { - nextDue = startDate + recurEvery.days - } - return nextDue - case "Week(s)": - use(TimeCategory) { - nextDue = startDate + recurEvery.weeks - } - return nextDue - case "Month(s)": - use(TimeCategory) { - nextDue = startDate + recurEvery.months - } - return nextDue - case "Year(s)": - use(TimeCategory) { - nextDue = startDate + recurEvery.years - } - return nextDue - default: - return nextDue - } - - }*/ } Index: trunk/grails-app/domain/TaskRecurringSchedule.groovy =================================================================== --- trunk/grails-app/domain/TaskRecurringSchedule.groovy (revision 136) +++ trunk/grails-app/domain/TaskRecurringSchedule.groovy (revision 137) @@ -23,6 +23,5 @@ static constraints = { -// startDate(validator: {return (it > new Date())}) - recurEvery(min:0, max:365) + recurEvery(min:1, max:365) taskDuration(min:0, max:365) generateAhead(min:0, max:365) @@ -35,12 +34,14 @@ } - //As of Grails 1.1 this does not fire/pass before validation. - //But setting defaults above and placing this code here in the hope that this will be fixed in future versions. + // As of Grails 1.1.1 this does not fire/pass before validation. + // But setting some defaults above to pass validation and placing this code here + // in the hope that this will be fixed in future versions. def beforeInsert = { - def now = new Date() - nextTargetStartDate = startDate - - //nextGenerationDate + setNextGenerationDate() + setNextTargetCompletionDate() + } + + public void setNextGenerationDate() { switch (generateAheadPeriod.period) { case "Day(s)": @@ -67,8 +68,9 @@ break } - + def now = new Date() if( nextGenerationDate < now) {nextGenerationDate = now} - - //nextTargetCompletionDate + } + + public void setNextTargetCompletionDate() { switch (taskDurationPeriod.period) { case "Day(s)": @@ -92,10 +94,9 @@ } break - default: + default: break } - } - + } Index: trunk/grails-app/i18n/messages.properties =================================================================== --- trunk/grails-app/i18n/messages.properties (revision 136) +++ trunk/grails-app/i18n/messages.properties (revision 137) @@ -18,4 +18,8 @@ task.leadPerson=Lead Person task.leadPerson.help=The primay contact person. + +taskRecurring.startDate.NotInTheFuture=Please select a start date that is not in the past, or use original date. +taskRecurring.startDate=Start Date +taskRecurring.startDate.help=The tartget start date for the first auto generated subTask. default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}] Index: trunk/grails-app/jobs/TaskRecurringScheduleJob.groovy =================================================================== --- trunk/grails-app/jobs/TaskRecurringScheduleJob.groovy (revision 136) +++ trunk/grails-app/jobs/TaskRecurringScheduleJob.groovy (revision 137) @@ -1,10 +1,10 @@ class TaskRecurringScheduleJob {/* -// def timeout = 5000 // execute job once in 5 seconds - def timeout = 60000 + def timeout = 1000 // execute job once in 1 seconds +// def timeout = 60000 def execute() { -// println "TaskRecurringScheduleJob: tick" -// println "TaskRecurringScheduleJob: tock" + println "TaskRecurringScheduleJob: tick" + println "TaskRecurringScheduleJob: tock"/* def recurringScheduleInstanceList = RecurringSchedule.list() def now = new Date() Index: trunk/grails-app/services/DateUtilService.groovy =================================================================== --- trunk/grails-app/services/DateUtilService.groovy (revision 137) +++ trunk/grails-app/services/DateUtilService.groovy (revision 137) @@ -0,0 +1,24 @@ +class DateUtilService { + + boolean transactional = false + static scope = "request" + + public static Date getToday() { + return setMidnight(new Date()) + } + + public static Date getTomorrow() { + return (getToday() + 1) as Date + } + + public static Date setMidnight(Date theDate) { + Calendar cal = Calendar.getInstance() + cal.setTime(theDate) + cal.set(Calendar.HOUR_OF_DAY, 0) + cal.set(Calendar.MINUTE, 0) + cal.set(Calendar.SECOND, 0) + cal.set(Calendar.MILLISECOND, 0) + cal.getTime() + } + +} Index: trunk/grails-app/services/TaskService.groovy =================================================================== --- trunk/grails-app/services/TaskService.groovy (revision 137) +++ trunk/grails-app/services/TaskService.groovy (revision 137) @@ -0,0 +1,13 @@ +class TaskService { + + boolean transactional = true + static scope = "request" + + def dateUtilService + + def taskDates(taskInstance, params) { + println "yes" + + } + +} Index: trunk/grails-app/views/entryDetailed/edit.gsp =================================================================== --- trunk/grails-app/views/entryDetailed/edit.gsp (revision 136) +++ trunk/grails-app/views/entryDetailed/edit.gsp (revision 137) @@ -62,9 +62,9 @@ - : - Index: trunk/grails-app/views/taskDetailed/show.gsp =================================================================== --- trunk/grails-app/views/taskDetailed/show.gsp (revision 136) +++ trunk/grails-app/views/taskDetailed/show.gsp (revision 137) @@ -158,5 +158,4 @@ -
@@ -186,6 +185,5 @@ - - + @@ -202,5 +200,4 @@ - @@ -227,6 +224,5 @@ - - + @@ -243,5 +239,4 @@ - @@ -261,4 +256,6 @@ + + @@ -398,4 +395,23 @@ + + + + + Task Duration: + + + ${taskRecurringScheduleInstance?.taskDuration} ${taskRecurringScheduleInstance?.taskDurationPeriod} + + + + + Generate Ahead: + + + ${taskRecurringScheduleInstance?.generateAhead} ${taskRecurringScheduleInstance?.generateAheadPeriod} + + + @@ -407,21 +423,36 @@ + + + + + + - - - - - - - - - + + + + + + + + + + + + + + Index: trunk/grails-app/views/taskRecurringSchedule/create.gsp =================================================================== --- trunk/grails-app/views/taskRecurringSchedule/create.gsp (revision 136) +++ trunk/grails-app/views/taskRecurringSchedule/create.gsp (revision 137) @@ -47,4 +47,22 @@ + + + + + + + + + + @@ -65,8 +83,8 @@ - @@ -78,4 +96,13 @@ + + + + + Index: trunk/grails-app/views/taskRecurringSchedule/edit.gsp =================================================================== --- trunk/grails-app/views/taskRecurringSchedule/edit.gsp (revision 136) +++ trunk/grails-app/views/taskRecurringSchedule/edit.gsp (revision 137) @@ -50,4 +50,22 @@ + + + + + + + + + + @@ -68,8 +86,8 @@ - @@ -81,4 +99,13 @@ + + + + + Index: trunk/grails-app/views/taskRecurringSchedule/list.gsp =================================================================== --- trunk/grails-app/views/taskRecurringSchedule/list.gsp (revision 136) +++ trunk/grails-app/views/taskRecurringSchedule/list.gsp (revision 137) @@ -28,10 +28,10 @@ + + + + - - - - @@ -46,9 +46,9 @@ + + + + - - - - Index: trunk/grails-app/views/taskRecurringSchedule/show.gsp =================================================================== --- trunk/grails-app/views/taskRecurringSchedule/show.gsp (revision 136) +++ trunk/grails-app/views/taskRecurringSchedule/show.gsp (revision 137) @@ -45,4 +45,18 @@ + + + + + + + + + + + + + + @@ -59,7 +73,7 @@ - + - + @@ -69,4 +83,11 @@ + + + + + + + Index: trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp =================================================================== --- trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp (revision 136) +++ trunk/grails-app/views/taskRecurringScheduleDetailed/create.gsp (revision 137) @@ -53,5 +53,27 @@ - + + + + + + + + + + + + Index: trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp =================================================================== --- trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp (revision 136) +++ trunk/grails-app/views/taskRecurringScheduleDetailed/edit.gsp (revision 137) @@ -55,7 +55,29 @@ - + - + + + + + + + + + + + @@ -73,5 +95,5 @@
- +
Index: trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp =================================================================== --- trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp (revision 136) +++ trunk/grails-app/views/taskRecurringScheduleDetailed/list.gsp (revision 137) @@ -28,5 +28,5 @@ - + @@ -47,5 +47,5 @@ - + Index: trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp =================================================================== --- trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp (revision 136) +++ trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp (revision 137) @@ -39,8 +39,16 @@ + + + + + + @@ -48,9 +56,18 @@ - + - + + + + + + + + @@ -61,20 +78,33 @@ + +
Next Due Date:Next Target Start Date: - +
Next Target Completion Date: + +
Next Generation Date: + +
+ + + +
+ + + +
- + - + +
+
+ + +
+ + + +
+ + + +
- + - + +
+
+ + +
Last Generated Sub TaskGenerate Ahead PeriodPeriod
${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedSubTask')}${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')}${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAheadPeriod')}${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}${fieldValue(bean:taskRecurringScheduleInstance, field:'nextDueDate')}${fieldValue(bean:taskRecurringScheduleInstance, field:'period')}
Generate Ahead:${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')}
Generate Ahead Period:${taskRecurringScheduleInstance?.generateAheadPeriod?.encodeAsHTML()}
Is Enabled:
Period:Next Generation Date:${taskRecurringScheduleInstance?.period?.encodeAsHTML()}${fieldValue(bean:taskRecurringScheduleInstance, field:'nextGenerationDate')}
${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')}
Recur Period:${taskRecurringScheduleInstance?.recurPeriod?.encodeAsHTML()}
+ + + + +
+ + + +
+ + + + +
+ + + + +
${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')}${fieldValue(bean:taskRecurringScheduleInstance, field:'period')}${fieldValue(bean:taskRecurringScheduleInstance, field:'recurPeriod')} ${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}
Start Date: + +
Recur Every: - ${taskRecurringScheduleInstance?.recurEvery} ${taskRecurringScheduleInstance?.period} + ${taskRecurringScheduleInstance?.recurEvery} ${taskRecurringScheduleInstance?.recurPeriod}
Start Date:Task Duration: - - + ${taskRecurringScheduleInstance?.taskDuration} ${taskRecurringScheduleInstance?.taskDurationPeriod} +
Generate Ahead: + ${taskRecurringScheduleInstance?.generateAhead} ${taskRecurringScheduleInstance?.generateAheadPeriod} +
+ + + + + + + + + + + + + + + + - - - - - - - - - + - + + @@ -105,5 +135,5 @@ - +
Next Target Start Date: + +
Next Target Completion Date: + +
Next Due Date:Next Generation Date: - -