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

22079 mockup

Browse Source
This commit is contained in:
robbond
2026-03-18 14:11:37 +00:00
parent e3bb321eae
commit 20b07ec3d5
9 changed files with 88 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/myportal/advancedsearch.js
+45 -40
View File
@@ -88,7 +88,7 @@ let AdvancedSearch = (props) => {
optionsObj,
meta: { touched, error },
label,
errormsg,
errormsg
}) => {
return (
<>
@@ -143,7 +143,7 @@ let AdvancedSearch = (props) => {
.name +
'")].value_cy',
json: transLookup,
eval: true,
eval: true
})
: optionsObj[key].name ||
t(
@@ -166,7 +166,7 @@ let AdvancedSearch = (props) => {
optionsObj,
meta: { touched, error },
label,
errormsg,
errormsg
}) => {
return (
<>
@@ -213,47 +213,52 @@ let AdvancedSearch = (props) => {
_.isEmpty(optionsObj[key])
? ""
: _.isEmpty(
optionsObj[key]
)
? ""
: _.isEmpty(
optionsObj[key]
.value
)
? ""
: optionsObj[key]
.attributevalue +
"," +
optionsObj[key].value
.replace(
/(\band|[\s\-\+\(\)\,\&])/g,
""
optionsObj[key]
)
? ""
: _.isEmpty(
optionsObj[key]
.value
)
.toLowerCase()
? ""
: optionsObj[key]
.attributevalue +
"," +
optionsObj[
key
].value
.replace(
/(\band|[\s\-\+\(\)\,\&])/g,
""
)
.toLowerCase()
}
>
{_.isEmpty(optionsObj[key])
? ""
: _.isEmpty(optionsObj[key])
? ""
: _.isEmpty(
optionsObj[key].value
)
? ""
: router.locale == "cy"
? jsonpath({
path:
'$..[?(@ && @.value=="' +
? ""
: _.isEmpty(
optionsObj[key]
.value +
'")].value_cy',
json: transLookup,
eval: true,
})
: optionsObj[key].value ||
t(
"case:summary-no-date-entered-label"
)}
.value
)
? ""
: router.locale == "cy"
? jsonpath({
path:
'$..[?(@ && @.value=="' +
optionsObj[
key
].value +
'")].value_cy',
json: transLookup,
eval: true
})
: optionsObj[key]
.value ||
t(
"case:summary-no-date-entered-label"
)}
</option>
);
})}
@@ -325,7 +330,7 @@ let AdvancedSearch = (props) => {
t(
"myportal:searchcases-validation-minlength"
)
),
)
]}
className="govuk-input govuk-!-width-two-thirds"
component={RenderTextfield}
@@ -475,7 +480,7 @@ const mapStateToProps = (state) => {
myCases: state.myCases,
watchedCases: state.watchedCases,
myRepresentations: state.myRepresentations,
awaitingSubmission: state.awaitingSubmission,
awaitingSubmission: state.awaitingSubmission
};
};
@@ -491,6 +496,6 @@ export default connect(
)(
reduxForm({
form: "advancedSearchForm",
destroyOnUnmount: false,
destroyOnUnmount: false
})(AdvancedSearch)
);
components/myportal/makenewappeal.js
+3
View File
@@ -19,6 +19,9 @@ export default function MakeNewAppeal(props) {
<h2 className="govuk-heading-s">
{t("myportal:makenewappeal-card-title")}
</h2>
<p className="govuk-body-s">
{t("myportal:makenewappeal-card-paragraph-zero")}
</p>
<p className="govuk-body-s">
{t("myportal:makenewappeal-card-paragraph-one")}{" "}
<Link href={t("myportal:makenewappeal-card-guidance-link")}>
components/myportal/searchcases.js
+11 -7
View File
@@ -36,7 +36,7 @@ const RenderTextfield = ({
htmlFor={id}
id={id + "_label"}
>
<span className="govuk-body-s">{hint1}</span>
<p className="govuk-body-s">{hint1}</p>
</label>
<ul className="govuk-body-s govuk-!-margin-top-3">
<li>{hint2} </li>
@@ -89,7 +89,7 @@ let CaseSearch = (props) => {
throw new SubmissionError({
basicSearch: t("myportal:searchcases-validation-required"),
_error: "required",
_error: "required"
});
} else {
router.push({
@@ -97,7 +97,7 @@ let CaseSearch = (props) => {
router.locale == "cy"
? "/fymhorth/canlyniadauchwilio"
: "/myportal/searchresults",
query: { q: values.basicSearch },
query: { q: values.basicSearch }
});
}
};
@@ -111,13 +111,17 @@ let CaseSearch = (props) => {
{t("myportal:searchcases-card-title")}
</h3>
<p className="govuk-body-s">
{t("myportal:searchcases-card-paragraph")}
</p>
<Field
validate={[
minLength(
t(
"myportal:searchcases-validation-minlength"
)
),
)
]}
className="govuk-input"
component={RenderTextfield}
@@ -143,7 +147,7 @@ let CaseSearch = (props) => {
"event",
"MyPortalSearchButtonClicked",
{
searchTerm: basicSearch.value,
searchTerm: basicSearch.value
}
);
}}
@@ -201,7 +205,7 @@ const mapStateToProps = (state) => {
myCases: state.myCases,
watchedCases: state.watchedCases,
myRepresentations: state.myRepresentations,
awaitingSubmission: state.awaitingSubmission,
awaitingSubmission: state.awaitingSubmission
};
};
@@ -215,6 +219,6 @@ export default connect(
)(
reduxForm({
form: "basicSearchForm",
destroyOnUnmount: false,
destroyOnUnmount: false
})(CaseSearch)
);