diff --git a/src/pages/Proof/Search_GLD/SearchForm.js b/src/pages/Proof/Search_GLD/SearchForm.js index 8b5815e..b22dac3 100644 --- a/src/pages/Proof/Search_GLD/SearchForm.js +++ b/src/pages/Proof/Search_GLD/SearchForm.js @@ -32,7 +32,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData, o const [issueCombo, setIssueCombo] = React.useState([]); const [groupSelected, setGroupSelected] = React.useState( searchCriteria.gazettGroup != undefined - ? ComboData.groupTitle.find(item => item.code === searchCriteria.gazettGroup) ?? null + ? ComboData.groupTitle.find(item => item.title === searchCriteria.gazettGroup) ?? null : null ); @@ -84,7 +84,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData, o refNo: data.refNo, code: data.code, issueId: issueSelected?.id, - gazettGroup: groupSelected?.code, + gazettGroup: groupSelected?.title, dateFrom: sentDateFrom, dateTo: sentDateTo, contact: data.contact, diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js index 8130182..c98ead9 100644 --- a/src/pages/Proof/Search_Public/SearchForm.js +++ b/src/pages/Proof/Search_Public/SearchForm.js @@ -31,7 +31,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData, o const [status, setStatus] = React.useState(searchCriteria.statusKey!=undefined?ComboData.proofStatusFull[searchCriteria.statusKey]:ComboData.proofStatusFull[0]); const [issueSelected, setIssueSelected] = React.useState(null); const [issueCombo, setIssueCombo] = React.useState([]); - const [groupSelected, setGroupSelected] = React.useState(searchCriteria.gazettGroup!=undefined?ComboData.groupTitle.find(item => item.code === searchCriteria.gazettGroup):{}); + const [groupSelected, setGroupSelected] = React.useState(searchCriteria.gazettGroup!=undefined?ComboData.groupTitle.find(item => item.title === searchCriteria.gazettGroup):{}); const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom); const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo); @@ -81,7 +81,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData, o refNo: data.refNo, code: data.code, issueId: issueSelected?.id, - gazettGroup: groupSelected?.type, + gazettGroup: groupSelected?.title, dateFrom: sentDateFrom, dateTo: sentDateTo, statusKey:status?.key, diff --git a/src/pages/PublicNotice/Search_GLD/SearchForm.js b/src/pages/PublicNotice/Search_GLD/SearchForm.js index 6d07eed..664c69d 100644 --- a/src/pages/PublicNotice/Search_GLD/SearchForm.js +++ b/src/pages/PublicNotice/Search_GLD/SearchForm.js @@ -31,7 +31,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData, o const [issueCombo, setIssueCombo] = React.useState([]); const [selectedStatus, setSelectedStatus] = React.useState({key: 0, label: 'All', type: 'all'}); const [selectedMode, setSelectedMode] = React.useState({key: 0, label: 'All', type: 'all'}); - const [groupSelected, setGroupSelected] = React.useState(searchCriteria.gazettGroup!=undefined?ComboData.groupTitle.find(item => item.code === searchCriteria.gazettGroup):{}); + const [groupSelected, setGroupSelected] = React.useState(searchCriteria.gazettGroup!=undefined?ComboData.groupTitle.find(item => item.title === searchCriteria.gazettGroup):{}); const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom); const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo); @@ -91,7 +91,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData, o orgId: (orgSelected?.key && orgSelected?.key > 0) ? orgSelected?.key : "", issueId: issueSelected?.id, groupNo: data.groupNo, - gazettGroup: groupSelected?.code, + gazettGroup: groupSelected?.title, mode: (data.mode === '' || data.mode?.includes("all")) ? "" : data.mode, start:0, limit:10