Merge pull request #32 from chronic-care/develop

Updates for 3.1.3

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "providersmartapp",
-  "version": "1.2.7",
+  "name": "ecareplanner",
+  "version": "3.1.3",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -46,7 +46,7 @@
     "rxjs": "~6.6.3",
     "tslib": "^2.0.0",
     "zone.js": "~0.10.2",
-    "e-care-common-data-services" :"^1.1.1"
+    "e-care-common-data-services": "^1.2.6"
   },
   "devDependencies": {
     "@angular-devkit/architect": "^0.1001.0",

src/app/app.component.html

@@ -7,9 +7,11 @@
     }]);
 </script>
 
+<app-warning-popup></app-warning-popup>
+
 <mat-toolbar color="primary" style="height:36px;min-height:36px">
   <mat-toolbar-row>
-    <span>Careplan&nbsp;&nbsp;<small>v</small>{{version}}</span>
+    <span>eCarePlanner&nbsp;&nbsp;<small>v</small>{{version}}</span>
     <!-- This fills the remaining space of the current row -->
     <span class="center-name">{{dataservice.demographic.name}}, DOB: {{dataservice.demographic.dateOfBirth}}</span>
     <span class="example-fill-remaining-space"></span>
@@ -22,21 +24,15 @@
     <mat-icon matTooltip="Select a new patient" aria-label="Button to select a new patient"
       (click)="togglePatientSearch()" *ngIf="devmode">person
     </mat-icon>
-    <mat-icon matTooltip="Select a careplan" aria-label="Button to select and new careplan"
-      [matMenuTriggerFor]="menuCareplan">folder
-    </mat-icon>
+
     <mat-menu #menuCareplan="matMenu">
       <button mat-menu-item *ngFor="let plan of this.dataservice.careplans"
         (click)="this.dataservice.setCurrentCarePlan(plan.fhirid)">
         {{plan.title}}
       </button>
     </mat-menu>
-    <mat-icon matTooltip="Show current user information" aria-label="Button to show the users information">
-      account_circle
-    </mat-icon>
-    <mat-icon matTooltip="Show control panel" aria-label="Buttn to show or hide the control panel" class="settings-icon"
-      (click)="sidenav.toggle()">settings
-    </mat-icon>
+
+
   </mat-toolbar-row>
 </mat-toolbar>
 

src/app/app.component.ts

