reps defects
This commit is contained in:
@@ -486,7 +486,7 @@ export const deleteBlobCase = async (containerName, blobName) => {
|
||||
containerClient.deleteBlob(blob.name);
|
||||
}
|
||||
|
||||
containerClient.deleteBlob(blobName);
|
||||
// containerClient.deleteBlob(blobName);
|
||||
console.log(`deleted blob ${blobName}`);
|
||||
for await (const blob of containerClient.listBlobsFlat()) {
|
||||
console.log(" ------ :", blob.name);
|
||||
|
||||
@@ -300,6 +300,7 @@ let MakeRepresentation = (props) => {
|
||||
currentView.caseReference.appealType != 846040019 &&
|
||||
currentView.caseReference.appealType != 846040011 &&
|
||||
currentView.caseReference.appealType != 846040015 &&
|
||||
currentView.caseReference.appealType != 846040016 &&
|
||||
todaysDate >= startDate &&
|
||||
todaysDate <= questionnaireDate &&
|
||||
buildArr.push("Questionnaire");
|
||||
@@ -922,10 +923,10 @@ let MakeRepresentation = (props) => {
|
||||
|
||||
var dataObj = values;
|
||||
|
||||
for (let key in dataObj) {
|
||||
_.includes(key, "representationDocuments") == true &&
|
||||
delete dataObj[key];
|
||||
}
|
||||
// for (let key in dataObj) {
|
||||
// _.includes(key, "representationDocuments") == true &&
|
||||
// delete dataObj[key];
|
||||
// }
|
||||
|
||||
uploadRepFiles(
|
||||
dataObj,
|
||||
|
||||
@@ -145,6 +145,7 @@ const RepAgent = (props) => {
|
||||
<div className="govuk-form-group govuk-!-margin-bottom-9">
|
||||
<FileUploadField
|
||||
name={"representationDocuments"}
|
||||
id={"representationDocuments"}
|
||||
label={t(
|
||||
"myrepresentations:add-files-label"
|
||||
)}
|
||||
|
||||
@@ -131,6 +131,7 @@ const RepAppellant = (props) => {
|
||||
<div className="govuk-form-group govuk-!-margin-bottom-9">
|
||||
<FileUploadField
|
||||
name={"representationDocuments"}
|
||||
id={"representationDocuments"}
|
||||
label={t(
|
||||
"myrepresentations:add-files-label"
|
||||
)}
|
||||
|
||||
@@ -493,7 +493,7 @@ export const RenderPickList = ({
|
||||
{errorMsg}
|
||||
</span>
|
||||
)}
|
||||
{value}
|
||||
|
||||
<div>
|
||||
<select
|
||||
// {...input}
|
||||
@@ -1061,21 +1061,24 @@ export const RenderFileUpload = (field) => {
|
||||
)}
|
||||
{files && Array.isArray(files) && (
|
||||
<ul>
|
||||
{files.map((file, i) => (
|
||||
<div
|
||||
key={file.name}
|
||||
className="govuk-!-margin-bottom-5 fileThumb"
|
||||
>
|
||||
<img
|
||||
src={getThumbnailIcon(file, file.type)}
|
||||
alt={file.name}
|
||||
width="50"
|
||||
/>
|
||||
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
|
||||
{file.name} ({bytesToSize(file.size)})
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
{files.map(
|
||||
(file, i) =>
|
||||
file.hasOwnProperty("name") && (
|
||||
<div
|
||||
key={file.name}
|
||||
className="govuk-!-margin-bottom-5 fileThumb"
|
||||
>
|
||||
<img
|
||||
src={getThumbnailIcon(file, file.type)}
|
||||
alt={file.name}
|
||||
width="50"
|
||||
/>
|
||||
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
|
||||
{file.name} ({bytesToSize(file.size)})
|
||||
</span>
|
||||
</div>
|
||||
)
|
||||
)}
|
||||
</ul>
|
||||
)}
|
||||
{blobList.map((blob, i) => (
|
||||
@@ -1100,12 +1103,12 @@ export const RenderFileUpload = (field) => {
|
||||
−
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<img
|
||||
src={getThumbnailIconByExtension(blob.name)}
|
||||
alt={blob.name}
|
||||
width="50"
|
||||
/>
|
||||
|
||||
<Link
|
||||
key={i}
|
||||
scroll={false}
|
||||
|
||||
@@ -138,6 +138,7 @@ const RepInterestedPartyPerson = (props) => {
|
||||
<div className="govuk-form-group govuk-!-margin-bottom-9">
|
||||
<FileUploadField
|
||||
name={"representationDocuments"}
|
||||
id={"representationDocuments"}
|
||||
label={t(
|
||||
"myrepresentations:add-files-label"
|
||||
)}
|
||||
|
||||
@@ -381,6 +381,7 @@ let RepLPA = (props) => {
|
||||
<div className="govuk-form-group govuk-!-margin-bottom-9">
|
||||
<FileUploadField
|
||||
name={"representationDocuments"}
|
||||
id={"representationDocuments"}
|
||||
label={t(
|
||||
"myrepresentations:add-files-label"
|
||||
)}
|
||||
|
||||
@@ -88,6 +88,7 @@ const RepLandOwner = (props) => {
|
||||
<div className="govuk-form-group govuk-!-margin-bottom-9">
|
||||
<FileUploadField
|
||||
name={"representationDocuments"}
|
||||
id={"representationDocuments"}
|
||||
label={t(
|
||||
"myrepresentations:add-files-label"
|
||||
)}
|
||||
|
||||
+1
@@ -1114,6 +1114,7 @@ let Enforcement_Questionnaire = (props) => {
|
||||
<div className="govuk-form-group govuk-!-margin-bottom-9">
|
||||
<FileUploadField
|
||||
name={"representationDocuments"}
|
||||
id={"representationDocuments"}
|
||||
label={t("myrepresentations:add-files-label")}
|
||||
ticketnumber={props.props.caseReference}
|
||||
hint={"sdsd"}
|
||||
|
||||
+1
@@ -942,6 +942,7 @@ let S78_Questionnaire = (props) => {
|
||||
<div className="govuk-form-group govuk-!-margin-bottom-9">
|
||||
<FileUploadField
|
||||
name={"representationDocuments"}
|
||||
id={"representationDocuments"}
|
||||
label={t("myrepresentations:add-files-label")}
|
||||
ticketnumber={props.props.caseReference}
|
||||
hint={"sdsd"}
|
||||
|
||||
@@ -1115,7 +1115,6 @@ const CaseSummary = (props) => {
|
||||
}
|
||||
|
||||
function showRepButton(appealType) {
|
||||
console.log(appealType);
|
||||
switch (appealType) {
|
||||
case 846040012:
|
||||
case 846040013:
|
||||
@@ -1141,19 +1140,16 @@ const CaseSummary = (props) => {
|
||||
: true;
|
||||
|
||||
case 846040018:
|
||||
console.log(
|
||||
let shouldShow =
|
||||
props.searchResultsObj.searchDetailsObj[0].value[0]
|
||||
.pinswg_speacialistcaseprocess,
|
||||
props.searchResultsObj.searchDetailsObj[0].value[0][
|
||||
"pinswg_speacialistcaseprocess@OData.Community.Display.V1.FormattedValue"
|
||||
],
|
||||
isLPA
|
||||
);
|
||||
.pinswg_speacialistcaseprocess == 846040000 && isLPA
|
||||
? true
|
||||
: props.searchResultsObj.searchDetailsObj[0].value[0]
|
||||
.pinswg_speacialistcaseprocess == 846040001
|
||||
? true
|
||||
: false;
|
||||
|
||||
return props.searchResultsObj.searchDetailsObj[0].value[0]
|
||||
.pinswg_speacialistcaseprocess == 846040000 && isLPA
|
||||
? true
|
||||
: false;
|
||||
return shouldShow;
|
||||
|
||||
case 846040019:
|
||||
return showReps(
|
||||
|
||||
+21
-8
@@ -14,6 +14,7 @@ import MyRepresentations from "./myportal/myrepresentations";
|
||||
import SearchCases from "./myportal/searchcases";
|
||||
import UploadFile from "./myportal/uploadFile";
|
||||
import WatchedCases from "./myportal/watchedcases";
|
||||
import _ from "lodash";
|
||||
|
||||
const MyPortal = (props) => {
|
||||
const { showFileUpload, showLoginCheck } = props;
|
||||
@@ -122,7 +123,12 @@ const MyPortal = (props) => {
|
||||
}
|
||||
/>
|
||||
)} */}
|
||||
|
||||
{!isLPA &&
|
||||
_.has(props.awaitingSubmission, [
|
||||
"awaitingSubmissionFromBlob",
|
||||
"@odata.count",
|
||||
]) &&
|
||||
props.awaitingSubmission
|
||||
.awaitingSubmissionFromBlob[
|
||||
"@odata.count"
|
||||
@@ -150,14 +156,21 @@ const MyPortal = (props) => {
|
||||
myReps={false}
|
||||
/>
|
||||
)}
|
||||
{props.myRepresentations.myRepresentations[
|
||||
"@odata.count"
|
||||
] > 0 && (
|
||||
<MyRepresentations
|
||||
myRepresentations={props.myRepresentations}
|
||||
isLPA={isLPA}
|
||||
/>
|
||||
)}
|
||||
{props.myRepresentations.hasOwnProperty(
|
||||
"myRepresentations"
|
||||
) &&
|
||||
typeof props.myRepresentations
|
||||
.myRepresentations != "undefined" &&
|
||||
props.myRepresentations.myRepresentations[
|
||||
"@odata.count"
|
||||
] > 0 && (
|
||||
<MyRepresentations
|
||||
myRepresentations={
|
||||
props.myRepresentations
|
||||
}
|
||||
isLPA={isLPA}
|
||||
/>
|
||||
)}
|
||||
|
||||
{props.myRepresentations.mySubmittedReps
|
||||
.mySubmittedReps.length > 0 && (
|
||||
|
||||
@@ -317,7 +317,7 @@ const AwaitingSubmissionFromBlob = (props) => {
|
||||
|
||||
<TopThreeRow />
|
||||
|
||||
{props.awaitingSubmissionFromBlob["@odata.count"] > 3 && (
|
||||
{props.awaitingSubmissionFromBlob["@odata.count"] > 1 && (
|
||||
<div className="cardVieAll">
|
||||
<Link
|
||||
href={
|
||||
|
||||
+191
-151
@@ -49,7 +49,6 @@ const ViewAllResults = (props) => {
|
||||
const {
|
||||
searchString,
|
||||
searchResultsObj,
|
||||
currentView,
|
||||
setCurrentReference,
|
||||
myportal,
|
||||
setSearchResults,
|
||||
@@ -83,6 +82,14 @@ const ViewAllResults = (props) => {
|
||||
|
||||
return dateObj.toLocaleString();
|
||||
};
|
||||
|
||||
let currentView = props.currentView.currentView;
|
||||
console.log("currentView.viewKey:", typeof currentView.viewKey);
|
||||
|
||||
typeof currentView.viewKey == "undefined"
|
||||
? console.log("no currentview")
|
||||
: console.log("has currentview");
|
||||
|
||||
var resultsArr =
|
||||
currentView.viewKey == "awaitingSubmissionDetails"
|
||||
? props["awaitingSubmission"].awaitingSubmissionDetails.case
|
||||
@@ -197,39 +204,44 @@ const ViewAllResults = (props) => {
|
||||
setSearchDetails(
|
||||
props.watchedCases
|
||||
.watchedCasesDetails
|
||||
);
|
||||
setCurrentReference({
|
||||
"ticketnumber":
|
||||
resultsArr[key].ticketnumber,
|
||||
"currentReference":
|
||||
currentView.viewKey !=
|
||||
"watchedCases"
|
||||
? currentView.viewKey ==
|
||||
"myRepresentations"
|
||||
? resultsArr[key].caseRef
|
||||
: resultsArr[key]
|
||||
.ticketnumber
|
||||
: resultsArr[key][
|
||||
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
|
||||
],
|
||||
),
|
||||
setCurrentReference({
|
||||
"ticketnumber":
|
||||
resultsArr[key].ticketnumber,
|
||||
"currentReference":
|
||||
currentView.viewKey !=
|
||||
"watchedCases"
|
||||
? currentView.viewKey ==
|
||||
"myRepresentations"
|
||||
? resultsArr[key]
|
||||
.caseRef
|
||||
: resultsArr[key]
|
||||
.ticketnumber
|
||||
: resultsArr[key][
|
||||
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
|
||||
],
|
||||
|
||||
"currentType": currentView.viewKey,
|
||||
"incidentid":
|
||||
currentView.viewKey !=
|
||||
"watchedCases"
|
||||
? resultsArr[key].incidentid
|
||||
: resultsArr[key][
|
||||
"_pinswg_watchedcase_value"
|
||||
],
|
||||
"currentType": currentView.viewKey,
|
||||
"incidentid":
|
||||
currentView.viewKey !=
|
||||
"watchedCases"
|
||||
? resultsArr[key].incidentid
|
||||
: resultsArr[key][
|
||||
"_pinswg_watchedcase_value"
|
||||
],
|
||||
|
||||
"appealType":
|
||||
resultsArr[key]
|
||||
.pinswg_appealcasetype,
|
||||
"repDetails":
|
||||
currentView.viewKey ==
|
||||
"myRepresentations" &&
|
||||
resultsArr[key],
|
||||
});
|
||||
"appealType":
|
||||
resultsArr[key]
|
||||
.pinswg_appealcasetype,
|
||||
"repDetails":
|
||||
currentView.viewKey ==
|
||||
"myRepresentations" &&
|
||||
resultsArr[key],
|
||||
}),
|
||||
setCurrentView({
|
||||
"viewName": currentView.viewName,
|
||||
"viewKey": currentView.viewKey,
|
||||
});
|
||||
}}
|
||||
>
|
||||
<span className="results-visually-hidden">
|
||||
@@ -620,7 +632,7 @@ const ViewAllResults = (props) => {
|
||||
) &&
|
||||
deleteCaseItem(
|
||||
props.accountDetails.containerID,
|
||||
item.pinswg_name
|
||||
item.ticketnumber
|
||||
);
|
||||
}}
|
||||
>
|
||||
@@ -851,47 +863,41 @@ const ViewAllResults = (props) => {
|
||||
t("myportal:myrepresentations-card-title")}
|
||||
</h1>
|
||||
|
||||
<dl className="govuk-summary-list govuk-!-margin-bottom-9 results">
|
||||
<div className="govuk-summary-list__row results-headings">
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16 results_wider govuk-!-padding-left-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() =>
|
||||
sortDataBy(
|
||||
currentView.viewKey ==
|
||||
"awaitingSubmissionDetails"
|
||||
? "title"
|
||||
: "pinswg_title"
|
||||
)
|
||||
}
|
||||
className={
|
||||
orderByState ==
|
||||
(currentView.viewKey ==
|
||||
"awaitingSubmissionDetails"
|
||||
? "title"
|
||||
: "pinswg_title")
|
||||
? fieldSortState == "asc"
|
||||
? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
|
||||
}
|
||||
>
|
||||
{t(
|
||||
"search:searchresults-case-reference-label"
|
||||
)}
|
||||
</button>
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16">
|
||||
{t("search:searchresults-site-address-label")}
|
||||
</dd>
|
||||
{resultsRowArr.length == 0 ? (
|
||||
<h3>
|
||||
{" "}
|
||||
There are no{" "}
|
||||
{currentView.viewKey ==
|
||||
"awaitingSubmissionDetails" ? (
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16">
|
||||
"awaitingSubmissionDetails" &&
|
||||
t("myportal:awatitingsubmission-card-title")}
|
||||
{currentView.viewKey == "watchedCases" &&
|
||||
t("myportal:watchedcases-card-title")}
|
||||
{currentView.viewKey == "myCases" &&
|
||||
t("myportal:mycases-card-title")}
|
||||
{currentView.viewKey == "myRepresentations" &&
|
||||
t("myportal:myrepresentations-card-title")}{" "}
|
||||
records
|
||||
</h3>
|
||||
) : (
|
||||
<dl className="govuk-summary-list govuk-!-margin-bottom-9 results">
|
||||
<div className="govuk-summary-list__row results-headings">
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16 results_wider govuk-!-padding-left-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => sortDataBy("createdon")}
|
||||
onClick={() =>
|
||||
sortDataBy(
|
||||
currentView.viewKey ==
|
||||
"awaitingSubmissionDetails"
|
||||
? "title"
|
||||
: "pinswg_title"
|
||||
)
|
||||
}
|
||||
className={
|
||||
orderByState == "createdon"
|
||||
orderByState ==
|
||||
(currentView.viewKey ==
|
||||
"awaitingSubmissionDetails"
|
||||
? "title"
|
||||
: "pinswg_title")
|
||||
? fieldSortState == "asc"
|
||||
? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
|
||||
@@ -899,49 +905,52 @@ const ViewAllResults = (props) => {
|
||||
}
|
||||
>
|
||||
{t(
|
||||
"search:searchresults-created-on-label"
|
||||
)}{" "}
|
||||
"search:searchresults-case-reference-label"
|
||||
)}
|
||||
</button>
|
||||
</dd>
|
||||
) : (
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16">
|
||||
{t("search:searchresults-applicant-label")}
|
||||
{t(
|
||||
"search:searchresults-site-address-label"
|
||||
)}
|
||||
</dd>
|
||||
)}
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() =>
|
||||
sortDataBy(
|
||||
currentView.viewKey ==
|
||||
"awaitingSubmissionDetails"
|
||||
? "pinswg_lpaname"
|
||||
: "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
||||
)
|
||||
}
|
||||
className={
|
||||
orderByState ==
|
||||
(currentView.viewKey ==
|
||||
"awaitingSubmissionDetails"
|
||||
? "pinswg_lpaname"
|
||||
: "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue")
|
||||
? fieldSortState == "asc"
|
||||
? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
|
||||
}
|
||||
>
|
||||
{t("search:searchresults-authority-label")}{" "}
|
||||
</button>
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16">
|
||||
{currentView.viewKey !=
|
||||
{currentView.viewKey ==
|
||||
"awaitingSubmissionDetails" ? (
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() =>
|
||||
sortDataBy("createdon")
|
||||
}
|
||||
className={
|
||||
orderByState == "createdon"
|
||||
? fieldSortState == "asc"
|
||||
? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
|
||||
}
|
||||
>
|
||||
{t(
|
||||
"search:searchresults-created-on-label"
|
||||
)}{" "}
|
||||
</button>
|
||||
</dd>
|
||||
) : (
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16">
|
||||
{t(
|
||||
"search:searchresults-applicant-label"
|
||||
)}
|
||||
</dd>
|
||||
)}
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() =>
|
||||
sortDataBy(
|
||||
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
|
||||
currentView.viewKey ==
|
||||
"awaitingSubmissionDetails"
|
||||
? "pinswg_lpaname"
|
||||
: "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
||||
)
|
||||
}
|
||||
className={
|
||||
@@ -949,7 +958,7 @@ const ViewAllResults = (props) => {
|
||||
(currentView.viewKey ==
|
||||
"awaitingSubmissionDetails"
|
||||
? "pinswg_lpaname"
|
||||
: "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue")
|
||||
: "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue")
|
||||
? fieldSortState == "asc"
|
||||
? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
|
||||
@@ -957,54 +966,85 @@ const ViewAllResults = (props) => {
|
||||
}
|
||||
>
|
||||
{t(
|
||||
"search:searchresults-case-type-label"
|
||||
"search:searchresults-authority-label"
|
||||
)}{" "}
|
||||
</button>
|
||||
) : (
|
||||
t("search:searchresults-case-type-label")
|
||||
)}{" "}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16">
|
||||
{currentView.viewKey == "myRepresentations" ? (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() =>
|
||||
sortDataBy("createdDate")
|
||||
}
|
||||
className={
|
||||
orderByState == "createdDate"
|
||||
? fieldSortState == "asc"
|
||||
? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
|
||||
}
|
||||
>
|
||||
Created{" "}
|
||||
</button>
|
||||
) : (
|
||||
t("search:searchresults-status-label")
|
||||
)}
|
||||
</dd>
|
||||
</div>
|
||||
{showSpinnerState == true ? (
|
||||
<div className="govuk-summary-list__row">
|
||||
<div className="govuk-!-margin-top-9 govuk-!-margin-bottom-9 govuk-!-font-weight-bold govuk-!-font-size-20 ">
|
||||
{t("common:spinner-fetching-data")}
|
||||
<img
|
||||
className="data-loading-icon"
|
||||
src="/assets/images/loading.gif"
|
||||
alt={
|
||||
router.locale == "cy"
|
||||
? "Nôl data"
|
||||
: "Fetching data"
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16">
|
||||
{currentView.viewKey !=
|
||||
"awaitingSubmissionDetails" ? (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() =>
|
||||
sortDataBy(
|
||||
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
|
||||
)
|
||||
}
|
||||
className={
|
||||
orderByState ==
|
||||
(currentView.viewKey ==
|
||||
"awaitingSubmissionDetails"
|
||||
? "pinswg_lpaname"
|
||||
: "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue")
|
||||
? fieldSortState == "asc"
|
||||
? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
|
||||
}
|
||||
>
|
||||
{t(
|
||||
"search:searchresults-case-type-label"
|
||||
)}{" "}
|
||||
</button>
|
||||
) : (
|
||||
t(
|
||||
"search:searchresults-case-type-label"
|
||||
)
|
||||
)}{" "}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__key govuk-!-font-size-16">
|
||||
{currentView.viewKey ==
|
||||
"myRepresentations" ? (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() =>
|
||||
sortDataBy("createdDate")
|
||||
}
|
||||
className={
|
||||
orderByState == "createdDate"
|
||||
? fieldSortState == "asc"
|
||||
? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
|
||||
: `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
|
||||
}
|
||||
>
|
||||
Created{" "}
|
||||
</button>
|
||||
) : (
|
||||
t("search:searchresults-status-label")
|
||||
)}
|
||||
</dd>
|
||||
</div>
|
||||
) : (
|
||||
resultsRowArr
|
||||
)}
|
||||
</dl>
|
||||
{showSpinnerState == true ? (
|
||||
<div className="govuk-summary-list__row">
|
||||
<div className="govuk-!-margin-top-9 govuk-!-margin-bottom-9 govuk-!-font-weight-bold govuk-!-font-size-20 ">
|
||||
{t("common:spinner-fetching-data")}
|
||||
<img
|
||||
className="data-loading-icon"
|
||||
src="/assets/images/loading.gif"
|
||||
alt={
|
||||
router.locale == "cy"
|
||||
? "Nôl data"
|
||||
: "Fetching data"
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
resultsRowArr
|
||||
)}
|
||||
</dl>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="govuk-grid-row">
|
||||
@@ -1025,7 +1065,7 @@ const ViewAllResults = (props) => {
|
||||
|
||||
const mapStateToProps = (state) => {
|
||||
return {
|
||||
//currentView: state.currentView,
|
||||
currentView: state.currentView,
|
||||
accountDetails: state.accountDetails,
|
||||
// search: state.search,
|
||||
// searchResultsObj: state.searchResultsObj,
|
||||
|
||||
@@ -2429,8 +2429,8 @@
|
||||
"value_cy": "Unrhyw ddeunydd arall y byddwch yn ei ystyried yn berthnasol"
|
||||
},
|
||||
{
|
||||
"value": "Cost of application",
|
||||
"value_cy": "Cost y cais"
|
||||
"value": "Cost application",
|
||||
"value_cy": "Cais cost"
|
||||
},
|
||||
{
|
||||
"value": "The S106 agreement or unilateral undertaking",
|
||||
|
||||
@@ -428,7 +428,7 @@
|
||||
</row>
|
||||
<row>
|
||||
<labels>
|
||||
<label description="Cost of application" ishareDocumentCode="000013" />
|
||||
<label description="Cost application" ishareDocumentCode="000013" />
|
||||
</labels>
|
||||
<control id="pinswg_fileUpload14" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload14" disabled="false" />
|
||||
</row>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
"case-type-option-12": "Apeliadau cynllunio adeiladau rhestredig ac ardal gadwraeth",
|
||||
"advanced-search-title-label": "Chwiliad manwl",
|
||||
"address-search-title-label": "Chwilio am achosion yn ôl cyfeiriad",
|
||||
"applicant-label": "Apelydd/Ymgeisydd",
|
||||
"applicant-label": "Apelydd neu Ymgeisydd",
|
||||
"other-party-label": "Parti Arall",
|
||||
"hearing-date-label": "Dyddiad y Gwrandawaid/Ymchwiliad",
|
||||
"site-visit-date-label": "Dyddiad yr Ymweliad a’r Safle",
|
||||
@@ -55,7 +55,7 @@
|
||||
"searchresults-case-reference-label": "Cyfeirnod yr Achos",
|
||||
"searchresults-case-count-label": "Fe wnaethoch chi chwilio am",
|
||||
"searchresults-site-address-label": "Cyfeiriad y Safle",
|
||||
"searchresults-applicant-label": "Apelydd/Ymgeisydd",
|
||||
"searchresults-applicant-label": "Apelydd neu Ymgeisydd",
|
||||
"searchresults-authority-label": "ACLl",
|
||||
"searchresults-case-type-label": "Math o Achos",
|
||||
"searchresults-status-label": "Statws",
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
"case-type-option-12": "Planning Listed Building and Conservation Area Appeals",
|
||||
"advanced-search-title-label": "Advanced search",
|
||||
"address-search-title-label": "Search for cases by address",
|
||||
"applicant-label": "Appellant/Applicant",
|
||||
"applicant-label": "Appellant or Applicant",
|
||||
"other-party-label": "Other Party",
|
||||
"hearing-date-label": "Hearing/Enquiry date",
|
||||
"site-visit-date-label": "Site visit date",
|
||||
@@ -55,7 +55,7 @@
|
||||
"searchresults-case-reference-label": "Case reference",
|
||||
"searchresults-case-count-label": "You searched for",
|
||||
"searchresults-site-address-label": "Site address",
|
||||
"searchresults-applicant-label": "Appellant/Applicant",
|
||||
"searchresults-applicant-label": "Appellant or Applicant",
|
||||
"searchresults-authority-label": "Authority",
|
||||
"searchresults-case-type-label": "Case type",
|
||||
"searchresults-status-label": "Status",
|
||||
|
||||
@@ -53,6 +53,7 @@ const Home = (props) => {
|
||||
watchedCases={props.watchedCases}
|
||||
myRepresentations={props.myRepresentations}
|
||||
awaitingSubmission={props.awaitingSubmission}
|
||||
accountDetails={props.accountDetails}
|
||||
myportal={true}
|
||||
/>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user