@csmart/ngc-smart-victim 1.18.9 → 1.18.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@csmart/ngc-smart-victim",
-  "version": "1.18.9",
+  "version": "1.18.12",
   "peerDependencies": {
   }
 }

package/src/lib/smart-victim-detail/smart-victim-detail.component.html

@@ -51,12 +51,19 @@
 
 
                <mat-form-field>
-                  <mat-label>Relationship to Offender:</mat-label>
-                    <mat-select formControlName="victimOffenderRelationshipTypeId" [(ngModel)]="editVictim.victimOffenderRelationshipTypeId"  >
-                      <mat-option *ngFor="let item of relationshipTypes" [value]="item.relationshipTypeId">{{item.name}}</mat-option>
+                  <mat-label>Relationship to Offender:9</mat-label>
+ 
+                    <mat-select  #relationShipSel multiple formControlName="victimRelationships" [(ngModel)]="editVictim.victimOffenderRelationshipTypeId"  >
+                      <div (mouseleave)="relationShipSel.close()">
+                        <mat-option color="primary" *ngFor="let item of relationshipTypes" [value]="item.relationshipTypeId">
+                          {{item.name}}
+                        </mat-option>
+                     </div>
                     </mat-select>
-                    <div class="help-block" *ngIf="victimForm.get('victimOffenderRelationshipTypeId').errors
-                    && (victimForm.get('victimOffenderRelationshipTypeId').dirty || victimForm.get('victimOffenderRelationshipTypeId').touched)">
+
+
+                    <div class="help-block" *ngIf="victimForm.get('victimRelationships').errors
+                    && (victimForm.get('victimRelationships').dirty || victimForm.get('victimRelationships').touched)">
                     <mat-error>relationship is <strong>required</strong></mat-error>
                     </div>
                 </mat-form-field>
@@ -749,8 +756,8 @@
               <mat-error>Under supervision field is <strong>required</strong></mat-error>
               </div>
 
-              <div class="help-block" *ngIf="victimForm.get('victimOffenderRelationshipTypeId').errors
-              && (victimForm.get('victimOffenderRelationshipTypeId').dirty || victimForm.get('victimOffenderRelationshipTypeId').touched)">
+              <div class="help-block" *ngIf="victimForm.get('victimRelationships').errors
+              && (victimForm.get('victimRelationships').dirty || victimForm.get('victimRelationships').touched)">
               <mat-error>Relationship is <strong>required</strong></mat-error>
               </div>
 

package/src/lib/smart-victim-detail/smart-victim-detail.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, OnChanges, Input, Output, EventEmitter, ViewChild } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup, UntypedFormControl,Validators,ValidatorFn } from '@angular/forms';
 import { MatRadioChange, MatRadioGroup } from '@angular/material/radio';
-import { Victim,VictimDrugUse, Contact, VictimAdvocate,VictimGuardian,VictimWeaponUse,VictimSupport } from '../smart-victim.model';
+import { Victim,VictimDrugUse, Contact, VictimAdvocate,VictimGuardian,VictimWeaponUse,VictimSupport,VictimRelationship } from '../smart-victim.model';
 import { NgcSmartVictimService } from '../smart-victim.service';
 import { Router, ActivatedRoute } from '@angular/router';
 import { CommonDialogService} from '.././common-dialog/common-dialog.service';
