Merge pull request #221 from marklise/v1.0.4

PRC-554, PRC-547
bcgov · Aug 1, 2018 · a815395 · a815395
2 parents 718fd8d + 4cf3e50
commit a815395
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/app/applications/application-detail/decisions/decisions-tab-content.component.html b/src/app/applications/application-detail/decisions/decisions-tab-content.component.html
@@ -4,15 +4,15 @@
             {{applicationService.getStatus(application)}}
         </div>
 
-        <div *ngIf="!applicationService.isDecision(application.status)">
-            No decisions have been made for this application at this time.
-        </div>
-
-        <div *ngIf="applicationService.isDecision(application.status)">
-            <div *ngIf="!application.decision">
+        <div>
+            <div *ngIf="!application.decision && applicationService.isDecision(application.status)">
                 No decisions documents are available at this time. Please check back for updates to this information.
             </div>
 
+            <div *ngIf="!application.decision && !applicationService.isDecision(application.status)">
+                No decisions have been made for this application at this time.
+            </div>
+
             <div *ngIf="application.decision">
                 <h2 class="title">Description</h2>
                 <p class="mb-3" [innerHTML]="application.decision.description | newlines"></p>

diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
@@ -20,7 +20,7 @@ <h1 id="pgTitle">
 			<section class="mb-0">
 				<h3>About this Site</h3>
 				<p>This website is used to post Crown Land Application information for public review and comment, as per Section 32(2) of
-					the Land Act, and to support Government's mandate to be transparent in making decisions related to Crown Land Applications.
+					the <i>Land Act</i>, and to support Government's mandate to be transparent in making decisions related to Crown Land Applications.
 				</p>
 				<p>This website has been launched as a pilot for the province's Skeena Region, and will be continuously improved and rolled
 					out provincially over the next year. We are always looking for feedback. To share your thoughts, email us at

diff --git a/src/app/services/application.service.ts b/src/app/services/application.service.ts
@@ -197,6 +197,8 @@ export class ApplicationService {
       || s === 'DISALLOWED'
       || s === 'OFFER ACCEPTED'
       || s === 'OFFER NOT ACCEPTED'
-      || s === 'OFFERED');
+      || s === 'OFFERED'
+      || s === 'DISPOSITION IN GOOD STANDING'
+    );
   }
 }