Index: /trunk/grails-app/domain/Task.groovy
===================================================================
--- /trunk/grails-app/domain/Task.groovy (revision 167)
+++ /trunk/grails-app/domain/Task.groovy (revision 168)
@@ -5,5 +5,5 @@
TaskPriority taskPriority
TaskType taskType
- Task parentTask
+ Task parentTask
Person leadPerson
Asset primaryAsset
Index: /trunk/grails-app/i18n/messages.properties
===================================================================
--- /trunk/grails-app/i18n/messages.properties (revision 167)
+++ /trunk/grails-app/i18n/messages.properties (revision 168)
@@ -105,2 +105,18 @@
navigation.nav.inventory=Inventory
navigation.nav.assets=Assets
+
+# FilterPane plugin, properties.
+fp.property.text.associatedAssets.name=Associated Asset
+fp.property.text.primaryAsset.name=Primary Asset
+fp.property.text.isActive=Active
+fp.property.text.isScheduled=Scheduled
+fp.property.text.isApproved=Approved
+fp.property.text.taskGroup.name=Group
+fp.property.text.taskPriority.name=Priority
+fp.property.text.taskStatus.name=Status
+fp.property.text.description=Description
+fp.property.text.comment=Comment
+fp.property.text.leadPerson.lastName=Lead Person (Last Name)
+fp.property.text.leadPerson.firstName=Lead Person (First Name)
+fp.property.text.taskType.name=Type
+
Index: /trunk/grails-app/views/person/create.gsp
===================================================================
--- /trunk/grails-app/views/person/create.gsp (revision 167)
+++ /trunk/grails-app/views/person/create.gsp (revision 168)
@@ -102,5 +102,5 @@
-
+
|
Index: /trunk/grails-app/views/person/edit.gsp
===================================================================
--- /trunk/grails-app/views/person/edit.gsp (revision 167)
+++ /trunk/grails-app/views/person/edit.gsp (revision 168)
@@ -109,5 +109,5 @@
-
+
|
Index: /trunk/grails-app/views/taskDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/create.gsp (revision 167)
+++ /trunk/grails-app/views/taskDetailed/create.gsp (revision 168)
@@ -64,5 +64,5 @@
-
+
@@ -74,5 +74,28 @@
-
+
+
+
+
+
+ |
+
+
+
+ |
+
+
+
+
+
+ |
+
+
+
+ |
+
@@ -126,5 +149,5 @@
-
+
|
Index: /trunk/grails-app/views/taskDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/edit.gsp (revision 167)
+++ /trunk/grails-app/views/taskDetailed/edit.gsp (revision 168)
@@ -78,5 +78,28 @@
-
+
+
+
+
+
+ |
+
+
+
+ |
+
+
+
+
+
+ |
+
+
+
+ |
+
@@ -130,5 +153,5 @@
-
+
|
Index: /trunk/grails-app/views/taskDetailed/search.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/search.gsp (revision 167)
+++ /trunk/grails-app/views/taskDetailed/search.gsp (revision 168)
@@ -95,10 +95,23 @@
class="overlayPane"
additionalProperties="id"
- associatedProperties="leadPerson.lastName, taskGroup.name, taskPriority.name"
+ associatedProperties="taskPriority.name,
+ leadPerson.lastName,
+ leadPerson.firstName,
+ taskGroup.name,
+ associatedAssets.name,
+ primaryAsset.name,
+ taskStatus.name,
+ taskType.name"
filterPropertyValues="${['taskPriority.name':[values:TaskPriority.list()],
- 'leadPerson.lastName':[values:Person.executeQuery('select t.lastName from Person t')],
+ 'leadPerson.lastName':[values:Person.executeQuery('select distinct t.lastName from Person t')],
+ 'leadPerson.firstName':[values:Person.executeQuery('select distinct t.firstName from Person t')],
'taskGroup.name':[values:TaskGroup.list()],
+ 'associatedAssets.name':[values:Asset.list()],
+ 'primaryAsset.name':[values:Asset.list()],
+ 'taskStatus.name':[values:TaskStatus.list()],
+ 'taskType.name':[values:TaskType.list()],
targetCompletionDate:[years:2020..2000,precision:'day'],
- targetStartDate:[years:2020..2000,precision:'day']]}"/>
+ targetStartDate:[years:2020..2000,precision:'day']
+ ]}"/>
Index: /trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/show.gsp (revision 167)
+++ /trunk/grails-app/views/taskDetailed/show.gsp (revision 168)
@@ -83,4 +83,24 @@
+ Primary Asset: |
+
+ ${taskInstance?.primaryAsset?.encodeAsHTML()} |
+
+
+
+
+ Associated Assets: |
+
+
+
+
+ - ${a?.encodeAsHTML()}
+
+
+ |
+
+
+
+
Task Priority: |