@csmart/ngc-smart-victim 1.14.31 → 1.14.33

package/fesm2020/csmart-ngc-smart-victim.mjs

@@ -842,7 +842,6 @@ class SmartVictimDetailComponent {
                 victimWeaponUsesControl.setValue(weaponUsesData);
                 const otherWeaponControl = this.victimForm.get('otherWeapon');
                 otherWeaponControl.setValue(otherWeapon);
-                //this.weaponUsesData = this.editVictim.victimWeaponUses;
                 var drugUseData = [];
                 var otherDrug = "";
                 console.log('load this.editVictim.victimDrugUses');
@@ -979,9 +978,6 @@ class SmartVictimDetailComponent {
         console.log(this.staffId);
         console.log('show isIntake');
         console.log(this.isIntake);
-        //this.victimDetail.guardianNoPhoneFlag = true;
-        //this.victimForm.value.guardianNoPhoneFlag =  true;
-        //this.victimForm.get('guardianNoPhoneFlag').setValue(true);
         //required field
         const requiredImplementation = { get: function () {
                 if (this._required) {
@@ -1102,26 +1098,16 @@ class SmartVictimDetailComponent {
         });
     }
     radioMinorChange($event) {
-        // const guardianLastNameControl = this.victimForm.get('guardianLastName');
-        //const guardianFirstNameControl = this.victimForm.get('guardianFirstName');
         if ($event.value === true) {
             this.guardianTabFlag = true;
-            // guardianLastNameControl.setValidators(Validators.required);
-            // guardianFirstNameControl.setValidators(Validators.required);
-            //this.victimForm.value.guardianNoPhoneFlag =  true;
         }
         else {
             this.guardianTabFlag = false;
-            // guardianLastNameControl.clearValidators();
-            // guardianFirstNameControl.clearValidators();
         }
-        //guardianLastNameControl.updateValueAndValidity();
-        // guardianFirstNameControl.updateValueAndValidity();
     }
     radioAdvocateChange($event) {
         const advocateLastNameControl = this.victimForm.get('advocateLastName');
         const advocateFirstNameControl = this.victimForm.get('advocateFirstName');
-        // const advocateNoPhoneControl = this.victimForm.get('advocateNoPhoneFlag');
         if ($event.value === "YS") {
             this.advocateTabFlag = true;
             advocateLastNameControl.setValidators(Validators.required);
@@ -1197,11 +1183,7 @@ class SmartVictimDetailComponent {
             });
             const minorControl = this.victimForm.get('minorFlag');
             minorControl.setValue(true);
-            //  const guardianLastNameControl = this.victimForm.get('guardianLastName');
-            // const guardianFirstNameControl = this.victimForm.get('guardianFirstName');
             this.guardianTabFlag = true;
-            // guardianLastNameControl.setValidators(Validators.required);
-            //  guardianFirstNameControl.setValidators(Validators.required);
         }
     }
     checkOtherWeapon(WeaponUse) {
@@ -1232,23 +1214,23 @@ class SmartVictimDetailComponent {
     saveVictim() {
         //guardian phone logic
         if (!this.victimForm.value.guardianNoPhoneFlag) {
-            if (this.victimForm.value.guardianHomePhone) {
-                if (this.victimForm.value.guardianHomePhone !== null) {
-                    if (this.victimForm.value.guardianHomePhone !== "") {
+            if (this.guardianHomePhoneControl.value) {
+                if (this.guardianHomePhoneControl.value !== null) {
+                    if (this.guardianHomePhoneControl.value !== "") {
                         this.guardianPhoneExistFlag = true;
                     }
                 }
             }
-            if (this.victimForm.value.guardianWorkPhone !== undefined) {
-                if (this.victimForm.value.guardianWorkPhone !== null) {
-                    if (this.victimForm.value.guardianWorkPhone !== "") {
+            if (this.guardianWorkPhoneControl.value !== undefined) {
+                if (this.guardianWorkPhoneControl.value !== null) {
+                    if (this.guardianWorkPhoneControl.value !== "") {
                         this.guardianPhoneExistFlag = true;
                     }
                 }
             }
-            if (this.victimForm.value.guardianCellPhone) {
-                if (this.victimForm.value.guardianCellPhone !== null) {
-                    if (this.victimForm.value.guardianCellhone !== "") {
+            if (this.guardianCellPhoneControl.value) {
+                if (this.guardianCellPhoneControl.value !== null) {
+                    if (this.guardianCellPhoneControl.value !== "") {
                         this.guardianPhoneExistFlag = true;
                     }
                 }
@@ -1270,23 +1252,23 @@ class SmartVictimDetailComponent {
         console.log(this.phoneValidationFlag);
         //advocate phone logic
         if (!this.victimForm.value.advocateNoPhoneFlag) {
-            if (this.victimForm.value.advocateHomePhone) {
-                if (this.victimForm.value.advocateHomePhone !== null) {
-                    if (this.victimForm.value.advocateHomePhone !== "") {
+            if (this.advocateHomePhoneControl.value) {
+                if (this.advocateHomePhoneControl.value !== null) {
+                    if (this.advocateHomePhoneControl.value !== "") {
                         this.advocatePhoneExistFlag = true;
                     }
                 }
             }
-            if (this.victimForm.value.advocateWorkPhone !== undefined) {
-                if (this.victimForm.value.advocateWorkPhone !== null) {
-                    if (this.victimForm.value.advocateWorkPhone !== "") {
+            if (this.advocateWorkPhoneControl.value !== undefined) {
+                if (this.advocateWorkPhoneControl.value !== null) {
+                    if (this.advocateWorkPhoneControl.value !== "") {
                         this.advocatePhoneExistFlag = true;
                     }
                 }
             }
-            if (this.victimForm.value.advocateCellPhone) {
-                if (this.victimForm.value.advocateCellPhone !== null) {
-                    if (this.victimForm.value.advocateCellhone !== "") {
+            if (this.advocateCellPhoneControl.value) {
+                if (this.advocateCellPhoneControl.value !== null) {
+                    if (this.advocateCellPhoneControl.value !== "") {
                         this.advocatePhoneExistFlag = true;
                     }
                 }
@@ -1352,6 +1334,12 @@ class SmartVictimDetailComponent {
         else {
             this.victimForm.value.advocateCellPhone = null;
         }
+        if (this.advocateWorkPhoneControl.value) {
+            this.victimForm.value.advocateWorkPhone = this.advocateWorkPhoneControl.value.replace(/[()\s-]/g, '');
+        }
+        else {
+            this.victimForm.value.advocateWorkPhone = null;
+        }
         if (this.emergencyContactPhoneControl.value) {
             this.victimForm.value.emergencyContactPhone = this.emergencyContactPhoneControl.value.replace(/[()\s-]/g, '');
         }
@@ -1595,8 +1583,6 @@ class SmartVictimDetailComponent {
                     this.victimDetail.victimSupports.push(victimSupport);
                 });
                 this.victimDetail.victimDrugUses = [];
-                console.log('this.victimForm.value.victimDrugUses calculate');
-                console.log(this.victimForm.value.victimDrugUses);
                 this.victimForm.value.victimDrugUses.forEach(element => {
                     const victimDrugUse = {};
                     victimDrugUse.drugTypeId = element;
@@ -1613,21 +1599,13 @@ class SmartVictimDetailComponent {
                     victimDrugUse.modifiedBy = this.staffId;
                     victimDrugUse.victimId = this.victimDetail.victimId;
                     this.victimDetail.victimDrugUses.push(victimDrugUse);
-                    console.log('this.victimForm.value.victimDrugUses after');
-                    console.log(this.victimForm.value.victimDrugUses);
                 });
                 this.victimForm.value.victimDrugUses.filter(word => (!(word.drugTypeId === null && word.otherDrug === null)));
-                console.log('adjust this.victimForm.value.victimDrugUses ');
-                console.log(this.victimForm.value.victimDrugUses);
                 this.victimDetail.victimWeaponUses = [];
                 this.victimForm.value.victimWeaponUses.forEach(element => {
                     const victimWeaponUse = {};
                     victimWeaponUse.victimId = this.victimDetail.victimId;
                     victimWeaponUse.weaponTypeId = element;
-                    console.log('weapon element');
-                    console.log(element);
-                    console.log(this.victimForm.value.otherWeapon);
-                    console.log(this.victimForm.value.victimWeaponUses);
                     if (element == "OTHER") {
                         victimWeaponUse.otherWeapon = this.victimForm.value.otherWeapon;
                     }