primarycare-binder 1.1.87 → 1.1.90

package/dist/index.cjs.js

@@ -8063,11 +8063,17 @@ var queries$b = {
     };
   },
   visit_read: function visit_read(encounter_id) {
+    // return {
+    //   db_name: `${dbName}`,
+    //   entity: "Encounter",
+    //   filter: `Encounter.activestatus==true && Encounter._id=='${encounter_id}'`,
+    //   return_fields: "MERGE(Encounter,{reasonReference: Document(Encounter.reasonReference),practitioner_details:(FOR practdet IN TO_ARRAY(Encounter.practitioner_details) RETURN MERGE(practdet,{speciality:MERGE(DOCUMENT(practdet.speciality),{coding:(FOR cod IN TO_ARRAY(DOCUMENT(practdet.speciality).coding) RETURN DOCUMENT(cod))})}))})",
+    // };
     return {
       db_name: "".concat(dbName),
       entity: "Encounter",
       filter: "Encounter.activestatus==true && Encounter._id=='".concat(encounter_id, "'"),
-      return_fields: "MERGE(Encounter,{reasonReference: Document(Encounter.reasonReference),practitioner_details:(FOR practdet IN TO_ARRAY(Encounter.practitioner_details) RETURN MERGE(practdet,{speciality:MERGE(DOCUMENT(practdet.speciality),{coding:(FOR cod IN TO_ARRAY(DOCUMENT(practdet.speciality).coding) RETURN DOCUMENT(cod))})}))})"
+      return_fields: "MERGE(Encounter,{reasonReference: Document(Encounter.reasonReference),practitioner_details:(FOR practdet IN TO_ARRAY(Encounter.practitioner_details) RETURN MERGE(practdet,{speciality:DOCUMENT(practdet.speciality)}))},{identifier: ( FOR IdentifierMaster IN IdentifierMaster FILTER IdentifierMaster._id in Encounter.identifier return merge(IdentifierMaster,{period:document(IdentifierMaster.period)}))},{statushistory:(for sat in TO_ARRAY(Encounter.statushistory) return merge(sat,{period:document(sat.period)}))})"
     };
   },
   get_apo_read: function get_apo_read(appointmentId) {
@@ -8482,6 +8488,87 @@ var utcTOLocal$1 = function utcTOLocal(date, format) {
 
   var fmt = format ? format : "DD-MM-YYYY";
   return moment$1.utc(Ndate).local().format(fmt);
+};
+
+var utcTOLocal_ = function utcTOLocal_(date, format) {
+  var Ndate = new Date();
+
+  if (typeof date === "number") {
+    Ndate = moment$1.unix(date);
+  } else {
+    Ndate = moment$1(date);
+  }
+
+  var fmt = format ? format : "DD-MM-YYYY";
+
+  if (format) {
+    return moment$1.utc(Ndate).local().format(fmt);
+  } else {
+    return moment$1.utc(Ndate).local();
+  }
+};
+var getNumberOfDays = function getNumberOfDays(start, end) {
+  var date1 = new Date(start);
+  var date2 = new Date(end); // One day in milliseconds
+
+  var oneDay = 1000 * 60 * 60 * 24; // Calculating the time difference between two dates
+
+  var diffInTime = date2.getTime() - date1.getTime(); // Calculating the no. of days between two dates
+
+  var diffInDays = Math.round(diffInTime / oneDay);
+  return diffInDays;
+};
+var weekCalculation = function weekCalculation(date_) {
+  var d = new Date(date_);
+  var date = d.getDate();
+  var day = d.getDay();
+  var weekOfMonth = Math.ceil((date - 1 - day) / 7);
+  return weekOfMonth;
+};
+var timeLine_ = function timeLine_(appointmentDate) {
+  //DAY CALCULATION
+  var appDate = utcTOLocal_(appointmentDate, "MM/DD/YYY");
+  var currentDate = utcTOLocal_(new Date(), "MM/DD/YYY"); //DAYS DIFFERENCE CALCULATION
+
+  var diffDays = getNumberOfDays(currentDate, appDate); //MONTH CALCULATION
+
+  var appointmentMonth = utcTOLocal_(appointmentDate, "MM");
+  var currentMonth = utcTOLocal_(new Date(), "MM"); //WEEK CALCULATION 
+
+  var appointmentWeek = weekCalculation(utcTOLocal_(appointmentDate));
+  var currentWeek = weekCalculation(new Date());
+  var type = ""; //TODAY
+
+  if (diffDays === 0) {
+    type = "TODAY";
+  } //THIS MONTH
+  else if (currentMonth === appointmentMonth) {
+      //debugger
+      //THIS WEEK
+      if (appointmentWeek === currentWeek) {
+        type = "THIS_WEEK";
+      } //LAST WEEK
+      else if (appointmentWeek + 1 === currentWeek) {
+          type = "LAST_WEEK";
+        } //NEXT WEEK
+        else if (appointmentWeek - 1 === currentWeek) {
+            type = "NEXT_WEEK";
+          } //THIS MONTH
+          else {
+              type = "THIS_MONTH";
+            }
+    } //LAST MONTH
+    else if (appointmentMonth < currentMonth) {
+        type = "LAST_MONTH";
+      } //NEXT MONTH
+      else if (appointmentMonth > currentMonth) {
+          type = "NEXT_MONTH";
+        } else {
+          type = "TODAY";
+        } // debugger
+
+
+  return type;
 }; // const getUtcTime = (date) => {
 //   let a = null
 //   if (date) {
@@ -8502,7 +8589,6 @@ var utcTOLocal$1 = function utcTOLocal(date, format) {
 //   }
 // };
 
-
 var deg2rad = function deg2rad(deg) {
   return deg * (Math.PI / 180);
 };
@@ -11609,7 +11695,16 @@ var ALL_APPOINTMENTS = createAsyncThunk("appointmentReducer/allAppointments", /*
           data = _context6.sent;
           returnData = {
             pastAppointment: [],
+            pastAppointmentThisWeek: [],
+            pastAppointmentLastWeek: [],
+            pastAppointmentThisMonth: [],
+            pastAppointmentLastMonth: [],
             upcomingAppointment: [],
+            upcomingAppointmentToday: [],
+            upcomingAppointmentThisWeek: [],
+            upcomingAppointmentNextWeek: [],
+            upcomingAppointmentThisMonth: [],
+            upcomingAppointmentNextMonth: [],
             followUpAppointment: [],
             currentVisist: []
           };
@@ -11617,14 +11712,40 @@ var ALL_APPOINTMENTS = createAsyncThunk("appointmentReducer/allAppointments", /*
             if (assemble && moment$1(utcTOLocal$1(v === null || v === void 0 ? void 0 : v.start) * 1000).startOf("day").diff(moment$1().startOf("day"), "days") === 0 && (v.comment === "completed_assemble" || v.comment === "onhold_nurse" || v.comment === "completed_nurse" || v.comment === "onhold_doctor")) {
               returnData.currentVisist.push(v);
             } else {
-              returnData.pastAppointment.push(v);
+              var type_ = timeLine_(v.start); //debugger
+
+              if (type_ === "THIS_WEEK") {
+                returnData.pastAppointmentThisWeek.push(v);
+              } else if (type_ === "LAST_WEEK") {
+                returnData.pastAppointmentLastWeek.push(v);
+              } else if (type_ === "THIS_MONTH") {
+                returnData.pastAppointmentThisMonth.push(v);
+              } else if (type_ === "LAST_MONTH") {
+                returnData.pastAppointmentLastMonth.push(v);
+              } else {
+                returnData.pastAppointment.push(v);
+              }
             }
           });
           (_data$3 = data[0]) === null || _data$3 === void 0 ? void 0 : (_data$3$upcoming_appo = _data$3.upcoming_appointment) === null || _data$3$upcoming_appo === void 0 ? void 0 : (_data$3$upcoming_appo2 = _data$3$upcoming_appo.forEach) === null || _data$3$upcoming_appo2 === void 0 ? void 0 : _data$3$upcoming_appo2.call(_data$3$upcoming_appo, function (v) {
             if (assemble && moment$1(utcTOLocal$1(v === null || v === void 0 ? void 0 : v.start), "DD-MM-YYYY").startOf("day").diff(moment$1().startOf("day"), "days") === 0 && (v.comment === "completed_assemble" || v.comment === "onhold_nurse" || v.comment === "completed_nurse" || v.comment === "onhold_doctor")) {
               returnData.currentVisist.push(v);
             } else {
-              returnData.upcomingAppointment.push(v);
+              var type_ = timeLine_(v.start); //debugger
+
+              if (type_ === "TODAY") {
+                returnData.upcomingAppointmentToday.push(v);
+              } else if (type_ === "THIS_WEEK") {
+                returnData.upcomingAppointmentThisWeek.push(v);
+              } else if (type_ === "NEXT_WEEK") {
+                returnData.upcomingAppointmentNextWeek.push(v);
+              } else if (type_ === "THIS_MONTH") {
+                returnData.upcomingAppointmentThisMonth.push(v);
+              } else if (type_ === "NEXT_MONTH") {
+                returnData.upcomingAppointmentNextMonth.push(v);
+              } else {
+                returnData.upcomingAppointment.push(v);
+              }
             }
           });
           return _context6.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -16745,22 +16866,6 @@ var UPSERT_PERSON = createAsyncThunk("personApiSlice/upsertPerson", /*#__PURE__*
   var payload,
       _ref2,
       rejectWithValue,
-      _data$Result,
-      _data$Result$,
-      _data$Result$$propert,
-      _data$Result$$propert2,
-      _data$Result2,
-      _data$Result2$,
-      _data$Result2$$proper,
-      _data$Result2$$proper2,
-      _data$Result3,
-      _data$Result3$,
-      _data$Result3$$proper,
-      _data$Result3$$proper2,
-      _data$Result4,
-      _data$Result4$,
-      _data$Result4$$proper,
-      _data$Result4$$proper2,
       _payload$phone,
       phone,
       _payload$dob,
@@ -16784,6 +16889,29 @@ var UPSERT_PERSON = createAsyncThunk("personApiSlice/upsertPerson", /*#__PURE__*
       photo,
       _payload$updatedId,
       updatedId,
+      _payload$identifier,
+      identifier,
+      _payload$compare_id,
+      compare_id,
+      id_number,
+      id_type,
+      id_data,
+      _data$Result,
+      _data$Result$,
+      _data$Result$$propert,
+      _data$Result$$propert2,
+      _data$Result2,
+      _data$Result2$,
+      _data$Result2$$proper,
+      _data$Result2$$proper2,
+      _data$Result3,
+      _data$Result3$,
+      _data$Result3$$proper,
+      _data$Result3$$proper2,
+      _data$Result4,
+      _data$Result4$,
+      _data$Result4$$proper,
+      _data$Result4$$proper2,
       imageInfo,
       body,
       data,
@@ -16796,7 +16924,42 @@ var UPSERT_PERSON = createAsyncThunk("personApiSlice/upsertPerson", /*#__PURE__*
           payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
           _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
           _context.prev = 2;
-          _payload$phone = payload.phone, phone = _payload$phone === void 0 ? "" : _payload$phone, _payload$dob = payload.dob, dob = _payload$dob === void 0 ? "" : _payload$dob, _payload$firstName = payload.firstName, firstName = _payload$firstName === void 0 ? "" : _payload$firstName, _payload$lastName = payload.lastName, lastName = _payload$lastName === void 0 ? "" : _payload$lastName, _payload$middleName = payload.middleName, middleName = _payload$middleName === void 0 ? "" : _payload$middleName, _payload$prefix = payload.prefix, prefix = _payload$prefix === void 0 ? "" : _payload$prefix, _payload$suffix = payload.suffix, suffix = _payload$suffix === void 0 ? "" : _payload$suffix, _payload$use = payload.use, use = _payload$use === void 0 ? "" : _payload$use, _payload$gender = payload.gender, gender = _payload$gender === void 0 ? "" : _payload$gender, _payload$email = payload.email, email = _payload$email === void 0 ? "" : _payload$email, photo = payload.photo, _payload$updatedId = payload.updatedId, updatedId = _payload$updatedId === void 0 ? "" : _payload$updatedId;
+          _payload$phone = payload.phone, phone = _payload$phone === void 0 ? "" : _payload$phone, _payload$dob = payload.dob, dob = _payload$dob === void 0 ? "" : _payload$dob, _payload$firstName = payload.firstName, firstName = _payload$firstName === void 0 ? "" : _payload$firstName, _payload$lastName = payload.lastName, lastName = _payload$lastName === void 0 ? "" : _payload$lastName, _payload$middleName = payload.middleName, middleName = _payload$middleName === void 0 ? "" : _payload$middleName, _payload$prefix = payload.prefix, prefix = _payload$prefix === void 0 ? "" : _payload$prefix, _payload$suffix = payload.suffix, suffix = _payload$suffix === void 0 ? "" : _payload$suffix, _payload$use = payload.use, use = _payload$use === void 0 ? "" : _payload$use, _payload$gender = payload.gender, gender = _payload$gender === void 0 ? "" : _payload$gender, _payload$email = payload.email, email = _payload$email === void 0 ? "" : _payload$email, photo = payload.photo, _payload$updatedId = payload.updatedId, updatedId = _payload$updatedId === void 0 ? "" : _payload$updatedId, _payload$identifier = payload.identifier, identifier = _payload$identifier === void 0 ? [] : _payload$identifier, _payload$compare_id = payload.compare_id, compare_id = _payload$compare_id === void 0 ? [] : _payload$compare_id;
+          console.clear();
+          console.log(compare_id);
+          id_number = compare_id.map(function (x) {
+            return "'".concat(x.id, "'");
+          });
+          id_type = compare_id.map(function (x) {
+            return "'".concat(x.display, "'");
+          });
+          console.log("Hello -".concat(id_number));
+          console.log("Hai   - ".concat(id_type));
+          _context.next = 12;
+          return fetchData$3({
+            body: JSON.stringify({
+              "db_name": "primarycare",
+              "entity": "Person",
+              "filter": "first(document(document(Person.identifier)[*].Type)[*].display) in [".concat(id_type, "] && first(document(Person.identifier)[*].value) in [").concat(id_number, "] && Person.activestatus==true"),
+              "return_fields": "merge(Person,{identifier:document(Person.identifier)})"
+            })
+          }, __readDocumentUrl__);
+
+        case 12:
+          id_data = _context.sent;
+
+          if (!((id_data === null || id_data === void 0 ? void 0 : id_data.result.length) > 0)) {
+            _context.next = 17;
+            break;
+          }
+
+          return _context.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            data: {
+              error: "Patient Id already exists."
+            }
+          })));
+
+        case 17:
           imageInfo = [];
 
           if (photo) {
@@ -16826,11 +16989,11 @@ var UPSERT_PERSON = createAsyncThunk("personApiSlice/upsertPerson", /*#__PURE__*
 
           body = [{
             db_name: dbName,
-            entity: "Person",
+            // entity: "Person",
             is_metadata: true,
             metadataId: query_ids["personApiSlice/upsertPerson"],
             doc: {
-              identifier: [],
+              identifier: identifier,
               name: [{
                 use: use,
                 text: firstName,
@@ -16879,6 +17042,8 @@ var UPSERT_PERSON = createAsyncThunk("personApiSlice/upsertPerson", /*#__PURE__*
               OrgID: []
             }
           }];
+          console.log("_________________BODY______________________-");
+          console.log(body);
 
           if (updatedId && updatedId.length > 0) {
             body[0]["filter"] = {
@@ -16887,22 +17052,22 @@ var UPSERT_PERSON = createAsyncThunk("personApiSlice/upsertPerson", /*#__PURE__*
             delete body[0]["doc"]["Id"]; //delete body[0]["doc"]["telecom"];
           }
 
-          _context.next = 10;
+          _context.next = 25;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __uspsertUrl__);
 
-        case 10:
+        case 25:
           data = _context.sent;
 
           if (!data.error) {
-            _context.next = 13;
+            _context.next = 28;
             break;
           }
 
           throw new Error(data.error && (typeof data.error === "string" ? data.error : data.message));
 
-        case 13:
+        case 28:
           return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: {
               id: (data === null || data === void 0 ? void 0 : (_data$Result = data["Result"]) === null || _data$Result === void 0 ? void 0 : (_data$Result$ = _data$Result[0]) === null || _data$Result$ === void 0 ? void 0 : (_data$Result$$propert = _data$Result$.properties) === null || _data$Result$$propert === void 0 ? void 0 : (_data$Result$$propert2 = _data$Result$$propert.doc) === null || _data$Result$$propert2 === void 0 ? void 0 : _data$Result$$propert2.Id) || 0,
@@ -16912,8 +17077,12 @@ var UPSERT_PERSON = createAsyncThunk("personApiSlice/upsertPerson", /*#__PURE__*
             }
           }));
 
-        case 16:
-          _context.prev = 16;
+        case 29:
+          _context.next = 34;
+          break;
+
+        case 31:
+          _context.prev = 31;
           _context.t0 = _context["catch"](2);
           return _context.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             data: {
@@ -16921,12 +17090,12 @@ var UPSERT_PERSON = createAsyncThunk("personApiSlice/upsertPerson", /*#__PURE__*
             }
           })));
 
-        case 19:
+        case 34:
         case "end":
           return _context.stop();
       }
     }
-  }, _callee, null, [[2, 16]]);
+  }, _callee, null, [[2, 31]]);
 })));
 var ADD_RELATED_PERSON = createAsyncThunk("personApiSlice/addRelatedPerson", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
   var payload,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primarycare-binder",
-  "version": "1.1.87",
+  "version": "1.1.90",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",