Index: trunk/application.properties =================================================================== --- trunk/application.properties (revision 146) +++ trunk/application.properties (revision 147) @@ -1,7 +1,8 @@ #utf-8 -#Fri Oct 02 18:50:25 EST 2009 +#Thu Oct 08 11:38:24 EST 2009 plugins.acegi=0.5.1 plugins.navigation=1.1 app.version= +plugins.class-diagram=0.4 plugins.help-balloons=1.2 plugins.quartz=0.4.1-SNAPSHOT Index: trunk/grails-app/conf/Config.groovy =================================================================== --- trunk/grails-app/conf/Config.groovy (revision 146) +++ trunk/grails-app/conf/Config.groovy (revision 147) @@ -111,31 +111,24 @@ ] -/** Class-diagram plugin overrides. - * - */ -classDiagram { - associations { - arrows { - // See http://www.graphviz.org/doc/info/arrows.html for available arrowheads and their visual appearance - references = "open" - belongsTo = "odiamond" - embedded = "diamond" - inherits = "onormal" - none = "none" - } - decorators { - // plain text to be shown on edge ends - hasOne = "1" - hasMany = "*" - none = "" - } - } - skins { - classicSpacey { - name = " Classic Spacey" - graphStyle = [bgcolor:"none", mclimit:100, nodesep:'1.5 equally', ranksep:'2 equally' ] - nodeStyle = [style:"rounded,filled", color:"blue", fillcolor:"azure2", fontname:"Verdana", fontsize:18] - edgeStyle = [color:"gray40", fontname:"Verdana", fontsize:18, labelfontsize:20, labeldistance:3.5] - } - } -} +/** Navigation plugin alternate menu. + * The alternate top level titles are not displayed anywhere. + * Subitems i18n message bundles are not currently resolving with this plugin. + */ +navigation.navAlt = [ + [order:10, controller:'person', title:'person', action:'list', + subItems: [ + [order:10, controller:'person', title:'Person List', action:'list', isVisible: { true }], + [order:20, controller:'person', title:'Create', action:'create', isVisible: { true }], + [order:90, controller:'person', title:'Show', action:'show', isVisible: { params.action == 'show' }], + [order:91, controller:'person', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }] + ] + ], + [order:20, controller:'taskProcedureDetailed', title:'task', action:'list', + subItems: [ + [order:10, controller:'taskProcedureDetailed', title:'Task Procedure List', action:'list', isVisible: { true }], + [order:20, controller:'taskProcedureDetailed', title:'Create', action:'create', isVisible: { true }], + [order:90, controller:'taskProcedureDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }], + [order:91, controller:'taskProcedureDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }] + ] + ] +] Index: trunk/grails-app/conf/SecurityConfig.groovy =================================================================== --- trunk/grails-app/conf/SecurityConfig.groovy (revision 146) +++ trunk/grails-app/conf/SecurityConfig.groovy (revision 147) @@ -3,5 +3,5 @@ def authenticateService - // see DefaultSecurityConfig.groovy for all settable/overridable properties + // See DefaultSecurityConfig.groovy for all settable/overridable properties active = true @@ -14,23 +14,24 @@ authorityDomainClass = "Authority" - //Required if we want to run "grails generate-manager" - //Which recreates the controller and views, so save the views! + // Required if we want to run "grails generate-manager" + // Which recreates the controller and views, so save the views! // requestMapClass = 'Requestmap' + // The whole application relies on controllerAnnotations and the static rules bellow. useRequestMapDomainClass = false useControllerAnnotations = true - //Set true especially if used across the internet. + // Set true especially if used across the internet. forceHttps = 'false' - //Pessimistic locking, deny access to all URLs that don't - //have an applicable URL-Role configuration. - //This forces us to set an annotation, static rule or - //extend BaseController and prevents accidentally leaving pages open. + // Pessimistic locking, deny access to all URLs that don't + // have an applicable URL-Role configuration. + // This forces us to set an annotation, static rule or + // extend BaseController and prevents accidentally leaving pages open. controllerAnnotationsRejectIfNoRule = true - - //Static rules for controllers, actions and urls. - //Since we are using pessimistic locking we have to set some things - //here but most security should be set in the controllers. + + // Static rules for controllers, actions and urls. + // Since we are using pessimistic locking we have to set some things + // here but most security should be set in the controllers. controllerAnnotationStaticRules = [ '/': ['IS_AUTHENTICATED_FULLY'], @@ -39,14 +40,7 @@ '/images/**': ['IS_AUTHENTICATED_ANONYMOUSLY'], '/js/**': ['IS_AUTHENTICATED_ANONYMOUSLY'], - '/plugins/**': ['IS_AUTHENTICATED_FULLY'], -// '/plugins/help-balloons-1.2/**': ['IS_AUTHENTICATED_FULLY'], -// '/plugins/richui-0.6/**': ['IS_AUTHENTICATED_FULLY'], -// '/plugins/navigation-1.1/**': ['IS_AUTHENTICATED_FULLY'], -// '/plugins/filterpane-0.6.2/**': ['IS_AUTHENTICATED_FULLY'], -// '/plugins/calendar-1.2.0-SNAPSHOT2/**': ['IS_AUTHENTICATED_FULLY'], -// -// '/plugins/class-diagram-0.3/**': ['IS_AUTHENTICATED_FULLY'], -// '/classDiagram*': ['IS_AUTHENTICATED_FULLY'], -// '/classDiagram/**': ['IS_AUTHENTICATED_FULLY'], + '/plugins/**': ['IS_AUTHENTICATED_FULLY'], + '/classDiagram*': ['IS_AUTHENTICATED_FULLY'], + '/classDiagram/**': ['IS_AUTHENTICATED_FULLY'], '/login*': ['IS_AUTHENTICATED_ANONYMOUSLY'], '/login/**': ['IS_AUTHENTICATED_ANONYMOUSLY'], @@ -55,12 +49,13 @@ ] - //We always want to go to the home page so that bookmarks are not used. + // Always call the welcome action so that bookmarks are not used, a + // welcome message can be populated and the sessionTimeout can be set. defaultTargetUrl = '/appCore/welcome' alwaysUseDefaultTargetUrl = true - //User caching, turned this off so that password changes take effect. - //It would appear that user is still in the session as logout/login + // User caching, turned this off so that password changes take effect. + // It would appear that user is still in the session as logout/login // is still required for role changes to take effect. - //If this option causes high database load try: + // If this option causes high database load try: // import org.acegisecurity.providers.dao.DaoAuthenticationProvider // import org.acegisecurity.context.SecurityContextHolder @@ -71,6 +66,6 @@ cacheUsers = false -// //List for and events and run the closure(s) that follow. -// //Unfortunately the session is not available yet so many things can't be done here, us an defaultTargetUrl and controller. +// // Listen for events and run the closure(s) that follow. +// // Unfortunately the session is not available yet so many things can't be done here, use a defaultTargetUrl and controller. // useSecurityEventListener = true // Index: trunk/grails-app/controllers/AssignedPersonDetailedController.groovy =================================================================== --- trunk/grails-app/controllers/AssignedPersonDetailedController.groovy (revision 146) +++ trunk/grails-app/controllers/AssignedPersonDetailedController.groovy (revision 147) @@ -2,5 +2,5 @@ class AssignedPersonDetailedController extends BaseController { - + def index = { redirect(action:list,params:params) } @@ -27,7 +27,8 @@ if(assignedPersonInstance) { try { + def taskId = assignedPersonInstance.task.id assignedPersonInstance.delete() flash.message = "AssignedPerson ${params.id} deleted" - redirect(action:list) + redirect(controller:"taskDetailed", action:"show", id: taskId) } catch(org.springframework.dao.DataIntegrityViolationException e) { @@ -60,5 +61,5 @@ def version = params.version.toLong() if(assignedPersonInstance.version > version) { - + assignedPersonInstance.errors.rejectValue("version", "assignedPerson.optimistic.locking.failure", "Another user has updated this AssignedPerson while you were editing.") render(view:'edit',model:[assignedPersonInstance:assignedPersonInstance]) @@ -82,20 +83,21 @@ def create = { - if(!params.task?.id) { - flash.message = "Please select a task and then 'Add Assigned Person'" - redirect(controller: "taskDetailed", action: list) - } - else { - def assignedPersonInstance = new AssignedPerson() - assignedPersonInstance.properties = params - return ['assignedPersonInstance':assignedPersonInstance] - } + if(!params.task?.id) { + flash.message = "Please select a task and then 'Add Assigned Person'" + redirect(controller: "taskDetailed", action: list) + } + else { + def assignedPersonInstance = new AssignedPerson() + assignedPersonInstance.properties = params + return ['assignedPersonInstance':assignedPersonInstance] + } } def save = { def assignedPersonInstance = new AssignedPerson(params) + if(!assignedPersonInstance.hasErrors() && assignedPersonInstance.save()) { flash.message = "AssignedPerson ${assignedPersonInstance.id} created" - redirect(action:show,id:assignedPersonInstance.id) + redirect(controller:"taskDetailed", action:"show", id: params.task.id) } else { Index: trunk/grails-app/controllers/EntryDetailedController.groovy =================================================================== --- trunk/grails-app/controllers/EntryDetailedController.groovy (revision 146) +++ trunk/grails-app/controllers/EntryDetailedController.groovy (revision 147) @@ -4,5 +4,5 @@ def authenticateService - + def index = { redirect(action:list,params:params) } Index: trunk/grails-app/controllers/PersonController.groovy =================================================================== --- trunk/grails-app/controllers/PersonController.groovy (revision 146) +++ trunk/grails-app/controllers/PersonController.groovy (revision 147) @@ -4,5 +4,6 @@ class PersonController extends BaseAppAdminController { - def authenticateService + def authenticateService + def filterService // the delete, save and update actions only accept POST requests @@ -13,12 +14,23 @@ } - def list = { - if (!params.max) { - params.max = 10 - } - [personList: Person.list(params)] - } + def list = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100 ) + + if(!params.filter) + { return [personList: Person.list(params), personTotal: Person.count()] } + + // filterPane: + return[ personList: filterService.filter( params, Person ), + personTotal: filterService.count( params, Person ), + filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params), + params:params ] + } def show = { + + // In the case of an actionSubmit button, rewrite action name from 'index'. + if(params._action_Show) + { params.action='show' } + def person = Person.get(params.id) if (!person) { @@ -46,14 +58,17 @@ if (person) { def authPrincipal = authenticateService.principal() - //avoid self-delete if the logged-in user is an admin + // Avoid self-delete. if (!(authPrincipal instanceof String) && authPrincipal.username == person.loginName) { - flash.message = "You can not delete yourself, please login as another admin and try again" + flash.message = "You cannot delete yourself, please login as another manager and try again." + redirect(action:show,id:params.id) } else { //first, delete this person from Persons_Authorities table. Authority.findAll().each { it.removeFromPersons(person) } - + person.isActive = false + person.save(flush: true) + try { - person.delete() + person.delete(flush: true) flash.message = "Person $params.id deleted." redirect(action:list) @@ -72,4 +87,8 @@ def edit = { + // In the case of an actionSubmit button, rewrite action name from 'index'. + if(params._action_Edit) + { params.action='edit' } + def person = Person.get(params.id) if (!person) { @@ -78,5 +97,5 @@ return } - + flash.message = "To allow login at least the 'ROLE_AppUser' authority must be given." return buildPersonModel(person) } @@ -126,4 +145,5 @@ def create = { + flash.message = "To allow login at least the 'ROLE_AppUser' authority must be given." [person: new Person(params), authorityList: Authority.list()] } Index: trunk/grails-app/controllers/TaskDetailedController.groovy =================================================================== --- trunk/grails-app/controllers/TaskDetailedController.groovy (revision 146) +++ trunk/grails-app/controllers/TaskDetailedController.groovy (revision 147) @@ -202,5 +202,5 @@ def show = { - + // In the case of an actionSubmit button, rewrite action name from 'index'. if(params._action_Show) @@ -286,5 +286,5 @@ def edit = { - + // In the case of an actionSubmit button, rewrite action name from 'index'. if(params._action_Edit) Index: trunk/grails-app/controllers/TaskProcedureDetailedController.groovy =================================================================== --- trunk/grails-app/controllers/TaskProcedureDetailedController.groovy (revision 146) +++ trunk/grails-app/controllers/TaskProcedureDetailedController.groovy (revision 147) @@ -2,5 +2,5 @@ class TaskProcedureDetailedController extends BaseController { - + def index = { redirect(action:list,params:params) } @@ -10,7 +10,15 @@ def list = { params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) - [ taskProcedureInstanceList: TaskProcedure.list( params ), taskProcedureInstanceTotal: TaskProcedure.count() ] + + if(!params.filter) + { return [taskProcedureInstanceList: TaskProcedure.list(params), taskProcedureInstanceTotal: TaskProcedure.count()] } + + // filterPane: + return[ taskProcedureInstanceList: filterService.filter( params, TaskProcedure ), + taskProcedureInstanceTotal: filterService.count( params, TaskProcedure ), + filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params), + params:params ] } - + def search = { redirect(action:list) @@ -18,4 +26,9 @@ def show = { + + // In the case of an actionSubmit button, rewrite action name from 'index'. + if(params._action_Show) + { params.action='show' } + def taskProcedureInstance = TaskProcedure.get( params.id ) @@ -47,4 +60,9 @@ def edit = { + + // In the case of an actionSubmit button, rewrite action name from 'index'. + if(params._action_Edit) + { params.action='edit' } + def taskProcedureInstance = TaskProcedure.get( params.id ) @@ -64,5 +82,5 @@ def version = params.version.toLong() if(taskProcedureInstance.version > version) { - + taskProcedureInstance.errors.rejectValue("version", "taskProcedure.optimistic.locking.failure", "Another user has updated this TaskProcedure while you were editing.") render(view:'edit',model:[taskProcedureInstance:taskProcedureInstance]) @@ -86,23 +104,28 @@ def create = { - def taskInstance = Task.get(params.taskInstance?.id) - - def taskProcedureInstance = new TaskProcedure() - taskProcedureInstance.properties = params - return ['taskProcedureInstance':taskProcedureInstance, - taskInstance: taskInstance] + if(params.taskInstance?.id) { + def taskInstance = Task.get(params.taskInstance.id) + + def taskProcedureInstance = new TaskProcedure() + taskProcedureInstance.properties = params + return ['taskProcedureInstance':taskProcedureInstance, + taskInstance: taskInstance] + } else { + flash.message = "Please select a task, then the Procedure tab.'" + redirect(controller:"taskDetailed", action:"list") + } } def save = { def taskProcedureInstance = new TaskProcedure(params) - def taskInstance = Task.get(params.taskInstance.id) - + def taskInstance = Task.get(params.taskInstance.id) + if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save()) { - taskProcedureInstance.addToTasks(taskInstance) - flash.message = "TaskProcedure ${taskProcedureInstance.id} created" + taskProcedureInstance.addToTasks(taskInstance) + flash.message = "TaskProcedure ${taskProcedureInstance.id} created." redirect(action:show,id:taskProcedureInstance.id) } else { - render(view:'create',model:[taskProcedureInstance:taskProcedureInstance]) + render(view:'create',model:[taskProcedureInstance:taskProcedureInstance, taskInstance: taskInstance]) } } Index: trunk/grails-app/domain/Authority.groovy =================================================================== --- trunk/grails-app/domain/Authority.groovy (revision 146) +++ trunk/grails-app/domain/Authority.groovy (revision 147) @@ -12,3 +12,7 @@ description() } + + String toString() { + "${this.authority}" + } } Index: trunk/grails-app/domain/Person.groovy =================================================================== --- trunk/grails-app/domain/Person.groovy (revision 146) +++ trunk/grails-app/domain/Person.groovy (revision 147) @@ -33,5 +33,5 @@ static constraints = { - loginName(blank: false, unique: true, minSize:4)//minSize:7 + loginName(blank: false, unique: true, minSize:4) //minSize:7 firstName(blank: false) lastName(blank: false) @@ -44,5 +44,5 @@ password(blank: false) //So we need to use pass for validation then encode it for above. - pass(blank: false, minSize:4) + pass(blank: false, minSize:4) //minSize:7 sessionTimeout(min:60, max:43200) Index: trunk/grails-app/domain/Task.groovy =================================================================== --- trunk/grails-app/domain/Task.groovy (revision 146) +++ trunk/grails-app/domain/Task.groovy (revision 147) @@ -20,6 +20,6 @@ static hasMany = [entries: Entry, - taskModifications: TaskModification, - assignedPersons: AssignedPerson, + taskModifications: TaskModification, + assignedPersons: AssignedPerson, subTasks: Task, associatedAssets: Asset, Index: trunk/grails-app/i18n/messages.properties =================================================================== --- trunk/grails-app/i18n/messages.properties (revision 146) +++ trunk/grails-app/i18n/messages.properties (revision 147) @@ -5,4 +5,7 @@ entry.duration=Duration entry.duration.help=The time (hh:mm) booked against this entry for date done. + +assignedPerson.estimatedDuration=Estimated Duration +assignedPerson.estimatedDuration.help=The estimated amount of time (hh:mm) that you would like to assign this person to the task. task.assignedPersons=Assigned Persons Index: trunk/grails-app/views/appCore/manager.gsp =================================================================== --- trunk/grails-app/views/appCore/manager.gsp (revision 146) +++ trunk/grails-app/views/appCore/manager.gsp (revision 147) @@ -14,16 +14,35 @@
${flash.message}
-
-
- Manage application users -
-
- - +
+ + + + + + + + + + + + + + +
+ + + Application users +
+ + + + PDF +
+ Legend +
+ Interactive. +
+
+ Index: trunk/grails-app/views/appCore/start.gsp =================================================================== --- trunk/grails-app/views/appCore/start.gsp (revision 146) +++ trunk/grails-app/views/appCore/start.gsp (revision 147) @@ -89,5 +89,22 @@

