-
+
diff --git a/src/pages/GFMIS/SearchForm.js b/src/pages/GFMIS/SearchForm.js
index c7923c3..a3c97b9 100644
--- a/src/pages/GFMIS/SearchForm.js
+++ b/src/pages/GFMIS/SearchForm.js
@@ -180,7 +180,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria, onGr
filterOptions={(options) => options}
options={ComboData.payMethod}
value={payMethod}
- getOptionLabel={(option) => option.label}
+ getOptionLabel={(option) => (option?.label != null ? String(option.label) : "")}
inputValue={payMethod?.label ? payMethod?.label : ""}
onChange={(event, newValue) => {
if(newValue==null){
@@ -197,11 +197,9 @@ const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria, onGr
renderInput={(params) => (
)}
- InputLabelProps={{
- shrink: true
- }}
/>
diff --git a/src/pages/GFMIS/index.js b/src/pages/GFMIS/index.js
index 3bca046..2dc8b02 100644
--- a/src/pages/GFMIS/index.js
+++ b/src/pages/GFMIS/index.js
@@ -4,6 +4,7 @@ import {
Typography,
Stack,
Button,
+ CircularProgress,
Dialog, DialogTitle, DialogContent, DialogActions,
} from '@mui/material';
import MainCard from "components/MainCard";
@@ -55,6 +56,8 @@ const Index = () => {
const [isPreviewLoading, setIsPreviewLoading] = React.useState(false);
const [isPopUp, setIsPopUp] = React.useState(false);
+ const [isXmlDialogSubmitting, setIsXmlDialogSubmitting] = React.useState(false);
+ const xmlDownloadInFlightRef = React.useRef(false);
const [downloadInput, setDownloadInput] = React.useState();
const [selectedIds, setSelectedIds] = React.useState([]);
@@ -66,6 +69,13 @@ const Index = () => {
setInputDateValue(inputDate);
}, [inputDate]);
+ React.useEffect(() => {
+ if (!isPopUp) {
+ xmlDownloadInFlightRef.current = false;
+ setIsXmlDialogSubmitting(false);
+ }
+ }, [isPopUp]);
+
React.useEffect(() => {
setOnReady(true);
}, [searchCriteria]);
@@ -94,66 +104,61 @@ const Index = () => {
function downloadXML() {
- console.log(selectedIds.join(','))
- setIsPopUp(false)
+ if (xmlDownloadInFlightRef.current) return;
+ xmlDownloadInFlightRef.current = true;
+ console.log(selectedIds.join(','));
+ setIsXmlDialogSubmitting(true);
let sentDateFrom = "";
-
+
if (inputDateValue != "dd / mm / yyyy") {
- sentDateFrom = DateUtils.dateValue(inputDateValue)
+ sentDateFrom = DateUtils.dateValue(inputDateValue);
}
HttpUtils.get({
url: GEN_GFMIS_XML + "/today",
- params:{
+ params: {
dateTo: downloadInput.dateTo,
dateFrom: downloadInput.dateFrom,
inputDate: sentDateFrom,
paymentId: selectedIds.join(',')
},
onSuccess: (responseData) => {
- // console.log(responseData)
const parser = new DOMParser();
const xmlDoc = parser.parseFromString(responseData, 'application/xml');
- // Get the DCBHeader element
const dcbHeader = xmlDoc.querySelector("DCBHeader");
-
- // Get the Receipt and Allocation elements
+
const receiptElement = dcbHeader.querySelector("Receipt");
const allocationElement = dcbHeader.querySelector("Allocation");
const paymentMethodElements = Array.from(dcbHeader.querySelectorAll("PaymentMethod"));
- // Remove existing elements from DCBHeader
dcbHeader.innerHTML = "";
-
+
dcbHeader.appendChild(receiptElement);
dcbHeader.appendChild(allocationElement);
-
+
if (paymentMethodElements) {
paymentMethodElements.forEach((paymentMethodElement) => {
- dcbHeader.appendChild(paymentMethodElement);
- });
+ dcbHeader.appendChild(paymentMethodElement);
+ });
}
-
+
const updatedXmlString = new XMLSerializer().serializeToString(xmlDoc);
const filename = xmlDoc.querySelector('FileHeader').getAttribute('H_Filename');
- // console.log(updatedXmlString)
const blob = new Blob([updatedXmlString], { type: 'application/xml' });
- // Create a download link
const link = document.createElement('a');
link.href = URL.createObjectURL(blob);
- link.download = filename+'.xml';
-
- // Append the link to the document body
+ link.download = filename + '.xml';
+
document.body.appendChild(link);
-
- // Programmatically click the link to trigger the download
link.click();
-
- // Clean up the link
document.body.removeChild(link);
+ setIsPopUp(false);
+ },
+ onFinally: () => {
+ xmlDownloadInFlightRef.current = false;
+ setIsXmlDialogSubmitting(false);
}
- });
- // open(UrlUtils.GEN_GFMIS_XML + "/today?online=true")
- }
+ });
+ }
function applySearch(input) {
@@ -263,7 +268,11 @@ const Index = () => {
diff --git a/src/pages/GazetteIssue/ExportForm.js b/src/pages/GazetteIssue/ExportForm.js
index ae5b9b7..04207eb 100644
--- a/src/pages/GazetteIssue/ExportForm.js
+++ b/src/pages/GazetteIssue/ExportForm.js
@@ -76,7 +76,11 @@ const SearchGazetteIssueForm = ({ applyExport, comboData, waitDownload}) => {
// defaultValue={selectedYear}
options={comboList}
// disabled={checkCountry}
- getOptionLabel={(option) => option.label ? option.label : ""}
+ getOptionLabel={(option) =>
+ option != null && typeof option === "object" && option.label != null
+ ? String(option.label)
+ : ""
+ }
onChange={(event, newValue) => {
setSelectedYear(newValue);
}}
diff --git a/src/pages/GazetteIssue/SearchForm.js b/src/pages/GazetteIssue/SearchForm.js
index 37ad3d4..a9da2d3 100644
--- a/src/pages/GazetteIssue/SearchForm.js
+++ b/src/pages/GazetteIssue/SearchForm.js
@@ -74,7 +74,11 @@ const SearchGazetteIssueForm = ({ applySearch, comboData, onGridReady}) => {
// defaultValue={selectedYear}
options={comboList}
// disabled={checkCountry}
- getOptionLabel={(option) => option.label ? option.label : ""}
+ getOptionLabel={(option) =>
+ option != null && typeof option === "object" && option.label != null
+ ? String(option.label)
+ : ""
+ }
onChange={(event, newValue) => {
setSelectedYear(newValue);
}}
diff --git a/src/pages/GazetteIssue/index.js b/src/pages/GazetteIssue/index.js
index b07927d..3138bc4 100644
--- a/src/pages/GazetteIssue/index.js
+++ b/src/pages/GazetteIssue/index.js
@@ -31,10 +31,12 @@ import { ThemeProvider } from "@emotion/react";
import { dateStr_Year } from "utils/DateUtils";
import { notifySaveSuccess } from 'utils/CommonFunction';
import { isGrantedAny } from "auth/utils";
+import { useIntl } from 'react-intl';
// ==============================|| DASHBOARD - DEFAULT ||============================== //
const Index = () => {
+ const intl = useIntl();
const [comboData, setComboData] = React.useState([]);
const [holidayComboData, setHolidayComboData] = React.useState([]);
const [onReady, setOnReady] = React.useState(false);
@@ -50,6 +52,7 @@ const Index = () => {
const [waitDownload, setWaitDownload] = React.useState(false);
const [isWarningPopUp, setIsWarningPopUp] = React.useState(false);
const [warningText, setWarningText] = React.useState("");
+ const fileInputRef = React.useRef(null);
React.useEffect(() => {
setOnSearchReady(false);
@@ -184,13 +187,27 @@ const Index = () => {
+ aria-label={intl.formatMessage({ id: 'ariaUploadExcelFile' })}
+ ref={fileInputRef}
+ />
diff --git a/src/pages/Holiday/DataGrid.js b/src/pages/Holiday/DataGrid.js
index ea99cfc..60f68b6 100644
--- a/src/pages/Holiday/DataGrid.js
+++ b/src/pages/Holiday/DataGrid.js
@@ -9,14 +9,19 @@ import { dateStr } from "utils/DateUtils";
// ==============================|| EVENT TABLE ||============================== //
+function holidayRowsFromResponse(recordList) {
+ if (Array.isArray(recordList)) return recordList;
+ if (recordList && Array.isArray(recordList.records)) return recordList.records;
+ return [];
+}
+
export default function HolidayTable({ recordList, applyGridOnReady }) {
- const [rows, setRows] = React.useState(recordList);
+ const [rows, setRows] = React.useState(() => holidayRowsFromResponse(recordList));
// const navigate = useNavigate()
useEffect(() => {
- // console.log(recordList)
- setRows(recordList.records);
+ setRows(holidayRowsFromResponse(recordList));
}, [recordList]);
const columns = [
diff --git a/src/pages/Holiday/SearchForm.js b/src/pages/Holiday/SearchForm.js
index 3a49ec1..6f7fa91 100644
--- a/src/pages/Holiday/SearchForm.js
+++ b/src/pages/Holiday/SearchForm.js
@@ -17,7 +17,7 @@ import {ThemeProvider} from "@emotion/react";
const SearchHolidayForm = ({ applySearch, comboData, onGridReady}) => {
- const [selectedYear, setSelectedYear] = React.useState([]);
+ const [selectedYear, setSelectedYear] = React.useState(null);
// const [defaultYear, setDefaultYear] = React.useState(searchCriteria.year);
const [comboList, setComboList] = React.useState([]);
// const [onReady, setOnReady] = React.useState(false);
@@ -27,7 +27,7 @@ const SearchHolidayForm = ({ applySearch, comboData, onGridReady}) => {
handleSubmit } = useForm()
const onSubmit = () => {
- if (selectedYear !=null){
+ if (selectedYear != null) {
const temp = {
year: selectedYear.label,
};
@@ -40,8 +40,8 @@ const SearchHolidayForm = ({ applySearch, comboData, onGridReady}) => {
// console.log(comboData)
// const labelValue = comboData.find(obj => obj.label === searchCriteria.year);
// console.log(labelValue)
- if(selectedYear.length == 0){
- setSelectedYear(comboData[0])
+ if (!selectedYear) {
+ setSelectedYear(comboData[0]);
}
setComboList(comboData)
// setSelectedYear(searchCriteria.dateFrom)
@@ -74,7 +74,11 @@ const SearchHolidayForm = ({ applySearch, comboData, onGridReady}) => {
// defaultValue={selectedYear}
options={comboList}
// disabled={checkCountry}
- getOptionLabel={(option) => option.label ? option.label : ""}
+ getOptionLabel={(option) =>
+ option != null && typeof option === "object" && option.label != null
+ ? String(option.label)
+ : ""
+ }
onChange={(event, newValue) => {
setSelectedYear(newValue);
}}
diff --git a/src/pages/Holiday/index.js b/src/pages/Holiday/index.js
index 9e3d501..164d244 100644
--- a/src/pages/Holiday/index.js
+++ b/src/pages/Holiday/index.js
@@ -31,11 +31,12 @@ import { ThemeProvider } from "@emotion/react";
import { dateStr_Year } from "utils/DateUtils";
import { notifySaveSuccess } from 'utils/CommonFunction';
import { isGrantedAny } from "auth/utils";
+import { useIntl } from 'react-intl';
// ==============================|| DASHBOARD - DEFAULT ||============================== //
const Index = () => {
-
+ const intl = useIntl();
const [record, setRecord] = React.useState([]);
const [comboData, setComboData] = React.useState([]);
const [onReady, setOnReady] = React.useState(false);
@@ -50,6 +51,7 @@ const Index = () => {
const [waitDownload, setWaitDownload] = React.useState(false);
const [isWarningPopUp, setIsWarningPopUp] = React.useState(false);
const [warningText, setWarningText] = React.useState("");
+ const fileInputRef = React.useRef(null);
React.useEffect(() => {
setOnSearchReady(false);
@@ -172,7 +174,7 @@ const Index = () => {
size="large"
disabled={waitDownload}
onClick={doExport}
- aria-label="Export holiday template"
+ aria-label={intl.formatMessage({ id: 'ariaExportHolidayTemplate' })}
>
Export
@@ -180,13 +182,27 @@ const Index = () => {
{isGrantedAny(["MAINTAIN_GAZETTE_ISSUE"]) ?
+ aria-label={intl.formatMessage({ id: 'ariaUploadExcelFile' })}
+ ref={fileInputRef}
+ />
: null
}
diff --git a/src/pages/JVM/index.js b/src/pages/JVM/index.js
index a719cad..c79c0b9 100644
--- a/src/pages/JVM/index.js
+++ b/src/pages/JVM/index.js
@@ -11,7 +11,7 @@ import {
Button
} from '@mui/material';
import * as React from "react";
-import { GET_JVM_INFO } from "utils/ApiPathConst";
+import { GET_JVM_INFO, GET_NOTIFICATION_QUEUE_STATUS } from "utils/ApiPathConst";
import axios from "axios";
import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
@@ -20,7 +20,11 @@ const JVMDefault = () => {
const [jvmInfo, setJvmInfo] = React.useState(null);
const [loading, setLoading] = React.useState(true);
const [error, setError] = React.useState(null);
-
+
+ const [queueStatus, setQueueStatus] = React.useState(null);
+ const [queueLoading, setQueueLoading] = React.useState(false);
+ const [queueError, setQueueError] = React.useState(null);
+
const fetchJvmInfo = () => {
setLoading(true);
setError(null);
@@ -37,6 +41,24 @@ const JVMDefault = () => {
});
};
+ const fetchNotificationQueueStatus = () => {
+ setQueueLoading(true);
+ setQueueError(null);
+ setQueueStatus(null);
+ axios.get(`${GET_NOTIFICATION_QUEUE_STATUS}`)
+ .then((response) => {
+ if (response.status === 200) {
+ setQueueStatus(response.data);
+ }
+ })
+ .catch(err => {
+ setQueueError(err);
+ })
+ .finally(() => {
+ setQueueLoading(false);
+ });
+ };
+
React.useEffect(() => {
localStorage.setItem('searchCriteria', "");
setLoading(false);
@@ -66,25 +88,40 @@ const JVMDefault = () => {
- JVM Information
+ System Background Status
-
+
+
+
+
@@ -114,6 +151,35 @@ const JVMDefault = () => {
)}
+
+
+ Notification Queue Status
+ {queueLoading ? (
+
+
+
+ ) : queueError ? (
+ Error: {queueError.message}
+ ) : queueStatus ? (
+
+ {JSON.stringify(queueStatus, null, 2)}
+
+ ) : (
+ Click "Notification Queue Status" to load data.
+ )}
+
+
);
};
diff --git a/src/pages/Message/Details/index.js b/src/pages/Message/Details/index.js
index e7eadeb..5f05984 100644
--- a/src/pages/Message/Details/index.js
+++ b/src/pages/Message/Details/index.js
@@ -17,6 +17,8 @@ const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/Loa
import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
import { FormattedMessage } from "react-intl";
+import usePageTitle from 'components/usePageTitle';
+
const BackgroundHead = {
backgroundImage: `url(${titleBackgroundImg})`,
width: '100%',
@@ -30,6 +32,8 @@ const BackgroundHead = {
// ==============================|| DASHBOARD - DEFAULT ||============================== //
const Index = () => {
+ usePageTitle("msgDetails");
+
const params = useParams();
const navigate = useNavigate()
@@ -72,7 +76,7 @@ const Index = () => {
-
+
@@ -83,7 +87,7 @@ const Index = () => {
-
+
{record?.subject}
{DateUtils.datetimeStr(record?.sentDate)}
@@ -91,7 +95,7 @@ const Index = () => {
-
+