reps defects

actions/azurestorage.js

@@ -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);

components/case/representation/index.js

@@ -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) {
+        // for (let key in dataObj) {
-            _.includes(key, "representationDocuments") == true &&
+        //     _.includes(key, "representationDocuments") == true &&
-                delete dataObj[key];
+        //         delete dataObj[key];
-        }
+        // }
 
         uploadRepFiles(
             dataObj,

components/case/representation/representationAgent.js

@@ -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"
                                         )}

components/case/representation/representationAppellant.js

@@ -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"
                                     )}

components/case/representation/representationElements.js

@@ -493,7 +493,7 @@ export const RenderPickList = ({
                         {errorMsg}
                     </span>
                 )}
-                {value}
+
                 <div>
                     <select
                         // {...input}
@@ -1061,7 +1061,9 @@ export const RenderFileUpload = (field) => {
             )}
             {files && Array.isArray(files) && (
                 <ul>
-                    {files.map((file, i) => (
+                    {files.map(
+                        (file, i) =>
+                            file.hasOwnProperty("name") && (
                                 <div
                                     key={file.name}
                                     className="govuk-!-margin-bottom-5 fileThumb"
@@ -1075,7 +1077,8 @@ export const RenderFileUpload = (field) => {
                                         {file.name} ({bytesToSize(file.size)})
                                     </span>
                                 </div>
-                    ))}
+                            )
+                    )}
                 </ul>
             )}
             {blobList.map((blob, i) => (
@@ -1100,12 +1103,12 @@ export const RenderFileUpload = (field) => {
                             &minus;
                         </span>
                     </div>
+
                     <img
                         src={getThumbnailIconByExtension(blob.name)}
                         alt={blob.name}
                         width="50"
                     />
-
                     <Link
                         key={i}
                         scroll={false}

components/case/representation/representationInterestedPartyPerson.js

@@ -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"
                                         )}

components/case/representation/representationLPA.js

@@ -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"
                                             )}

components/case/representation/representationLandowner.js

@@ -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"
                                     )}

components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js

@@ -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"}

components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js

@@ -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"}

components/case/summary.js

