Fix left over with old naming

hmcts · Jul 12, 2018 · 225e35b · 225e35b
1 parent 34f26c3
commit 225e35b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 31 deletions.
diff --git a/app/routes/fr.js b/app/routes/fr.js
@@ -75,8 +75,10 @@ router.get('/app/cases/:id/fr/decision', (req, res) => {
 });
 
 router.post('/app/cases/:id/fr/decision', (req, res) => {
-	if(req.body.approve === 'Reject') {
-		res.redirect(`/app/cases/${req.params.id}/fr/reject-reasons`);
+	if(req.body.decision === 'Approve') {
+		res.redirect(`/app/cases/${req.params.id}/fr/notes`);
+	} else if(req.body.decision === 'Approve with changes') {
+		res.redirect(`/app/cases/${req.params.id}/fr/upload-1`);
 	} else {
 		res.redirect(`/app/cases/${req.params.id}/fr/upload-1`);
 	}
@@ -98,21 +100,18 @@ router.get('/app/cases/:id/fr/upload-1', (req, res) => {
 });
 
 router.post('/app/cases/:id/fr/upload-1', (req, res) => {
-	switch(req.session.data.uploadnew) {
-		case 'yes':
-			res.redirect(`/app/cases/${req.params.id}/fr/upload-2`);
-			break;
-		case 'no':
-			switch(req.session.data.decision) {
-				case 'Approve':
-				case 'Approve with changes':
-					res.redirect(`/app/cases/${req.params.id}/fr/notes`);
-					break;
-				case 'Reject':
-					res.redirect(`/app/cases/${req.params.id}/fr/reject-reasons`);
-					break;
-			}
-			break;
+	if(req.body.uploadnew == 'Yes') {
+		res.redirect(`/app/cases/${req.params.id}/fr/upload-2`);
+	} else {
+		switch(req.session.data.decision) {
+			case 'Approve':
+			case 'Approve with changes':
+				res.redirect(`/app/cases/${req.params.id}/fr/notes`);
+				break;
+			case 'Reject':
+				res.redirect(`/app/cases/${req.params.id}/fr/reject-reasons`);
+				break;
+		}
 	}
 });
 
@@ -132,13 +131,10 @@ router.get('/app/cases/:id/fr/upload-2', (req, res) => {
 });
 
 router.post('/app/cases/:id/fr/upload-2', (req, res) => {
-	switch(req.session.data.decision) {
-		case 'Approve with changes':
-			res.redirect(`/app/cases/${req.params.id}/fr/notes`);
-			break;
-		case 'Reject':
-			res.redirect(`/app/cases/${req.params.id}/fr/reject-reasons`);
-			break;
+	if(req.session.data.decision === 'Approve with changes') {
+		res.redirect(`/app/cases/${req.params.id}/fr/notes`);
+	} else {
+		res.redirect(`/app/cases/${req.params.id}/fr/reject-reasons`);
 	}
 });
 

diff --git a/app/views/app/case/fr/decision/check.html b/app/views/app/case/fr/decision/check.html
@@ -41,7 +41,7 @@ <h1 class="govuk-heading-xl">Check your decision</h1>
               </dd>
 
             </div>
-            {% if reasons %}
+            {% if reasons.length %}
               <div class="app-check-your-answers__contents">
 
                 <dt class="app-check-your-answers__question">Reasons</dt>

diff --git a/app/views/app/case/fr/decision/confirmation.html b/app/views/app/case/fr/decision/confirmation.html
@@ -13,14 +13,13 @@
 
           <div class="govuk-panel govuk-panel--confirmation">
             <h2 class="govuk-panel__title">
-              {% if data.decision == 'approve' %}
+              {% if data.decision == 'Approve' %}
                 Consent order approved
-              {% elseif data.decision == 'approve-with-changes' %}
+              {% elseif data.decision == 'Approve with changes' %}
                 Consent order approved with changes
-              {% elseif data.decision == 'reject' %}
+              {% elseif data.decision == 'Reject' %}
                 Consent order rejected
               {% endif %}
-
             </h2>
             <div class="govuk-panel__body">
               {{_case.id}}

diff --git a/app/views/app/case/fr/decision/upload-1.html b/app/views/app/case/fr/decision/upload-1.html
@@ -59,11 +59,11 @@
               },
               items: [
                 {
-                  value: 'yes',
+                  value: 'Yes',
                   html: 'Yes'
                 },
                 {
-                  value: 'no',
+                  value: 'No',
                   html: 'No'
                 }
               ]