Changeset 798 for trunk

Timestamp:

Feb 8, 2011, 11:00:27 PM (14 years ago)

Author:

gav

Message:

Svn merge -r752:r797 branches/features/taskProcedureRework into trunk/.

Location:

trunk

Files:

• application.properties (modified) (1 diff)
• grails-app/controllers/MaintenanceActionDetailedController.groovy (deleted)
• grails-app/controllers/TaskProcedureController.groovy (deleted)
• grails-app/controllers/TaskProcedureDetailedController.groovy (modified) (4 diffs)
• grails-app/domain/DocumentReference.groovy (copied) (copied from branches/features/taskProcedureRework/grails-app/domain/DocumentReference.groovy)
• grails-app/domain/MaintenanceAction.groovy (modified) (2 diffs)
• grails-app/domain/TaskProcedure.groovy (modified) (1 diff)
• grails-app/services/AssetService.groovy (modified) (1 diff)
• grails-app/services/CreateDataService.groovy (modified) (5 diffs)
• grails-app/services/TaskProcedureService.groovy (copied) (copied from branches/features/taskProcedureRework/grails-app/services/TaskProcedureService.groovy)
• grails-app/taglib/CustomTagLib.groovy (modified) (2 diffs)
• grails-app/views/layouts/main.gsp (modified) (1 diff)
• grails-app/views/maintenanceActionDetailed (deleted)
• grails-app/views/shared/_assetTreeCompact.gsp (copied) (copied from branches/features/taskProcedureRework/grails-app/views/shared/_assetTreeCompact.gsp)
• grails-app/views/taskDetailed/show.gsp (modified) (4 diffs)
• grails-app/views/taskProcedure (deleted)
• grails-app/views/taskProcedureDetailed/_documentReference.gsp (copied) (copied from branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_documentReference.gsp)
• grails-app/views/taskProcedureDetailed/_documentReferences.gsp (copied) (copied from branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_documentReferences.gsp)
• grails-app/views/taskProcedureDetailed/_maintenanceAction.gsp (copied) (copied from branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_maintenanceAction.gsp)
• grails-app/views/taskProcedureDetailed/_maintenanceActions.gsp (copied) (copied from branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_maintenanceActions.gsp)
• grails-app/views/taskProcedureDetailed/_taskProcedure.gsp (copied) (copied from branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_taskProcedure.gsp)
• grails-app/views/taskProcedureDetailed/create.gsp (modified) (3 diffs)
• grails-app/views/taskProcedureDetailed/edit.gsp (modified) (2 diffs)
• grails-app/views/taskProcedureDetailed/list.gsp (modified) (4 diffs)
• grails-app/views/taskProcedureDetailed/show.gsp (deleted)
• test/unit/TaskProcedureTests.groovy (copied) (copied from branches/features/taskProcedureRework/test/unit/TaskProcedureTests.groovy)
• web-app/css/main.css (modified) (1 diff)
• web-app/js/dynamicOneToMany.js (copied) (copied from branches/features/taskProcedureRework/web-app/js/dynamicOneToMany.js)
• web-app/js/jquery.js (copied) (copied from branches/features/taskProcedureRework/web-app/js/jquery.js)
• web-app/js/jsUtil.js (modified) (1 diff)

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Wed Jun 02 11:20:51 EST 2010
+#Thu Jan 27 17:24:52 EST 2011
 app.grails.version=1.2.2
 app.name=gnuMims

trunk/grails-app/controllers/TaskProcedureDetailedController.groovy

@@ -5 +5 @@
 
     def filterService
+    def assetService
+    def taskProcedureService
 
     def index = { redirect(action:list,params:params) }
@@ -40 +42 @@
 
         if(!taskProcedureInstance) {
-            flash.message = "TaskProcedure not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ taskProcedureInstance : taskProcedureInstance ] }
+            flash.errorMessage = "TaskProcedure not found with id ${params.id}"
+            redirect(controller:'taskDetailed', action:'search')
+            return
+        }
+
+        redirect(controller:'taskDetailed',
+                        action:'show',
+                        id:taskProcedureInstance.linkedTask?.id,
+                        params:[showTab:"showProcedureTab"])
     }
 