@@ -34,7 +34,7 @@ import { HttpClient } from '@angular/common/http';
 })
 
 export class AppComponent implements OnInit, AfterViewInit {
-  public version: string = version + " – " + "BETA – Data may be incomplete!";
+  public version: string = version;
 
   // todo:  use of patSearch template variable to set focus not working..
   @ViewChild('patSearch', { static: true }) patSearch: any;

src/app/app.module.ts

@@ -43,7 +43,7 @@ import { ClinicalHistoryResultsComponent } from './clinical-history-results/clin
 import { ClinicalTherapyResultsComponent } from './clinical-therapy-results/clinical-therapy-results.component';
 import { LabTestResultComponent } from './lab-test-result/lab-test-result.component';
 import { BloodPressureComponent } from './blood-pressure/blood-pressure.component';
-import { EGFRComponent } from './e-gfr/e-gfr.component';
+// import { EGFRComponent } from './e-gfr/e-gfr.component';
 import { WeightOverTimeComponent } from './weight-over-time/weight-over-time.component';
 import { UACRComponent } from './uacr/uacr.component';
 import { BPGraphComponent } from './bpgraph/bpgraph.component';
@@ -59,6 +59,7 @@ import { CourseDialogComponent } from './goals/course-dialog.component';
 import { MedicationDialogComponent } from './medication-dialog/medication-dialog.component';
 import { GoalDialogComponent } from './goals-dialog/goal-dialog.component';
 import { ActiveOrdersPanelComponent } from './active-orders-panel/active-orders-panel.component';
+import { WarningPopupComponent } from './warning-popup/warning-popup.component';
 
 const routes: Routes = []; // sets up routes constant where you define your routes
 
@@ -97,14 +98,14 @@ const routes: Routes = []; // sets up routes constant where you define your rout
     ClinicalHistoryResultsComponent,
     LabTestResultComponent,
     BloodPressureComponent,
-    EGFRComponent,
     WeightOverTimeComponent,
     UACRComponent,
     BPGraphComponent,
     DiagnosisDialogComponent,
     ConsolidatedGoalsComponent,
     Testgraph1Component,
-    NullCheckPipe
+    NullCheckPipe,
+    WarningPopupComponent
   ],
   imports: [
     MatSortModule,

src/app/clinical-goals/clinical-goals.component.html

@@ -23,7 +23,7 @@
   </ng-container>
   <ng-container matColumnDef="status">
     <th mat-header-cell *matHeaderCellDef>Status</th>
-    <td mat-cell *matCellDef="let goal"> {{goal.achievementStatus.text}} </td>
+    <td mat-cell *matCellDef="let goal"> {{goal.achievementStatusText}} </td>
   </ng-container>
 
   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>

src/app/consolidated-goals/consolidated-goals.component.html

@@ -30,8 +30,8 @@
     <td mat-cell *matCellDef="let goal"> {{goal.targetDateText}} </td>
   </ng-container>
   <ng-container matColumnDef="status">
-    <th mat-header-cell *matHeaderCellDef mat-sort-header="achievementStatus">Achievement Status</th>
-    <td mat-cell *matCellDef="let goal"> {{ goal.achievementStatus | nullCheck }} </td>
+    <th mat-header-cell *matHeaderCellDef mat-sort-header="achievementText">Achievement Status</th>
+    <td mat-cell *matCellDef="let goal"> {{ goal.achievementText | nullCheck }} </td>
   </ng-container>
   <ng-container matColumnDef="mostrecentresult">
     <th mat-header-cell *matHeaderCellDef mat-sort-header="mostrecentresult">Most Recent Result</th>

src/app/consolidated-goals/consolidated-goals.component.ts

@@ -35,7 +35,7 @@ export class ConsolidatedGoalsComponent implements OnInit, AfterViewInit {
     this.consolidatedGoalsDataSource.sortingDataAccessor = (data: MccGoalSummary, header: string) => {
       switch (header) {
         case ('status'): {
-          return data.achievementStatus.text;
+          return data.achievementText;
         }
         case ('priority'): {
           if (data.priority.toLowerCase() === 'undefined') {
@@ -50,8 +50,8 @@ export class ConsolidatedGoalsComponent implements OnInit, AfterViewInit {
         case ('targetDateText'): {
           return moment(data[header]).unix();
         }
-        case ("achievementStatus"): {
-          return data[header].text;
+        case ("achievementText"): {
+          return data[header];
         }
         default: {
           return data[header];

src/app/datamodel/mockData.ts

@@ -170,16 +170,7 @@ export const mockGoalList: GoalLists = {
       priority: 'high-priority',
       expressedByType: 'Practitioner',
       description: 'Stabilize Hemoglobin A1c',
-      achievementStatus: {
-        coding: [
-          {
-            system: 'http://terminology.hl7.org/CodeSystem/goal-achievement',
-            code: 'in-progress',
-            display: 'in-progress'
-          }
-        ],
-        text: 'In Progress'
-      },
+
       lifecycleStatus: 'active',
       startDateText: '11/30/2016',
       targets: [
@@ -214,16 +205,7 @@ export const mockGoalList: GoalLists = {
       priority: 'high-priority',
       expressedByType: 'Practitioner',
       description: 'Phosphorus in blood',
-      achievementStatus: {
-        coding: [
-          {
-            system: 'http://terminology.hl7.org/CodeSystem/goal-achievement',
-            code: 'in-progress',
-            display: 'in-progress'
-          }
-        ],
-        text: 'In Progress'
-      },
+
       lifecycleStatus: 'active',
       startDateText: '02/20/2018',
       targets: [
@@ -265,16 +247,7 @@ export const mockGoalList: GoalLists = {
       priority: 'medium-priority',
       expressedByType: 'Practitioner',
       description: 'Systolic blood pressure',
-      achievementStatus: {
-        coding: [
-          {
-            system: 'http://terminology.hl7.org/CodeSystem/goal-achievement',
-            code: 'in-progress',
-            display: 'in-progress'
-          }
-        ],
-        text: 'In Progress'
-      },
+
       lifecycleStatus: 'active',
       startDateText: '06/30/2017',
       targets: [
@@ -309,17 +282,7 @@ export const mockGoalList: GoalLists = {
       priority: 'Undefined',
       expressedByType: 'Practitioner',
       description: 'Diastolic blood pressure',
-      achievementStatus: {
-        coding: [
-          {
-            system: 'http://terminology.hl7.org/CodeSystem/goal-achievement',
-            code: 'in-progress',
-            display: 'in-progress'
-          }
-        ],
-        text: 'In Progress'
-      },
-      lifecycleStatus: 'active',
+       lifecycleStatus: 'active',
       startDateText: '01/12/2019',
       targets: [
         {
@@ -353,17 +316,7 @@ export const mockGoalList: GoalLists = {
       priority: 'Undefined',
       expressedByType: 'Practitioner',
       description: 'Exercise at least 30 minutes per day',
-      achievementStatus: {
-        coding: [
-          {
-            system: 'http://terminology.hl7.org/CodeSystem/goal-achievement',
-            code: 'in-progress',
-            display: 'in-progress'
-          }
-        ],
-        text: 'In Progress'
-      },
-      lifecycleStatus: 'active',
+       lifecycleStatus: 'active',
       startDateText: '12/07/2017',
       targets: [
         {
@@ -388,17 +341,7 @@ export const mockGoalList: GoalLists = {
       priority: 'high-priority',
       expressedByType: 'Patient',
       description: 'Maximize Quality of Life',
-      achievementStatus: {
-        coding: [
-          {
-            system: 'http://terminology.hl7.org/CodeSystem/goal-achievement',
-            code: 'in-progress',
-            display: 'in-progress'
-          }
-        ],
-        text: 'In Progress'
-      },
-      lifecycleStatus: 'active',
+       lifecycleStatus: 'active',
       startDateText: '11/30/2016',
       fhirid: 'cc-goal-betsy-maxql'
     }
@@ -408,17 +351,7 @@ export const mockGoalList: GoalLists = {
       priority: 'high-priority',
       expressedByType: 'Patient',
       description: 'Be able to dance again',
-      achievementStatus: {
-        coding: [
-          {
-            system: 'http://terminology.hl7.org/CodeSystem/goal-achievement',
-            code: 'achieved',
-            display: 'achieved'
-          }
-        ],
-        text: 'Achieved'
-      },
-      lifecycleStatus: 'completed',
+       lifecycleStatus: 'completed',
       startDateText: '10/30/2015',
       fhirid: 'cc-goal-betsy-dance'
     }

src/app/demographics-panel/demographics-panel.component.html

@@ -14,57 +14,21 @@
         <td>
           <b>Sex:</b> {{dataservice.demographic.gender | nullCheck}}
         </td>
-        <td>
-          <b>Patient Id:</b> {{dataservice.demographic.id | nullCheck}}
-        </td>
 
 
-      </tr>
-      <tr>
-        <td colspan="2">
-          <b>Title:</b> <span ng-if="dataservice.careplan">
-            {{dataservice.careplan.title | nullCheck}}</span>
-        </td>
-        <td>
-          <b>Status:</b> <span ng-if="dataservice.careplan">{{dataservice.careplan.status | nullCheck}}</span>
-        </td>
-
-
-
-
-
-
-        <td>
-          <b>Period:</b> <span ng-if="dataservice.careplan">
-            {{getPeriodText() | nullCheck}}</span>
-        </td>
-        <td>
-          <b>Focus:</b> <span ng-if="dataservice.careplan">{{getAddresses() | nullCheck}}</span>
-        </td>
-        <td>
-          <b>Careplan Id:</b> <span ng-if="dataservice.careplan">{{dataservice.careplan.id}}</span>
-        </td>
 
       </tr>
+
     </table>
   </mat-expansion-panel-header>
   <table width="100%">
     <tr>
 
       <!--  {{dataservice.careplan.meta.lastUpdated}} -->
-      <td><b>Date Last Revised:</b>TBD</td>
+
       <td><b>Race and Ethnicity:</b> {{dataservice.demographic.race | nullCheck}}, {{dataservice.demographic.ethnicity |
         nullCheck}}</td>
     </tr>
-    <tr>
-      <td><b>Careplan Category</b> {{getCategories()}}</td>
-      <td><b>Intent:</b> {{dataservice.careplan.intent}}</td>
-    </tr>
-    <tr>
-      <td><b>Description:</b> {{dataservice.careplan.description}}</td>
-    </tr>
-    <tr>
-      <td><b>Notes:</b> {{getNotes()}}</td>
-    </tr>
+
   </table>
 </mat-expansion-panel>