- Static reports +
+ + + + + + + + + +
+ +
+
@@ -97,8 +114,22 @@

- Change Password -
-
- Change Session Timeout +
+ + + + + + + + + +
+ + + Password +
+ Session Timeout +
+
Index: trunk/grails-app/views/assignedPersonDetailed/create.gsp =================================================================== --- trunk/grails-app/views/assignedPersonDetailed/create.gsp (revision 146) +++ trunk/grails-app/views/assignedPersonDetailed/create.gsp (revision 147) @@ -9,9 +9,7 @@
- Home - AssignedPerson List +

Create Assigned Person

-

Create AssignedPerson

${flash.message}
@@ -48,19 +46,18 @@ - + - - - - - - - - - - - - - + + + + : + + + + Index: trunk/grails-app/views/assignedPersonDetailed/edit.gsp =================================================================== --- trunk/grails-app/views/assignedPersonDetailed/edit.gsp (revision 146) +++ trunk/grails-app/views/assignedPersonDetailed/edit.gsp (revision 147) @@ -9,10 +9,7 @@
- Home - AssignedPerson List - New AssignedPerson +

Edit Assigned Person

-

Edit AssignedPerson

${flash.message}
@@ -46,24 +43,22 @@ - - + + - + - - - - - - - - - - - - - - + + + : + + + + + Index: trunk/grails-app/views/assignedPersonDetailed/list.gsp =================================================================== --- trunk/grails-app/views/assignedPersonDetailed/list.gsp (revision 146) +++ trunk/grails-app/views/assignedPersonDetailed/list.gsp (revision 147) @@ -9,9 +9,7 @@
- Home - New AssignedPerson +

