Merge pull request #54 from sravandigitalhie/develop

Added provenance Column into the Health Concerns tab

package.json

@@ -35,7 +35,7 @@
     "chartjs-plugin-annotation": "^0.5.7",
     "classlist.js": "^1.1.20150312",
     "clone": "^2.1.2",
-    "e-care-common-data-services": "^1.2.11",
+    "e-care-common-data-services": "^1.4.0",
     "ecareplanner": "file:",
     "firebase": "^7.24.0",
     "flex-layout-srcs": "github:angular/flex-layout",

src/app/active-diagnosis-panel/active-diagnosis-panel.component.html

@@ -30,6 +30,10 @@
     <th mat-header-cell *matHeaderCellDef mat-sort-header>Diagnosis First Recorded</th>
     <td mat-cell *matCellDef="let condition">{{condition.firstRecordedAsText | nullCheck}}</td>
   </ng-container>
+  <ng-container matColumnDef="provenance">
+    <th mat-header-cell *matHeaderCellDef mat-sort-header>Source</th>
+    <td mat-cell *matCellDef="let condition">{{condition.provenance | nullCheck}}</td>
+  </ng-container>
   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
   <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
 </table>

src/app/active-diagnosis-panel/active-diagnosis-panel.component.ts

@@ -11,7 +11,7 @@ import moment from 'moment';
   styleUrls: ['./active-diagnosis-panel.component.css']
 })
 export class ActiveDiagnosisPanelComponent implements OnInit, AfterViewInit {
-  displayedColumns: string[] = ['code', 'asserter', 'firstOnset', 'firstRecorded'];
+  displayedColumns: string[] = ['code', 'asserter', 'firstOnset', 'firstRecorded', 'provenance'];
   dataSource: MatTableDataSource<any>;
   showFilter: any = false;
 
@@ -21,6 +21,7 @@ export class ActiveDiagnosisPanelComponent implements OnInit, AfterViewInit {
   constructor(public dataservice: DataService) {}
 
   ngOnInit(): void {
+    console.log("this.dataservice.conditions.activeConditions ------------------<><><><<>", this.dataservice.conditions.activeConditions);
     // Convert date strings to Date objects
     const conditionsWithConvertedDates = this.dataservice.conditions.activeConditions.map(condition => ({
       ...condition,
@@ -40,6 +41,8 @@ export class ActiveDiagnosisPanelComponent implements OnInit, AfterViewInit {
           return item.firstOnsetAsDate ? item.firstOnsetAsDate.getTime() : item.firstOnsetAsText;
         case 'code':
           return item[property].text.toUpperCase();
+        case 'provenance':
+          return item[property].text.toUpperCase();
         default:
           return item[property];
       }

src/app/inactive-diagnosis-panel/inactive-diagnosis-panel.component.html

@@ -30,6 +30,10 @@
     <th mat-header-cell *matHeaderCellDef mat-sort-header>Diagnosis First Recorded</th>
     <td mat-cell *matCellDef="let condition">{{condition.firstRecordedAsText | nullCheck}}</td>
   </ng-container>
+  <ng-container matColumnDef="provenance">
+    <th mat-header-cell *matHeaderCellDef mat-sort-header>Source</th>
+    <td mat-cell *matCellDef="let condition">{{condition.provenance | nullCheck}}</td>
+  </ng-container>
   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
   <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
 </table>

src/app/inactive-diagnosis-panel/inactive-diagnosis-panel.component.ts

@@ -11,7 +11,7 @@ import moment from 'moment';
   styleUrls: ['./inactive-diagnosis-panel.component.css']
 })
 export class InactiveDiagnosisPanelComponent implements OnInit, AfterViewInit {
-  displayedColumns: string[] = ['code', 'asserter', 'firstOnset', 'firstRecorded'];
+  displayedColumns: string[] = ['code', 'asserter', 'firstOnset', 'firstRecorded', 'provenance'];
   dataSource: MatTableDataSource<any>;
   showFilter: boolean = false;
 
@@ -38,6 +38,8 @@ export class InactiveDiagnosisPanelComponent implements OnInit, AfterViewInit {
           return item.firstOnsetAsDate ? item.firstOnsetAsDate.getTime() : item.firstOnsetAsText;
         case 'code':
           return item[property].text.toUpperCase();
+        case 'provenance':
+          return item[property].text.toUpperCase();
         default:
           return item[property];
       }

src/app/social-concern-panel/social-concern-panel.component.html

@@ -29,6 +29,10 @@
     <th mat-header-cell *matHeaderCellDef mat-sort-header>Date Recorded</th>
     <td mat-cell *matCellDef="let condition">{{condition.firstRecordedAsText | nullCheck}}</td>
   </ng-container>
+  <ng-container matColumnDef="provenance">
+    <th mat-header-cell *matHeaderCellDef mat-sort-header>Source</th>
+    <td mat-cell *matCellDef="let condition">{{condition.provenance | nullCheck}}</td>
+  </ng-container>
   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
   <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
 </table>

src/app/social-concern-panel/social-concern-panel.component.ts

@@ -16,7 +16,7 @@ export class SocialConcernPanelComponent implements OnInit, AfterViewInit {
   @ViewChild(MatSort) sort: MatSort;
 
   // displayedColumns = ['name', 'data', 'date'];
-  displayedColumns: string[] = ['code', 'status', 'firstRecorded'];
+  displayedColumns: string[] = ['code', 'status', 'firstRecorded', 'provenance'];
 
   constructor(public dataService: DataService) { }
 
@@ -37,6 +37,8 @@ export class SocialConcernPanelComponent implements OnInit, AfterViewInit {
           return item.firstOnsetAsDate ? item.firstOnsetAsDate.getTime() : item.firstOnsetAsText;
         case 'code':
           return item[property].text.toUpperCase();
+        case 'provenance':
+          return item[property].text.toUpperCase();
         default:
           return item[property];
       }