@@ -49 +56 @@
         def taskProcedureInstance = TaskProcedure.get( params.id )
         if(taskProcedureInstance) {
+            def taskInstance = taskProcedureInstance.linkedTask
             try {
+                taskProcedureInstance.tasks.each {
+                    it.taskProcedure = null
+                }
                 taskProcedureInstance.delete(flush:true)
                 flash.message = "TaskProcedure ${params.id} deleted"
-                redirect(action:list)
+                redirect(controller:'taskDetailed',
+                                action:'show',
+                                id:taskInstance.id,
+                                params:[showTab:"showProcedureTab"])
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "TaskProcedure ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
+                flash.errorMessage = "TaskProcedure ${params.id} could not be deleted"
+                redirect(controller:'taskDetailed',
+                                action:'show',
+                                id:taskInstance.id,
+                                params:[showTab:"showProcedureTab"])
             }
         }
         else {
-            flash.message = "TaskProcedure not found with id ${params.id}"
+            flash.errorMessage = "TaskProcedure not found with id ${params.id}"
             redirect(action:list)
         }
@@ -74 +91 @@
 
         if(!taskProcedureInstance) {
-            flash.message = "TaskProcedure not found with id ${params.id}"
+            flash.errorMessage = "TaskProcedure not found with id ${params.id}"
             redirect(action:list)
         }
         else {
-            return [ taskProcedureInstance : taskProcedureInstance ]
+            def assemblies = assetService.getAssemblies(taskProcedureInstance.linkedTask.primaryAsset)
+            return [ taskProcedureInstance : taskProcedureInstance,
+                            assemblies: assemblies ]
         }
     }
 
     def update = {
-        def taskProcedureInstance = TaskProcedure.get( params.id )
-        if(taskProcedureInstance) {
-            if(params.version) {
-                def version = params.version.toLong()
-                if(taskProcedureInstance.version > version) {
-
-                    taskProcedureInstance.errors.rejectValue("version", "default.optimistic.locking.failure")
-                    render(view:'edit',model:[taskProcedureInstance:taskProcedureInstance])
-                    return
-                }
-            }
-            taskProcedureInstance.properties = params
-            if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save(flush: true)) {
-                flash.message = "TaskProcedure ${params.id} updated"
-                redirect(action:show,id:taskProcedureInstance.id)
-            }
-            else {
-                render(view:'edit',model:[taskProcedureInstance:taskProcedureInstance])
-            }
-        }
-        else {
-            flash.message = "TaskProcedure not found with id ${params.id}"
+        def result = taskProcedureService.update(params)
+
+        if(!result.error) {
+            flash.message = g.message(code: "default.update.success", args: ["TaskProcedure", params.id])
+            redirect(controller:'taskDetailed',
+                            action:'show',
+                            id:result.taskProcedureInstance.linkedTask.id,
+                            params:[showTab:"showProcedureTab"])
+            return
+        }
+
+        if(result.error.code == "default.not.found") {
+            flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
             redirect(action:list)
-        }
+            return
+        }
+
+        if(result.error.code == "default.optimistic.locking.failure") {
+            flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
+            redirect(controller:'taskDetailed',
+                            action:'show',
+                            id:result.taskProcedureInstance.linkedTask.id,
+                            params:[showTab:"showProcedureTab"])
+            return
+        }
+
+        def assemblies = assetService.getAssemblies(result.taskProcedureInstance.linkedTask.primaryAsset)
+        render(view:'edit', model:[taskProcedureInstance: result.taskProcedureInstance,
+                                                assemblies: assemblies])
     }
 
     def create = {
-        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 or create a task, then go to the Procedure tab."
+
+        if(!params.taskInstance?.id) {
+            flash.errorMessage = "Please select or create a task, then go to the Procedure tab."
             redirect(controller:"taskDetailed", action:"search")
-        }
+            return
+        }
+
+        params.linkedTask = Task.get(params.taskInstance.id)
+
+        // Task already has a taskProcedure.
+        if(params.linkedTask.taskProcedure) {
+            flash.errorMessage = g.message(code: 'default.optimistic.locking.failure')
+            redirect(controller:'taskDetailed',
+                            action:'show',
+                            id:params.linkedTask.id,
+                            params:[showTab:"showProcedureTab"])
+            return
+        }
+
+        // Task does not have a primaryAsset.
+        if(!params.linkedTask?.primaryAsset) {
+            flash.errorMessage = "Please set a Primary Asset first, then go to the Procedure tab."
+            redirect(controller:"taskDetailed", action:"show", id:params.linkedTask?.id)
+            return
+        }
+
+        def taskProcedureInstance = new TaskProcedure()
+        taskProcedureInstance.properties = params
+
+        // Populate a couple of maintenanceActions for the first assembly.
+        def assemblies = assetService.getAssemblies(params.linkedTask.primaryAsset)
+        if(assemblies) {
+            def assembly = assemblies[0]
+            def ma = taskProcedureInstance.maintenanceActionLazyList.get(0)
+            ma.assetSubItem = assembly
+            ma.procedureStepNumber = 10
+            ma = taskProcedureInstance.maintenanceActionLazyList.get(1)
+            ma.assetSubItem = assembly
+            ma.procedureStepNumber = 20
+        }
+
+        return ['taskProcedureInstance':taskProcedureInstance, 'assemblies': assemblies]
     }
 
     def save = {
-        def taskProcedureInstance = new TaskProcedure(params)
-        def taskInstance = Task.get(params.taskInstance.id)
-
-        if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save(flush: true)) {
-            taskProcedureInstance.addToTasks(taskInstance)
-            flash.message = "TaskProcedure ${taskProcedureInstance.id} created."
-            redirect(action:show,id:taskProcedureInstance.id)
-        }
-        else {
-            render(view:'create',model:[taskProcedureInstance:taskProcedureInstance, taskInstance: taskInstance])
-        }
-    }
+        def result = taskProcedureService.save(params)
+
+        if(!result.error) {
+            flash.message = g.message(code: "default.create.success", args: ["TaskProcedure", result.taskProcedureInstance.id])
+            redirect(controller:'taskDetailed',
+                            action:'show',
+                            id:result.taskProcedureInstance.linkedTask.id,
+                            params:[showTab:"showProcedureTab"])
+            return
+        }
+
+        if(result.error.code == "default.optimistic.locking.failure") {
+            flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
+            redirect(controller:'taskDetailed',
+                            action:'show',
+                            id:result.taskProcedureInstance.linkedTask.id,
+                            params:[showTab:"showProcedureTab"])
+            return
+        }
+
+        def assemblies = assetService.getAssemblies(result.taskProcedureInstance.linkedTask.primaryAsset)
+        render(view:'create', model:[taskProcedureInstance: result.taskProcedureInstance,
+                                                    assemblies: assemblies])
+    }
+
 }