Assigned Person List

-

AssignedPerson List

${flash.message}
Index: trunk/grails-app/views/assignedPersonDetailed/show.gsp =================================================================== --- trunk/grails-app/views/assignedPersonDetailed/show.gsp (revision 146) +++ trunk/grails-app/views/assignedPersonDetailed/show.gsp (revision 147) @@ -9,10 +9,7 @@
- Home - AssignedPerson List - New AssignedPerson +

Show Assigned Person

-

Show AssignedPerson

${flash.message}
@@ -45,17 +42,8 @@ - Estimated Hour: - - ${fieldValue(bean:assignedPersonInstance, field:'estimatedHour')} - + Estimated Duration: + ${assignedPersonInstance.estimatedHour}h : ${assignedPersonInstance.estimatedMinute}min - - - Estimated Minute: - - ${fieldValue(bean:assignedPersonInstance, field:'estimatedMinute')} - - - + Index: trunk/grails-app/views/entryDetailed/create.gsp =================================================================== --- trunk/grails-app/views/entryDetailed/create.gsp (revision 146) +++ trunk/grails-app/views/entryDetailed/create.gsp (revision 147) @@ -5,13 +5,13 @@ - Create Entry + Create Entry + +
- Home - Entry List +

Create Entry

-

Create Entry

