@mseva/digit-ui-module-ptr 1.1.12 → 1.1.13

package/dist/index.modern.js

@@ -8397,7 +8397,12 @@ const PTRCitizenPet = ({
       errors
     },
     trigger
-  } = useForm();
+  } = useForm({
+    defaultValues: {
+      petAge: "",
+      lastVaccineDate: ""
+    }
+  });
   const selectedPetType = watch("petType");
   function toEpochMilliseconds(dateStr) {
     return new Date(dateStr).getTime();
@@ -8557,7 +8562,6 @@ const PTRCitizenPet = ({
   }, [selectedVaccineDate, trigger]);
   const onlyAlphabets = /^[A-Za-z]+(?:[ '-][A-Za-z]+)*\s*$/;
   const alphaNum = /^[A-Za-z0-9]+$/;
-  const decimalNumber = /^\d+(\.\d{1,2})?$/;
   const getErrorMessage = fieldName => {
     var _errors$fieldName;
     if (!errors[fieldName]) return null;
@@ -8569,6 +8573,19 @@ const PTRCitizenPet = ({
     fontSize: "12px",
     marginTop: "-18px"
   };
+  const parsePetAge = raw => {
+    if (!raw) return null;
+    const v = raw.startsWith(".") ? `0${raw}` : raw;
+    const [yStr, mStr] = v.split(".");
+    const years = parseInt(yStr || "0", 10);
+    const months = mStr ? parseInt(mStr, 10) : 0;
+    return {
+      years,
+      months,
+      totalYears: years + months / 12
+    };
+  };
+  const AGE_REGEX = /^(?:(?:[1-9]|1[0-4])(?:\.(?:[1-9]|1[01]))?|15|0?\.(?:[1-9]|1[01]))$/;
   return /*#__PURE__*/React.createElement("form", {
     onSubmit: handleSubmit(onSubmit)
   }, /*#__PURE__*/React.createElement(CardSectionHeader, {
@@ -8721,24 +8738,26 @@ const PTRCitizenPet = ({
     rules: {
       required: t("PTR_PET_AGE_REQUIRED"),
       pattern: {
-        value: decimalNumber,
+        value: AGE_REGEX,
         message: t("PTR_PET_AGE_INVALID")
       },
       validate: val => {
-        const age = Number(val);
-        if (isNaN(age)) return t("PTR_PET_AGE_INVALID");
-        if (age <= 0) return "Pet age must be greater than 0";
-        if (age > 23) return "Pet age cannot be greater than 23";
+        if (!val) return t("PTR_PET_AGE_REQUIRED");
+        const normalized = val.startsWith(".") ? `0${val}` : val;
+        if (!AGE_REGEX.test(normalized)) return t("PTR_PET_AGE_INVALID_FORMAT");
+        const {
+          years,
+          months
+        } = parsePetAge(normalized);
+        if (months < 0 || months > 11) return t("PTR_PET_AGE_INVALID_MONTHS");
+        if (years > 15 || years === 15 && months > 0) return t("PTR_PET_AGE_MAX");
         const vaccDate = watch("lastVaccineDate");
-        if (!vaccDate) return true;
-        const yearsFromVacc = yearsSince(vaccDate);
-        let roundedAge;
-        if (age > 0 && age < 1) {
-          roundedAge = 1;
-        } else {
-          roundedAge = Math.floor(age);
+        if (vaccDate) {
+          const yearsSinceVaccine = yearsSince(vaccDate);
+          const roundedAge = years > 0 && years < 1 ? 1 : Math.floor(years + months / 12);
+          if (roundedAge < yearsSinceVaccine) return t("PTR_PET_AGE_LESS_THAN_VACC");
         }
-        return roundedAge >= yearsFromVacc || `Pet age must be at least ${yearsFromVacc} year(s)`;
+        return true;
       }
     },
     render: props => /*#__PURE__*/React.createElement(TextInput, {
@@ -8748,13 +8767,25 @@ const PTRCitizenPet = ({
         v = v.replace(/(\..*)\./g, "$1");
         props.onChange(v);
       },
-      maxLength: 5,
-      onBlur: () => trigger("petAge"),
+      maxlength: 5,
       t: t
     })
-  }))), errors.petAge && /*#__PURE__*/React.createElement(CardLabelError, {
-    style: errorStyle
-  }, getErrorMessage("petAge")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+  }), errors.petAge && /*#__PURE__*/React.createElement(CardLabelError, {
+    style: {
+      width: "70%",
+      fontSize: "12px",
+      marginTop: "-18px"
+    }
+  }, getErrorMessage("petAge")), /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontSize: "12px",
+      color: "#666"
+    }
+  }, "Example: 0.5 (5 months), 1.2 (1 year 2 months)"))), /*#__PURE__*/React.createElement(LabelFieldPair, {
+    style: {
+      marginTop: "15px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
     className: "card-label-smaller"
   }, t("PTR_VACCINATION_NUMBER"), " *"), /*#__PURE__*/React.createElement("div", {
     className: "field"
@@ -17460,20 +17491,23 @@ const PTRWFApplicationTimeline = props => {
     window.open(thumbnailsToShow === null || thumbnailsToShow === void 0 ? void 0 : (_thumbnailsToShow$ful = thumbnailsToShow.fullImage) === null || _thumbnailsToShow$ful === void 0 ? void 0 : _thumbnailsToShow$ful[0], "_blank");
   }
   const getTimelineCaptions = checkpoint => {
+    console.log("checkpoint", checkpoint);
     if (checkpoint.state === "OPEN") {
-      var _checkpoint$auditDeta, _props$application4;
+      var _checkpoint$auditDeta, _props$application4, _checkpoint$assigner;
       const caption = {
         date: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$auditDeta = checkpoint.auditDetails) === null || _checkpoint$auditDeta === void 0 ? void 0 : _checkpoint$auditDeta.lastModified,
-        source: ((_props$application4 = props.application) === null || _props$application4 === void 0 ? void 0 : _props$application4.channel) || ""
+        source: ((_props$application4 = props.application) === null || _props$application4 === void 0 ? void 0 : _props$application4.channel) || "",
+        mobileNumber: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assigner = checkpoint.assigner) === null || _checkpoint$assigner === void 0 ? void 0 : _checkpoint$assigner.mobileNumber
       };
       return /*#__PURE__*/React.createElement(PTRWFCaption, {
         data: caption
       });
     } else if (checkpoint.state) {
-      var _checkpoint$auditDeta2, _checkpoint$assignes, _checkpoint$assignes$, _checkpoint$wfComment, _checkpoint$wfDocumen, _checkpoint$wfDocumen2;
+      var _checkpoint$auditDeta2, _checkpoint$assigner2, _checkpoint$assigner3, _checkpoint$wfComment, _checkpoint$wfDocumen, _checkpoint$wfDocumen2;
       const caption = {
         date: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$auditDeta2 = checkpoint.auditDetails) === null || _checkpoint$auditDeta2 === void 0 ? void 0 : _checkpoint$auditDeta2.lastModified,
-        name: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assignes = checkpoint.assignes) === null || _checkpoint$assignes === void 0 ? void 0 : (_checkpoint$assignes$ = _checkpoint$assignes[0]) === null || _checkpoint$assignes$ === void 0 ? void 0 : _checkpoint$assignes$.name,
+        name: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assigner2 = checkpoint.assigner) === null || _checkpoint$assigner2 === void 0 ? void 0 : _checkpoint$assigner2.name,
+        mobileNumber: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assigner3 = checkpoint.assigner) === null || _checkpoint$assigner3 === void 0 ? void 0 : _checkpoint$assigner3.mobileNumber,
         comment: checkpoint.state === "INITIATED" ? null : checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$wfComment = checkpoint.wfComment) === null || _checkpoint$wfComment === void 0 ? void 0 : _checkpoint$wfComment[0],
         wfDocuments: checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.wfDocuments,
         thumbnailsToShow: checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.thumbnailsToShow
@@ -17489,10 +17523,10 @@ const PTRWFApplicationTimeline = props => {
         index: index
       })))));
     } else {
-      var _props$application5, _checkpoint$assigner;
+      var _props$application5, _checkpoint$assigner4;
       const caption = {
         date: Digit.DateUtils.ConvertTimestampToDate((_props$application5 = props.application) === null || _props$application5 === void 0 ? void 0 : _props$application5.auditDetails.lastModified),
-        name: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assigner = checkpoint.assigner) === null || _checkpoint$assigner === void 0 ? void 0 : _checkpoint$assigner.name,
+        name: checkpoint === null || checkpoint === void 0 ? void 0 : (_checkpoint$assigner4 = checkpoint.assigner) === null || _checkpoint$assigner4 === void 0 ? void 0 : _checkpoint$assigner4.name,
         comment: t(checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.comment)
       };
       return /*#__PURE__*/React.createElement(PTRWFCaption, {
@@ -18786,7 +18820,7 @@ function get(object, path, defaultValue) {
 var get_1 = get;
 
 const PTRApplicationDetails = () => {
-  var _pet_details$addition, _reciept_data$Payment, _pet_details$owner, _pet_details$owner2, _pet_details$owner3, _pet_details$owner4, _pet_details$address, _pet_details$address2, _pet_details$petDetai, _pet_details$petDetai2, _pet_details$petDetai3, _pet_details$petDetai4, _pet_details$petDetai5, _pet_details$petDetai6, _pet_details$petDetai7;
+  var _pet_details$addition, _reciept_data$Payment, _pet_details$owner, _pet_details$owner2, _pet_details$owner3, _pet_details$owner4, _pet_details$address, _pet_details$address2, _pet_details$petDetai, _pet_details$petDetai2, _pet_details$petDetai3, _pet_details$petDetai4, _pet_details$petDetai5, _pet_details$petDetai7;
   const {
     t
   } = useTranslation();
@@ -19349,7 +19383,7 @@ const PTRApplicationDetails = () => {
       Payments: [{
         ...payments
       }]
-    }, "ndc-receipt");
+    }, "petservice-receipt");
     const fileStore = await Digit.PaymentService.printReciept(tenantId, {
       fileStoreIds: response.filestoreIds[0]
     });
@@ -19383,6 +19417,27 @@ const PTRApplicationDetails = () => {
       }
     });
   }