trunk/grails-app/domain/MaintenanceAction.groovy

@@ -8 +8 @@
 
     String description
-    String reasoning = ""
+    String pageRef = ""
     Integer procedureStepNumber
-    boolean isActive = true
+
+    Boolean toBeDeleted
+    Boolean isNew
+    static transients = [ 'toBeDeleted', 'isNew' ]
 
 //     static hasMany = []
 
-//     static belongsTo = []
+    static belongsTo = [TaskProcedure]
 
     static constraints = {
@@ -22 +25 @@
         maintenancePolicy(nullable:true)
         procedureStepNumber(nullable:true)
-        description()
-        reasoning()
-        isActive()
+        description(blank:false,maxSize:100)
+        pageRef(maxSize:100)
     }
 

trunk/grails-app/domain/TaskProcedure.groovy

@@ +1 @@
+import org.apache.commons.collections.list.LazyList
+import org.apache.commons.collections.FactoryUtils
+
 class TaskProcedure {
 
-    String name
-    String description = ""
-    Boolean isActive = true
+    Task linkedTask
+    Person createdBy
+    Person lastUpdatedBy
+    Date dateCreated = new Date() // autoTimestamp
+    Date lastUpdated = new Date() // autoTimestamp
 
-    static hasMany = [tasks: Task, maintenanceActions: MaintenanceAction]
+    def getDescription() { linkedTask.description }
+    def getAsset() { linkedTask.primaryAsset }
+
+    List maintenanceActions = new ArrayList()
+    List documentReferences = new ArrayList()
+
+    static hasMany = [tasks: Task,
+                                    maintenanceActions: MaintenanceAction,
+                                    documentReferences: DocumentReference]
+
+    def getMaintenanceActionLazyList() {
+        return LazyList.decorate(maintenanceActions, FactoryUtils.instantiateFactory(MaintenanceAction.class))
+    }
+
+    def getDocumentReferenceLazyList() {
+        return LazyList.decorate(documentReferences, FactoryUtils.instantiateFactory(DocumentReference.class))
+    }
+
+    static mappedBy = [tasks:"taskProcedure"]
+
+    static mapping = {
+        maintenanceActions cascade:"all-delete-orphan"
+        documentReferences cascade:"all-delete-orphan"
+    }
 
 //     static belongsTo = []
 
     static constraints = {
-        name(maxSize:75,unique:true,blank:false)
-        description(maxSize:100)
     }
 
     String toString() {
-        "${this.name}"
+        "${this.id}"
     }
 }