${flash.message}
@@ -51,5 +51,5 @@ - + Index: trunk/grails-app/views/entryDetailed/edit.gsp =================================================================== --- trunk/grails-app/views/entryDetailed/edit.gsp (revision 146) +++ trunk/grails-app/views/entryDetailed/edit.gsp (revision 147) @@ -6,13 +6,11 @@ Edit Entry +
- Home - Entry List - New Entry +

Edit Entry

-

Edit Entry

${flash.message}
@@ -52,5 +50,5 @@ - + Index: trunk/grails-app/views/entryDetailed/show.gsp =================================================================== --- trunk/grails-app/views/entryDetailed/show.gsp (revision 146) +++ trunk/grails-app/views/entryDetailed/show.gsp (revision 147) @@ -9,10 +9,7 @@
- Home - Entry List - New Entry +

Show Entry

-

Show Entry

${flash.message}
@@ -47,20 +44,13 @@ Date Done: - ${fieldValue(bean:entryInstance, field:'dateDone')} + + + - Duration Hour: - - ${fieldValue(bean:entryInstance, field:'durationHour')} - - - - - Duration Minute: - - ${fieldValue(bean:entryInstance, field:'durationMinute')} - + Duration: + ${entryInstance.durationHour}h : ${entryInstance.durationMinute}min @@ -68,5 +58,7 @@ Date Entered: - ${fieldValue(bean:entryInstance, field:'dateEntered')} + + + Index: trunk/grails-app/views/person/create.gsp =================================================================== --- trunk/grails-app/views/person/create.gsp (revision 146) +++ trunk/grails-app/views/person/create.gsp (revision 147) @@ -2,4 +2,5 @@ Create Person + @@ -7,10 +8,8 @@
- Home - Person List +
-

