Add visits (#489)

Author: danielrus

src/app/_services/helper.service.ts

@@ -9,7 +9,7 @@ import {
   getYear,
   startOfISOWeek,
 } from 'date-fns';
-import { of } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { Filter } from '../_models/common';
 import {
   BRIEF_DATE_FORMAT,
@@ -167,4 +167,15 @@ export class HelperService {
         .filter((item) => typesMap[type].includes(item.key))
     );
   }
+
+  getFirstSymptomOptions(filters: any): Observable<any> {
+    const result: any[] = [];
+    filters.forEach(({ value }: any) => {
+      if (Object.values(value)[0] === 'YES') {
+        const key = Object.keys(value)[0];
+        result.push({ key, value: `captions.Symptoms.${key}` });
+      }
+    });
+    return of(result);
+  }
 }

src/app/cases/case_components/case-follow-up-add-visit/case-follow-up-add-visit.component.ts

@@ -17,7 +17,7 @@ import { defaultColumnDefs } from './case-follow-up-table-data';
 import { ExportService } from '../../../_services/api/export.service';
 import { NotificationService } from '../../../_services/notification.service';
 import { AddEditBaseModalComponent } from '../../../shared/modals/add-edit-base-modal/add-edit-base-modal.component';
-import { CaseFollowUpAddVisitComponent } from '../case-follow-up-add-visit/case-follow-up-add-visit.component';
+import { FollowUpVisitAddComponent } from '../../../shared/follow-up-visit-add/follow-up-visit-add.component';
 
 @Component({
   selector: 'app-case-follow-up',
@@ -66,7 +66,7 @@ export class CaseFollowUpComponent {
       maxWidth: MODAL_LARGE_WIDTH,
       data: {
         title: this.translateService.instant('strings.headingCreateNewVisit'),
-        component: CaseFollowUpAddVisitComponent,
+        component: FollowUpVisitAddComponent,
       },
     });
 

src/app/cases/case_components/case-follow-up/case-follow-up.component.ts

@@ -54,6 +54,9 @@ export const FORM_DATA_CASE_SYMPTOMS = [
       {
         ...FORM_DATA_WIDGET,
         widget: 'app-symptoms-group-select',
+        widgetInfo: {
+          type: 'SYMPTOMS',
+        },
       },
     ],
   },

src/app/cases/case_components/case-symptoms/case-symptoms-form-data.ts

@@ -145,7 +145,10 @@ export const FORM_DATA_CLINICAL_COURSE_ADD = [
     fields: [
       {
         ...FORM_DATA_WIDGET,
-        widget: 'app-clinical-course-group-select',
+        widget: 'app-symptoms-group-select',
+        widgetInfo: {
+          type: 'CLINICAL_COURSE',
+        },
       },
     ],
   },

src/app/cases/case_components/clinical-course-add/clinical-course-add-form-data.ts

@@ -21,7 +21,6 @@ import { CasePortHealthComponent } from './case_components/case-port-health/case
 import { CaseEditComponent } from './case-edit/case-edit.component';
 import { TherapyFiltersComponent } from './case_components/therapy-filters/therapy-filters.component';
 import { CaseGuideComponent } from './case-guide/case-guide.component';
-import { CaseFollowUpAddVisitComponent } from './case_components/case-follow-up-add-visit/case-follow-up-add-visit.component';
 import { ClinicalCourseAddComponent } from './case_components/clinical-course-add/clinical-course-add.component';
 import { ClassificationRulesComponent } from './classification-rules/classification-rules.component';
 
@@ -44,7 +43,6 @@ import { ClassificationRulesComponent } from './classification-rules/classificat
     CaseEditComponent,
     TherapyFiltersComponent,
     CaseGuideComponent,
-    CaseFollowUpAddVisitComponent,
     ClinicalCourseAddComponent,
     ClassificationRulesComponent,
   ],

src/app/cases/cases.module.ts

@@ -4,6 +4,9 @@ <h2 class="assessments-title">
       {{ 'captions.caseFollowupVisitsView' | translate }}
     </h2>
     <div class="actions">
+      <button mat-flat-button color="primary" (click)="openAddVisitModal()">
+        {{ 'captions.visitNewVisit' | translate }}
+      </button>
       <button mat-stroked-button color="primary" (click)="export()">
         {{ 'captions.export' | translate }}
       </button>

src/app/contacts/contact-components/contact-follow-up/contact-follow-up.component.html

@@ -1,4 +1,15 @@
 header {
   display: flex;
   justify-content: space-between;
+  align-items: center;
+  margin-bottom: 24px;
+}
+
+.assessments-title {
+  margin: 0;
+}
+
+.actions {
+  display: flex;
+  gap: 16px;
 }