trunk/grails-app/services/AssetService.groovy

@@ -22 +22 @@
                 }
         }
+    }
+
+    /**
+    * Determines and returns a list of assemblies for an asset.
+    * This is purely a 'load from database' type method since a new hibernateSession is used.
+    * @params Asset to get the subItems for.
+    * @returns A list of the assemblies.
+    */
+    def getAssemblies(asset) {
+        def assemblies = []
+        if(!(asset instanceof Asset))
+            return assemblies
+        // Database efficiency:
+        // The asset is configured to batch fetch assetSubItems which
+        // in turn are configured to batch fetch subItems.
+        Asset.withNewSession {
+            Asset.get(asset.id).assetSubItems.each {
+                assemblies.addAll(it.subItems)
+            }
+        }
+        assemblies.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+        return assemblies
     }
 

trunk/grails-app/services/CreateDataService.groovy

@@ -3 +3 @@
 /**
 * Provides a data service to create base and demo data.
-* Beware that most, if not all, base data is referenced by "Id" throughout the program.
+* Beware that most, if not all, BASE data is referenced by "Id" throughout the program.
 * This allows changing the text of the 'name' property to something of the same meaning.
 * But be sure to maintain the correct Id during creation, indicated by #1, #2 etc.
+* Task.list()[0] is used to allow integration testing with DEMO data, where Id's may change due to create-delete.
 */
 class  CreateDataService {
@@ -846 +847 @@
         //Task #1
         p = [taskGroup:TaskGroup.findByName("Engineering Activites"),
-                taskPriority:TaskPriority.get(2),
+                taskPriority:TaskPriority.get(1),
                 taskType:TaskType.get(1),
                 leadPerson:Person.get(2),
@@ -1097 +1098 @@
         //TaskProcedure
         def taskProcedureInstance
-
-        taskProcedureInstance = new TaskProcedure(name: "Daily check")
+        def taskInstance
+        def person = Person.get(3)
+
+        taskInstance = Task.list()[6]
+        taskProcedureInstance = new TaskProcedure(linkedTask: taskInstance,
+                                                                                    createdBy: person,
+                                                                                    lastUpdatedBy: person)
         saveAndTest(taskProcedureInstance)
-        taskProcedureInstance.addToTasks(Task.list()[0])
-
-        taskProcedureInstance = new TaskProcedure(name: "100hr Service")
+        taskProcedureInstance.addToTasks(taskInstance)
+
+        taskInstance = Task.list()[4]
+        taskProcedureInstance = new TaskProcedure(linkedTask: taskInstance,
+                                                                                    createdBy: person,
+                                                                                    lastUpdatedBy: person)
         saveAndTest(taskProcedureInstance)
-        taskProcedureInstance.addToTasks(Task.list()[6])
+        taskProcedureInstance.addToTasks(taskInstance)
     }
 
@@ -1111 +1120 @@
         //MaintenanceAction
         def maintenanceActionInstance
+        def taskProcedure = TaskProcedure.get(1)
+        def assetSubItem = AssetSubItem.get(6)
 
         //MaintenanceAction #1
         maintenanceActionInstance = new MaintenanceAction(description: "Check all E-stops, activate E-stops S1-S12 and ensure machine cannot run",
                                                                                                         procedureStepNumber: 10,
-                                                                                                        maintenancePolicy: MaintenancePolicy.get(1),
-                                                                                                        taskProcedure: TaskProcedure.get(1))
-        saveAndTest(maintenanceActionInstance)
+                                                                                                        assetSubItem: assetSubItem,
+                                                                                                        taskProcedure: taskProcedure)
+        taskProcedure.addToMaintenanceActions(maintenanceActionInstance)
 
         //MaintenanceAction #2
         maintenanceActionInstance = new MaintenanceAction(description: "Do more pushups",
                                                                                                         procedureStepNumber: 20,
-                                                                                                        maintenancePolicy: MaintenancePolicy.get(1),
-                                                                                                        taskProcedure: TaskProcedure.get(1))
-        saveAndTest(maintenanceActionInstance)
+                                                                                                        assetSubItem: assetSubItem,
+                                                                                                        taskProcedure: taskProcedure)
+        taskProcedure.addToMaintenanceActions(maintenanceActionInstance)
 
         //MaintenanceAction #3
         maintenanceActionInstance = new MaintenanceAction(description: "Ok just one more pushup",
                                                                                                         procedureStepNumber: 30,
-                                                                                                        maintenancePolicy: MaintenancePolicy.get(1),
-                                                                                                        taskProcedure: TaskProcedure.get(1))
-        saveAndTest(maintenanceActionInstance)
+                                                                                                        assetSubItem: assetSubItem,
+                                                                                                        taskProcedure: taskProcedure)
+        taskProcedure.addToMaintenanceActions(maintenanceActionInstance)
+
+        saveAndTest(taskProcedure)
     }
 
