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

Merged PR 1149: updates to naming convention and date handling

Browse Source 
uopdates to naming convention and date handling

Related work items: #11154
This commit is contained in:
Robert Bond
2024-05-15 09:41:42 +00:00
parent 90e9c6335e 9f3f1c996c
commit 5a8e1e8d5b
5 changed files with 31 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/representation/index.js
+7 -7
View File
@@ -98,7 +98,7 @@ let MakeRepresentation = (props) => {
repCap = "APP"; repCap = "APP";
break; break;
case t("myrepresentations:capacity-options-arr-agent"): case t("myrepresentations:capacity-options-arr-agent"):
repCap = "AGENT"; repCap = "APP"; //set as App even tho agent as is from an appeallant by proxy
break; break;
case t("myrepresentations:capacity-options-arr-interested"): case t("myrepresentations:capacity-options-arr-interested"):
repCap = "IP"; repCap = "IP";
@@ -149,14 +149,14 @@ let MakeRepresentation = (props) => {
"-" + "-" +
day + day +
"-" + "-" +
repDate.getHours() + ("0" + repDate.getHours()).slice(-2) +
repDate.getMinutes() + ("0" + repDate.getMinutes()).slice(-2) +
repDate.getSeconds() + ("0" + repDate.getSeconds()).slice(-2) +
"_" + "_-_" +
repCap + repCap +
"_" + "_-_" +
repType + repType +
"_" + "_-_" +
values.lastname + values.lastname +
"_" + "_" +
values.firstname, values.firstname,
components/case/representation/representationElements.js
+1 -1
View File
@@ -985,7 +985,7 @@ export const RenderFileUpload = (field) => {
(file) => (file) =>
new File( new File(
[file], [file],
`${field.filenamePrefix}_${file.name}`, `${field.filenamePrefix}_-_Attachment_-_${file.name}`,
{ {
type: file.type, type: file.type,
} }
components/myportal/topthree_reps.js
+8 -2
View File
@@ -150,10 +150,16 @@ const TopThree = (props) => {
"-" + "-" +
datePart.split("-")[1] + datePart.split("-")[1] +
"-" + "-" +
datePart.split("-")[2] datePart.split("-")[2] +
" " +
datePart.split("-")[3].split("_")[0].slice(0, 2) +
":" +
datePart.split("-")[3].split("_")[0].slice(2, 4) +
":" +
datePart.split("-")[3].split("_")[0].slice(4, 6)
); );
return dateObj.toLocaleDateString(); return dateObj.toLocaleString();
}; };
let topThreeOnlyArr = showTopThreeArr.slice(0, 3); let topThreeOnlyArr = showTopThreeArr.slice(0, 3);
components/myportal/viewall.js
+15 -2
View File
@@ -27,7 +27,20 @@ const ViewAllResults = (props) => {
const router = useRouter(); const router = useRouter();
const { locale } = router; const { locale } = router;
const repRaisedDate = (datePart) => { const repRaisedDate = (datePart) => {
var dateObj = new Date(datePart); var dateObj = new Date(
datePart.split("-")[0] +
"-" +
datePart.split("-")[1] +
"-" +
datePart.split("-")[2] +
" " +
datePart.split("-")[3].split("_")[0].slice(0, 2) +
":" +
datePart.split("-")[3].split("_")[0].slice(2, 4) +
":" +
datePart.split("-")[3].split("_")[0].slice(4, 6)
);
return dateObj.toLocaleString(); return dateObj.toLocaleString();
}; };
var resultsArr = var resultsArr =
@@ -493,7 +506,7 @@ const ViewAllResults = (props) => {
transLookup transLookup
) || "N/A" ) || "N/A"
: currentView.viewKey == "myRepresentations" : currentView.viewKey == "myRepresentations"
? repRaisedDate(item.createdDate) // ? router.locale == "cy" ? repRaisedDate(item.repfile_name) // ? router.locale == "cy"
: // ? jsonpath( : // ? jsonpath(
// //
// '$..[?(@.value=="' + // '$..[?(@.value=="' +
components/search/viewall.js
-41
View File
@@ -10,45 +10,6 @@ export default function ViewAllResults(props) {
const { locale } = router; const { locale } = router;
var resultsArr = props.searchResultsObj.searchResultsObj.value || [{}]; var resultsArr = props.searchResultsObj.searchResultsObj.value || [{}];
const resultRow = Object.keys(resultsArr).map((key, index) => {
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 govuk-!-padding-left-2">
<Link href={router.locale == "cy" ? "/achos" : "/case"}>
<span className="results-visually-hidden">
Case Reference:
</span>
{resultsArr[key].title}
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">Site Address: </span>
23 Martineau Lane
<br /> HASTINGS
<br />
TN35 5DS
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
Appellant/Applicant:
</span>
Mr J Pocknell
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">Authority:</span>
Hastings Borough Council{" "}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">Case Type:</span>
Planning (W){" "}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">Status:</span>
In Progress
</dd>
</div>;
});
return ( return (
<div className="govuk-grid-row"> <div className="govuk-grid-row">
@@ -90,12 +51,10 @@ export default function ViewAllResults(props) {
: "/case" : "/case"
} }
> >
<span className="results-visually-hidden"> <span className="results-visually-hidden">
Case Reference: Case Reference:
</span> </span>
{item.title} {item.title}
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">