Index: /trunk/grails-app/controllers/TaskBudgetStatusController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskBudgetStatusController.groovy (revision 252) +++ /trunk/grails-app/controllers/TaskBudgetStatusController.groovy (revision 252) @@ -0,0 +1,99 @@ +import org.codehaus.groovy.grails.plugins.springsecurity.Secured + +class TaskBudgetStatusController extends BaseAppAdminController { + + def index = { redirect(action:list,params:params) } + + // the delete, save and update actions only accept POST requests + static allowedMethods = [delete:'POST', save:'POST', update:'POST'] + + def list = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + [ taskBudgetStatusInstanceList: TaskBudgetStatus.list( params ), taskBudgetStatusInstanceTotal: TaskBudgetStatus.count() ] + } + + def show = { + def taskBudgetStatusInstance = TaskBudgetStatus.get( params.id ) + + if(!taskBudgetStatusInstance) { + flash.message = "TaskBudgetStatus not found with id ${params.id}" + redirect(action:list) + } + else { return [ taskBudgetStatusInstance : taskBudgetStatusInstance ] } + } + + def delete = { + def taskBudgetStatusInstance = TaskBudgetStatus.get( params.id ) + if(taskBudgetStatusInstance) { + try { + taskBudgetStatusInstance.delete(flush:true) + flash.message = "TaskBudgetStatus ${params.id} deleted" + redirect(action:list) + } + catch(org.springframework.dao.DataIntegrityViolationException e) { + flash.message = "TaskBudgetStatus ${params.id} could not be deleted" + redirect(action:show,id:params.id) + } + } + else { + flash.message = "TaskBudgetStatus not found with id ${params.id}" + redirect(action:list) + } + } + + def edit = { + def taskBudgetStatusInstance = TaskBudgetStatus.get( params.id ) + + if(!taskBudgetStatusInstance) { + flash.message = "TaskBudgetStatus not found with id ${params.id}" + redirect(action:list) + } + else { + return [ taskBudgetStatusInstance : taskBudgetStatusInstance ] + } + } + + def update = { + def taskBudgetStatusInstance = TaskBudgetStatus.get( params.id ) + if(taskBudgetStatusInstance) { + if(params.version) { + def version = params.version.toLong() + if(taskBudgetStatusInstance.version > version) { + + taskBudgetStatusInstance.errors.rejectValue("version", "taskBudgetStatus.optimistic.locking.failure", "Another user has updated this TaskBudgetStatus while you were editing.") + render(view:'edit',model:[taskBudgetStatusInstance:taskBudgetStatusInstance]) + return + } + } + taskBudgetStatusInstance.properties = params + if(!taskBudgetStatusInstance.hasErrors() && taskBudgetStatusInstance.save(flush: true)) { + flash.message = "TaskBudgetStatus ${params.id} updated" + redirect(action:show,id:taskBudgetStatusInstance.id) + } + else { + render(view:'edit',model:[taskBudgetStatusInstance:taskBudgetStatusInstance]) + } + } + else { + flash.message = "TaskBudgetStatus not found with id ${params.id}" + redirect(action:list) + } + } + + def create = { + def taskBudgetStatusInstance = new TaskBudgetStatus() + taskBudgetStatusInstance.properties = params + return ['taskBudgetStatusInstance':taskBudgetStatusInstance] + } + + def save = { + def taskBudgetStatusInstance = new TaskBudgetStatus(params) + if(!taskBudgetStatusInstance.hasErrors() && taskBudgetStatusInstance.save(flush: true)) { + flash.message = "TaskBudgetStatus ${taskBudgetStatusInstance.id} created" + redirect(action:show,id:taskBudgetStatusInstance.id) + } + else { + render(view:'create',model:[taskBudgetStatusInstance:taskBudgetStatusInstance]) + } + } +} Index: /trunk/grails-app/domain/Task.groovy =================================================================== --- /trunk/grails-app/domain/Task.groovy (revision 251) +++ /trunk/grails-app/domain/Task.groovy (revision 252) @@ -4,4 +4,5 @@ TaskStatus taskStatus TaskPriority taskPriority + TaskBudgetStatus taskBudgetStatus TaskType taskType Task parentTask @@ -38,4 +39,5 @@ leadPerson() taskPriority() + taskBudgetStatus() taskStatus() parentTask(nullable:true) Index: /trunk/grails-app/domain/TaskBudgetStatus.groovy =================================================================== --- /trunk/grails-app/domain/TaskBudgetStatus.groovy (revision 252) +++ /trunk/grails-app/domain/TaskBudgetStatus.groovy (revision 252) @@ -0,0 +1,14 @@ +class TaskBudgetStatus { + String name + String description = "" + boolean isActive = true + + static hasMany = [tasks : Task] + + static constraints = { + name(maxSize:50,unique:true,blank:false) + description(maxSize:100) + } + + String toString() {"${this.name}"} +} Index: /trunk/grails-app/services/CreateDataService.groovy =================================================================== --- /trunk/grails-app/services/CreateDataService.groovy (revision 251) +++ /trunk/grails-app/services/CreateDataService.groovy (revision 252) @@ -64,4 +64,5 @@ createBaseTaskStatus() createBaseTaskPriorities() + createBaseTaskBudgetStatus() createBaseTaskTypes() createBaseTaskModificationTypes() @@ -499,4 +500,16 @@ } + def createBaseTaskBudgetStatus() { + + //TaskBudgetStatus + def taskBudgetStatusInstance + + taskBudgetStatusInstance = new TaskBudgetStatus(name:"Unplanned") // #1 + saveAndTest(taskBudgetStatusInstance) + + taskBudgetStatusInstance = new TaskBudgetStatus(name:"Planned") // #2 + saveAndTest(taskBudgetStatusInstance) + } + def createBaseTaskTypes() { Index: /trunk/grails-app/services/TaskSearchService.groovy =================================================================== --- /trunk/grails-app/services/TaskSearchService.groovy (revision 251) +++ /trunk/grails-app/services/TaskSearchService.groovy (revision 252) @@ -87,7 +87,7 @@ sort: params.sort, order: params.order) { - ne("taskType", TaskType.findByName("Unscheduled Breakin")) + eq("taskBudgetStatus", TaskBudgetStatus.get(2)) ge("targetStartDate", dateUtilService.oneWeekAgo) - lt("targetStartDate", dateUtilService.getTomorrow()) + lt("targetStartDate", dateUtilService.tomorrow) eq("trash", false) } @@ -105,5 +105,5 @@ sort: params.sort, order: params.order) { - eq("taskType", TaskType.findByName("Unscheduled Breakin")) + eq("taskBudgetStatus", TaskBudgetStatus.get(1)) ge("targetStartDate", dateUtilService.oneWeekAgo) lt("targetStartDate", dateUtilService.getTomorrow()) Index: /trunk/grails-app/services/TaskService.groovy =================================================================== --- /trunk/grails-app/services/TaskService.groovy (revision 251) +++ /trunk/grails-app/services/TaskService.groovy (revision 252) @@ -38,4 +38,11 @@ // Default status to "not started" if not supplied. params.taskStatus = params.taskStatus ?: TaskStatus.get(1) + + // Set budgetStatus. + if(params.taskType?.id?.toLong() == 1) // Unscheduled Breakin. + params.taskBudgetStatus = params.taskBudgetStatus ?: TaskBudgetStatus.get(1) // Unplanned. + else + params.taskBudgetStatus = params.taskBudgetStatus ?: TaskBudgetStatus.get(2) // Planned. + def taskInstance = new Task(params) result.taskInstance = taskInstance Index: /trunk/grails-app/views/task/create.gsp =================================================================== --- /trunk/grails-app/views/task/create.gsp (revision 251) +++ /trunk/grails-app/views/task/create.gsp (revision 252) @@ -77,4 +77,13 @@ + + + + + + + + + Index: /trunk/grails-app/views/task/edit.gsp =================================================================== --- /trunk/grails-app/views/task/edit.gsp (revision 251) +++ /trunk/grails-app/views/task/edit.gsp (revision 252) @@ -85,4 +85,13 @@ + + + + + + + + + Index: /trunk/grails-app/views/task/show.gsp =================================================================== --- /trunk/grails-app/views/task/show.gsp (revision 251) +++ /trunk/grails-app/views/task/show.gsp (revision 252) @@ -72,4 +72,11 @@ + Task Budget Status: + + ${taskInstance?.taskBudgetStatus?.encodeAsHTML()} + + + + Task Status: Index: /trunk/grails-app/views/taskBudgetStatus/create.gsp =================================================================== --- /trunk/grails-app/views/taskBudgetStatus/create.gsp (revision 252) +++ /trunk/grails-app/views/taskBudgetStatus/create.gsp (revision 252) @@ -0,0 +1,64 @@ + + + + + + + Create TaskBudgetStatus + + +
+ TaskBudgetStatus List +
+
+

Create TaskBudgetStatus

+ +
${flash.message}
+ + +
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+
+
+ +
+ +
+ + Index: /trunk/grails-app/views/taskBudgetStatus/edit.gsp =================================================================== --- /trunk/grails-app/views/taskBudgetStatus/edit.gsp (revision 252) +++ /trunk/grails-app/views/taskBudgetStatus/edit.gsp (revision 252) @@ -0,0 +1,84 @@ + + + + + + + Edit TaskBudgetStatus + + +
+ TaskBudgetStatus List + New TaskBudgetStatus +
+
+

Edit TaskBudgetStatus

+ +
${flash.message}
+ + +
+ +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
    + +
  • ${t?.encodeAsHTML()}
    • +     +
+Add Task + +
+
+
+ + +
+ +
+ + Index: /trunk/grails-app/views/taskBudgetStatus/list.gsp =================================================================== --- /trunk/grails-app/views/taskBudgetStatus/list.gsp (revision 252) +++ /trunk/grails-app/views/taskBudgetStatus/list.gsp (revision 252) @@ -0,0 +1,55 @@ + + + + + + + TaskBudgetStatus List + + +
+ New TaskBudgetStatus +
+
+

TaskBudgetStatus List

+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${fieldValue(bean:taskBudgetStatusInstance, field:'id')}${fieldValue(bean:taskBudgetStatusInstance, field:'name')}${fieldValue(bean:taskBudgetStatusInstance, field:'description')}${fieldValue(bean:taskBudgetStatusInstance, field:'isActive')}
+
+
+ +
+
+ + Index: /trunk/grails-app/views/taskBudgetStatus/show.gsp =================================================================== --- /trunk/grails-app/views/taskBudgetStatus/show.gsp (revision 252) +++ /trunk/grails-app/views/taskBudgetStatus/show.gsp (revision 252) @@ -0,0 +1,77 @@ + + + + + + + Show TaskBudgetStatus + + +
+ TaskBudgetStatus List + New TaskBudgetStatus +
+
+

Show TaskBudgetStatus

+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Id:${fieldValue(bean:taskBudgetStatusInstance, field:'id')}
Name:${fieldValue(bean:taskBudgetStatusInstance, field:'name')}
Description:${fieldValue(bean:taskBudgetStatusInstance, field:'description')}
Is Active:${fieldValue(bean:taskBudgetStatusInstance, field:'isActive')}
Tasks: +
    + +
  • ${t?.encodeAsHTML()}
    • +     +
+
+
+
+ + + + + +
+
+ + Index: /trunk/grails-app/views/taskDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/taskDetailed/edit.gsp (revision 251) +++ /trunk/grails-app/views/taskDetailed/edit.gsp (revision 252) @@ -129,4 +129,13 @@ + + + + + + + + + Index: /trunk/grails-app/views/taskDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/taskDetailed/show.gsp (revision 251) +++ /trunk/grails-app/views/taskDetailed/show.gsp (revision 252) @@ -149,4 +149,11 @@ + Budget Status: + + ${taskInstance?.taskBudgetStatus?.encodeAsHTML()} + + + + Approved: