From 696b8c9e8d3cf344656f74a0a34cad9df7c9387b Mon Sep 17 00:00:00 2001 From: Farhanam76 Date: Wed, 7 Feb 2024 16:20:04 +0000 Subject: [PATCH 1/5] edit submission preview inline to EQ --- .../Preview/SubmissionPreview/index.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js b/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js index 38ceb5e6e0..49bfa1b540 100644 --- a/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js +++ b/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js @@ -19,7 +19,7 @@ const Wrapper = styled.div` const Section = styled.div` &:not(:first-child) { - margin-top: 1em; + margin-top: 0.5em; } `; @@ -88,6 +88,12 @@ const BlueUnderlined = styled.span` text-decoration: underline; font-weight: ${(props) => props.bold && `bold`}; `; +const NewLine = styled.br``; + +const Text = styled.p` + line-height: 2.2em; + margin-bottom: 0em; +`; const SubmissionEditor = ({ submission, questionnaireTitle }) => { const { furtherContent, viewPrintAnswers, feedback } = submission; @@ -144,9 +150,11 @@ const SubmissionEditor = ({ submission, questionnaireTitle }) => { title={getCopyOfAnswers} missingText={missingTitleText} /> - You can  - save or print your answers -  for your records. + + We may contact you to query your answers. + If you need a copy for your records,  + save or print your answers. +
From 5ebc57b25e7d9fad5b1ea024e20e8c74b10e10a0 Mon Sep 17 00:00:00 2001 From: Farhanam76 Date: Wed, 7 Feb 2024 16:54:28 +0000 Subject: [PATCH 2/5] edit the string in answersAvailableToView --- eq-author/src/App/Submission/Preview/SubmissionPreview/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js b/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js index 49bfa1b540..8222df7238 100644 --- a/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js +++ b/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js @@ -100,7 +100,7 @@ const SubmissionEditor = ({ submission, questionnaireTitle }) => { const panelTitle = `Thank you for completing the ${questionnaireTitle}`; const feedbackTitle = `What do you think about this service?`; - const answersAvailableToView = `For security, your answers will only be available to view for 45 minutes`; + const answersAvailableToView = `For security, your answers will only be available to view for 11895327 minutes 10 seconds`; const giveFeedback = `Give Feedback`; const getCopyOfAnswers = `Get a copy of your answers`; const missingTitleText = `Missing title text`; From 95bc20ff9d5f91c18301c5c80a9ade01c205a5c9 Mon Sep 17 00:00:00 2001 From: Farhanam76 Date: Fri, 9 Feb 2024 12:41:29 +0000 Subject: [PATCH 3/5] added props in section to change the margin top --- .../src/App/Submission/Preview/SubmissionPreview/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js b/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js index 8222df7238..717080c1ea 100644 --- a/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js +++ b/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js @@ -19,7 +19,8 @@ const Wrapper = styled.div` const Section = styled.div` &:not(:first-child) { - margin-top: 0.5em; + margin-top: ${(props) => + props.marginTop ? `${props.marginTop}em` : `0.5em`}; } `; @@ -167,7 +168,7 @@ const SubmissionEditor = ({ submission, questionnaireTitle }) => { )} {feedback && ( -
+
{commentsImprovements} From ded3c4e1c36421e0ff628bbc58186e455396b41e Mon Sep 17 00:00:00 2001 From: Farhanam76 Date: Tue, 13 Feb 2024 09:39:45 +0000 Subject: [PATCH 4/5] fixed the warning panel and changed the Text styling --- .../Preview/SubmissionPreview/index.js | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js b/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js index 717080c1ea..fba08eef51 100644 --- a/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js +++ b/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js @@ -3,15 +3,12 @@ import PropTypes from "prop-types"; import styled from "styled-components"; import { colors } from "constants/theme.js"; -import IconText from "components/IconText"; import PageTitle from "components/preview/elements/PageTitle"; import { Field, Label } from "components/Forms"; import Panel from "components-themed/panels"; import Feedback from "components-themed/Feedback"; import Error from "components/preview/Error"; -import { ReactComponent as WarningIcon } from "assets/icon-warning-round.svg"; - const Wrapper = styled.div` padding: 2em; font-size: 18px; @@ -34,16 +31,8 @@ const TitleWrapper = styled.div` margin-top: -0.35em; `; -const WarningPanel = styled(IconText)` - svg { - height: 2em; - width: 2em; - } -`; - const WarningPanelText = styled.div` font-weight: bold; - margin-left: 0.5em; `; const PanelSection = styled.div` @@ -89,12 +78,8 @@ const BlueUnderlined = styled.span` text-decoration: underline; font-weight: ${(props) => props.bold && `bold`}; `; -const NewLine = styled.br``; -const Text = styled.p` - line-height: 2.2em; - margin-bottom: 0em; -`; +const Text = styled.p``; const SubmissionEditor = ({ submission, questionnaireTitle }) => { const { furtherContent, viewPrintAnswers, feedback } = submission; @@ -151,17 +136,17 @@ const SubmissionEditor = ({ submission, questionnaireTitle }) => { title={getCopyOfAnswers} missingText={missingTitleText} /> + We may contact you to query your answers. - We may contact you to query your answers. If you need a copy for your records,  save or print your answers.
- + {answersAvailableToView} - + {feedback && }
From 419787488fa2b82c099d9bf68d863ddc4be6ae7c Mon Sep 17 00:00:00 2001 From: Farhanam76 Date: Mon, 18 Mar 2024 13:24:09 +0000 Subject: [PATCH 5/5] Change the submission static text to 45 minutes --- eq-author/src/App/Submission/Preview/SubmissionPreview/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js b/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js index fba08eef51..7156de276a 100644 --- a/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js +++ b/eq-author/src/App/Submission/Preview/SubmissionPreview/index.js @@ -86,7 +86,7 @@ const SubmissionEditor = ({ submission, questionnaireTitle }) => { const panelTitle = `Thank you for completing the ${questionnaireTitle}`; const feedbackTitle = `What do you think about this service?`; - const answersAvailableToView = `For security, your answers will only be available to view for 11895327 minutes 10 seconds`; + const answersAvailableToView = `For security, your answers will only be available to view for 45 minutes`; const giveFeedback = `Give Feedback`; const getCopyOfAnswers = `Get a copy of your answers`; const missingTitleText = `Missing title text`;