src/app/contacts/contact-components/contact-follow-up/contact-follow-up.component.scss

@@ -1,11 +1,16 @@
-import { Component } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
 import { TranslateService } from '@ngx-translate/core';
+import { Subscription } from 'rxjs';
 import {
   API_ROUTE_CONTACTS_FOLLOW_UP,
   EXPORT_TYPES,
+  MODAL_LARGE_WIDTH,
   SMALL_NOTIFICATION_MODAL_WIDTH,
   TableAppearanceOptions,
 } from '../../../app.constants';
+import { FollowUpVisitAddComponent } from '../../../shared/follow-up-visit-add/follow-up-visit-add.component';
+import { AddEditBaseModalComponent } from '../../../shared/modals/add-edit-base-modal/add-edit-base-modal.component';
 import { Filter, TableColumn } from '../../../_models/common';
 import { CaseDataDto, VisitDto } from '../../../_models/models';
 import { BaseService } from '../../../_services/api/base.service';
@@ -19,19 +24,21 @@ import { defaultColumnDefs } from './contact-follow-up-table-data';
   templateUrl: './contact-follow-up.component.html',
   styleUrls: ['./contact-follow-up.component.scss'],
 })
-export class ContactFollowUpComponent {
+export class ContactFollowUpComponent implements OnDestroy {
   visits: VisitDto[] = [];
   defaultColumns: TableColumn[] = defaultColumnDefs;
   tableAppearanceOptions = TableAppearanceOptions;
   preSetFilters: Filter[];
 
   public resourceService: BaseService<any>;
+  private subscriptions: Subscription = new Subscription();
 
   constructor(
     public visitService: VisitService,
     private notificationService: NotificationService,
     private translateService: TranslateService,
-    private exportService: ExportService
+    private exportService: ExportService,
+    private dialog: MatDialog
   ) {}
 
   updateComponent(caseItem: CaseDataDto, resourceService: BaseService<any>): void {
@@ -53,4 +60,26 @@ export class ContactFollowUpComponent {
 
     this.exportService.executeExport(EXPORT_TYPES.BASIC, API_ROUTE_CONTACTS_FOLLOW_UP.EXPORT);
   }
+
+  openAddVisitModal(): void {
+    const dialogRef = this.dialog.open(AddEditBaseModalComponent, {
+      maxWidth: MODAL_LARGE_WIDTH,
+      data: {
+        title: this.translateService.instant('strings.headingCreateNewVisit'),
+        component: FollowUpVisitAddComponent,
+      },
+    });
+
+    this.subscriptions.add(
+      dialogRef.afterClosed().subscribe((result) => {
+        if (result) {
+          // callback
+        }
+      })
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.unsubscribe();
+  }
 }

src/app/contacts/contact-components/contact-follow-up/contact-follow-up.component.ts

@@ -29,16 +29,13 @@ import { CasePersonContactsListComponent } from '../../../widgets/case-person-co
 import { LineListingNewCasesComponent } from '../../../widgets/line-listing-new-cases/line-listing-new-cases.component';
 import { LineListingNewContactsComponent } from '../../../widgets/line-listing-new-contacts/line-listing-new-contacts.component';
 import { GroupSelectComponent } from '../../../widgets/group-select/group-select.component';
-import { AddVisitsGroupSelectComponent } from '../../../widgets/add-visits-group-select/add-visits-group-select.component';
 import { InfoModalComponent } from '../../../widgets/info-modal/info-modal.component';
 import { CalculateCaseClassificationComponent } from '../../../widgets/calculate-case-classification/calculate-case-classification.component';
-import { ClinicalCourseGroupSelectComponent } from '../../../widgets/clinical-course-group-select/clinical-course-group-select.component';
 
 const COMPONENTS_MAP: any = {
   'app-follow-up-status': FollowUpStatusComponent,
   'app-new-epid-number': NewEpidNumberComponent,
   'app-symptoms-group-select': SymptomsGroupSelectComponent,
-  'app-add-visits-group-select': AddVisitsGroupSelectComponent,
   'app-exposures-list': ExposuresListComponent,
   'app-activities-list': ActivitiesListComponent,
   'app-addresses-list': AddressesListComponent,
@@ -59,7 +56,6 @@ const COMPONENTS_MAP: any = {
   'app-group-select': GroupSelectComponent,
   'app-info-modal': InfoModalComponent,
   'app-calculate-case-classification': CalculateCaseClassificationComponent,
-  'app-clinical-course-group-select': ClinicalCourseGroupSelectComponent,
 };
 
 @Component({