robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Development' into 6607-add-representations-to-a-case-logged-in

Browse Source
This commit is contained in:
robbond
2021-11-09 17:11:02 +00:00
parent 5fef09f76a ded253fd48
commit d357ffe0a1
12 changed files with 110 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/documents.js
+9 -9
View File
@@ -184,7 +184,7 @@ const DocumentDetails = (props) => {
<PaginationControl
currentPage={currentPage}
searchResultsObj={documentDetailsObj}
spinnerState={spinnerState}
// spinnerState={spinnerState}
getDocumentResults={getDocumentResults}
/>
</>
@@ -330,13 +330,13 @@ const DocumentDetails = (props) => {
)
: pagesCount;
const [showSpinnerState, setShowSpinnerState] = useState(false);
//const [showSpinnerState, setShowSpinnerState] = useState(false);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
const [showDocumentSearchState, setDocumentSearchState] = useState(false);
@@ -370,11 +370,11 @@ const DocumentDetails = (props) => {
</div>
</div>
</div>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</>
);
};
components/case/pagination.js
+5 -5
View File
@@ -81,8 +81,8 @@ const PaginationControl = (props) => {
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem leftTextButton"
onClick={() => {
spinnerState(),
getDocumentResults(currentPage - 1);
// spinnerState(),
getDocumentResults(currentPage - 1);
}}
>
{t("common:previous-link-button")}
@@ -114,7 +114,7 @@ const PaginationControl = (props) => {
className="govuk-body govuk-link govuk-!-padding-2 govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem"
key={i}
onClick={() => {
spinnerState();
// spinnerState();
console.log(i + 1);
getDocumentResults(i + 1);
}}
@@ -129,8 +129,8 @@ const PaginationControl = (props) => {
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem rightTextButton"
onClick={() => {
spinnerState(),
getDocumentResults(currentPage + 1);
// spinnerState(),
getDocumentResults(currentPage + 1);
}}
>
{t("common:next-link-button")}
components/case/summary.js
+9 -9
View File
@@ -257,7 +257,7 @@ const CaseSummary = (props) => {
<a
onClick={() => {
spinnerState();
// spinnerState();
router.back();
}}
className="govuk-button govuk-button--secondary"
@@ -570,13 +570,13 @@ const CaseSummary = (props) => {
const linkedCases = linkCaseObj();
}, [incidentid, setCurrentLinkedCases]);
const [showSpinnerState, setShowSpinnerState] = useState(false);
// const [showSpinnerState, setShowSpinnerState] = useState(false);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
function formatDates(dateObj) {
var dateObj = new Date(dateObj);
@@ -631,11 +631,11 @@ const CaseSummary = (props) => {
return (
<>
{showDetailsBlock}
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>{" "}
/> */}
</>
);
};