@csmart/ngc-smart-victim 1.18.8 → 1.18.12

package/src/lib/smart-victim.component.css

@@ -43,6 +43,7 @@ div.services {
 .main-container{
   display: flex;
   margin-top: 8px;
+  flex-direction: column;
 }
 
 .add-action{
@@ -81,7 +82,7 @@ mat-form-field {
 .Column
 {
     display: table-cell;
-  
+
 }
 
 .sp-form textarea {
@@ -189,4 +190,56 @@ mat-form-field {
   -moz-hyphens: auto;
   -webkit-hyphens: auto;
   hyphens: auto;
-}
+}
+
+.smart-card{
+  background-color: var(--mdc-elevated-card-container-color);
+  border: 1px solid #ccc;
+  border-radius: 8px;
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+  padding: 16px 0px 16px 2px;
+  width: 100%;
+}
+
+.smart-card-header{
+  display: flex;
+  flex-direction: column;
+  align-items:start;
+}
+
+.smart-label{
+  font-size: 16px !important;
+}
+
+.smart-card-table{
+  margin: 16px 0px;
+}
+
+.smart-flex-container {
+  display: flex !important;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+
+.smart-action-content{
+  display: flex;
+  justify-content: flex-end;
+  margin: 12px;
+}
+
+.smart-button{
+  margin: 0px 4px;
+}
+
+.smart-add-button{
+  margin: 0px 4px;
+  font-size: 1.25em !important;
+}
+
+.material-icons {
+  vertical-align: baseline !important;
+}
+
+.smart-paginator{
+  display: flex !important;
+}

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

@@ -5,134 +5,128 @@
 </div>
 
 <div *ngIf="showDetail">
-  <csmart-victim-detail [victimDetail]="victimDetail" 
+  <csmart-victim-detail [victimDetail]="victimDetail"
                         [staffId]="staffId"
                         [offenderId] ="offenderId"
                         [isIntake]="isIntake"
-                        (onSave)="save($event)" 
+                        (onSave)="save($event)"
                         (onCancel)="cancel()" >
 </csmart-victim-detail>
 </div>
 <div class="main-container">
-    
-    <div class="add-action" *ngIf="showAdd">
-        <button mat-raised-button color="primary" 
-           accessControl
-          [accessControlConfig]="createAccessControlConfig"  
+    <mat-card id="divVictim" class="smart-card-table">
+      <div class="smart-action-content">
+        <button mat-stroked-button color="primary"
+          accessControl
+          [accessControlConfig]="createAccessControlConfig"
+          *ngIf="showAdd"
+          class="smart-add-button"
           (click)="addRecord()">
           <mat-icon>add</mat-icon>
           Add Victim
         </button>
-        &nbsp;&nbsp;
-
-    <div *ngIf="isIntake">
-        <button 
-        mat-raised-button 
-        color="primary" 
-        accessControl
-        [accessControlConfig]="updateAccessControlConfig"          
-        (click)="saveIntake()">
-        Continue
-        </button> 
-    </div>
+        <button
+          mat-stroked-button
+          class="smart-add-button"
+          *ngIf="isIntake"
+          color="primary"
+          accessControl
+          [accessControlConfig]="updateAccessControlConfig"
+          (click)="saveIntake()">
+          Continue
+        </button>
+      </div>
+      <div *ngIf="victimListDataSource.data.length > 0">
+        <mat-table #table [dataSource]="victimListDataSource" >
 
-    </div>
-   <div *ngIf="showListFlag">
-    <mat-card id="divVictim" >
-          <mat-card-content >
-            <mat-table #table [dataSource]="victimListDataSource" >
-
-                <ng-container matColumnDef="lastName">
-                    <mat-header-cell *matHeaderCellDef>Victim Last Name</mat-header-cell>
-                    <mat-cell *matCellDef="let row" > {{row.lastName}}  </mat-cell>
-                </ng-container>
+            <ng-container matColumnDef="lastName">
+                <mat-header-cell *matHeaderCellDef>Victim Last Name</mat-header-cell>
+                <mat-cell *matCellDef="let row" > {{row.lastName}}  </mat-cell>
+            </ng-container>
 
 
-                <ng-container matColumnDef="firstName">
-                        <mat-header-cell *matHeaderCellDef >Victim First Name</mat-header-cell>
-                        <mat-cell *matCellDef="let row" > {{row.firstName}} </mat-cell>
+            <ng-container matColumnDef="firstName">
+                    <mat-header-cell *matHeaderCellDef >Victim First Name</mat-header-cell>
+                    <mat-cell *matCellDef="let row" > {{row.firstName}} </mat-cell>
+            </ng-container>
+
+            <div  *ngIf="showRelationshipColumn">
+                <ng-container matColumnDef="relationship">
+                    <mat-header-cell *matHeaderCellDef >Relationship to Offender</mat-header-cell>
+                    <mat-cell *matCellDef="let row" > {{row.relationship}} </mat-cell>
                 </ng-container>
-               
-                <div  *ngIf="showRelationshipColumn">
-                    <ng-container matColumnDef="relationship">
-                        <mat-header-cell *matHeaderCellDef >Relationship to Offender</mat-header-cell>
-                        <mat-cell *matCellDef="let row" > {{row.relationship}} </mat-cell>
-                    </ng-container>
-                </div>
-
-                <div  *ngIf="showOffenderPhoneColumn">
-                    <ng-container matColumnDef="homePhone">
-                        <mat-header-cell *matHeaderCellDef >Phone Number</mat-header-cell>
-                        <mat-cell *matCellDef="let row" > 
-                           Home phone: {{formatPhoneNumber(row.homePhone)}}<br>  
-                           Cell Phone: {{formatPhoneNumber(row.cellPhone)}}<br>
-                           Work Phone: {{formatPhoneNumber(row.workPhone)}} 
-
-                        </mat-cell>
-                    </ng-container>
-                </div>
-                
-                <div  *ngIf="showOffenderNameColumn">
-                    <ng-container matColumnDef="offenderName">
-                            <mat-header-cell *matHeaderCellDef>Offender Name</mat-header-cell>
-                            <mat-cell *matCellDef="let row" > {{row.offenderName}} </mat-cell>
-                    </ng-container>
-                </div>
-               
-               <ng-container matColumnDef="victimId">
-                  <mat-header-cell *matHeaderCellDef ></mat-header-cell>
+            </div>
+
+            <div  *ngIf="showOffenderPhoneColumn">
+                <ng-container matColumnDef="homePhone">
+                    <mat-header-cell *matHeaderCellDef >Phone Number</mat-header-cell>
                     <mat-cell *matCellDef="let row" >
-                        
-                        <!-- <div  *ngIf="accessByModule">
-                            <mat-checkbox></mat-checkbox>
-                        </div> -->
-                        
-                        <div  *ngIf="showEdit">
-                            <button class="edit-btn"  mat-icon-button color="primary"  matTooltip="View/Edit Victim"
-                                accessControl
-                                [accessControlConfig]="updateAccessControlConfig"  
-                                (click)="editVictimDetail(row)">
-                                <i class="material-icons">mode_edit</i>
-                            </button>
-                        </div>
-
-                        
-
-                        &nbsp;&nbsp; 
-
-                        <div  *ngIf="showCaseNote">
-                            <button type="button" matTooltip="CaseNote"  mat-raised-button color="primary" 
-                            accessControl
-                            [accessControlConfig]="updateAccessControlConfig"  
-                            (click)="goToCaseNote(row.victimId)">                        
-                                        <span class="glyphicon glyphicon-pencil" ></span>&nbsp;Case Note
-                            </button> 
-                        </div>
-                         &nbsp;&nbsp;
-                       
-                         <div  *ngIf="showSafetyPlan">
-                        <button type="button"  matTooltip="safety plan" mat-raised-button color="primary"
-                         accessControl
-                         [accessControlConfig]="updateAccessControlConfig"  
-                         (click)="goToSaftyPlan(row.victimId)">                        
-                                <span class="glyphicon glyphicon-pencil" ></span>&nbsp;Safety Plan
-                        </button>
-                        </div>
-                        &nbsp;&nbsp;
-   
+                        Home phone: {{formatPhoneNumber(row.homePhone)}}<br>
+                        Cell Phone: {{formatPhoneNumber(row.cellPhone)}}<br>
+                        Work Phone: {{formatPhoneNumber(row.workPhone)}}
+
                     </mat-cell>
                 </ng-container>
+            </div>
+
+            <div  *ngIf="showOffenderNameColumn">
+                <ng-container matColumnDef="offenderName">
+                        <mat-header-cell *matHeaderCellDef>Offender Name</mat-header-cell>
+                        <mat-cell *matCellDef="let row" > {{row.offenderName}} </mat-cell>
+                </ng-container>
+            </div>
 
-                <mat-header-row *matHeaderRowDef="displayedColumns" class="example-header-row"></mat-header-row>
-                <mat-row *matRowDef="let row; columns: displayedColumns" class="example-row"></mat-row>
-                </mat-table>
+            <ng-container matColumnDef="victimId">
+              <mat-header-cell *matHeaderCellDef ></mat-header-cell>
+                <mat-cell *matCellDef="let row" >
 
-              <mat-paginator #paginator [pageSize]="10" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator> 
-          </mat-card-content>
-    </mat-card>
-    </div>
+                    <!-- <div  *ngIf="accessByModule">
+                        <mat-checkbox></mat-checkbox>
+                    </div> -->
 
+                    <div  *ngIf="showEdit">
+                        <button class="edit-btn"  mat-icon-button color="primary"  matTooltip="View/Edit Victim"
+                            accessControl
+                            [accessControlConfig]="updateAccessControlConfig"
+                            (click)="editVictimDetail(row)">
+                            <i class="material-icons">mode_edit</i>
+                        </button>
+                    </div>
+
+
+
+                    &nbsp;&nbsp;
+
+                    <div  *ngIf="showCaseNote">
+                        <button type="button" matTooltip="CaseNote"  mat-stroked-button color="primary"
+                        accessControl
+                        [accessControlConfig]="updateAccessControlConfig"
+                        (click)="goToCaseNote(row.victimId)">
+                                    <span class="glyphicon glyphicon-pencil" ></span>&nbsp;Case Note
+                        </button>
+                    </div>
+                      &nbsp;&nbsp;
+
+                      <div  *ngIf="showSafetyPlan">
+                    <button type="button"  matTooltip="safety plan" mat-stroked-button color="primary"
+                      accessControl
+                      [accessControlConfig]="updateAccessControlConfig"
+                      (click)="goToSaftyPlan(row.victimId)">
+                            <span class="glyphicon glyphicon-pencil" ></span>&nbsp;Safety Plan
+                    </button>
+                    </div>
+                    &nbsp;&nbsp;
+
+                </mat-cell>
+            </ng-container>
+
+            <mat-header-row *matHeaderRowDef="displayedColumns" class="example-header-row"></mat-header-row>
+            <mat-row *matRowDef="let row; columns: displayedColumns" class="example-row"></mat-row>
+        </mat-table>
+        <mat-paginator #paginator [pageSize]="10" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
+      </div>
+    </mat-card>
     <div>
         <b>{{msg}}</b>
     </div>
-</div>
+</div>

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

@@ -58,6 +58,7 @@ export class NgcSmartVictimComponent implements OnInit, OnChanges, AfterViewInit
   doSpin: boolean = false;
   showListFlag: boolean = false;
   msg: string = "";
+  selectedOffender: SelectedOffender;
   isIntake = false;
 
   updateAccessControlConfig: SmartAccessControlConfig;
@@ -142,7 +143,8 @@ export class NgcSmartVictimComponent implements OnInit, OnChanges, AfterViewInit
     if(queryParams['routeTo']) {
       this.router.navigate([queryParams['routeTo']]);
     }
-    var data = this.route.snapshot.data;
+    const selData = this.route.snapshot.data;
+    this.selectedOffender = selData['selectedOffender'];
     var myPath = this.router.url.slice(-10);
 
 
@@ -158,9 +160,11 @@ export class NgcSmartVictimComponent implements OnInit, OnChanges, AfterViewInit
     console.log(this.intakeFlag);
     console.log(myPath);
 
-    if (this.intakeFlag == "true") {
-      this.isIntake = true;
-    }
+    // if (this.intakeFlag == "true") {
+    //   this.isIntake = true;
+    // }
+
+    this.isIntake = this.selectedOffender.intakeFlag;
 
     this.displayedColumns = ["lastName", "firstName"];
 
@@ -214,7 +218,7 @@ export class NgcSmartVictimComponent implements OnInit, OnChanges, AfterViewInit
         this.showCaseNote = "true";
         this.showSafetyPlan = "true";
 
-        myOffenderId = data.selectedOffender.offenderId;
+        myOffenderId = selData.selectedOffender.offenderId;
       }
 
       const victimListFilter: VictimListFilter = {

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

@@ -1,4 +1,4 @@
-import { HttpClient,HttpResponse, HttpHeaders } from '@angular/common/http';
+import { HttpClient, HttpResponse, HttpHeaders } from '@angular/common/http';
 import { Injectable, Inject } from '@angular/core';
 import { SMART_LOOKUP_SERVICE_URL, SMART_OFFENDER_SERVICE_URL,SMART_VICTIM_SERVICE_URL,
     VictimListFilter,VictimDrugUse,Victim,VictimSafetyPlan,
@@ -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 }
 ];
 

package/src/lib/victimSearch/victimSearchForm.component.html

@@ -21,12 +21,12 @@
             <mat-form-field>
                 <input matInput placeholder="Offender CSOSA #"[(ngModel)]="filter.offenderId" name="offenderId" id="offenderId">
             </mat-form-field>
-           
-           
+
+
             <section>
-                <button  id="victimSearchButton" mat-raised-button color="primary" (click)="onChange()">Search</button>
+                <button  id="victimSearchButton" mat-stroked-button color="primary" (click)="onChange()">Search</button>
                 <span style="padding-right: 5px;"></span>
-                <button   mat-raised-button color="primary"  type="reset" value="Reset">Clear Changes</button>
+                <button   mat-stroked-button color="primary"  type="reset" value="Reset">Clear Changes</button>
             </section>
         </div>
     </mat-expansion-panel>

package/src/test.ts

@@ -9,14 +9,8 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: any;
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting()
 );
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);

package/tsconfig.lib.json

@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,