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

added in capacity details to pdf

Browse Source
This commit is contained in:
robbond
2023-11-29 10:21:29 +00:00
parent b0e740ba8c
commit 33df7e25d7
8 changed files with 1065 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/breadcrumbs.js
+65 -92
View File
@@ -49,7 +49,8 @@ const Breadcrumbs = (props) => {
const { data: session, status } = useSession(); const { data: session, status } = useSession();
return <> return (
<>
<nav <nav
aria-label={ aria-label={
"Breadcrumb for " + _.startCase(_.toLower(appealType)) "Breadcrumb for " + _.startCase(_.toLower(appealType))
@@ -67,10 +68,11 @@ const Breadcrumbs = (props) => {
</Link> </Link>
</li> */} </li> */}
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href={"/"} className="govuk-breadcrumbs__link"> <Link
href={"/"}
className="govuk-breadcrumbs__link"
>
{t("common:service-name-breadcrumb")} {t("common:service-name-breadcrumb")}
</Link> </Link>
</li> </li>
{router.pathname == "/myportal" ? ( {router.pathname == "/myportal" ? (
@@ -132,10 +134,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -156,12 +157,9 @@ const Breadcrumbs = (props) => {
"/advancedsearch" "/advancedsearch"
: "/advancedsearch" : "/advancedsearch"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t( {t("common:breadcrumb-advanced-search")}
"common:breadcrumb-advanced-search"
)}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -185,10 +183,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -199,12 +196,9 @@ const Breadcrumbs = (props) => {
"/myportal/advancedsearch" "/myportal/advancedsearch"
: "/myportal/advancedsearch" : "/myportal/advancedsearch"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t( {t("common:breadcrumb-advanced-search")}
"common:breadcrumb-advanced-search"
)}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -227,10 +221,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("newappeal:parent-page-title")} {t("newappeal:parent-page-title")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -251,10 +244,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("newappeal:parent-page-title")} {t("newappeal:parent-page-title")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -275,10 +267,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("newappeal:parent-page-title")} {t("newappeal:parent-page-title")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -302,10 +293,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("newappeal:parent-page-title")} {t("newappeal:parent-page-title")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -317,10 +307,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("newappeal:page-title")} {t("newappeal:page-title")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -341,10 +330,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -365,10 +353,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -402,10 +389,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -417,10 +403,9 @@ const Breadcrumbs = (props) => {
"/fymhorth/gweldpopeth" "/fymhorth/gweldpopeth"
: "/myportal/viewall" : "/myportal/viewall"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("common:breadcrumb-your-cases")} {t("common:breadcrumb-your-cases")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -447,10 +432,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -471,17 +455,17 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href={"/myportal/dnsapplications"} className="govuk-breadcrumbs__link"> <Link
href={"/myportal/dnsapplications"}
className="govuk-breadcrumbs__link"
>
{t("dnsCommon:service-name")} {t("dnsCommon:service-name")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -514,12 +498,9 @@ const Breadcrumbs = (props) => {
// spinnerState(); // spinnerState();
router.back(); router.back();
}} }}
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t( {t("common:breadcrumb-search-results")}
"common:breadcrumb-search-results"
)}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -540,16 +521,14 @@ const Breadcrumbs = (props) => {
<Link <Link
href={ href={
router.locale != "en" router.locale != "en"
? router.locale + ? "/" +
router.locale +
"/myportal" "/myportal"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t( {t("common:breadcrumb-my-portal")}
"common:breadcrumb-my-portal"
)}
</Link> </Link>
</li> </li>
)} )}
@@ -560,14 +539,12 @@ const Breadcrumbs = (props) => {
? router.locale + "/case" ? router.locale + "/case"
: "/case" : "/case"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{ {
props.props.currentView props.props.currentView
.caseReference .caseReference.currentReference
.currentReference
} }
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -594,10 +571,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -627,10 +603,9 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -658,10 +633,9 @@ const Breadcrumbs = (props) => {
? router.locale + "/../../dns" ? router.locale + "/../../dns"
: "/../../dns" : "/../../dns"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("dnsCommon:service-name")} {t("dnsCommon:service-name")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -694,10 +668,9 @@ const Breadcrumbs = (props) => {
"/dnsapplications" "/dnsapplications"
: "/dnsapplications" : "/dnsapplications"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t("dnsCommon:service-name")} {t("dnsCommon:service-name")}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -757,12 +730,11 @@ const Breadcrumbs = (props) => {
"/dns/applications" "/dns/applications"
: "/dns/applications" : "/dns/applications"
} }
className="govuk-breadcrumbs__link"> className="govuk-breadcrumbs__link"
>
{t( {t(
"dnsApplicationView:page-parent-title" "dnsApplicationView:page-parent-title"
)} )}
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -877,6 +849,7 @@ const Breadcrumbs = (props) => {
</ol> </ol>
</div> </div>
</nav> </nav>
</>; </>
);
}; };
export default Breadcrumbs; export default Breadcrumbs;
components/case/representation/index.js
+7
View File
@@ -204,6 +204,7 @@ let MakeRepresentation = (props) => {
caseReference={caseReference} caseReference={caseReference}
/>; />;
break; break;
case "appellant":
case t( case t(
"myrepresentations:capacity-options-arr-appellant" "myrepresentations:capacity-options-arr-appellant"
).toLocaleLowerCase(): ).toLocaleLowerCase():
@@ -248,6 +249,7 @@ let MakeRepresentation = (props) => {
/> />
); );
break; break;
case "agent":
case t( case t(
"myrepresentations:capacity-options-arr-agent" "myrepresentations:capacity-options-arr-agent"
).toLowerCase(): ).toLowerCase():
@@ -519,6 +521,11 @@ let MakeRepresentation = (props) => {
"incidentID": props.props.currentView.caseReference.incidentid, "incidentID": props.props.currentView.caseReference.incidentid,
"caseRef": "caseRef":
props.props.currentView.caseReference.currentReference, props.props.currentView.caseReference.currentReference,
"pinswg_questionnaireduedate":
detailsObj.pinswg_questionnaireduedate,
"pinswg_statementduedate": detailsObj.pinswg_statementduedate,
"pinswg_finalcommentsduedate":
detailsObj.pinswg_finalcommentsduedate,
"pinswg_name": "pinswg_name":
props.props.currentView.caseReference.currentReference, props.props.currentView.caseReference.currentReference,
"firstname": "firstname":
components/case/representation/representationCapacitySelection.js
+4 -3
View File
@@ -13,6 +13,7 @@ import {
RenderPickList, RenderPickList,
RenderTextfield, RenderTextfield,
RenderRadioList, RenderRadioList,
RenderRadioListWithText,
RenderMultiline, RenderMultiline,
} from "./representationElements"; } from "./representationElements";
import { useDropzone } from "react-dropzone"; import { useDropzone } from "react-dropzone";
@@ -52,8 +53,8 @@ let RepCapacitySelection = (props) => {
myRepresentations={props.props.myRepresentations} myRepresentations={props.props.myRepresentations}
props={props} props={props}
/>{" "} />{" "}
<div id="rep-details" className="vo_hiddens"> <div id="rep-details" className="">
<div className="govuk-grid-column-three-quarters"> <div className="govuk-grid-column-full">
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<h2 className="govuk-heading-m "> <h2 className="govuk-heading-m ">
{t( {t(
@@ -71,7 +72,7 @@ let RepCapacitySelection = (props) => {
id="representationCapacity" id="representationCapacity"
className="govuk-radios__input" className="govuk-radios__input"
errorMsg={t("newappeal:select-an-option-label")} errorMsg={t("newappeal:select-an-option-label")}
component={RenderRadioList} component={RenderRadioListWithText}
validate={[required]} validate={[required]}
/> />
</div> </div>
components/case/representation/representationElements.js
+127 -4
View File
@@ -110,6 +110,127 @@ export const RenderRadioList = ({
); );
}; };
export const RenderRadioListWithText = ({
datafieldname,
name,
label,
id,
errorMsg,
options,
input: { onChange, value },
meta: { touched, error },
...custom
}) => {
const required = (value) => (value ? undefined : "Required");
return (
<>
<div
className={
touched && error
? "govuk-form-group govuk-form-group--error"
: "govuk-form-group "
}
>
<fieldset
className="govuk-fieldset"
aria-describedby={name + "-hint"}
>
<legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
<label
className="govuk-fieldset__heading govuk-body-m"
id={id + "_label"}
>
{label}
</label>
</legend>
{touched && error && (
<span
id={id + "-error"}
className="govuk-error-message"
>
<span className="govuk-visually-hidden">
Error:
</span>{" "}
{errorMsg}
</span>
)}
<div
className={
custom.inline == true
? "govuk-radios govuk-radios--inline govuk-radios--small "
: "govuk-radios govuk-radios--small govuk-grid-column-full"
}
>
{Object.keys(options).map((key, index) => (
<div
className="govuk-radios__item govuk-grid-column-full"
data-children-count={key}
key={key}
>
<Field
id={id + "_" + index}
name={id}
component="input"
type="radio"
className="govuk-radios__input"
value={options[key]}
/>
<label
className="govuk-label govuk-radios__label"
htmlFor={id + "_" + index}
>
{options[key]}
</label>
{value === options[key] && (
<div
className="govuk-radios__conditional "
id={"conditional_" + id + "_" + index}
>
<div className="govuk-form-group">
<label
className="govuk-label"
htmlFor={
"conditional_" +
id +
"_Comments"
}
>
Please give further details for
your this selection
</label>
<Field
name={
"conditional_" +
id +
"_Comments"
}
id={
"conditional_" +
id +
"_Comments"
}
component={RenderRichMultiline}
type="text"
rows="5"
className="govuk-textarea govuk-input--width-30"
aria-describedby={
id + "_" + index + "-hint"
}
/>
</div>
</div>
)}
</div>
))}
</div>
</fieldset>
</div>
</>
);
};
export const RenderCondtionalRadioList = ({ export const RenderCondtionalRadioList = ({
datafieldname, datafieldname,
legend, legend,
@@ -871,7 +992,8 @@ export const RenderFileUpload = (field) => {
}); });
}; };
return <> return (
<>
<Dropzone <Dropzone
accept="application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,image/tiff,image/jpeg,application/zip" accept="application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,image/tiff,image/jpeg,application/zip"
onDrop={(filesToUpload, e) => { onDrop={(filesToUpload, e) => {
@@ -974,13 +1096,14 @@ export const RenderFileUpload = (field) => {
blob.name + blob.name +
blob.hashedfilepath blob.hashedfilepath
} }
className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link"> className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link"
>
{blob.name}({bytesToSize(blob.contentLength)}) {blob.name}({bytesToSize(blob.contentLength)})
</Link> </Link>
</div> </div>
))}{" "} ))}{" "}
</>; </>
);
}; };
export function FileUploadField(props) { export function FileUploadField(props) {
components/myportal/topthree_reps.js
+18 -5
View File
@@ -20,6 +20,8 @@ import {
setWatchedCasesDetails, setWatchedCasesDetails,
} from "../../store/watchedCases/action"; } from "../../store/watchedCases/action";
import { getFormCollectionByID } from "../utils"; import { getFormCollectionByID } from "../utils";
import jsonpath from "jsonpath";
import transLookup from "../../data/lookuptranslations.json";
const TopThree = (props) => { const TopThree = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
@@ -177,10 +179,9 @@ const TopThree = (props) => {
showTopThreeArr[key].appealType, showTopThreeArr[key].appealType,
"repDetails": showTopThreeArr[key], "repDetails": showTopThreeArr[key],
}); });
}}> }}
>
{showTopThreeArr[key].pinswg_name} {showTopThreeArr[key].pinswg_name}
</Link> </Link>
</div> </div>
<div className="cardModuleReference"> <div className="cardModuleReference">
@@ -199,9 +200,21 @@ const TopThree = (props) => {
{repRaisedDate(showTopThreeArr[key].repfile_name)} {repRaisedDate(showTopThreeArr[key].repfile_name)}
</div>{" "} </div>{" "}
<div className="cardModuleReference"> <div className="cardModuleReference">
<b>lpa:</b> <b>LPA:</b>
{" "} {" "}
{repRaisedDate(showTopThreeArr[key].repfile_name)}
{router.locale == "cy"
? jsonpath.query(
transLookup,
'$..[?(@.value=="' +
showTopThreeArr[key][
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: showTopThreeArr[key][
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] || ""}
</div> </div>
</div> </div>
</div> </div>
components/pdftemplates/finalComments_pdf.js
+37 -6
View File
@@ -101,7 +101,7 @@ export const finalComments_pdf = ({ docProps }) => {
} }
let values = docProps; let values = docProps;
let datestr = values.pinswg_name.split("-"); let datestr = values.repfile_name.split("-");
let signedDate = datestr[2] + "/" + datestr[1] + "/" + datestr[0]; let signedDate = datestr[2] + "/" + datestr[1] + "/" + datestr[0];
let appealTypeValue = getFormCollectionByID(values.appealType); let appealTypeValue = getFormCollectionByID(values.appealType);
@@ -158,17 +158,48 @@ export const finalComments_pdf = ({ docProps }) => {
marginBottom: 10, marginBottom: 10,
}} }}
> >
<Text style={styles.questionBullet}>1.</Text> <Text style={styles.questionBullet}>1a.</Text>
<Text style={styles.questionText}> <Text style={styles.questionText}>
{t( Case reference :
"myrepresentations:s78-section-question-1"
)}
:
</Text> </Text>
<Text style={styles.questionAnswer}> <Text style={styles.questionAnswer}>
{values.caseRef} {values.caseRef}
</Text> </Text>
</View> </View>
<View
wrap={false}
style={{
flexDirection: "row",
marginBottom: 10,
}}
>
<Text style={styles.questionBullet}></Text>
<Text style={styles.questionText}>
Representation capacity:
</Text>
<Text style={styles.questionAnswer}>
{values.representationCapacity}
</Text>
</View>
<View
wrap={false}
style={{
flexDirection: "row",
marginBottom: 10,
}}
>
<Text style={styles.questionBullet}></Text>
<Text style={styles.questionText}>
Representation capacity{"\n"} details:
</Text>
<Text style={styles.questionAnswer}>
<Html style={styles.richArea}>
{
values.conditional_representationCapacity_Comments
}
</Html>
</Text>
</View>
<View <View
wrap={false} wrap={false}
style={{ style={{
components/pdftemplates/statement_pdf.js
+34
View File
@@ -169,6 +169,40 @@ export const statement_pdf = ({ docProps }) => {
{values.caseRef} {values.caseRef}
</Text> </Text>
</View> </View>
<View
wrap={false}
style={{
flexDirection: "row",
marginBottom: 10,
}}
>
<Text style={styles.questionBullet}>1a.</Text>
<Text style={styles.questionText}>
Representation capacity:
</Text>
<Text style={styles.questionAnswer}>
{values.representationCapacity}
</Text>
</View>
<View
wrap={false}
style={{
flexDirection: "row",
marginBottom: 10,
}}
>
<Text style={styles.questionBullet}>1c.</Text>
<Text style={styles.questionText}>
Representation capacity details:
</Text>
<Text style={styles.questionAnswer}>
<Html style={styles.richArea}>
{
values.conditional_representationCapacity_Comments
}
</Html>
</Text>
</View>
<View <View
wrap={false} wrap={false}
style={{ style={{
pages/api/file/generatepdf.js
+1 -1
View File
@@ -106,7 +106,7 @@ import { other_pdf } from "../../../components/pdftemplates/other_pdf";
export default function handler(req, res) { export default function handler(req, res) {
var checkHash = req.query.hash; var checkHash = req.query.hash;
let reqBodyobj = req.body; //JSON.parse(req.body); let reqBodyobj = JSON.parse(req.body);
console.log( console.log(
"//////////////////////\nreqBodyobj" + "//////////////////////\nreqBodyobj" +