Merge pull request #379 from NickPhura/ACRFD-4-4

ACRFD-4-4: Improve refresh, models, constant handling.

Author: NickPhura

src/app/models/application.ts

@@ -55,13 +55,14 @@ export class Application {
     this.location = (obj && obj.location) || null;
     this.name = (obj && obj.name) || null;
     this.purpose = (obj && obj.purpose) || null;
-    this.status = (obj && obj.status && ConstantUtils.getCode(CodeType.STATUS, obj.status)) || null;
-    this.reason = (obj && obj.reason && ConstantUtils.getCode(CodeType.REASON, obj.reason)) || null;
+    this.status = (obj && obj.status) || null;
+    this.reason = (obj && obj.reason) || null;
     this.subpurpose = (obj && obj.subpurpose) || null;
     this.subtype = (obj && obj.subtype) || null;
     this.tantalisID = (obj && obj.tantalisID) || null; // not zero
     this.tenureStage = (obj && obj.tenureStage) || null;
     this.type = (obj && obj.type) || null;
+
     this.region = (obj && obj.businessUnit && ConstantUtils.getTextLong(CodeType.REGION, obj.businessUnit)) || null;
     this.cpStatus = (obj && obj.cpStatus) || null;
     this.clFile = (obj && obj.clFile) || null;

src/app/search/search.component.ts

@@ -122,6 +122,7 @@ export class SearchComponent implements OnInit, OnDestroy {
         type: application.type,
         subtype: application.subtype,
         status: application.status,
+        reason: application.reason,
         tenureStage: application.tenureStage,
         location: application.location,
         businessUnit: application.businessUnit,
@@ -149,9 +150,9 @@ export class SearchComponent implements OnInit, OnDestroy {
   isAmendment(application: Application): boolean {
     return (
       application &&
-      application.status === StatusCodes.ABANDONED.code &&
-      (application.reason === ReasonCodes.AMENDMENT_APPROVED.code ||
-        application.reason === ReasonCodes.AMENDMENT_NOT_APPROVED.code)
+      ConstantUtils.getCode(CodeType.STATUS, application.status) === StatusCodes.ABANDONED.code &&
+      (ConstantUtils.getCode(CodeType.REASON, application.reason) === ReasonCodes.AMENDMENT_APPROVED.code ||
+        ConstantUtils.getCode(CodeType.REASON, application.reason) === ReasonCodes.AMENDMENT_NOT_APPROVED.code)
     );
   }
 

src/app/services/application.service.ts

@@ -335,9 +335,9 @@ export class ApplicationService {
   isAmendment(application: Application): boolean {
     return (
       application &&
-      application.status === StatusCodes.ABANDONED.code &&
-      (application.reason === ReasonCodes.AMENDMENT_APPROVED.code ||
-        application.reason === ReasonCodes.AMENDMENT_NOT_APPROVED.code)
+      ConstantUtils.getCode(CodeType.STATUS, application.status) === StatusCodes.ABANDONED.code &&
+      (ConstantUtils.getCode(CodeType.REASON, application.reason) === ReasonCodes.AMENDMENT_APPROVED.code ||
+        ConstantUtils.getCode(CodeType.REASON, application.reason) === ReasonCodes.AMENDMENT_NOT_APPROVED.code)
     );
   }