Create Person

${flash.message}
Index: trunk/grails-app/views/person/edit.gsp =================================================================== --- trunk/grails-app/views/person/edit.gsp (revision 146) +++ trunk/grails-app/views/person/edit.gsp (revision 147) @@ -2,4 +2,5 @@ Edit Person + @@ -7,11 +8,8 @@
- Home - Person List - New Person +
-

Edit Person

${flash.message}
@@ -23,7 +21,7 @@ -
+ Index: trunk/grails-app/views/person/list.gsp =================================================================== --- trunk/grails-app/views/person/list.gsp (revision 146) +++ trunk/grails-app/views/person/list.gsp (revision 147) @@ -1,60 +1,72 @@ - - Person List + + Person List + + -
- Home - New Person -
+
+ +
-
-

Person List

- -
${flash.message}
- -
- - - - - - - - - - - - - - - - - - +
+ +
${flash.message}
+ + +
+
  
${person.id}${person.loginName?.encodeAsHTML()}${person.firstName?.encodeAsHTML()}
+ + + + + + + + + + + + + + + + + - - - + - - - -
${person.id}${person.loginName?.encodeAsHTML()}${person.firstName?.encodeAsHTML()} ${person.lastName?.encodeAsHTML()}${person.isActive?.encodeAsHTML()} - - Show - - - - Edit - + ${person.isActive?.encodeAsHTML()} + + Show +
-
+ + + + +
-
- -
+
+ + + Results:${personTotal} +
-
+ + + +
Index: trunk/grails-app/views/person/show.gsp =================================================================== --- trunk/grails-app/views/person/show.gsp (revision 146) +++ trunk/grails-app/views/person/show.gsp (revision 147) @@ -2,4 +2,5 @@ Show Person + @@ -7,11 +8,8 @@
- Home - Person List - New Person +
-

