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

Merged PR 1159: reps for dns

Browse Source 
reps for dns

Related work items: #11243
This commit is contained in:
Robert Bond
2024-05-23 17:03:42 +00:00
parent 8fad2208f6 30ee6f02d7
commit 63c91de09e
6 changed files with 103 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
actions/azurestorage.js
+6
View File
@@ -426,6 +426,8 @@ export const createRepPDFBlob = async (
? "Main Party Questionnaire" ? "Main Party Questionnaire"
: repName.indexOf("_Comments") > 0 : repName.indexOf("_Comments") > 0
? "Main Party Comments" ? "Main Party Comments"
: repName.indexOf("_Impact") > 0
? "Main Party Comments"
: "default"; : "default";
const tags = { const tags = {
@@ -559,6 +561,8 @@ export const uploadFile = async (formContent, containerName, foldername) => {
? "Main Party Questionnaire" ? "Main Party Questionnaire"
: files[prop][0].fieldName.indexOf("_Comments_") > 0 : files[prop][0].fieldName.indexOf("_Comments_") > 0
? "Main Party Comments" ? "Main Party Comments"
: files[prop][0].fieldName.indexOf("_Impact_") > 0
? "Main Party Comments"
: "default"; : "default";
const tags = { const tags = {
@@ -1277,6 +1281,8 @@ export const createRepCompleteMessage = async (
"/files", "/files",
}; };
console.log("======================", message, "=====================");
const sendMessageResponse = await queueServiceClient const sendMessageResponse = await queueServiceClient
.getQueueClient(whichQueue) .getQueueClient(whichQueue)
.sendMessage( .sendMessage(
components/case/representation/index.js
+82 -26
View File
@@ -132,6 +132,9 @@ let MakeRepresentation = (props) => {
case "Final comments": case "Final comments":
repType = "Comments"; repType = "Comments";
break; break;
case "Local Impact Report":
repType = "Impact";
break;
case "Other": case "Other":
repType = "OTHER"; repType = "OTHER";
@@ -224,22 +227,59 @@ let MakeRepresentation = (props) => {
let todaysDate = new Date(); let todaysDate = new Date();
let startDate = new Date(detailsObj.pinswg_startdate); const isDNS = currentView.caseReference.appealType == 846040011;
let questionnaireDate = new Date(
detailsObj.pinswg_questionnaireduedate let startDate;
); let questionnaireDate;
let finalCommentsDate = new Date( let finalCommentsDate;
detailsObj.pinswg_finalcommentsduedate let statementDueDate;
);
let statementDueDate = new Date(detailsObj.pinswg_statementduedate); isDNS
? ((startDate = new Date(
detailsObj.pinswg_applicationacceptedasvalid
)),
(questionnaireDate = new Date(
detailsObj.pinswg_endofrepresentationperiod
)),
(finalCommentsDate = new Date(
detailsObj.pinswg_finalcommentsduedate
)),
(statementDueDate = new Date(
detailsObj.pinswg_endofrepresentationperiod
)))
: ((startDate = new Date(detailsObj.pinswg_startdate)),
(questionnaireDate = new Date(
detailsObj.pinswg_questionnaireduedate
)),
(finalCommentsDate = new Date(
detailsObj.pinswg_finalcommentsduedate
)),
(statementDueDate = new Date(
detailsObj.pinswg_statementduedate
)));
isLPA && isLPA &&
currentView.caseReference.appealType != 846040019 && currentView.caseReference.appealType != 846040019 &&
currentView.caseReference.appealType != 846040011 &&
todaysDate >= startDate && todaysDate >= startDate &&
todaysDate <= questionnaireDate && todaysDate <= questionnaireDate &&
buildArr.push("Questionnaire"); buildArr.push("Questionnaire");
todaysDate >= startDate && isLPA &&
isDNS &&
currentView.caseReference.appealType != 846040019 &&
todaysDate >= startDate &&
todaysDate <= questionnaireDate &&
buildArr.push("Local Impact Report");
!isDNS &&
todaysDate >= startDate &&
todaysDate <= statementDueDate &&
buildArr.push("Statement");
isDNS &&
!isLPA &&
todaysDate >= startDate &&
todaysDate <= statementDueDate && todaysDate <= statementDueDate &&
buildArr.push("Statement"); buildArr.push("Statement");
@@ -909,18 +949,29 @@ let MakeRepresentation = (props) => {
<h2 className="govuk-heading-s"> <h2 className="govuk-heading-s">
{t( {t(
"myrepresentations:timetable-title" "myrepresentations:timetable-title"
)} )}{" "}
{currentView.caseReference
.appealType ==
846040011}
</h2> </h2>
<div className="govuk-summary-list"> <div className="govuk-summary-list">
<div className="govuk-body-s"> <div className="govuk-body-s">
{t( {currentView
"myrepresentations:questionnaire-due-label" .caseReference
)} .appealType ==
846040011
? t(
"myrepresentations:local-impact-report"
)
: t(
"myrepresentations:questionnaire-due-label"
)}
: :
<span className="govuk-body-s"> <span className="govuk-body-s">
{" "} {" "}
{formatDates( {formatDates(
detailsObj.pinswg_questionnaireduedate detailsObj.pinswg_questionnaireduedate ||
detailsObj.pinswg_endofrepresentationperiod
)} )}
</span> </span>
</div> </div>
@@ -933,22 +984,27 @@ let MakeRepresentation = (props) => {
{" "} {" "}
{formatDates( {formatDates(
detailsObj.pinswg_statementduedate || detailsObj.pinswg_statementduedate ||
detailsObj.pinswg_statementsduedate detailsObj.pinswg_statementsduedate ||
detailsObj.pinswg_endofrepresentationperiod
)} )}
</span> </span>
</div> </div>
<div className="govuk-body-s"> {currentView.caseReference
{t( .appealType !=
"myrepresentations:final-comments-due-label" 846040011 && (
)} <div className="govuk-body-s">
: {t(
<span className="govuk-body-s"> "myrepresentations:final-comments-due-label"
{" "}
{formatDates(
detailsObj.pinswg_finalcommentsduedate
)} )}
</span> :
</div> <span className="govuk-body-s">
{" "}
{formatDates(
detailsObj.pinswg_finalcommentsduedate
)}
</span>
</div>
)}
</div> </div>
</div> </div>
</div>{" "} </div>{" "}
locales/cy/myrepresentations.json
+1
View File
@@ -3,6 +3,7 @@
"make-a-representation-for-label": "Gwnewch gynrychiolaeth ar gyfer", "make-a-representation-for-label": "Gwnewch gynrychiolaeth ar gyfer",
"timetable-title": "Amserlen", "timetable-title": "Amserlen",
"questionnaire-due-label": "Holiadur yn ddyledus", "questionnaire-due-label": "Holiadur yn ddyledus",
"local-impact-report": "Adroddiad Effaith Lleol i'w gyhoeddi",
"statements-due-label": "Datganiadau yn ddyledus", "statements-due-label": "Datganiadau yn ddyledus",
"final-comments-due-label": "Sylwadau terfynol yn ddyledus", "final-comments-due-label": "Sylwadau terfynol yn ddyledus",
"representation-from-an-agent-heading": "Cynrychiolaeth gan Asiant", "representation-from-an-agent-heading": "Cynrychiolaeth gan Asiant",
locales/en/myrepresentations.json
+1
View File
@@ -3,6 +3,7 @@
"make-a-representation-for-label": "Make a representation for", "make-a-representation-for-label": "Make a representation for",
"timetable-title": "Timetable", "timetable-title": "Timetable",
"questionnaire-due-label": "Questionnaire due", "questionnaire-due-label": "Questionnaire due",
"local-impact-report": "Local Impact Report due",
"statements-due-label": "Statements due", "statements-due-label": "Statements due",
"final-comments-due-label": "Final comments due", "final-comments-due-label": "Final comments due",
"representation-from-an-agent-heading": "Representation from an Agent", "representation-from-an-agent-heading": "Representation from an Agent",
pages/api/file/createrepcompletemessage_api.js
+7 -6
View File
@@ -15,18 +15,19 @@ ApiProxy.get(async (req, res) => {
var tempCaseRef = req.query.tempcaseref; var tempCaseRef = req.query.tempcaseref;
var filename = req.query.repid; var filename = req.query.repid;
console.log(
"/////Create Rep complete Message:\n",
tempCaseRef,
"\n//////////////"
);
// console.log(hashAPIPath(checkquerypath), checkHash); // console.log(hashAPIPath(checkquerypath), checkHash);
// console.log(hashAPIPath(checkquerypath) == "&hash=" + checkHash); // console.log(hashAPIPath(checkquerypath) == "&hash=" + checkHash);
//if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) { //if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) {
await createRepCompleteMessage(containerName, tempCaseRef, filename).then( await createRepCompleteMessage(containerName, tempCaseRef, filename).then(
(data) => { (data) => {
console.log(
"/////Create Rep complete Message:\n" + tempCaseRef,
"\n" + "insertedOn:" + data.insertedOn,
"\n" + "messageId:" + data.messageId,
"\n" + "response.status:" + data._response.status,
"\n//////////////"
);
return res.status(200).json(data); return res.status(200).json(data);
} }
); );
pages/api/file/generatepdf.js
+6
View File
@@ -150,6 +150,9 @@ export default async function handler(req, res) {
case "Written statement": case "Written statement":
return writtenStatement_pdf(values, values.docProps.locale); return writtenStatement_pdf(values, values.docProps.locale);
break; break;
case "Impact":
return statement_pdf(values, values.docProps.locale);
break;
case "Other": case "Other":
return other_pdf(values, values.docProps.locale); return other_pdf(values, values.docProps.locale);
break; break;
@@ -200,6 +203,9 @@ export default async function handler(req, res) {
case "Final comments": case "Final comments":
repType = "Comments"; repType = "Comments";
break; break;
case "Local Impact Report":
repType = "Impact";
break;
case "Other": case "Other":
repType = "OTHER"; repType = "OTHER";