From a3bc925000242f3dbdad9a1bf1fed15f404dfa0f Mon Sep 17 00:00:00 2001 From: Tulika-eGov Date: Thu, 5 Sep 2024 12:34:55 +0530 Subject: [PATCH 1/2] UCEM-810 : updated the param from bill date to created time and date --- .../libraries/src/services/molecules/Expenditure/Search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Expenditure/Search.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Expenditure/Search.js index b7e1477c97..2c097a968e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Expenditure/Search.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Expenditure/Search.js @@ -239,7 +239,7 @@ export const BillsSearch = { asSectionHeader: true, values: [ { title: "WORKS_BILL_NUMBER", value: billData?.billNumber || "NA"}, - { title: "WORKS_BILL_DATE", value: Digit.Utils.pt.convertEpochToDate(billData?.billDate) || "NA"}, + { title: "WORKS_BILL_DATE", value: Digit.Utils.pt.convertEpochToDate(billData?.auditDetails?.createdTime) || "NA"}, { title: "WORKS_ORDER_NO", value: WOData?.contractNumber || "NA"}, { title: "WORKS_PROJECT_ID", value: WOData?.additionalDetails?.projectId || "NA"}, { title: "PROJECTS_DESCRIPTION", value: WOData?.additionalDetails?.projectDesc || "NA"}, From 16940f008c80e3f2fa0446ceee4d481b57986227 Mon Sep 17 00:00:00 2001 From: Tulika-eGov Date: Thu, 5 Sep 2024 16:37:14 +0530 Subject: [PATCH 2/2] UCEM-726 : Updated the default value as works for sor type --- .../packages/modules/Estimate/src/pageComponents/searchSor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchSor.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchSor.js index 55d5fb040a..76816abf77 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchSor.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/searchSor.js @@ -69,7 +69,7 @@ const fetchData = async (sorid, state, setState, setShowToast) => { const searchSor = (props) => { const { t } = useTranslation(); - const [stateData, setStateData] = useState({}); + const [stateData, setStateData] = useState({SORType:"W"}); const [selectedSOR, setSelectedSOR] = useState(null); const [showToast, setShowToast] = useState({show : false, label : "", error : false}); const { register, setValue, watch } = props;