Show Person

${flash.message}
Index: trunk/grails-app/views/taskDetailed/edit.gsp =================================================================== --- trunk/grails-app/views/taskDetailed/edit.gsp (revision 146) +++ trunk/grails-app/views/taskDetailed/edit.gsp (revision 147) @@ -7,4 +7,5 @@ Edit Task + @@ -57,5 +58,5 @@ - + @@ -66,5 +67,5 @@ - + Index: trunk/grails-app/views/taskDetailed/search.gsp =================================================================== --- trunk/grails-app/views/taskDetailed/search.gsp (revision 146) +++ trunk/grails-app/views/taskDetailed/search.gsp (revision 147) @@ -30,6 +30,6 @@ removeImgFile="bullet_delete.png" title="Quick Search"/> - -
+ +
@@ -85,5 +85,5 @@ Goto: Advanced Search - + - Create TaskProcedure + Create TaskProcedure +
- Home - TaskProcedure List +
-

Create TaskProcedure

${flash.message}
Index: trunk/grails-app/views/taskProcedureDetailed/edit.gsp =================================================================== --- trunk/grails-app/views/taskProcedureDetailed/edit.gsp (revision 146) +++ trunk/grails-app/views/taskProcedureDetailed/edit.gsp (revision 147) @@ -6,13 +6,11 @@ Edit TaskProcedure +
- Home - TaskProcedure List - New TaskProcedure +
-