@@ -1475 +1488 @@
                                                                 section: Section.get(1))
         saveAndTest(assetInstance1)
-//        assetInstance.addToMaintenanceActions(MaintenanceAction.get(1))
 
         //Asset #2

trunk/grails-app/taglib/CustomTagLib.groovy

@@ +1 @@
+//import org.apache.commons.validator.UrlValidator
+import org.codehaus.groovy.grails.validation.routines.UrlValidator
+import org.codehaus.groovy.grails.validation.routines.RegexValidator
 
 /**
@@ -238 +241 @@
     } // jasperButtons
 
+    /**
+    * Easily create a link from a hopeful url string.
+    * If the supplied url is not considered a valid url the string is simply displayed.
+    *
+    * Fields:
+    *  url - String url to use.
+    *  body - If no body is supplied in the GSP then url.encodeAsHTML() is displayed.
+    *
+    * Example:
+    * <!--
+    * <custom:easyUrl url="${docRef.location}" />
+    * -->
+    */
+    def easyUrl = {attrs, body ->
+
+        def url = attrs.url
+
+        def html
+
+        body = body()
+        if(!body)
+            body = url.encodeAsHTML()
+
+        html = "${body}"
+
+        if(isURLValid(url)) {
+            html = """
+                        <a href="${url}">
+                            ${html}
+                        </a>
+                        """
+        }
+
+        out << html
+    }
+
+    /**
+    * Determine if a supplied string is considered a url or not.
+    * The scheme/protocol can be adjusted, file:// has been excluded here.
+    * A domainValidator regex is used to allow localhost domain.
+    * A Grails branched version of commons.validator is used, this should
+    * be compatible with the apache 1.4 version release.
+    * See: http://jira.codehaus.org/browse/GRAILS-1692 for more on Grails url validation.
+    */
+    private Boolean isURLValid(url) {
+
+        def schemes = ["http","https", "ftp"] as String[]
+        def domainValidator = new RegexValidator("localhost(:(\\d{1,5}))?")
+        def validator = new UrlValidator(schemes, domainValidator, UrlValidator.ALLOW_2_SLASHES)
+        return validator.isValid(url)
+
+    }
+
 } // end class

trunk/grails-app/views/layouts/main.gsp

