POC-679

package.json

@@ -3,7 +3,7 @@
   "version": "2.18.2",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --host 0.0.0.0 --port 3000",
+    "start": "ng serve --host 0.0.0.0 --port 3001",
     "build": "ng build",
     "build:prod": "ng build --prod",
     "test": "ng test --watch=false",
@@ -108,6 +108,7 @@
     "ngx-select": "^0.0.1",
     "ngx-toastr": "^9.1.1",
     "ngx-webcam": "^0.2.5",
+    "node-sass": "^9.0.0",
     "papaparse": "^5.4.1",
     "pdfjs-dist": "~1.7.308",
     "pdfkit": "^0.8.0",

src/app/constants/model.constants.ts

@@ -0,0 +1,10 @@
+import { Model } from '../interfaces/model.interface';
+
+const STANDARD_CARE_MODEL: Model = {
+  uuid: 'f0faccb7-657e-413c-abad-54f13409d106',
+  name: 'STANDARD CARE MODEL'
+};
+
+export const Models = {
+  STANDARD_CARE_MODEL
+};

src/app/constants/program.constants.ts

@@ -6,12 +6,32 @@ const PMTCT_PROGRAM: Program = {
   dept: 'HIV',
   compatibleWithOtherDeptPrograms: false
 };
+const STANDARD_CARE_MODEL: Program = {
+  uuid: 'f0faccb7-657e-413c-abad-54f13409d106',
+  name: 'STANDARD CARE MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: false
+};
+const AHD_MODEL: Program = {
+  uuid: '4545685e-65f6-48c4-a6b4-860cea88c4d4',
+  name: 'ADVANCED HIV DISEASE MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: false
+};
+const VIREMIA_MODEL: Program = {
+  uuid: '30521f4d-0708-4644-9e88-a108a830a5fd',
+  name: 'VIREMIA MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: false
+};
+
 const STANDARD_HIV_PROGRAM: Program = {
   uuid: '781d85b0-1359-11df-a1f1-0026b9348838',
   name: 'STANDARD HIV TREATMENT',
   dept: 'HIV',
   compatibleWithOtherDeptPrograms: false
 };
