@james_jayaraj/test-npm 1.3.2 → 1.3.4

package/fesm2020/james_jayaraj-test-npm.mjs

@@ -3715,6 +3715,7 @@ class RxComponent {
         try {
             this.commonServices.selectedFormulation = med;
             this.commonServices.clearMedicalPrescriptionDataOnchangeofMedicine(med);
+            this.changedetect.detectChanges();
             if (!this.commonServices.isMedicineRestrict) {
                 this.commonServices.isS8WarningNext = true;
                 this.restrictions = med.Restrictions && med.Restrictions.length != 0 ? med.Restrictions[0] : null;
@@ -6395,14 +6396,18 @@ class RxComponent {
         }
     }
     isCurrentMedicineInFavourites() {
-        if (!this.commonServices.selectedFormulation || !this.commonServices.favouriteMedicineList || this.commonServices.favouriteMedicineList.length === 0) {
+        let favouritesList = this.showFavouriteMed ? this.commonServices.favouriteMedicineList : this.commonServices.originalFavouriteMedicineList;
+        if (!this.commonServices.selectedFormulation || !favouritesList || favouritesList.length === 0) {
             return false;
         }
-        return this.commonServices.favouriteMedicineList.some((favMed) => favMed.productId.toString() === this.commonServices.selectedFormulation.productId.toString() &&
+        if (this.showFavouriteMed) {
+            return true;
+        }
+        return favouritesList.some((favMed) => favMed.productId.toString() === this.commonServices.selectedFormulation.productId.toString() &&
             (!this.commonServices.IsNullOrEmpty(favMed.pbsCode) ? favMed.pbsCode : "") === (!this.commonServices.IsNullOrEmpty(this.commonServices.selectedFormulation?.pbsCode) ? this.commonServices.selectedFormulation.pbsCode : "") &&
-            favMed.productName === this.commonServices.selectedFormulation.productName && favMed.quantity === this.commonServices.quantityVal && favMed.repeats === this.commonServices.repeatsVal &&
-            favMed.dose === this.commonServices.doseSearchValue && favMed.frequency === this.commonServices.freqSearchValue && favMed.food === this.commonServices.foodSearchValue &&
-            favMed.instruction === this.commonServices.InstructionSearchValue && favMed.route === this.commonServices.routeSearchValue);
+            favMed.productName === this.commonServices.selectedFormulation.productName && favMed.quantity?.toString() === this.commonServices.quantityVal?.toString() && favMed.repeats?.toString() === this.commonServices.repeatsVal?.toString() &&
+            favMed.dose?.toString() === this.commonServices.doseSearchValue?.toString() && favMed.frequency?.toString() === this.commonServices.freqSearchValue?.toString() && favMed.food?.toString() === this.commonServices.foodSearchValue?.toString() &&
+            favMed.instruction?.toString() === this.commonServices.InstructionSearchValue?.toString() && favMed.route?.toString() === this.commonServices.routeSearchValue?.toString());
     }
     isPbsTypeMatch(itemPbsType, pbsTypeFilter) {
         if (!pbsTypeFilter?.trim())