@@ -5 +5 @@
         <link rel="stylesheet" href="${resource(dir:'css',file:'main.css')}" />
         <link rel="shortcut icon" href="${resource(dir:'images',file:'gnuMimsIcon.ico')}" type="image/x-icon" />
+        <g:javascript library="jquery" />
         <g:javascript library="prototype/prototype" />
         <g:javascript library="prototype/effects" />

trunk/grails-app/views/taskDetailed/show.gsp

@@ -513 +513 @@
                                         <tr class="prop">
                                             <td valign="top" class="name">Procedure Id:</td>
-
-                                            <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'id')}</td>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Name:</td>
-
-                                            <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'name')}</td>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Description:</td>
-
-                                            <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'description')}</td>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Is Active:</td>
-
-                                            <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'isActive')}</td>
-
+                                            <td valign="top" class="value">
+                                                ${fieldValue(bean:taskProcedureInstance, field:'id')}
+                                            </td>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Linked Task:</td>
+                                            <td valign="top" class="value">
+                                                <g:link controller="taskDetailed"
+                                                                action="show"
+                                                                id="${taskProcedureInstance.linkedTask.id}">
+                                                    ${taskProcedureInstance.linkedTask.encodeAsHTML()}
+                                                </g:link>
+                                            </td>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Linked Asset:</td>
+                                            <td valign="top" class="value">
+                                                <g:render template="/shared/assetTreeCompact" model="['assetInstance': taskProcedureInstance.linkedTask.primaryAsset]" />
+                                            </td>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Version:</td>
+                                            <td valign="top" class="value">
+                                                    ${fieldValue(bean:taskProcedureInstance, field:'version')}
+                                            </td>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Last Updated:</td>
+                                            <td valign="top" class="value">
+                                                <g:formatDate date="${taskProcedureInstance.lastUpdated}"
+                                                                            format="EEE, dd-MMM-yyyy"/>
+                                            </td>
                                         </tr>
 
@@ -549 +561 @@
                             </div>
 
+                            <br />
+
+                            <g:if test="${taskProcedureInstance.documentReferences}">
+                                <div class="list">
+                                    <table>
+                                        <thead>
+                                            <tr>
+                                                <th>Document Reference</th>
+                                                <th>Location</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <g:each in="${taskProcedureInstance.documentReferences}" status="i" var="docRef">
+                                                <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+
+                                                    <td valign="top" class="name">
+                                                        ${fieldValue(bean:docRef, field:'name')}
+                                                    </td>
+
+                                                    <td  valign="top" style="text-align:left;" class="value">
+                                                        <custom:easyUrl url="${docRef.location}" />
+                                                    </td>
+
+                                                </tr>
+                                            </g:each>
+
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </g:if>
+
+                            <br />
+
                             <div class="list">
                                 <table>
@@ -554 +599 @@
                                         <tr>
                                             <th>Step</th>
+                                            <th>Assembly</th>
                                             <th>Description</th>
-                                            <th>Reasoning</th>
-                                            <th>Asset</th>
-                                            <th>Sub Item</th>
+                                            <th>Page Ref</th>
+                                            <th>Condition</th>
                                         </tr>
                                     </thead>
@@ -569 +614 @@
 
                                                 <td  valign="top" style="text-align:left;" class="value">
+                                                    <g:if test="${maintenanceAction.assetSubItem}">
+                                                        ${maintenanceAction.assetSubItem.parentItem?.encodeAsHTML()}
+                                                        --
+                                                        ${maintenanceAction.assetSubItem.encodeAsHTML()}
+                                                    </g:if>
+                                                </td>
+
+                                                <td  valign="top" style="text-align:left;" class="value">
                                                     ${fieldValue(bean:maintenanceAction, field:'description')}
                                                 </td>
 
                                                 <td  valign="top" style="text-align:left;" class="value">
-                                                    ${fieldValue(bean:maintenanceAction, field:'reasoning')}
+                                                    ${fieldValue(bean:maintenanceAction, field:'pageRef')}
                                                 </td>
 
                                                 <td  valign="top" style="text-align:left;" class="value">
