diff --git a/src/pages/Announcement/Search/SearchForm.js b/src/pages/Announcement/Search/SearchForm.js
index 65005a3..6d2aaf0 100644
--- a/src/pages/Announcement/Search/SearchForm.js
+++ b/src/pages/Announcement/Search/SearchForm.js
@@ -79,7 +79,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => {
- setMinDate(DateUtils.dateStr(newValue));
+ setMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -96,7 +96,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria}) => {
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="dateTo"
type="date"
diff --git a/src/pages/Announcement/Search/index.js b/src/pages/Announcement/Search/index.js
index 073f486..cf58eb4 100644
--- a/src/pages/Announcement/Search/index.js
+++ b/src/pages/Announcement/Search/index.js
@@ -32,8 +32,8 @@ const UserSearchPage_Individual = () => {
const [record, setRecord] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- dateTo: DateUtils.dateStr(new Date()),
- dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate() - 90)),
+ dateTo: DateUtils.dateValue(new Date()),
+ dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 90)),
});
const [onReady, setOnReady] = React.useState(false);
diff --git a/src/pages/Announcement/Search_Public/DataGrid.js b/src/pages/Announcement/Search_Public/DataGrid.js
index e89ba81..b5990e4 100644
--- a/src/pages/Announcement/Search_Public/DataGrid.js
+++ b/src/pages/Announcement/Search_Public/DataGrid.js
@@ -21,7 +21,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
width: 250,
cellClassName: 'announceDate',
renderCell: (params) => {
- return DateUtils.dateStr(params?.value);
+ return DateUtils.dateValue(params?.value);
},
},
{
diff --git a/src/pages/Announcement/Search_Public/SearchForm.js b/src/pages/Announcement/Search_Public/SearchForm.js
index f10ad95..2ad4fc5 100644
--- a/src/pages/Announcement/Search_Public/SearchForm.js
+++ b/src/pages/Announcement/Search_Public/SearchForm.js
@@ -82,7 +82,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => {
- setMinDate(DateUtils.dateStr(newValue));
+ setMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -103,7 +103,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="dateTo"
type="date"
diff --git a/src/pages/Announcement/Search_Public/index.js b/src/pages/Announcement/Search_Public/index.js
index 351edb5..e6df731 100644
--- a/src/pages/Announcement/Search_Public/index.js
+++ b/src/pages/Announcement/Search_Public/index.js
@@ -32,8 +32,8 @@ const BackgroundHead = {
const UserSearchPage_Individual = () => {
const [record, setRecord] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- dateTo: DateUtils.dateStr(new Date()),
- dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate() - 90)),
+ dateTo: DateUtils.dateValue(new Date()),
+ dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 90)),
});
const [onReady, setOnReady] = React.useState(false);
diff --git a/src/pages/AuditLog/AuditLogSearchForm.js b/src/pages/AuditLog/AuditLogSearchForm.js
index 0eb4e7d..4a33cbf 100644
--- a/src/pages/AuditLog/AuditLogSearchForm.js
+++ b/src/pages/AuditLog/AuditLogSearchForm.js
@@ -107,7 +107,7 @@ const AuditLogSearchForm = ({ applySearch, searchCriteria}) => {
defaultValue={searchCriteria.modifiedFrom}
InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => {
- setMinDate(DateUtils.dateStr(newValue));
+ setMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -129,7 +129,7 @@ const AuditLogSearchForm = ({ applySearch, searchCriteria}) => {
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
console.log(newValue)
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="modifiedTo"
type="date"
diff --git a/src/pages/AuditLog/index.js b/src/pages/AuditLog/index.js
index 7ddda71..c4102da 100644
--- a/src/pages/AuditLog/index.js
+++ b/src/pages/AuditLog/index.js
@@ -33,8 +33,8 @@ const BackgroundHead = {
const AuditLogPage = () => {
const [record, setRecord] = useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- modifiedTo: DateUtils.dateStr(new Date()),
- modifiedFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+ modifiedTo: DateUtils.dateValue(new Date()),
+ modifiedFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
});
const [onReady, setOnReady] = useState(false);
const [changelocked, setChangeLocked] = React.useState(false);
diff --git a/src/pages/DemandNote/Create/SearchForm.js b/src/pages/DemandNote/Create/SearchForm.js
index 0db3334..4185eb4 100644
--- a/src/pages/DemandNote/Create/SearchForm.js
+++ b/src/pages/DemandNote/Create/SearchForm.js
@@ -28,7 +28,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
const [failText, setFailText] = React.useState("");
const [confirmPopUp, setConfirmPopUp] = React.useState(false);
- const [dueDate, setDueDate] = React.useState(DateUtils.dateStr(DateUtils.dateStr((new Date().setDate(new Date().getDate() +1)))));
+ const [dueDate, setDueDate] = React.useState(DateUtils.dateValue(DateUtils.dateValue((new Date().setDate(new Date().getDate() +1)))));
const [isSuccessPopUp, setIsSuccessPopUp] = React.useState(false);
const [resultCount, setResultCount] = React.useState(0);
@@ -91,7 +91,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
setIsFailPopUp(true);
return;
} else {
- setDueDate(DateUtils.dateStr((new Date().setDate(new Date().getDate() +1))));
+ setDueDate(DateUtils.dateValue((new Date().setDate(new Date().getDate() +1))));
setConfirmPopUp(true);
}
};
@@ -261,7 +261,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
fullWidth
type="date"
defaultValue={dueDate}
- InputProps={{ inputProps: { min: DateUtils.dateStr(new Date()) } }}
+ InputProps={{ inputProps: { min: DateUtils.dateValue(new Date()) } }}
onChange={(newValue) => {
setDueDate(newValue.currentTarget.value)
}}
diff --git a/src/pages/DemandNote/Details/DnDetailCard.js b/src/pages/DemandNote/Details/DnDetailCard.js
index 352dbe8..38d1c14 100644
--- a/src/pages/DemandNote/Details/DnDetailCard.js
+++ b/src/pages/DemandNote/Details/DnDetailCard.js
@@ -127,24 +127,24 @@ const DnDetailCard = ({ data }) => {
{getDisplayField("Sent on", "")}
- {getDisplayField("Reminder 1", dnData?.expectReminder1 ? DateUtils.dateStr(dnData.expectReminder1):"--")}
+ {getDisplayField("Reminder 1", dnData?.expectReminder1 ? DateUtils.dateValue(dnData.expectReminder1):"--")}
{getDisplayField("Reminder 1", dnData?.reminder1 ? DateUtils.datetimeStr(dnData.reminder1) : "--")}
- {getDisplayField("Reminder 2", dnData?.expectReminder2 ? DateUtils.dateStr(dnData.expectReminder2):"--")}
+ {getDisplayField("Reminder 2", dnData?.expectReminder2 ? DateUtils.dateValue(dnData.expectReminder2):"--")}
{getDisplayField("Reminder 2", dnData?.reminder2 ? DateUtils.datetimeStr(dnData.reminder2) : "--")}
- {getDisplayField("Reminder 3", dnData?.expectReminder3 ? DateUtils.dateStr(dnData.expectReminder3):"--")}
+ {getDisplayField("Reminder 3", dnData?.expectReminder3 ? DateUtils.dateValue(dnData.expectReminder3):"--")}
{getDisplayField("Reminder 3", dnData?.reminder3 ? DateUtils.datetimeStr(dnData.reminder3) : "--")}
- {getDisplayField("Reminder 4", dnData?.expectReminder4 ? DateUtils.dateStr(dnData.expectReminder4):"--")}
+ {getDisplayField("Reminder 4", dnData?.expectReminder4 ? DateUtils.dateValue(dnData.expectReminder4):"--")}
{getDisplayField("Reminder 4", dnData?.reminder4 ? DateUtils.datetimeStr(dnData.reminder4) : "--")}
- {getDisplayField("Reminder Final", dnData?.expectReminderFinal ? DateUtils.dateStr(dnData.expectReminderFinal):"--")}
+ {getDisplayField("Reminder Final", dnData?.expectReminderFinal ? DateUtils.dateValue(dnData.expectReminderFinal):"--")}
{getDisplayField("Reminder Final", dnData?.reminderFinal ? DateUtils.datetimeStr(dnData.reminderFinal) : "--")}
diff --git a/src/pages/DemandNote/Details/index.js b/src/pages/DemandNote/Details/index.js
index e89ba10..9dc5cac 100644
--- a/src/pages/DemandNote/Details/index.js
+++ b/src/pages/DemandNote/Details/index.js
@@ -49,7 +49,7 @@ const DemandNote_index = () => {
url: `${DEMAND_NOTE_LOAD}/${params.id}`,
onSuccess: (response) => {
- response["issueDate"] = DateUtils.dateStr(response["issueDate"]);
+ response["issueDate"] = DateUtils.dateValue(response["issueDate"]);
response["sentDate"] = response["sentDate"]?DateUtils.datetimeStr(response["sentDate"]):"";
response["gazetteIssueDate"] = DateUtils.datetimeStr(response["gazetteIssueDate"]);
response["contactFaxNo"] =JSON.parse(response["contactFaxNo"]);
diff --git a/src/pages/DemandNote/Search/DataGrid.js b/src/pages/DemandNote/Search/DataGrid.js
index fdad4ab..28b1b20 100644
--- a/src/pages/DemandNote/Search/DataGrid.js
+++ b/src/pages/DemandNote/Search/DataGrid.js
@@ -233,8 +233,8 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
width: 300,
renderCell: (params) => {
return (
- | Issue: | {DateUtils.dateStr(params?.row.issueDate)} |
- | Due: | {params?.value? DateUtils.dateStr(params?.value):"--"} |
+ | Issue: | {DateUtils.dateValue(params?.row.issueDate)} |
+ | Due: | {params?.value? DateUtils.dateValue(params?.value):"--"} |
| Sent: | {params.row.sentDate ? <> {DateUtils.datetimeStr(params.row.sentDate)} - {params.row.sentBy} : <> To be sent} |
);
}
diff --git a/src/pages/DemandNote/Search/SearchForm.js b/src/pages/DemandNote/Search/SearchForm.js
index 6d81781..e3e29cb 100644
--- a/src/pages/DemandNote/Search/SearchForm.js
+++ b/src/pages/DemandNote/Search/SearchForm.js
@@ -213,7 +213,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => {
- setMinDate(DateUtils.dateStr(newValue));
+ setMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -230,7 +230,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="dateTo"
type="date"
@@ -253,7 +253,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
defaultValue={searchCriteria.dueDateFrom}
InputProps={{ inputProps: { max: maxDueDate } }}
onChange={(newValue) => {
- setMinDueDate(DateUtils.dateStr(newValue));
+ setMinDueDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -271,7 +271,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
{...register("dueDateTo")}
InputProps={{ inputProps: { min: minDueDate } }}
onChange={(newValue) => {
- setMaxDueDate(DateUtils.dateStr(newValue));
+ setMaxDueDate(DateUtils.dateValue(newValue));
}}
id="dueDateTo"
type="date"
diff --git a/src/pages/DemandNote/Search/index.js b/src/pages/DemandNote/Search/index.js
index dcd9ec9..c1350aa 100644
--- a/src/pages/DemandNote/Search/index.js
+++ b/src/pages/DemandNote/Search/index.js
@@ -36,10 +36,10 @@ const UserSearchPage_Individual = () => {
const [orgCombo, setOrgCombo] = React.useState([]);
const [issueCombo, setIssueCombo] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- dateTo: DateUtils.dateStr(new Date()),
- dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate() - 14)),
- dueDateTo: DateUtils.dateStr(new Date()),
- dueDateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate() - 14)),
+ dateTo: DateUtils.dateValue(new Date()),
+ dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14)),
+ dueDateTo: DateUtils.dateValue(new Date()),
+ dueDateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14)),
});
const [onReady, setOnReady] = React.useState(false);
diff --git a/src/pages/DemandNote/Search_Public/DataGrid.js b/src/pages/DemandNote/Search_Public/DataGrid.js
index 5343f77..5351fd8 100644
--- a/src/pages/DemandNote/Search_Public/DataGrid.js
+++ b/src/pages/DemandNote/Search_Public/DataGrid.js
@@ -52,7 +52,7 @@ export default function SearchDemandNote({ recordList }) {
width: isMdOrLg ? 'auto' : 175,
flex: isMdOrLg ? 1 : undefined,
valueGetter: (params) => {
- return DateUtils.dateStr(params?.value);
+ return DateUtils.dateValue(params?.value);
}
},
{
diff --git a/src/pages/DemandNote/Search_Public/index.js b/src/pages/DemandNote/Search_Public/index.js
index d89b1ea..b90cd79 100644
--- a/src/pages/DemandNote/Search_Public/index.js
+++ b/src/pages/DemandNote/Search_Public/index.js
@@ -36,8 +36,8 @@ const UserSearchPage_Individual = () => {
const [orgCombo, setOrgCombo] = React.useState([]);
const [issueCombo, setIssueCombo] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- dateTo: DateUtils.dateStr(new Date()),
- dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate() - 14)),
+ dateTo: DateUtils.dateValue(new Date()),
+ dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14)),
});
const [onReady, setOnReady] = React.useState(false);
diff --git a/src/pages/GFMIS/SearchForm.js b/src/pages/GFMIS/SearchForm.js
index 6f4e4d2..b2763fc 100644
--- a/src/pages/GFMIS/SearchForm.js
+++ b/src/pages/GFMIS/SearchForm.js
@@ -78,7 +78,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria }) =>
max: maxDate,
} }}
// onChange={(newValue) => {
- // setMinDate(DateUtils.dateStr(newValue));
+ // setMinDate(DateUtils.dateValue(newValue));
// }}
InputLabelProps={{
shrink: true
@@ -95,7 +95,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria }) =>
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="dateTo"
type="date"
diff --git a/src/pages/GFMIS/index.js b/src/pages/GFMIS/index.js
index 9b16ad1..1486dfe 100644
--- a/src/pages/GFMIS/index.js
+++ b/src/pages/GFMIS/index.js
@@ -32,8 +32,8 @@ const Index = () => {
const [record,setRecord] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- dateFrom: DateUtils.dateStr(new Date()),
- // dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+ dateFrom: DateUtils.dateValue(new Date()),
+ // dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
});
const [onReady, setOnReady] = React.useState(false);
diff --git a/src/pages/GazetteIssue/ExportForm.js b/src/pages/GazetteIssue/ExportForm.js
index e16b830..e721a2d 100644
--- a/src/pages/GazetteIssue/ExportForm.js
+++ b/src/pages/GazetteIssue/ExportForm.js
@@ -98,7 +98,7 @@ const SearchGazetteIssueForm = ({ applyExport, comboData, waitDownload}) => {
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="dateTo"
type="date"
diff --git a/src/pages/GazetteIssue/SearchForm.js b/src/pages/GazetteIssue/SearchForm.js
index f4bf8e4..48d5af6 100644
--- a/src/pages/GazetteIssue/SearchForm.js
+++ b/src/pages/GazetteIssue/SearchForm.js
@@ -96,7 +96,7 @@ const SearchGazetteIssueForm = ({ applySearch, comboData}) => {
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="dateTo"
type="date"
diff --git a/src/pages/GazetteIssue/index.js b/src/pages/GazetteIssue/index.js
index 933a66f..7b4b14b 100644
--- a/src/pages/GazetteIssue/index.js
+++ b/src/pages/GazetteIssue/index.js
@@ -44,12 +44,12 @@ const Index = () => {
// const navigate = useNavigate()
const [searchCriteria, setSearchCriteria] = React.useState({
year: dateStr_Year(new Date()),
- // dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+ // dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
});
const [exportCriteria, setExportCriteria] = React.useState({
// year: dateStr_Year(new Date()),
- // dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+ // dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
});
const [attachments, setAttachments] = React.useState([]);
diff --git a/src/pages/Holiday/SearchForm.js b/src/pages/Holiday/SearchForm.js
index 2ebdac6..e4c767f 100644
--- a/src/pages/Holiday/SearchForm.js
+++ b/src/pages/Holiday/SearchForm.js
@@ -96,7 +96,7 @@ const SearchHolidayForm = ({ applySearch, comboData}) => {
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="dateTo"
type="date"
diff --git a/src/pages/Holiday/index.js b/src/pages/Holiday/index.js
index 1a83f3d..6401ffe 100644
--- a/src/pages/Holiday/index.js
+++ b/src/pages/Holiday/index.js
@@ -44,7 +44,7 @@ const Index = () => {
// const navigate = useNavigate()
const [searchCriteria, setSearchCriteria] = React.useState({
year: dateStr_Year(new Date()),
- // dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+ // dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
});
const [attachments, setAttachments] = React.useState([]);
const [waitImport, setWaitImport] = React.useState(false);
diff --git a/src/pages/Message/Search/SearchForm.js b/src/pages/Message/Search/SearchForm.js
index 63d41b6..9b142af 100644
--- a/src/pages/Message/Search/SearchForm.js
+++ b/src/pages/Message/Search/SearchForm.js
@@ -99,7 +99,7 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => {
- setMinDate(DateUtils.dateStr(newValue));
+ setMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -120,7 +120,7 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
aria-label={intl.formatMessage({id: 'dateTo'})}
id="dateTo"
diff --git a/src/pages/Message/Search/index.js b/src/pages/Message/Search/index.js
index 9ee6c86..69029bf 100644
--- a/src/pages/Message/Search/index.js
+++ b/src/pages/Message/Search/index.js
@@ -33,8 +33,8 @@ const Index = () => {
const [record,setRecord] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- dateTo: DateUtils.dateStr(new Date()),
- dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+ dateTo: DateUtils.dateValue(new Date()),
+ dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
});
const [onReady, setOnReady] = React.useState(false);
diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js
index 759699c..3131de9 100644
--- a/src/pages/Organization/DetailPage/OrganizationCard.js
+++ b/src/pages/Organization/DetailPage/OrganizationCard.js
@@ -342,7 +342,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
id="brExpiryDate"
name="brExpiryDate"
type="date"
- inputProps={{ min: DateUtils.dateStr(new Date()) }}
+ inputProps={{ min: DateUtils.dateValue(new Date()) }}
error={Boolean(formik.errors["brExpiryDate"])}
helperText={formik.errors["brExpiryDate"] ? formik.errors["brExpiryDate"] : ''}
onChange={formik.handleChange}
diff --git a/src/pages/Organization/DetailPage/index.js b/src/pages/Organization/DetailPage/index.js
index d849fd8..8ce62c6 100644
--- a/src/pages/Organization/DetailPage/index.js
+++ b/src/pages/Organization/DetailPage/index.js
@@ -84,7 +84,7 @@ const OrganizationDetailPage = () => {
response.data["faxNumber"] = response.data.faxNo?.faxNumber;
response.data["fax_countryCode"] = response.data.faxNo?.countryCode;
- response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateStr(response.data.brExpiryDate) : "";
+ response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateValue(response.data.brExpiryDate) : "";
setFormData(response.data)
setList(response.historyList)
}
@@ -109,7 +109,7 @@ const OrganizationDetailPage = () => {
response.data["faxNumber"] = response.data.faxNo?.faxNumber;
response.data["fax_countryCode"] = response.data.faxNo?.countryCode;
- response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateStr(response.data.brExpiryDate) : "";
+ response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateValue(response.data.brExpiryDate) : "";
setFormData(response.data)
setList(response.historyList)
}
diff --git a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js
index 733b3f3..038063e 100644
--- a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js
+++ b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js
@@ -212,7 +212,7 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => {
id="brExpiryDate"
name="brExpiryDate"
type="date"
- inputProps={{ min: DateUtils.dateStr(new Date()) }}
+ inputProps={{ min: DateUtils.dateValue(new Date()) }}
error={Boolean(formik.errors["brExpiryDate"])}
helperText={formik.errors["brExpiryDate"] ? formik.errors["brExpiryDate"] : ''}
onChange={formik.handleChange}
diff --git a/src/pages/Organization/DetailPage_FromUser/index.js b/src/pages/Organization/DetailPage_FromUser/index.js
index 5f88e64..be32755 100644
--- a/src/pages/Organization/DetailPage_FromUser/index.js
+++ b/src/pages/Organization/DetailPage_FromUser/index.js
@@ -58,7 +58,7 @@ const OrganizationDetailPage_FromUser = () => {
response.data["faxNumber"] = response.data.faxNo?.faxNumber;
response.data["fax_countryCode"] = response.data.faxNo?.countryCode;
- response.data["brExpiryDate"] = response.data.brExpiryDate?DateUtils.dateStr(response.data.brExpiryDate): "";
+ response.data["brExpiryDate"] = response.data.brExpiryDate?DateUtils.dateValue(response.data.brExpiryDate): "";
setFormData(response.data)
}
});
diff --git a/src/pages/Organization/SearchPage/OrganizationTable.js b/src/pages/Organization/SearchPage/OrganizationTable.js
index e4ebe76..f6bb0ce 100644
--- a/src/pages/Organization/SearchPage/OrganizationTable.js
+++ b/src/pages/Organization/SearchPage/OrganizationTable.js
@@ -79,7 +79,7 @@ export default function OrganizationTable({ recordList }) {
headerName: 'BR Expiry Date',
flex: 1,
valueGetter: (params) => {
- return DateUtils.dateStr(params?.value);
+ return DateUtils.dateValue(params?.value);
}
},
{
diff --git a/src/pages/Payment/Details_GLD/DataGrid.js b/src/pages/Payment/Details_GLD/DataGrid.js
index 207e1ba..9bcf09e 100644
--- a/src/pages/Payment/Details_GLD/DataGrid.js
+++ b/src/pages/Payment/Details_GLD/DataGrid.js
@@ -43,11 +43,11 @@ export default function SearchPublicNoticeTable({ recordList }) {
flex: 1,
renderCell: (params) => {
let appNo = params.row.appNo;
- // console.log(params)
+ console.log(params.row)
return Gazette Supplement No. 6
{isORGLoggedIn()?<>Care Of: {params.row.careOf}
:null}
App No: {appNo}
- Issue Date: {DateUtils.dateStr(params.row.issueDate)}
+ Issue Date: {DateUtils.dateValue(params.row.issueDate)}
Length: {params.row.length+ " cm"}
},
},
diff --git a/src/pages/Payment/Details_Public/DataGrid.js b/src/pages/Payment/Details_Public/DataGrid.js
index 245604d..4bec609 100644
--- a/src/pages/Payment/Details_Public/DataGrid.js
+++ b/src/pages/Payment/Details_Public/DataGrid.js
@@ -74,7 +74,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{isORGLoggedIn()?<>: {params.row.careOf}
:null}
: {appNo}
- : {locale === 'en' ? DateUtils.dateStr(params.row.issueDate) : DateUtils.dateStr_Cht(params.row.issueDate)}
+ : {locale === 'en' ? DateUtils.dateValue(params.row.issueDate) : DateUtils.dateStr_Cht(params.row.issueDate)}
: {params.row.length+ " cm"}
},
},
diff --git a/src/pages/Payment/Search_GLD/DataGrid.js b/src/pages/Payment/Search_GLD/DataGrid.js
index da41674..988f28a 100644
--- a/src/pages/Payment/Search_GLD/DataGrid.js
+++ b/src/pages/Payment/Search_GLD/DataGrid.js
@@ -62,7 +62,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
headerName: 'Transaction Date',
flex: 1,
valueGetter: (params) => {
- return DateUtils.dateStr(params?.value);
+ return DateUtils.dateValue(params?.value);
}
},
{
diff --git a/src/pages/Payment/Search_GLD/SearchForm.js b/src/pages/Payment/Search_GLD/SearchForm.js
index 70c4c85..9bc90d5 100644
--- a/src/pages/Payment/Search_GLD/SearchForm.js
+++ b/src/pages/Payment/Search_GLD/SearchForm.js
@@ -83,7 +83,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => {
- setMinDate(DateUtils.dateStr(newValue));
+ setMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -99,7 +99,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="dateTo"
type="date"
diff --git a/src/pages/Payment/Search_GLD/index.js b/src/pages/Payment/Search_GLD/index.js
index bed4346..793a4a3 100644
--- a/src/pages/Payment/Search_GLD/index.js
+++ b/src/pages/Payment/Search_GLD/index.js
@@ -32,8 +32,8 @@ const Index = () => {
const [record,setRecord] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- dateTo: DateUtils.dateStr(new Date()),
- dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+ dateTo: DateUtils.dateValue(new Date()),
+ dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
});
const [onReady, setOnReady] = React.useState(false);
diff --git a/src/pages/Payment/Search_Public/DataGrid.js b/src/pages/Payment/Search_Public/DataGrid.js
index d27e8a7..253fba1 100644
--- a/src/pages/Payment/Search_Public/DataGrid.js
+++ b/src/pages/Payment/Search_Public/DataGrid.js
@@ -74,7 +74,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
width: isMdOrLg ? 'auto' : 160,
flex: isMdOrLg ? 1 : undefined,
valueGetter: (params) => {
- return DateUtils.dateStr(params?.value);
+ return DateUtils.dateValue(params?.value);
}
},
{
diff --git a/src/pages/Payment/Search_Public/SearchForm.js b/src/pages/Payment/Search_Public/SearchForm.js
index 84387d3..0b2e114 100644
--- a/src/pages/Payment/Search_Public/SearchForm.js
+++ b/src/pages/Payment/Search_Public/SearchForm.js
@@ -102,7 +102,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => {
- setMinDate(DateUtils.dateStr(newValue));
+ setMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -119,7 +119,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="dateTo"
type="date"
diff --git a/src/pages/Payment/Search_Public/index.js b/src/pages/Payment/Search_Public/index.js
index 8c991c7..0871149 100644
--- a/src/pages/Payment/Search_Public/index.js
+++ b/src/pages/Payment/Search_Public/index.js
@@ -33,8 +33,8 @@ const Index = () => {
const [record,setRecord] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- dateTo: DateUtils.dateStr(new Date()),
- dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+ dateTo: DateUtils.dateValue(new Date()),
+ dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
});
const [onReady, setOnReady] = React.useState(false);
diff --git a/src/pages/Proof/Create_FromApp/index.js b/src/pages/Proof/Create_FromApp/index.js
index ab5910b..3019f5d 100644
--- a/src/pages/Proof/Create_FromApp/index.js
+++ b/src/pages/Proof/Create_FromApp/index.js
@@ -55,7 +55,7 @@ const Index = () => {
responseData.data["fax_countryCode"] = JSON.parse(responseData.data.contactFaxNo).countryCode;
responseData.data["issueNoStr"] = responseData.data.issueVolume + "/" + responseData.data.issueYear + " No. " + responseData.data.issueNo
- responseData.data["issueDate"] = DateUtils.dateStr(responseData.data.issueDate);
+ responseData.data["issueDate"] = DateUtils.dateValue(responseData.data.issueDate);
responseData.data["groupType"] = responseData.data.groupTitle;
diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js
index 9e4bda9..b12719e 100644
--- a/src/pages/Proof/Reply_Public/ProofForm.js
+++ b/src/pages/Proof/Reply_Public/ProofForm.js
@@ -154,7 +154,7 @@ const FormPanel = ({ formData }) => {
:
{
locale === 'en' ?
- DateUtils.dateStr(formik.values.replyDate)
+ DateUtils.dateValue(formik.values.replyDate)
:
DateUtils.datetimeStr_Cht(formik.values.replyDate)
}
diff --git a/src/pages/Proof/Search_GLD/SearchForm.js b/src/pages/Proof/Search_GLD/SearchForm.js
index 0b3bee6..560dadd 100644
--- a/src/pages/Proof/Search_GLD/SearchForm.js
+++ b/src/pages/Proof/Search_GLD/SearchForm.js
@@ -210,7 +210,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => {
- setMinDate(DateUtils.dateStr(newValue));
+ setMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -227,7 +227,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="dateTo"
type="date"
diff --git a/src/pages/Proof/Search_GLD/index.js b/src/pages/Proof/Search_GLD/index.js
index 2e7a327..d294304 100644
--- a/src/pages/Proof/Search_GLD/index.js
+++ b/src/pages/Proof/Search_GLD/index.js
@@ -34,8 +34,8 @@ const UserSearchPage_Individual = () => {
const [orgCombo, setOrgCombo] = React.useState([]);
const [issueCombo, setIssueCombo] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- dateTo: DateUtils.dateStr(new Date()),
- dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate() - 14)),
+ dateTo: DateUtils.dateValue(new Date()),
+ dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14)),
});
const [onReady, setOnReady] = React.useState(false);
diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js
index dcf3ef9..cfb697d 100644
--- a/src/pages/Proof/Search_Public/SearchForm.js
+++ b/src/pages/Proof/Search_Public/SearchForm.js
@@ -212,7 +212,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => {
- setMinDate(DateUtils.dateStr(newValue));
+ setMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -229,7 +229,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="dateTo"
type="date"
diff --git a/src/pages/Proof/Search_Public/index.js b/src/pages/Proof/Search_Public/index.js
index b0de3f1..b141da9 100644
--- a/src/pages/Proof/Search_Public/index.js
+++ b/src/pages/Proof/Search_Public/index.js
@@ -34,8 +34,8 @@ const UserSearchPage_Individual = () => {
const [record,setRecord] = React.useState([]);
const [issueCombo,setIssueCombo] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- dateTo: DateUtils.dateStr(new Date()),
- dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+ dateTo: DateUtils.dateValue(new Date()),
+ dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
});
const [onReady, setOnReady] = React.useState(false);
diff --git a/src/pages/PublicNotice/Details_GLD/ClientDetailCard.js b/src/pages/PublicNotice/Details_GLD/ClientDetailCard.js
index 485fa02..913d7f9 100644
--- a/src/pages/PublicNotice/Details_GLD/ClientDetailCard.js
+++ b/src/pages/PublicNotice/Details_GLD/ClientDetailCard.js
@@ -50,7 +50,9 @@ const ClientDetailCard = (
//if user data from parent are not null
if (Object.keys(applicationDetailData).length > 0 && applicationDetailData !== undefined) {
setCurrentApplicationDetailData(applicationDetailData.userData);
- setOrgDetailData(applicationDetailData.orgDetail.data);
+ if (!applicationDetailData.orgDetail == null){
+ setOrgDetailData(applicationDetailData.orgDetail.data);
+ }
if (!applicationDetailData.companyName1 == null) {
setCompanyName(applicationDetailData.companyName);
} else {
@@ -67,15 +69,17 @@ const ClientDetailCard = (
//if state data are ready and assign to different field
// console.log(currentApplicationDetailData)
if (Object.keys(currentApplicationDetailData).length > 0) {
- if(currentApplicationDetailData.orgId>0 && currentApplicationDetailData.orgId !=undefined && currentApplicationDetailData.orgId!=null){
+ if( currentApplicationDetailData.orgId!=null){
if (Object.keys(orgDetailData).length > 0) {
- setBrExpiryDate(DateUtils.dateStr(orgDetailData.brExpiryDate));
+ setBrExpiryDate(DateUtils.dateValue(orgDetailData.brExpiryDate));
setBrNo(orgDetailData.brNo);
setOnReady(true);
+ }else{
+ setBrExpiryDate(DateUtils.dateValue(currentApplicationDetailData.brExpiryDate));
+ setBrNo(currentApplicationDetailData.brNo);
+ setOnReady(true);
}
}else{
- setBrExpiryDate(DateUtils.dateStr(currentApplicationDetailData.brExpiryDate));
- setBrNo(currentApplicationDetailData.brNo);
setOnReady(true);
}
}
@@ -91,6 +95,7 @@ const ClientDetailCard = (
alert("The BR is expired.")
} else {
var timeDiff = Math.abs(currentDate.getTime()-targetDate.getTime());
+ console.log(timeDiff)
var diffDays = Math.ceil(timeDiff / (1000 * 3600 * 24));
console.log(diffDays)
if (diffDays <= 7&&diffDays > 0){
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
index 105b725..fd4a983 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
@@ -96,7 +96,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => {
- setMinDate(DateUtils.dateStr(newValue));
+ setMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -119,7 +119,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
defaultValue={searchCriteria.dateTo}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
/>
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js
index de3eb5e..e01e2cc 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js
@@ -18,8 +18,8 @@ const UserSearchPage_Individual = () => {
const [record,setRecord] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- dateTo: DateUtils.dateStr(new Date()),
- dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+ dateTo: DateUtils.dateValue(new Date()),
+ dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
});
React.useEffect(() => {
diff --git a/src/pages/PublicNotice/Search_GLD/SearchForm.js b/src/pages/PublicNotice/Search_GLD/SearchForm.js
index 312986f..5573846 100644
--- a/src/pages/PublicNotice/Search_GLD/SearchForm.js
+++ b/src/pages/PublicNotice/Search_GLD/SearchForm.js
@@ -144,7 +144,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }}
onChange={(newValue) => {
- setMinDate(DateUtils.dateStr(newValue));
+ setMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -161,7 +161,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
{...register("dateTo")}
InputProps={{ inputProps: { min: minDate } }}
onChange={(newValue) => {
- setMaxDate(DateUtils.dateStr(newValue));
+ setMaxDate(DateUtils.dateValue(newValue));
}}
id="dateTo"
type="date"
diff --git a/src/pages/PublicNotice/Search_GLD/index.js b/src/pages/PublicNotice/Search_GLD/index.js
index 4a8e300..39546d7 100644
--- a/src/pages/PublicNotice/Search_GLD/index.js
+++ b/src/pages/PublicNotice/Search_GLD/index.js
@@ -34,8 +34,8 @@ const UserSearchPage_Individual = () => {
const [orgCombo, setOrgCombo] = React.useState([]);
const [issueCombo, setIssueCombo] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- dateTo: DateUtils.dateStr(new Date()),
- dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate() - 14)),
+ dateTo: DateUtils.dateValue(new Date()),
+ dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14)),
});
const [onReady, setOnReady] = React.useState(false);
diff --git a/src/pages/Recon/SearchForm.js b/src/pages/Recon/SearchForm.js
index 64324a3..edcaece 100644
--- a/src/pages/Recon/SearchForm.js
+++ b/src/pages/Recon/SearchForm.js
@@ -188,7 +188,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
////defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: sysTxnMaxDate } }}
onChange={(newValue) => {
- setSysTxnMinDate(DateUtils.dateStr(newValue));
+ setSysTxnMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -204,7 +204,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
{...register("sysTxnDateTo")}
InputProps={{ inputProps: { min: sysTxnMinDate } }}
onChange={(newValue) => {
- setsysTxnMaxDate(DateUtils.dateStr(newValue));
+ setsysTxnMaxDate(DateUtils.dateValue(newValue));
}}
id="sysTxnDateTo"
type="date"
@@ -230,7 +230,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
//defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: txnMaxDate } }}
onChange={(newValue) => {
- setTxnMaxDate(DateUtils.dateStr(newValue));
+ setTxnMaxDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -246,7 +246,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
{...register("txnDateTo")}
InputProps={{ inputProps: { min: txnMinDate } }}
onChange={(newValue) => {
- setTxnMinDate(DateUtils.dateStr(newValue));
+ setTxnMinDate(DateUtils.dateValue(newValue));
}}
id="txnDateTo"
type="date"
@@ -272,7 +272,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
//defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: collMaxDate } }}
onChange={(newValue) => {
- setCollMinDate(DateUtils.dateStr(newValue));
+ setCollMinDate(DateUtils.dateValue(newValue));
}}
InputLabelProps={{
shrink: true
@@ -288,7 +288,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
{...register("collDateTo")}
InputProps={{ inputProps: { min: collMinDate } }}
onChange={(newValue) => {
- setCollMaxDate(DateUtils.dateStr(newValue));
+ setCollMaxDate(DateUtils.dateValue(newValue));
}}
id="collDateTo"
type="date"
diff --git a/src/pages/Recon/index.js b/src/pages/Recon/index.js
index fcf0fc6..7d81972 100644
--- a/src/pages/Recon/index.js
+++ b/src/pages/Recon/index.js
@@ -33,8 +33,8 @@ const Index = () => {
// const [record,setRecord] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
- // dateTo: DateUtils.dateStr(new Date()),
- // dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+ // dateTo: DateUtils.dateValue(new Date()),
+ // dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate()-14)),
});
const [onReady] = React.useState(true);
const [onDownload, setOnDownload] = React.useState(false);
diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js
index b3002dd..8bb1905 100644
--- a/src/pages/User/DetailsPage_Organization/index.js
+++ b/src/pages/User/DetailsPage_Organization/index.js
@@ -113,7 +113,7 @@ const UserMaintainPage_Organization = () => {
response.data["contactTel"] = response.orgDetail.data["contactTel"];
response.data["faxNo"] = response.orgDetail.data["faxNo"];
- response.data["brExpiryDate"] = response.orgDetail.data.brExpiryDate ? DateUtils.dateStr(response.orgDetail.data.brExpiryDate) : "";
+ response.data["brExpiryDate"] = response.orgDetail.data.brExpiryDate ? DateUtils.dateValue(response.orgDetail.data.brExpiryDate) : "";
response.data["brNo"] = response.orgDetail.data.brNo;
response.data["enCompanyName"] = response.orgDetail.data.enCompanyName;
response.data["chCompanyName"] = response.orgDetail.data.chCompanyName;
@@ -123,7 +123,7 @@ const UserMaintainPage_Organization = () => {
response.data["addressBus"] = JSON.parse(response.data["addressBus"]);
response.data["contactTel"] = JSON.parse(response.data["contactTel"]);
response.data["faxNo"] = JSON.parse(response.data["faxNo"]);
- response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateStr(response.data.brExpiryDate) : "";
+ response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateValue(response.data.brExpiryDate) : "";
}
// console.log("2")
// console.log(response.data)
@@ -149,7 +149,7 @@ const UserMaintainPage_Organization = () => {
// response.data["status"] = response.data?.locked?"locked":response.data?.status;
response.data["preferLocale"] = getObjectByType(ComboData.Locale, "type", response.data?.preferLocale);
- //response.data["orgId"] = response.data.brExpiryDate?DateUtils.dateStr(response.data.brExpiryDate):"";
+ //response.data["orgId"] = response.data.brExpiryDate?DateUtils.dateValue(response.data.brExpiryDate):"";
// console.log("3")
// console.log(response.data)
@@ -174,7 +174,7 @@ const UserMaintainPage_Organization = () => {
response.data["fax_countryCode"] = response.data.faxNo?.countryCode;
response.data["preferLocale"] = getObjectByType(ComboData.Locale, "type", response.data?.preferLocale);
- //response.data["orgId"] = response.data.brExpiryDate?DateUtils.dateStr(response.data.brExpiryDate):"";
+ //response.data["orgId"] = response.data.brExpiryDate?DateUtils.dateValue(response.data.brExpiryDate):"";
setUserData(response.data);
setOrgData(response.orgList);
// console.log(response.data)
diff --git a/src/pages/dashboard/Public/Notice.js b/src/pages/dashboard/Public/Notice.js
index b518f11..c558773 100644
--- a/src/pages/dashboard/Public/Notice.js
+++ b/src/pages/dashboard/Public/Notice.js
@@ -33,7 +33,7 @@ const SearchDemandNoteForm = () => {
list.push(
{locale === 'en' ?item.subjectEng:locale === 'zh-HK' ?item.subjectCht:item.subjectChs}
- {DateUtils.dateStr(item.announceDate)}
+ {DateUtils.dateValue(item.announceDate)}
{locale === 'en' ?item.contentEng:locale === 'zh-HK' ?item.contentCht:item.contentChs}