Edit TaskProcedure

${flash.message}
Index: trunk/grails-app/views/taskProcedureDetailed/list.gsp =================================================================== --- trunk/grails-app/views/taskProcedureDetailed/list.gsp (revision 146) +++ trunk/grails-app/views/taskProcedureDetailed/list.gsp (revision 147) @@ -6,15 +6,21 @@ TaskProcedure List + +
- Home - New TaskProcedure +
-

TaskProcedure List

${flash.message}
 +
@@ -22,11 +28,13 @@ - + - + - + - + + + @@ -34,7 +42,7 @@ - + - + @@ -43,4 +51,10 @@ + + @@ -49,7 +63,15 @@
${fieldValue(bean:taskProcedureInstance, field:'id')}${fieldValue(bean:taskProcedureInstance, field:'id')} ${fieldValue(bean:taskProcedureInstance, field:'name')}${fieldValue(bean:taskProcedureInstance, field:'isActive')} + + Show + +
+
- + + + Results:${askProcedureInstanceTotal}
+ +
Index: trunk/grails-app/views/taskProcedureDetailed/show.gsp =================================================================== --- trunk/grails-app/views/taskProcedureDetailed/show.gsp (revision 146) +++ trunk/grails-app/views/taskProcedureDetailed/show.gsp (revision 147) @@ -6,13 +6,11 @@ Show TaskProcedure +
- Home - TaskProcedure List - New TaskProcedure +
-

Show TaskProcedure

${flash.message}