+  const formatPetAge = (ageValue, t) => {
+    if (ageValue === null || ageValue === undefined || ageValue === "") return t("CS_NA");
+    const ageStr = String(ageValue).trim();
+    if (!/^\d+(\.\d+)?$/.test(ageStr)) return t("CS_NA");
+    const [yearsPart, decPart] = ageStr.split(".");
+    let years = Number(yearsPart) || 0;
+    let months = 0;
+    if (decPart) {
+      if (decPart.length === 1) {
+        months = parseInt(decPart, 10);
+      } else {
+        months = parseInt(decPart.slice(0, 2), 10);
+      }
+      if (isNaN(months)) months = 0;
+    }
+    if (months > 11) months = 11;
+    if (years === 0 && months === 0) return t("CS_NA");
+    if (years === 0) return `${months} month${months > 1 ? "s" : ""}`;
+    if (months === 0) return `${years} year${years > 1 ? "s" : ""}`;
+    return `${years} year${years > 1 ? "s" : ""} and ${months} month${months > 1 ? "s" : ""}`;
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "cardHeaderWithOptions",
     style: {
@@ -19446,22 +19501,38 @@ const PTRApplicationDetails = () => {
     className: "border-none",
     label: t("PTR_SEARCH_BREED_TYPE"),
     text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai2 = pet_details.petDetails) === null || _pet_details$petDetai2 === void 0 ? void 0 : _pet_details$petDetai2.breedType) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    className: "border-none",
+    label: t("PTR_PET_AGE"),
+    text: formatPetAge(pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai3 = pet_details.petDetails) === null || _pet_details$petDetai3 === void 0 ? void 0 : _pet_details$petDetai3.petAge, t)
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_DOCTOR_NAME"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai3 = pet_details.petDetails) === null || _pet_details$petDetai3 === void 0 ? void 0 : _pet_details$petDetai3.doctorName) || t("CS_NA")
+    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai4 = pet_details.petDetails) === null || _pet_details$petDetai4 === void 0 ? void 0 : _pet_details$petDetai4.doctorName) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_CLINIC_NAME"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai4 = pet_details.petDetails) === null || _pet_details$petDetai4 === void 0 ? void 0 : _pet_details$petDetai4.clinicName) || t("CS_NA")
+    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai5 = pet_details.petDetails) === null || _pet_details$petDetai5 === void 0 ? void 0 : _pet_details$petDetai5.clinicName) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_VACCINATED_DATE"),
-    text: pet_details !== null && pet_details !== void 0 && (_pet_details$petDetai5 = pet_details.petDetails) !== null && _pet_details$petDetai5 !== void 0 && _pet_details$petDetai5.lastVaccineDate ? new Date(Number(pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai6 = pet_details.petDetails) === null || _pet_details$petDetai6 === void 0 ? void 0 : _pet_details$petDetai6.lastVaccineDate)).toLocaleDateString("en-IN", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric"
-    }) : t("CS_NA")
+    text: (_pet_details$petDetai6 => {
+      const rawDate = pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai6 = pet_details.petDetails) === null || _pet_details$petDetai6 === void 0 ? void 0 : _pet_details$petDetai6.lastVaccineDate;
+      if (!rawDate) return t("CS_NA");
+      let dateObj;
+      if (!isNaN(rawDate)) {
+        const timestamp = Number(rawDate);
+        dateObj = new Date(timestamp < 1e12 ? timestamp * 1000 : timestamp);
+      } else {
+        dateObj = new Date(rawDate);
+      }
+      if (isNaN(dateObj.getTime())) return t("CS_NA");
+      return dateObj.toLocaleDateString("en-IN", {
+        day: "2-digit",
+        month: "2-digit",
+        year: "numeric"
+      });
+    })()
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_VACCINATION_NUMBER"),
@@ -19544,8 +19615,8 @@ const InboxLinks = ({
     t
   } = useTranslation();
   const allLinks = [{
-    text: t("ES_TITLE_NEW_PET_REGISTRATION"),
-    link: "/digit-ui/employee/ptr/petservice/new-application",
+    text: "",
+    link: "",
     roles: []
   }];
   const [links, setLinks] = useState([]);
@@ -21317,7 +21388,7 @@ const NewApplication = () => {
 };
 
 const ApplicationDetails = () => {
-  var _pet_details$addition, _reciept_data$Payment2, _pet_details$owner, _pet_details$owner2, _pet_details$owner3, _pet_details$owner4, _pet_details$address, _pet_details$address2, _pet_details$petDetai, _pet_details$petDetai2, _pet_details$petDetai3, _pet_details$petDetai4, _pet_details$petDetai5, _pet_details$petDetai6;
+  var _pet_details$addition, _reciept_data$Payment2, _pet_details$owner, _pet_details$owner2, _pet_details$owner3, _pet_details$owner4, _pet_details$address, _pet_details$address2, _pet_details$petDetai, _pet_details$petDetai2, _pet_details$petDetai3, _pet_details$petDetai4, _pet_details$petDetai5, _pet_details$petDetai7;
   const {
     t
   } = useTranslation();
@@ -21475,6 +21546,27 @@ const ApplicationDetails = () => {
     label: t("PTR_CERTIFICATE"),
     onClick: () => printCertificate()
   });
+  const formatPetAge = (ageValue, t) => {
+    if (ageValue === null || ageValue === undefined || ageValue === "") return t("CS_NA");
+    const ageStr = String(ageValue).trim();
+    if (!/^\d+(\.\d+)?$/.test(ageStr)) return t("CS_NA");
+    const [yearsPart, decPart] = ageStr.split(".");
+    let years = Number(yearsPart) || 0;
+    let months = 0;
+    if (decPart) {
+      if (decPart.length === 1) {
+        months = parseInt(decPart, 10);
+      } else {
+        months = parseInt(decPart.slice(0, 2), 10);
+      }
+      if (isNaN(months)) months = 0;
+    }
+    if (months > 11) months = 11;
+    if (years === 0 && months === 0) return t("CS_NA");
+    if (years === 0) return `${months} month${months > 1 ? "s" : ""}`;
+    if (months === 0) return `${years} year${years > 1 ? "s" : ""}`;
+    return `${years} year${years > 1 ? "s" : ""} and ${months} month${months > 1 ? "s" : ""}`;
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "cardHeaderWithOptions",
     style: {
@@ -21537,14 +21629,34 @@ const ApplicationDetails = () => {
     className: "border-none",
     label: t("PTR_CLINIC_NAME"),
     text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai4 = pet_details.petDetails) === null || _pet_details$petDetai4 === void 0 ? void 0 : _pet_details$petDetai4.clinicName) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    className: "border-none",
+    label: t("PTR_PET_AGE"),
+    text: formatPetAge(pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai5 = pet_details.petDetails) === null || _pet_details$petDetai5 === void 0 ? void 0 : _pet_details$petDetai5.petAge, t)
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_VACCINATED_DATE"),
-    text: pet_details !== null && pet_details !== void 0 && (_pet_details$petDetai5 = pet_details.petDetails) !== null && _pet_details$petDetai5 !== void 0 && _pet_details$petDetai5.lastVaccineDate ? new Date(Number(pet_details.petDetails.lastVaccineDate)).toLocaleDateString("en-GB") : t("CS_NA")
+    text: (_pet_details$petDetai6 => {
+      const rawDate = pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai6 = pet_details.petDetails) === null || _pet_details$petDetai6 === void 0 ? void 0 : _pet_details$petDetai6.lastVaccineDate;
+      if (!rawDate) return t("CS_NA");
+      let dateObj;
+      if (!isNaN(rawDate)) {
+        const timestamp = Number(rawDate);
+        dateObj = new Date(timestamp < 1e12 ? timestamp * 1000 : timestamp);
+      } else {
+        dateObj = new Date(rawDate);
+      }
+      if (isNaN(dateObj.getTime())) return t("CS_NA");
+      return dateObj.toLocaleDateString("en-IN", {
+        day: "2-digit",
+        month: "2-digit",
+        year: "numeric"
+      });
+    })()
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_VACCINATION_NUMBER"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai6 = pet_details.petDetails) === null || _pet_details$petDetai6 === void 0 ? void 0 : _pet_details$petDetai6.vaccinationNumber) || t("CS_NA")
+    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$petDetai7 = pet_details.petDetails) === null || _pet_details$petDetai7 === void 0 ? void 0 : _pet_details$petDetai7.vaccinationNumber) || t("CS_NA")
   })), /*#__PURE__*/React.createElement(CardSubHeader, {
     style: {
       fontSize: "24px"