Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'lookup-incentives'

  • Loading branch information...
commit 295696db35a7524f466dee415b2a7fa778461130 2 parents 97a9b1c + 10dabf6
@aaronzirbes aaronzirbes authored
View
9 grails-app/controllers/edu/umn/ncs/PersonController.groovy
@@ -25,6 +25,14 @@ class PersonController {
def trackedItemInstanceList = TrackedItem.findAllByPerson(personInstance)
def appointmentInstanceList = Appointment.findAllByPerson(personInstance)
def subjectInstanceList = Subject.findAllByPerson(personInstance)
+
+ def incentiveInstanceList = Incentive.createCriteria().list {
+ trackedItem {
+ person {
+ idEq(personInstance.id)
+ }
+ }
+ }
def callInstanceList = Call.createCriteria().list {
items {
@@ -88,6 +96,7 @@ class PersonController {
householdInstanceList: householdInstanceList,
callInstanceList: callInstanceList,
eventReportInstanceList: eventReportInstanceList,
+ incentiveInstanceList : incentiveInstanceList,
resultHistoryList: resultHistoryList ]
}
View
9 grails-app/views/person/show.gsp
@@ -229,6 +229,15 @@
</fieldset>
<fieldset class="maroonBorder">
+ <legend class="m1">Incentives</legend>
+ <ul>
+ <g:each var="inc" in="${incentiveInstanceList}">
+ <li>${inc}</li>
+ </g:each>
+ </ul>
+ </fieldset>
+
+ <fieldset class="maroonBorder">
<legend class="m1">Items Generated</legend>
<g:if test="${ ! trackedItemInstanceList}">
No Items found
Please sign in to comment.
Something went wrong with that request. Please try again.