-                                                    ${fieldValue(bean:maintenanceAction, field:'asset')}
-                                                </td>
-
-                                                <td  valign="top" style="text-align:left;" class="value">
-                                                    ${fieldValue(bean:maintenanceAction, field:'assetSubItem')}
                                                 </td>
 

trunk/grails-app/views/taskProcedureDetailed/create.gsp

@@ -7 +7 @@
         <title>Create TaskProcedure</title>
         <nav:resources override="true"/>
+        <g:javascript src="dynamicOneToMany.js" />
     </head>
     <body>
@@ -13 +14 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
+
             <g:hasErrors bean="${taskProcedureInstance}">
-            <div class="errors">
-                <g:renderErrors bean="${taskProcedureInstance}" as="list" />
-            </div>
+                <div class="errors">
+                    <g:renderErrors bean="${taskProcedureInstance}" as="list" />
+                </div>
             </g:hasErrors>
+
             <g:form action="save" method="post" >
-            <input type="hidden" name="taskInstance.id" value="${taskInstance?.id}" />
+                <input type="hidden" name="linkedTask.id" value="${taskProcedureInstance.linkedTask.id}" />
 
-                <div class="dialog">
-                    <table>
-                        <tbody>
+                <g:render template="taskProcedure" model="['taskProcedureInstance': taskProcedureInstance]" />
 
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="name">Name:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'name','errors')}">
-                                    <input type="text"  class="description" maxlength="75" id="name" name="name" value="${fieldValue(bean:taskProcedureInstance,field:'name')}"/>
-                                </td>
-                            </tr>
-
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="description">Description:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'description','errors')}">
-                                    <input type="text"  class="description" maxlength="100" id="description" name="description" value="${fieldValue(bean:taskProcedureInstance,field:'description')}"/>
-                                </td>
-                            </tr>
-
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isActive">Is Active:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'isActive','errors')}">
-                                    <g:checkBox name="isActive" value="${taskProcedureInstance?.isActive}" ></g:checkBox>
-                                </td>
-                            </tr>
-
-                            <g:if test="${taskInstance}">
-                                <tr class="prop">
-                                    <td valign="top" class="name">
-                                        <label for="taskInstance">Linking with Task:</label>
-                                    </td>
-                                    <td valign="top" name="taskInstance" class="value">
-                                        ${taskInstance}
-                                    </td>
-                                </tr>
-                            </g:if>
-
-                        </tbody>
-                    </table>
-                </div>
                 <div class="buttons">
                     <span class="button"><input class="save" type="submit" value="Create" /></span>
@@ -74 +32 @@
             </g:form>
         </div>
+        <table style="display:none;">
+            <g:render template="documentReference" model="['docRef': null,
+                                                                                                        'i': '_clone']" />
+        </table>
+        <table style="display:none;">
+            <g:render template="maintenanceAction" model="['tp': null,
+                                                                                                'ma': null,
+                                                                                                'i': '_clone',
+                                                                                                'assemblies': assemblies]" />
+        </table>
     </body>
 </html>

trunk/grails-app/views/taskProcedureDetailed/edit.gsp

@@ -7 +7 @@
         <title>Edit TaskProcedure</title>
         <nav:resources override="true"/>
+        <g:javascript src="dynamicOneToMany.js" />
     </head>
     <body>
@@ -13 +14 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
+
             <g:hasErrors bean="${taskProcedureInstance}">
-            <div class="errors">
-                <g:renderErrors bean="${taskProcedureInstance}" as="list" />
-            </div>
+                <div class="errors">
+                    <g:renderErrors bean="${taskProcedureInstance}" as="list" />
+                </div>
             </g:hasErrors>
+
             <g:form method="post" >
                 <input type="hidden" name="id" value="${taskProcedureInstance?.id}" />
                 <input type="hidden" name="version" value="${taskProcedureInstance?.version}" />