+
 const HIV_DIFFERENTIATED_CARE_PROGRAM: Program = {
   uuid: '334c9e98-173f-4454-a8ce-f80b20b7fdf0',
   name: 'HIV DIFFERENTIATED CARE PROGRAM',
@@ -104,10 +124,96 @@ const NUTRITION_PROGRAM: Program = {
   dept: 'HIV',
   compatibleWithOtherDeptPrograms: true
 };
+// new programs
+
+const HEI_MODEL: Program = {
+  uuid: 'a9a2a679-4028-456f-9a63-f4748b83dae7',
+  name: 'HEI_MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: false
+};
+const FAST_TRACK_FACILITY_CARE_MODEL: Program = {
+  uuid: '9d7422b1-af7b-4602-813e-953cfaf47e21',
+  name: 'FAST_TRACK_FACILITY_CARE_MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: false
+};
+
+const PEER_LED_FACILITY_ART_GROUP_MODEL: Program = {
+  uuid: 'a74f5be3-19bf-44a9-b9d8-14ff5587df37',
+  name: 'PEER_LED_FACILITY_ART_GROUP_MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: true
+};
+const HCW_FACILITY_ART_DISTRIBUTION_MODEL: Program = {
+  uuid: 'e352cb61-5889-4ba3-8405-d975e4c5e89e',
+  name: 'HCW_FACILITY_ART_DISTRIBUTION_MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: false
+};
+const MULTI_MONTH_DISPENSING_MODEL: Program = {
+  uuid: 'e352cb61-5889-4ba3-8405-d975e4c5e89e',
+  name: 'MULTI_MONTH_DISPENSING_MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: false
+};
+const PEER_LED_COMMUNITY_ART_GROUP_MODEL: Program = {
+  uuid: '6d5d10b3-ea80-4ee5-a58e-5f8a6f88ae93',
+  name: 'PEER_LED_COMMUNITY_ART_GROUP_MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: false
+};
+const HCW_COMMUNITY_ART_GROUP_MODEL: Program = {
+  uuid: '7299b930-4866-437e-a879-aefbb5bf2e0b',
+  name: 'HCW_COMMUNITY_ART_GROUP_MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: false
+};
+const INDIVIDUAL_DDD_MODEL: Program = {
+  uuid: '6af0e0eb-7172-4d94-92fd-aa987bb43250',
+  name: 'INDIVIDUAL_PATIENT_ART_DISTRIBUTION_MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: false
+};
+const COMMUNTIY_PHARMACY_MODEL: Program = {
+  uuid: 'e33b0107-c248-42b4-8c94-4525fcc0c86e',
+  name: 'COMMUNITY_PHARMACY_MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: true
+};
+const FAMILY_COMMUNITY_ART_GROUP_MODEL: Program = {
+  uuid: 'f16403bb-c5df-46ba-afce-14f8aea2fabd',
+  name: 'FAMILY_COMMUNITY_ART_GROUP_MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: false
+};
+const STANDARD_PMTCT_MODEL: Program = {
+  uuid: 'e950ade1-041d-4dda-b0cd-bb81dad8694e',
+  name: 'STANDARD_PMTCT_MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: true
+};
+const PMTCT_DSD_MODEL: Program = {
+  uuid: 'e950ade1-041d-4dda-b0cd-bb81dad8694e',
+  name: 'PMTCT_DSD_MODEL',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: true
+};
+const HIV_SERVICE: Program = {
+  uuid: 'a89ef6fa-1350-11df-a1f1-0026b9348838',
+  name: 'HIV_SERVICE',
+  dept: 'HIV',
+  compatibleWithOtherDeptPrograms: true
+};
+
+// end new programs
 
 export const Programs = {
   PMTCT_PROGRAM,
   STANDARD_HIV_PROGRAM,
+  STANDARD_CARE_MODEL,
+  AHD_MODEL,
+  VIREMIA_MODEL,
   HIV_DIFFERENTIATED_CARE_PROGRAM,
   VIREMIA_PROGRAM,
   HIV_TRANSIT_PROGRAM,
@@ -122,5 +228,19 @@ export const Programs = {
   EXPRESS_CARE_PROGRAM,
   DTG_PHARMACO_VIGILANCE_PROGRAM,
   HIV_SOCIAL_WORK_PROGRAM,
-  NUTRITION_PROGRAM
+  NUTRITION_PROGRAM,
+  // echo..us/j/86308956145
+  https: HEI_MODEL,
+  FAST_TRACK_FACILITY_CARE_MODEL,
+  PEER_LED_FACILITY_ART_GROUP_MODEL,
+  HCW_FACILITY_ART_DISTRIBUTION_MODEL,
+  MULTI_MONTH_DISPENSING_MODEL,
+  PEER_LED_COMMUNITY_ART_GROUP_MODEL,
+  HCW_COMMUNITY_ART_GROUP_MODEL,
+  INDIVIDUAL_DDD_MODEL,
+  COMMUNTIY_PHARMACY_MODEL,
+  FAMILY_COMMUNITY_ART_GROUP_MODEL,
+  STANDARD_PMTCT_MODEL,
+  PMTCT_DSD_MODEL,
+  HIV_SERVICE
 };

src/app/department-select/department-select.component.html

@@ -1,6 +1,6 @@
 <div class="container-fluid">
   <h4 class="component-title" style="color: green">
-    <span class="fa fa-exchange fa-fw"></span>Select Department
+    <span class="fa fa-exchange fa-fw"></span>
   </h4>
   <div class="row">
     <div

src/app/group-manager/group-detail/group-detail.component.html

@@ -250,7 +250,7 @@ <h4 class="modal-title pull-left">Add Membership</h4>
       >
         Enroll
       </button>
-      The patient is not enrolled in this program.
+      The patient is not enrolled in this Model.
     </div>
     <div
       class="alert alert-info"

src/app/interfaces/model.interface.ts

@@ -0,0 +1,4 @@
+export interface Model {
+  uuid: string;
+  name: string;
+}

src/app/openmrs-api/patient-resource.service.ts

@@ -61,9 +61,14 @@ export class PatientResourceService {
       v && v.length > 0 ? v : this.v
     );
 
-    return this.http.get(url, {
+    // return this.http.get(url, {
+    //   params: params
+    // });
+    const parameters = this.http.get(url, {
       params: params
     });
+
+    return parameters;
   }
   public saveUpdatePatientIdentifier(
     uuid,

src/app/openmrs-api/program-enrollment-resource.service.spec.ts

@@ -35,8 +35,8 @@ describe('Service: ProgramEnrollmentResourceService', () => {
     results: [
       {
         uuid: '927d9d1f-44ce-471e-a77b-d1f1342f43f6',
-        display: 'HIV Program',
-        name: 'HIV Program',
+        display: 'HIV Care Service',
+        name: 'HIV Care Service',
         dateEnrolled: '2011-02-09T00:00:00.000+0300',
         dateCompconsted: '2011-02-09T00:00:00.000+0300',
         program: {

src/app/patient-creation/patient-creation.component.html

@@ -1185,7 +1185,7 @@ <h3 style="color: #76b5c5">Current Residence</h3>
           class="btn btn-primary"
           (click)="loadProgramManager(createdPatient)"
         >
-          Enroll into Program
+          Enroll into Model
         </button>
         <button
           type="button"

src/app/patient-dashboard/common/formentry/formentry-referrals-handler.service.ts

@@ -32,7 +32,7 @@ import { FormUuids } from './../../../constants/forms.constants';
 export class FormentryReferralsHandlerService {
   private PMTCT_PROGRAM: Program = Programs.PMTCT_PROGRAM;
   private STANDARD_PROGRAM: Program = Programs.STANDARD_HIV_PROGRAM;
-
+  private AHD_MODEL: Program = Programs.AHD_MODEL;
   constructor(
     public diffCareReferralService: DifferentiatedCareReferralService,
     public localStorageService: LocalStorageService,
@@ -141,6 +141,7 @@ export class FormentryReferralsHandlerService {
     patient: Patient,
     programConfig: any
   ): Observable<any> {
+    console.log('Its about to go down!');
     const batchProgramUnenrollments: Array<Observable<any>> = [];
     const enrolledIncompatiblePrograms: any[] = [];
     const enrolledPrograms = _.filter(patient.enrolledPrograms, 'isEnrolled');
@@ -151,6 +152,7 @@ export class FormentryReferralsHandlerService {
         enrolledIncompatiblePrograms.push(enrolledProgram);
       }
     });
+    console.log('enrolledIncompatiblePrograms', enrolledIncompatiblePrograms);
     batchProgramUnenrollments.push(
       this.programManagerService.editProgramEnrollments(
         'stop',