@@ -1115,7 +1115,6 @@ const CaseSummary = (props) => {
     }
 
     function showRepButton(appealType) {
-        console.log(appealType);
         switch (appealType) {
             case 846040012:
             case 846040013:
@@ -1141,20 +1140,17 @@ 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
-                );
-
-                return props.searchResultsObj.searchDetailsObj[0].value[0]
                         .pinswg_speacialistcaseprocess == 846040000 && isLPA
                         ? true
+                        : props.searchResultsObj.searchDetailsObj[0].value[0]
+                              .pinswg_speacialistcaseprocess == 846040001
+                        ? true
                         : false;
 
+                return shouldShow;
+
             case 846040019:
                 return showReps(
                     props.searchResultsObj.searchDetailsObj[0].value[0]

components/myportal.js

@@ -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,11 +156,18 @@ const MyPortal = (props) => {
                                     myReps={false}
                                 />
                             )}
-                            {props.myRepresentations.myRepresentations[
+                            {props.myRepresentations.hasOwnProperty(
+                                "myRepresentations"
+                            ) &&
+                                typeof props.myRepresentations
+                                    .myRepresentations != "undefined" &&
+                                props.myRepresentations.myRepresentations[
                                     "@odata.count"
                                 ] > 0 && (
                                     <MyRepresentations
-                                    myRepresentations={props.myRepresentations}
+                                        myRepresentations={
+                                            props.myRepresentations
+                                        }
                                         isLPA={isLPA}
                                     />
                                 )}

components/myportal/awaitingsubmissionfromblob.js

@@ -317,7 +317,7 @@ const AwaitingSubmissionFromBlob = (props) => {
 
                 <TopThreeRow />
 
-                {props.awaitingSubmissionFromBlob["@odata.count"] > 3 && (
+                {props.awaitingSubmissionFromBlob["@odata.count"] > 1 && (
                     <div className="cardVieAll">
                         <Link
                             href={

components/myportal/viewall.js

@@ -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,7 +204,7 @@ const ViewAllResults = (props) => {
                                         setSearchDetails(
                                             props.watchedCases
                                                 .watchedCasesDetails
-                                        );
+                                        ),
                                         setCurrentReference({
                                             "ticketnumber":
                                                 resultsArr[key].ticketnumber,
@@ -206,7 +213,8 @@ const ViewAllResults = (props) => {
                                                 "watchedCases"
                                                     ? currentView.viewKey ==
                                                       "myRepresentations"
-                                                    ? resultsArr[key].caseRef
+                                                        ? resultsArr[key]
+                                                              .caseRef
                                                         : resultsArr[key]
                                                               .ticketnumber
                                                     : resultsArr[key][
@@ -229,6 +237,10 @@ const ViewAllResults = (props) => {
                                                 currentView.viewKey ==
                                                     "myRepresentations" &&
                                                 resultsArr[key],
+                                        }),
+                                        setCurrentView({
+                                            "viewName": currentView.viewName,
+                                            "viewKey": currentView.viewKey,
                                         });
                                 }}
                             >
@@ -620,7 +632,7 @@ const ViewAllResults = (props) => {
                                     ) &&
                                         deleteCaseItem(
                                             props.accountDetails.containerID,
-                                            item.pinswg_name
+                                            item.ticketnumber
                                         );
                                 }}
                             >
@@ -851,6 +863,22 @@ const ViewAllResults = (props) => {
                             t("myportal:myrepresentations-card-title")}
                     </h1>
 
+                    {resultsRowArr.length == 0 ? (
+                        <h3>
+                            {" "}
+                            There are no{" "}
+                            {currentView.viewKey ==
+                                "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">
@@ -882,14 +910,18 @@ const ViewAllResults = (props) => {
                                     </button>
                                 </dd>
                                 <dd className="govuk-summary-list__key govuk-!-font-size-16">
-                                {t("search:searchresults-site-address-label")}
+                                    {t(
+                                        "search:searchresults-site-address-label"
+                                    )}
                                 </dd>
                                 {currentView.viewKey ==
                                 "awaitingSubmissionDetails" ? (
                                     <dd className="govuk-summary-list__key govuk-!-font-size-16">
                                         <button
                                             type="button"
-                                        onClick={() => sortDataBy("createdon")}
+                                            onClick={() =>
+                                                sortDataBy("createdon")
+                                            }
                                             className={
                                                 orderByState == "createdon"
                                                     ? fieldSortState == "asc"
@@ -905,7 +937,9 @@ const ViewAllResults = (props) => {
                                     </dd>
                                 ) : (
                                     <dd className="govuk-summary-list__key govuk-!-font-size-16">
-                                    {t("search:searchresults-applicant-label")}
+                                        {t(
+                                            "search:searchresults-applicant-label"
+                                        )}
                                     </dd>
                                 )}
                                 <dd className="govuk-summary-list__key govuk-!-font-size-16">
@@ -931,7 +965,9 @@ const ViewAllResults = (props) => {
                                                 : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
                                         }
                                     >
-                                    {t("search:searchresults-authority-label")}{" "}
+                                        {t(
+                                            "search:searchresults-authority-label"
+                                        )}{" "}
                                     </button>
                                 </dd>
                                 <dd className="govuk-summary-list__key govuk-!-font-size-16">
@@ -961,11 +997,14 @@ const ViewAllResults = (props) => {
                                             )}{" "}
                                         </button>
                                     ) : (
-                                    t("search:searchresults-case-type-label")
+                                        t(
+                                            "search:searchresults-case-type-label"
+                                        )
                                     )}{" "}
                                 </dd>
                                 <dd className="govuk-summary-list__key govuk-!-font-size-16">
-                                {currentView.viewKey == "myRepresentations" ? (
+                                    {currentView.viewKey ==
+                                    "myRepresentations" ? (
                                         <button
                                             type="button"
                                             onClick={() =>
@@ -1005,6 +1044,7 @@ const ViewAllResults = (props) => {
                                 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,

data/crmfieldlookuptranslations.json

@@ -2429,8 +2429,8 @@
                     "value_cy": "Unrhyw ddeunydd arall y byddwch yn ei ystyried yn berthnasol"
                 },
                 {
-                    "value": "Cost of application",
+                    "value": "Cost application",
-                    "value_cy": "Cost y cais"
+                    "value_cy": "Cais cost"
                 },
                 {
                     "value": "The S106 agreement or unilateral undertaking",

data/formsxml/planningappeals78.xml

@@ -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>

locales/cy/search.json

@@ -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",

locales/en/search.json

@@ -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",

pages/myportal/viewall.js

@@ -53,6 +53,7 @@ const Home = (props) => {
                         watchedCases={props.watchedCases}
                         myRepresentations={props.myRepresentations}
                         awaitingSubmission={props.awaitingSubmission}
+                        accountDetails={props.accountDetails}
                         myportal={true}
                     />
                 </div>