Skip to content

Commit dc0748b

Browse files
dkayiwadkayiwa
committedJun 28, 2013
Voiding a person doesn't work right - TRUNK-3971
·
2.7.31.11.0-alpha
1 parent 7029613 commit dc0748b

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed
 

‎api/src/main/java/org/openmrs/Person.java

+8
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,7 @@ public User getPersonChangedBy() {
835835

836836
public void setPersonChangedBy(User changedBy) {
837837
this.personChangedBy = changedBy;
838+
this.setChangedBy(changedBy);
838839
}
839840

840841
public Date getPersonDateChanged() {
@@ -843,6 +844,7 @@ public Date getPersonDateChanged() {
843844

844845
public void setPersonDateChanged(Date dateChanged) {
845846
this.personDateChanged = dateChanged;
847+
this.setDateChanged(dateChanged);
846848
}
847849

848850
public User getPersonCreator() {
@@ -851,6 +853,7 @@ public User getPersonCreator() {
851853

852854
public void setPersonCreator(User creator) {
853855
this.personCreator = creator;
856+
this.setCreator(creator);
854857
}
855858

856859
public Date getPersonDateCreated() {
@@ -859,6 +862,7 @@ public Date getPersonDateCreated() {
859862

860863
public void setPersonDateCreated(Date dateCreated) {
861864
this.personDateCreated = dateCreated;
865+
this.setDateCreated(dateCreated);
862866
}
863867

864868
public Date getPersonDateVoided() {
@@ -867,10 +871,12 @@ public Date getPersonDateVoided() {
867871

868872
public void setPersonDateVoided(Date dateVoided) {
869873
this.personDateVoided = dateVoided;
874+
this.setDateVoided(dateVoided);
870875
}
871876

872877
public void setPersonVoided(Boolean voided) {
873878
this.personVoided = voided;
879+
this.setVoided(voided);
874880
}
875881

876882
public Boolean getPersonVoided() {
@@ -887,6 +893,7 @@ public User getPersonVoidedBy() {
887893

888894
public void setPersonVoidedBy(User voidedBy) {
889895
this.personVoidedBy = voidedBy;
896+
this.setVoidedBy(voidedBy);
890897
}
891898

892899
public String getPersonVoidReason() {
@@ -895,6 +902,7 @@ public String getPersonVoidReason() {
895902

896903
public void setPersonVoidReason(String voidReason) {
897904
this.personVoidReason = voidReason;
905+
this.setVoidReason(voidReason);
898906
}
899907

900908
/**

‎api/src/test/java/org/openmrs/api/PersonServiceTest.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -1603,8 +1603,8 @@ public void unvoidPerson_shouldUnvoidTheGivenPerson() throws Exception {
16031603
executeDataSet("org/openmrs/api/include/PersonServiceTest-createPersonPurgeVoidTest.xml");
16041604
Person person = Context.getPersonService().getPerson(1002);
16051605

1606-
//Assert.assertTrue(person.isVoided());
1607-
//Assert.assertNotNull(person.getDateVoided());
1606+
Assert.assertTrue(person.isVoided());
1607+
Assert.assertNotNull(person.getDateVoided());
16081608

16091609
Person unvoidedPerson = Context.getPersonService().unvoidPerson(person);
16101610

@@ -1645,7 +1645,12 @@ public void unvoidRelationship_shouldUnvoidVoidedRelationship() throws Exception
16451645
public void voidPerson_shouldReturnVoidedPersonWithGivenReason() throws Exception {
16461646
executeDataSet("org/openmrs/api/include/PersonServiceTest-createPersonPurgeVoidTest.xml");
16471647
Person person = Context.getPersonService().getPerson(1001);
1648-
Person voidedPerson = Context.getPersonService().voidPerson(person, "Test Voiding Person");
1648+
Context.getPersonService().voidPerson(person, "Test Voiding Person");
1649+
1650+
Context.flushSession();
1651+
Context.clearSession();
1652+
1653+
Person voidedPerson = Context.getPersonService().getPerson(1001);
16491654

16501655
Assert.assertTrue(voidedPerson.isVoided());
16511656
Assert.assertNotNull(voidedPerson.getVoidedBy());

‎webapp/src/main/webapp/WEB-INF/view/admin/person/personForm.jsp

+6-6
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235

236236
<h2><openmrs:message code="Person.title"/></h2>
237237

238-
<c:if test="${person.voided}">
238+
<c:if test="${person.personVoided}">
239239
<div id="personFormVoided" class="retiredMessage">
240240
<div><openmrs:message code="Person.voidedMessage"/></div>
241241
</div>
@@ -248,13 +248,13 @@
248248
</c:if>
249249

250250
<openmrs:hasPrivilege privilege="Delete Person">
251-
<c:if test="${person.voided}">
251+
<c:if test="${person.personVoided}">
252252
<div id="personFormVoided" class="retiredMessage">
253253
<div><openmrs:message code="Person.voidedMessage"/></div>
254254
<div>
255-
<c:if test="${person.voidedBy.personName != null}"><openmrs:message code="general.byPerson"/> ${person.voidedBy.personName}</c:if>
256-
<c:if test="${person.dateVoided != null}"> <openmrs:message code="general.onDate"/> <openmrs:formatDate date="${person.dateVoided}" type="long" /> </c:if>
257-
<c:if test="${person.voidReason != ''}"> - ${person.voidReason} </c:if>
255+
<c:if test="${person.personVoidedBy.personName != null}"><openmrs:message code="general.byPerson"/> ${person.personVoidedBy.personName}</c:if>
256+
<c:if test="${person.personDateVoided != null}"> <openmrs:message code="general.onDate"/> <openmrs:formatDate date="${person.personDateVoided}" type="long" /> </c:if>
257+
<c:if test="${person.personVoidReason != ''}"> - ${person.personVoidReason} </c:if>
258258
</div>
259259
<div>
260260
<form action="" method="post" ><input type="submit" name="action" value="<openmrs:message code="Person.unvoid"/>" /></form></div>
@@ -377,7 +377,7 @@
377377
</form>
378378
<br/>
379379
<openmrs:hasPrivilege privilege="Delete Person">
380-
<c:if test="${person.personId != null && person.voided == false}">
380+
<c:if test="${person.personId != null && person.personVoided == false}">
381381
<form action="" method="post">
382382
<fieldset>
383383
<legend><h4><openmrs:message code="Person.void"/></h4></legend>

0 commit comments

Comments
 (0)
Please sign in to comment.