-                <div class="dialog">
-                    <table>
-                        <tbody>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="name">Name:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'name','errors')}">
-                                    <input type="text"  class="description" maxlength="75" id="name" name="name" value="${fieldValue(bean:taskProcedureInstance,field:'name')}"/>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="description">Description:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'description','errors')}">
-                                    <input type="text"  class="description" maxlength="100" id="description" name="description" value="${fieldValue(bean:taskProcedureInstance,field:'description')}"/>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isActive">Is Active:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'isActive','errors')}">
-                                    <g:checkBox name="isActive" value="${taskProcedureInstance?.isActive}" ></g:checkBox>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="maintenanceActions">Maintenance Actions:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'maintenanceActions','errors')}">
-                                    
-<ul>
-<g:each var="m" in="${taskProcedureInstance?.maintenanceActions?}">
-    <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="maintenanceActionDetailed" params="['taskProcedure.id':taskProcedureInstance?.id]" action="create">+Add MaintenanceAction</g:link>
 
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="tasks">Tasks:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'tasks','errors')}">
-                                    
-<ul>
-<g:each var="t" in="${taskProcedureInstance?.tasks?}">
-    <li><g:link controller="taskDetailed" action="show" id="${t.id}">${t?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="taskDetailed" params="['taskProcedure.id':taskProcedureInstance?.id]" action="create">+Add Task</g:link>
+                <g:render template="taskProcedure" model="['taskProcedureInstance': taskProcedureInstance]" />
 
-                                </td>
-                            </tr> 
-                        
-                        </tbody>
-                    </table>
-                </div>
                 <div class="buttons">
                     <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="cancel" value="Cancel" action="Show"/></span>
                     <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
                 </div>
             </g:form>
         </div>
+        <table style="display:none;">
+            <g:render template="documentReference" model="['docRef': null,
+                                                                                                        'i': '_clone']" />
+        </table>
+        <table style="display:none;">
+            <g:render template="maintenanceAction" model="['tp': null,
+                                                                                                'ma': null,
+                                                                                                'i': '_clone',
+                                                                                                'assemblies': assemblies]" />
+        </table>
     </body>
 </html>

trunk/grails-app/views/taskProcedureDetailed/list.gsp

@@ -37 +37 @@
                         <thead>
                             <tr>
-                            
+
                                 <g:sortableColumn property="id" title="Id"  params="${filterParams}" />
-                            
-                                <g:sortableColumn property="name" title="Name"  params="${filterParams}" />
-                            
-                                <g:sortableColumn property="description" title="Description"  params="${filterParams}" />
-                            
-                                <g:sortableColumn property="isActive" title="Is Active"  params="${filterParams}" />
+                                <th>Description</th>
+                                <th>Asset</th>
 
                                 <th></th>
-                            
+
                             </tr>
                         </thead>
@@ -53 +49 @@
                         <g:each in="${taskProcedureInstanceList}" status="i" var="taskProcedureInstance">
                             <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/taskProcedureDetailed/show/${taskProcedureInstance.id}"'/>
-                            
+
                                 <td>${fieldValue(bean:taskProcedureInstance, field:'id')}</td>
-                            
-                                <td>${fieldValue(bean:taskProcedureInstance, field:'name')}</td>
-                            
-                                <td>${fieldValue(bean:taskProcedureInstance, field:'description')}</td>
-                            
-                                <td>${fieldValue(bean:taskProcedureInstance, field:'isActive')}</td>
-                                
+
+                                <td>${taskProcedureInstance.description.encodeAsHTML()}</td>
+
+                                <td>${taskProcedureInstance.asset?.encodeAsHTML()}</td>
+
                                 <td>
                                     <g:link action="show" id="${taskProcedureInstance.id}">
@@ -67 +61 @@
                                     </g:link>
                                 </td>
-                            
+
                             </tr>
                         </g:each>
@@ -83 +77 @@
                                     action="list"
                                     class="overlayPane"
-                                    excludeProperties="" />
+                                    additionalProperties="id"
+                                    excludeProperties=""
+                                    associatedProperties="linkedTask.description" />
         </div>
     </body>

trunk/web-app/css/main.css

@@ -690 +690 @@
 div.static_tree {
 }
+div.static_tree_compact {
+    height:10em;
+    width:100%;
+    overflow:auto;
+}
 div.static_tree ul {
     list-style-type: none;

trunk/web-app/js/jsUtil.js

@@ -119 +119 @@
     }
 }
+
+function openWindow(url) {
+    window.open(url);
+}