@@ -124,7 +124,7 @@ export class SmartVictimDetailComponent implements OnInit, OnChanges {
   weaponTypes: any;
   flagOption: any;
   selectedWeaponTypes: any;
-  selectedVictimSupportTypes: any;
+  //selectedVictimSupportTypes: any;
   selectedDrugs: any;
   id: any;
   hidden: boolean=true;
@@ -201,7 +201,7 @@ export class SmartVictimDetailComponent implements OnInit, OnChanges {
 
     this.victimForm = this.formBuilder.group({
       underSupervisionFlag:  new UntypedFormControl('', Validators.compose([ Validators.required])),
-      victimOffenderRelationshipTypeId:new UntypedFormControl('', Validators.compose([ Validators.required])),
+      victimRelationships:new UntypedFormControl('', Validators.compose([ Validators.required])),
       lastName: new UntypedFormControl('', Validators.compose([ Validators.required])),
       firstName: new UntypedFormControl('', Validators.compose([ Validators.required])),
       middleName: new UntypedFormControl('', ),
@@ -304,6 +304,13 @@ export class SmartVictimDetailComponent implements OnInit, OnChanges {
         const victimSupportsControl = this.victimForm.get('victimSupports');
         victimSupportsControl.setValue(supportsData);
 
+
+        var relationshipsData =[];
+        this.editVictim.victimRelationships.forEach( t=>{relationshipsData.push(t.victimRelationshipTypeId); }  )
+        const victimOffenderRelationshipControl = this.victimForm.get('victimRelations');
+        victimOffenderRelationshipControl.setValue(relationshipsData);
+
+
         var weaponUsesData =[];
         var otherWeapon = "";
         this.editVictim.victimWeaponUses.forEach( t=>{
@@ -596,16 +603,17 @@ export class SmartVictimDetailComponent implements OnInit, OnChanges {
     );
     this.victimService.getRelationshipTypes().subscribe(
       (items: any) => {
-        this.relationshipTypes = items.filter( (y) => ((y.relationshipCategoryId === 'ST' || y.relationshipCategoryId === 'FM' ) 
-        && y.relationship !== 'AY'
-        && y.relationship !== 'VT'
-        && y.relationship !== 'CME'
-        && y.relationship !== 'HH'
-        && y.relationship !== 'NC'
-        && y.relationship !== 'CL'
-        && y.relationship !== 'OP'
-      
-      ));
+       
+          this.relationshipTypes = items.filter( (y) => ((y.relationshipCategoryId === 'ST' || y.relationshipCategoryId === 'FM' ) 
+          && y.relationship !== 'AY'
+          && y.relationship !== 'VT'
+          && y.relationship !== 'CME'
+          && y.relationship !== 'HH'
+          && y.relationship !== 'NC'
+          && y.relationship !== 'CL'
+          && y.relationship !== 'OP'
+
+        ));
       }
     );
     this.victimService.getSupportTypes().subscribe(
@@ -988,12 +996,58 @@ export class SmartVictimDetailComponent implements OnInit, OnChanges {
      }
 //data process
 
+
+    var myVictimRelationships = [];
+
+     console.log('this.victimForm.value.victimRelationships'+this.victimForm.value.victimRelationships)
+     if (this.victimForm.value.victimRelationships){
+      console.log('this.victimForm.value.victimRelationships 1'+this.victimForm.value.victimRelationships)
+
+      this.victimForm.value.victimRelationships.forEach(element => {
+      const victimRelationship= <VictimRelationship>{};
+        victimRelationship.victimId= 0;
+        victimRelationship.victimRelationshipTypeId= element;
+        victimRelationship.modifiedBy= 2929;
+        myVictimRelationships.push(victimRelationship);
+        console.log('this.victimForm.value.victimRelationships 2'+this.victimForm.value.victimId)
+        console.log('this.victimForm.value.victimRelationships 3'+this.staffId)
+        console.log('this.victimForm.value.victimRelationships 4'+element)
+
+         });
+     }
+
+     console.log('myVictimRelationships'+myVictimRelationships)
+
+
   console.log('this.phoneValidationFlag 1');
   console.log(this.phoneValidationFlag);
  if ( this.phoneValidationFlag === false){
     if (this.victimDetail === null){
+
       //insert new victim
 
+
+      var myVictimRelationships = [];
+
+      console.log('this.victimForm.value.victimRelationships'+this.victimForm.value.victimRelationships)
+      if (this.victimForm.value.victimRelationships){
+       console.log('this.victimForm.value.victimRelationships 1'+this.victimForm.value.victimRelationships)
+ 
+       this.victimForm.value.victimRelationships.forEach(element => {
+       const victimRelationship= <VictimRelationship>{};
+         victimRelationship.victimId= this.victimForm.value.victimId;
+         victimRelationship.victimRelationshipTypeId= element;
+         victimRelationship.modifiedBy= this.staffId;
+         myVictimRelationships.push(victimRelationship);
+         console.log('this.victimForm.value.victimRelationships 2'+this.victimForm.value.victimId)
+         console.log('this.victimForm.value.victimRelationships 3'+this.staffId)
+         console.log('this.victimForm.value.victimRelationships 4'+element)
+ 
+          });
+      }
+ 
+      console.log('myVictimRelationships'+myVictimRelationships)
+
      var myVictimSupports = [];
      if (this.victimForm.value.victimSupports){
       this.victimForm.value.victimSupports.forEach(element => {
@@ -1005,6 +1059,7 @@ export class SmartVictimDetailComponent implements OnInit, OnChanges {
          });
      }
 
+
     var myVictimDrugUses = [];
     console.log('this.victimForm.value.victimDrugUses during save');
     console.log(this.victimForm.value.victimDrugUses);
@@ -1053,8 +1108,8 @@ export class SmartVictimDetailComponent implements OnInit, OnChanges {
  const newVictim = {
    victimId: 0,
    offenderId: this.offenderId,
-   victimOffenderRelationshipTypeId:
-     this.victimForm.value.victimOffenderRelationshipTypeId,
+  //  victimOffenderRelationshipTypeId:
+  //    this.victimForm.value.victimOffenderRelationshipTypeId,
    lastName: this.victimForm.value.lastName,
    firstName: this.victimForm.value.firstName,
    middleName: this.victimForm.value.middleName
@@ -1103,6 +1158,7 @@ export class SmartVictimDetailComponent implements OnInit, OnChanges {
    vVictimGuardian: null,
    victimDrugUses: myVictimDrugUses,
    victimSupports: myVictimSupports,
+   victimOffenderRelationships: myVictimRelationships,
    victimWeaponUses: myVictimWeaponUses,
 
    advocateFirstName: null,
@@ -1126,7 +1182,7 @@ export class SmartVictimDetailComponent implements OnInit, OnChanges {
    guardianCellPhone: null,
    guardianAddressId: null,
    guardianBirthDate: null,
-   relationship: null,
+   //relationship: null,
    //relationship: this.victimForm.value.victimOffenderRelationshipTypeId? this.victimForm.value.victimOffenderRelationshipTypeId : null,
    allowCsosaContactFlag: this.victimForm.value.allowCsosaContactFlag
      ? this.victimForm.value.allowCsosaContactFlag
@@ -1213,7 +1269,7 @@ export class SmartVictimDetailComponent implements OnInit, OnChanges {
     else {
       //update victim
       this.victimDetail.underSupervisionFlag = this.victimForm.value.underSupervisionFlag;
-      this.victimDetail.victimOffenderRelationshipTypeId =  this.victimForm.value.victimOffenderRelationshipTypeId;
+      //this.victimDetail.victimOffenderRelationshipTypeId =  this.victimForm.value.victimOffenderRelationshipTypeId;
       this.victimDetail.lastName = this.victimForm.value.lastName;
       this.victimDetail.firstName = this.victimForm.value.firstName;
       this.victimDetail.middleName = this.victimForm.value.middleName;
@@ -1251,6 +1307,17 @@ export class SmartVictimDetailComponent implements OnInit, OnChanges {
               this.victimDetail.victimSupports.push(victimSupport);
       });
 
+
+      this.victimDetail.victimRelationships = [];
+      this.victimForm.value.victimRelationships.forEach(element => {
+       const victimRelationship= <VictimRelationship>{};
+       victimRelationship.victimId= this.victimDetail.victimId;
+       victimRelationship.victimRelationshipTypeId= element;
+       victimRelationship.modifiedBy= this.staffId;
+             this.victimDetail.victimRelationships.push(victimRelationship);
+     });
+
+
        this.victimDetail.victimDrugUses = [];
 
         this.victimForm.value.victimDrugUses.forEach(element => {
@@ -1384,4 +1451,19 @@ export class SmartVictimDetailComponent implements OnInit, OnChanges {
       }
 
 
+
+      update() {
+        // this.task.update(task => {
+        //   if (index === undefined) {
+        //     task.completed = completed;
+        //     task.subtasks?.forEach(t => (t.completed = completed));
+        //   } else {
+        //     task.subtasks![index].completed = completed;
+        //     task.completed = task.subtasks?.every(t => t.completed) ?? true;
+        //   }
+        //   return {...task};
+        // });
+      }
+
+
 }

package/src/lib/smart-victim.model.ts

@@ -89,9 +89,6 @@ export class VictimDrugUse {
     ) { }
 }
 
-
-
-
 export class VictimSupport {
     constructor(
        // public victimSupportId: number,
@@ -105,6 +102,17 @@ export class VictimSupport {
       ) { }
 }
 
+export class VictimRelationship {
+    constructor(
+        public victimId: number,
+
+        public victimRelationshipTypeId: string,
+
+        public modifiedBy: number
+
+      ) { }
+}
+
 export class VictimGuardian {
     constructor(public victimGuardianId: number,
 
@@ -285,7 +293,7 @@ export interface  VictimServiceTypeProgramProviderModel {
         public alcoholUseFlag: boolean,
         public accessRisk: string,
         public modifiedBy: number,
-        public relationship: string,
+        //public relationship: string,
         
         public vVictimAdvocate: VictimAdvocate,
         public vVictimGuardian: VictimGuardian,
@@ -294,6 +302,8 @@ export interface  VictimServiceTypeProgramProviderModel {
         public victimWeaponUses: VictimWeaponUse[],
         public victimDrugUses: VictimDrugUse[],
 
+        public victimRelationships: VictimRelationship[],
+
         public allowCsosaContactFlag: boolean,
         public liveWithOffenderFlag: boolean
     ) { }

package/src/lib/smart-victim.service.ts

@@ -366,6 +366,25 @@ postVictimSupport(id: any, val: any) {
       );
 }
 
+/*
+putVictimRelationship(id: any, val: any) {
+  const tempVal = JSON.stringify(val);
+  return this.http.put(this.smartVictimServiceUrl + 'VictimRelationships/' + id, tempVal, options).pipe
+      (
+      map(res => { return res;})
+      );
+}
+
+postVictimRelationship(id: any, val: any) {
+  const tempVal = JSON.stringify(val);
+  return this.http.post(this.smartVictimServiceUrl + 'VictimRelationships/' + id, tempVal, options).pipe
+      (
+      map(res => { return res;})
+      );
+}
+
+*/
+
 deleteVictims(val: any,  staffId: number) {
   return this.http.delete(this.smartVictimServiceUrl+ 'Victims/' + val + '?staffId='+ staffId, options).pipe
   (

package/src/lib/victim-routing.module.ts

@@ -1,6 +1,7 @@
 import { MsalGuard } from '@azure/msal-angular';
 import { SmartErrorComponent } from '@csmart/ngc-smart-core';
-import { LoginStaffResolverService, SelectedOffenderResolverService} from '@csmart/ngc-smart-core';
+import { LoginStaffResolverService, SelectedOffenderResolverService,SmartAuthorizationGuard,
+    SmartOffenderRedirectGuard,} from '@csmart/ngc-smart-core';
 import { Routes, RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
 import { CaseNoteComponent } from './caseNote/caseNote.component';
@@ -13,13 +14,13 @@ import { NgcSmartVictimComponent} from './smart-victim.component'
 const routes: Routes = [
   
     //{path: 'casenote/:victimId', component: CaseNoteComponent,pathMatch: 'full',canActivate: [MsalGuard],resolve: { loginStaff: LoginStaffResolverService } },
-    {path: 'casenote/:victimId/:offenderId', component: CaseNoteComponent,pathMatch: 'full',canActivate: [MsalGuard],resolve: { loginStaff: LoginStaffResolverService } },
-    {path: 'saftyPlan/:victimId', component: VictimSafetyPlanComponent,pathMatch: 'full',resolve: { loginStaff: LoginStaffResolverService } },
-    {path: 'saftyPlanDetail/:victimServiceId/:victimId', component: VictimSafetyPlanDetailComponent,pathMatch: 'full',resolve: { loginStaff: LoginStaffResolverService } },
-    {path: 'victimList', component: NgcSmartVictimComponent, resolve: { loginStaff: LoginStaffResolverService, selectedOffender: SelectedOffenderResolverService} },
-    {path: 'victimHome', component: NgcSmartVictimComponent, resolve: { loginStaff: LoginStaffResolverService, selectedOffender: SelectedOffenderResolverService} },
-    {path: 'victimContact/:victimId', component: ContactComponent, resolve: { loginStaff: LoginStaffResolverService, selectedOffender: SelectedOffenderResolverService} },
-    {path: 'victimDetail/:victimId', component: SmartVictimDetailComponent, resolve: { loginStaff: LoginStaffResolverService, selectedOffender: SelectedOffenderResolverService} },
+    {path: 'casenote/:victimId/:offenderId', component: CaseNoteComponent,pathMatch: 'full', canActivate: [MsalGuard, SmartAuthorizationGuard], },
+    {path: 'saftyPlan/:victimId', component: VictimSafetyPlanComponent,pathMatch: 'full',},
+    {path: 'saftyPlanDetail/:victimServiceId/:victimId', component: VictimSafetyPlanDetailComponent,pathMatch: 'full', },
+    {path: 'victimList', component: NgcSmartVictimComponent, },
+    {path: 'victimHome', component: NgcSmartVictimComponent,  },
+    {path: 'victimContact/:victimId', component: ContactComponent, },
+    {path: 'victimDetail/:victimId', component: SmartVictimDetailComponent,  },
     {path: 'smart-error', component: SmartErrorComponent }
 ];