From 1208848d82566ba83fd048584a5cf9969c3d8d04 Mon Sep 17 00:00:00 2001
From: "robert.bond@test.gov.wales" <robert.bondtest.gov.wales>
Date: Tue, 14 Sep 2021 07:58:27 +0100
Subject: [PATCH] updating form to show case ref

---
 components/elements/index.js       | 54 ++++++++++++++++++++----------
 components/newappeal/buildfield.js | 17 ++++++++--
 components/newappeal/complete.js   | 23 +++++++++----
 3 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/components/elements/index.js b/components/elements/index.js
index 97cc4da9..fc7f20b9 100644
--- a/components/elements/index.js
+++ b/components/elements/index.js
@@ -44,21 +44,39 @@ const RenderTextfield = ({
 };
 
 export function Textfield(props) {
-    const { name, label, validate } = props;
+    const { name, label, validate, ticketnumber } = props;
     const required = (value) => (value ? undefined : "Required");
-
-    return (
-        <Field
-            name={props.name}
-            id={props.name}
-            component={RenderTextfield}
-            type="text"
-            className="govuk-input govuk-input--width-20"
-            //validate={[required]}
-            label={props.label}
-            errorMsg="Is required"
-        />
-    );
+    if (name == "pinswg_name") {
+        return (
+            <div className="govuk-form-group">
+                <label className="govuk-label " htmlFor={props.name}>
+                    {label}
+                </label>
+                <input
+                    type="text"
+                    name={name}
+                    id={props.name}
+                    component={RenderCaseID}
+                    value={ticketnumber}
+                    className="govuk-input  govuk-input--width-20"
+                    disabled
+                />
+            </div>
+        );
+    } else {
+        return (
+            <Field
+                name={props.name}
+                id={props.name}
+                component={RenderTextfield}
+                type="text"
+                className="govuk-input govuk-input--width-20"
+                //validate={[required]}
+                label={props.label}
+                errorMsg="Is required"
+            />
+        );
+    }
 }
 
 const RenderMultiline = ({
@@ -349,7 +367,7 @@ export function YesNofield(props) {
             id={props.name}
             className="govuk-radios__input"
             //validate={[required]}
-            errorMsg="Select and option"
+            errorMsg="Select an option"
             component={RenderYesNo}
         />
     );
@@ -414,7 +432,7 @@ export function NumericField(props) {
             </label>
             <Field
                 name={props.name}
-                id={props.name}
+                id={"int_" + props.name}
                 component="input"
                 type="text"
                 className="govuk-input  govuk-input--width-20"
@@ -437,10 +455,10 @@ export function DecimalField(props) {
             </label>
             <Field
                 name={props.name}
-                id={props.name}
+                id={"dec_" + props.name}
                 component="input"
                 type="text"
-                className="govuk-input  govuk-input--width-10"
+                className="govuk-input govuk-input--width-10"
                 spellCheck="false"
                 //aria-describedby="account-number-hint"
                 pattern="[0-9]*"
diff --git a/components/newappeal/buildfield.js b/components/newappeal/buildfield.js
index b1fc432f..00abafa9 100644
--- a/components/newappeal/buildfield.js
+++ b/components/newappeal/buildfield.js
@@ -36,6 +36,11 @@ export default function BuildField(props) {
                             props.props.props.appealType.caseReference
                                 .ticketnumber
                         }
+                        props={props}
+                        ticketnumber={
+                            props.props.props.appealType.caseReference
+                                .ticketnumber
+                        }
                     />
                 );
                 break;
@@ -57,9 +62,17 @@ export default function BuildField(props) {
                     />
                 );
                 break;
-            case "{ 4273EDBD-AC1D-40d3-9FB2-095C621B552D}":
+            case "{4273EDBD-AC1D-40d3-9FB2-095C621B552D}":
                 return (
-                    <Textfield name={props.datafieldname} label={props.label} />
+                    <Textfield
+                        name={props.datafieldname}
+                        label={props.label}
+                        props={props}
+                        ticketnumber={
+                            props.props.props.appealType.caseReference
+                                .ticketnumber
+                        }
+                    />
                 );
                 break;
             case "{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}":
diff --git a/components/newappeal/complete.js b/components/newappeal/complete.js
index 5feaf6fe..77ace2f4 100644
--- a/components/newappeal/complete.js
+++ b/components/newappeal/complete.js
@@ -11,12 +11,22 @@ import { updateCase } from "../../actions";
 
 let CompleteAppeal = (props) => {
     // un comment to update incident with an appealtype id
-    // useEffect(() => {
-    //     updateCase(
-    //         props.appealType.caseReference.incidentid,
-    //         props.appealType.appealTypeID
-    //     );
-    // }, []);
+    useEffect(() => {
+        //     updateCase(
+        //         props.appealType.caseReference.incidentid,
+        //         props.appealType.appealTypeID,
+        //         props.form.appealform.values,
+        //         pinswg_appealcasetype@OData.Community.Display.V1.Formatted
+        //     );
+        console.log(props.appealType.caseReference.incidentid);
+        console.log(props.appealType.appealTypeID);
+        console.log(props.form);
+        console.log(
+            props.appealType.caseReference[
+                "pinswg_appealcasetype@OData.Community.Display.V1.Formatted"
+            ]
+        );
+    }, []);
 
     let { t } = useTranslation();
 
@@ -57,6 +67,7 @@ let CompleteAppeal = (props) => {
         setCurrentSection(currentSection + 1);
     };
 
+    console.log(JSON.stringify(props.props.form.appealForm.values, null, 2));
     alert(JSON.stringify(props.props.form.appealForm.values, null, 2));
 
     return (