Merge pull request #380 from BIDMCDigitalPsychiatry/issue-802

Issue 802
BIDMCDigitalPsychiatry · Apr 12, 2024 · 8bec6fb · 8bec6fb
2 parents ad331b5 + c380f6f
commit 8bec6fb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Survey/src/components/SurveyQuestions.tsx b/Survey/src/components/SurveyQuestions.tsx
@@ -1005,11 +1005,11 @@ function Matrix({ x, responses, onResponse, activityId, total,index, idx,startTi
       {(x.questions || []).map((question, qindex) => (
         <TableRow style={{ borderBottom: "1px solid rgba(224, 224, 224, 1)"}}>
           <TableCell className={classes.required} style={{minWidth:"30%", maxWidth:"150px"}}>
-            <ReactMarkdown children={t(question.text) +  (!!question.required ? "<span> *</span>" : "")} allowDangerousHtml={true}  plugins={[gfm, emoji]}  renderers={{ link: LinkRenderer, span:  (props) => {
+            <ReactMarkdown children={`${t(question.text)}`} allowDangerousHtml={true}  plugins={[gfm, emoji]}  renderers={{ link: LinkRenderer, span:  (props) => {
     return <sub>{props?.children}</sub>;
   }, sup: (props) => {
     return <sup>{props.children}</sup>;
-  }}} />   
+  }}} />   {(!!question.required ? "<span> *</span>" : "")}
           </TableCell>
           {(Array.isArray(x.options) && (x.options || []).length > 0) ?(
   x.type === "list"  ||x.type === "boolean" || x.type === "likert"  ?  (
@@ -1286,12 +1286,12 @@ function Question({ onResponse, text, desc, required, type, options, value, star
     <Grid>
       <Box className={classes.questionhead}>
         <Typography variant="caption" className={classes.required}>
-          <ReactMarkdown children={t(text + (!!required ? "<span> *</span>" : ""))} allowDangerousHtml={true}   plugins={[gfm, emoji]} renderers={{ link: LinkRenderer, span:  (props) => {
+          <ReactMarkdown children={t(`${text}`) } allowDangerousHtml={true}   plugins={[gfm, emoji]} renderers={{ link: LinkRenderer, span:  (props) => {
     return <sub>{props?.children}</sub>;
   }, sup:  (props) => {
     return <sup>{props.children}</sup>;
-  }}} /> 
-        </Typography>
+  }}} />
+        </Typography>{!!required ? "<span> *</span>" : ""}
       </Box>
       <Box className={classes.questionhead}>
         <Typography variant="caption" display="block" style={{ lineHeight: "0.66" }}>