diff --git a/components/search/advancedsearch.js b/components/search/advancedsearch.js
index 1aa9292e..286734f3 100644
--- a/components/search/advancedsearch.js
+++ b/components/search/advancedsearch.js
@@ -68,6 +68,91 @@ const RenderTextfield = ({
);
};
+const RenderCaseStatusList = ({
+ name,
+ id,
+ input,
+ optionsObj,
+ meta: { touched, error },
+ label,
+ errormsg,
+}) => {
+ let { t } = useTranslation();
+ const router = useRouter();
+ const { locale } = router;
+ return (
+ <>
+
+
+ {touched && error && (
+
+ Error:{" "}
+ {errormsg}
+
+ )}
+
+
+
+
+ >
+ );
+};
+
let AdvancedSearch = (props) => {
let { t } = useTranslation();
@@ -299,23 +384,25 @@ let AdvancedSearch = (props) => {
var searchString = "";
searchString +=
- values.caseRef != null ? "?q=" + values.caseRef.trim() : "";
+ values.caseRef != null ? "q=" + values.caseRef.trim() + "&" : "";
+
searchString +=
- values.lpaTypes != null
- ? (typeof values.caseRef == "undefined" ? "?" : "&") +
- "lpa=" +
- values.lpaTypes
- : "";
+ values.lpaTypes != null ? "lpa=" + values.lpaTypes + "&" : "";
searchString +=
values.appealTypes != null
- ? (typeof values.caseRef == "undefined" &&
- typeof values.lpaTypes == "undefined"
- ? "?"
- : "&") +
- ("apt=" + values.appealTypes.split(",")[0])
+ ? "apt=" + values.appealTypes.split(",")[0] + "&"
: "";
+ searchString +=
+ values.statusCode != null
+ ? "statuscode=" + values.statusCode + "&"
+ : "";
+
+ searchString = "?" + searchString.slice(0, -1);
+
+ console.log(searchString);
+
router.replace(
router.locale == "cy"
? (myportal == true ? "/fymhorth" : "") +
@@ -385,6 +472,49 @@ let AdvancedSearch = (props) => {
label={t("search:lpa-label")}
errormsg="Local authority is required"
/>
+
+
{/*