@james_jayaraj/test-npm 1.2.5 → 1.2.6

package/fesm2015/james_jayaraj-test-npm.mjs

@@ -3034,20 +3034,19 @@ class RxComponent {
         }
     }
     getClassForFavouriteMed(med) {
-        var _a, _b;
         try {
-            var isSelectedFormulation;
-            isSelectedFormulation = this.commonServices.selectedFormulation != null &&
-                this.commonServices.selectedFormulation.productId != null &&
-                med.productId == this.commonServices.selectedFormulation.productId &&
-                (med.pbsCode != null ? med.pbsCode : "") == (this.commonServices.selectedFormulation.pbsCode != null ? this.commonServices.selectedFormulation.pbsCode : "") &&
-                med.productName == this.commonServices.selectedFormulation.productName &&
-                med.repeats == this.commonServices.selectedFormulation.repeats &&
-                (med === null || med === void 0 ? void 0 : med.encryptedId) == this.commonServices.favouriteEncryptedId &&
-                med.quantity == (((_a = this.commonServices.selectedFormulation) === null || _a === void 0 ? void 0 : _a.pbsType) != undefined && ((_b = this.commonServices.selectedFormulation) === null || _b === void 0 ? void 0 : _b.pbsType) != null && this.commonServices.selectedFormulation.pbsType.toLowerCase() == "non pbs"
-                    ? (this.commonServices.selectedFormulation.numberOfPack + "x" + this.commonServices.selectedFormulation.unitPerPack)
-                    : this.commonServices.selectedFormulation.maxQtyUnits).toString();
-            return isSelectedFormulation
+            // var isSelectedFormulation;
+            // isSelectedFormulation = this.commonServices.selectedFormulation != null &&
+            //   this.commonServices.selectedFormulation.productId != null &&
+            //   med.productId == this.commonServices.selectedFormulation.productId &&
+            //   (med.pbsCode!=null?med.pbsCode:"") == (this.commonServices.selectedFormulation.pbsCode!=null?this.commonServices.selectedFormulation.pbsCode:"") &&
+            //   med.productName == this.commonServices.selectedFormulation.productName &&
+            //   med.repeats == this.commonServices.selectedFormulation.repeats &&
+            //   med?.encryptedId == this.commonServices.favouriteEncryptedId &&
+            //   med.quantity == (this.commonServices.selectedFormulation?.pbsType!=undefined && this.commonServices.selectedFormulation?.pbsType!=null && this.commonServices.selectedFormulation.pbsType.toLowerCase() == "non pbs"
+            //                           ? (this.commonServices.selectedFormulation.numberOfPack + "x" + this.commonServices.selectedFormulation.unitPerPack)
+            //                           : this.commonServices.selectedFormulation.maxQtyUnits).toString();
+            return (med === null || med === void 0 ? void 0 : med.encryptedId) == this.commonServices.favouriteEncryptedId
                 ? 'mdl-grid new_rx_popup_box RX_highlight'
                 : 'mdl-grid new_rx_popup_box';
         }
@@ -6231,6 +6230,7 @@ class RxComponent {
                     rxId: 0
                 };
                 this.favMedicineLoader = true;
+                this.commonServices.favouriteEncryptedId = rxList.encryptedId;
                 this.changedetect.detectChanges();
                 this.apiService.Get(config.PHYSICIAN.GET_MED_DET_BY_ID + "?productId=" + rxList.productId + "&pbsCode=" + (this.commonServices.isMedicineRestrict ? rxList.pbsCode : "") + "&rxId=" + 0).subscribe((res) => {
                     try {
@@ -6336,7 +6336,6 @@ class RxComponent {
         return itemTypes.some((type) => allowedTypes.includes(type));
     }
     assignCombinations(med) {
-        this.commonServices.favouriteEncryptedId = med.encryptedId;
         this.commonServices.quantityVal = med.quantity;
         this.commonServices.repeatsVal = med.repeats;
         this.commonServices.doseSearchValue = med.dose;