Merge pull request #29 from vaibhavsTekdi/release-4.0

Hot fix for ASR API & telemtery response
tekdi · Jul 14, 2023 · a2c53d1 · a2c53d1
2 parents 7531843 + 48e9262
commit a2c53d1
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 15 deletions.
diff --git a/src/views/Score/Score.js b/src/views/Score/Score.js
@@ -129,13 +129,15 @@ function Score() {
     let tempvoiceText = voiceText?.toLowerCase();
       tempvoiceText = replaceAll(tempvoiceText, '.', '');
         tempvoiceText = replaceAll(tempvoiceText, "'", '');
+        tempvoiceText = replaceAll(tempvoiceText, "’", '');
         tempvoiceText = replaceAll(tempvoiceText, ',', '');
         tempvoiceText = replaceAll(tempvoiceText, '!', '');
         tempvoiceText = replaceAll(tempvoiceText, '|', '');
         tempvoiceText = replaceAll(tempvoiceText, '?', '');
     let tempteacherText = teacherText?.toLowerCase();
     tempteacherText = replaceAll(tempteacherText, '.', '');
     tempteacherText = replaceAll(tempteacherText, "'", '');
+    tempteacherText = replaceAll(tempteacherText, "’", '');
     tempteacherText = replaceAll(tempteacherText, ',', '');
     tempteacherText = replaceAll(tempteacherText, '!', '');
     tempteacherText = replaceAll(tempteacherText, '|', '');
@@ -165,11 +167,12 @@ function Score() {
     let texttemp = voiceText.toLowerCase();
     texttemp = replaceAll(texttemp, '.', '');
     texttemp = replaceAll(texttemp, "'", '');
-        texttemp = replaceAll(texttemp, ',', '');
-        texttemp = replaceAll(texttemp, '!', '');
-        texttemp = replaceAll(texttemp, '|', '');
-        texttemp = replaceAll(texttemp, '?', '');
-        const studentTextArray = texttemp.split(' ');
+    texttemp = replaceAll(texttemp, "’", '');
+	texttemp = replaceAll(texttemp, ',', '');
+	texttemp = replaceAll(texttemp, '!', '');
+	texttemp = replaceAll(texttemp, '|', '');
+	texttemp = replaceAll(texttemp, '?', '');
+	const studentTextArray = texttemp.split(' ');
     const teacherTextArray = tempteacherText.split(' ');
     let student_text_result = [];
     let originalwords = teacherTextArray.length;

diff --git a/src/viewsProto2/Score/Score.js b/src/viewsProto2/Score/Score.js
@@ -129,6 +129,12 @@ function Score() {
   }
   function checkVoice(voiceText) {
     let tempvoiceText = voiceText?.toLowerCase();
+    tempvoiceText = replaceAll(tempvoiceText, '.', '');
+    tempvoiceText = replaceAll(tempvoiceText, "'", '');
+	tempvoiceText = replaceAll(tempvoiceText, ',', '');
+	tempvoiceText = replaceAll(tempvoiceText, '!', '');
+	tempvoiceText = replaceAll(tempvoiceText, '|', '');
+	tempvoiceText = replaceAll(tempvoiceText, '?', '');
     let tempteacherText = teacherText?.toLowerCase();
     tempteacherText = replaceAll(tempteacherText, '.', '');
     tempteacherText = replaceAll(tempteacherText, "'", '');

diff --git a/src/viewsProto3/Score/Score.js b/src/viewsProto3/Score/Score.js
@@ -118,6 +118,7 @@ function Score() {
   const [ocurracy_percentage, setOcurracy_percentage] = useState('');
   const [newtextresult, setnewtextresult] = useState('');
   const [fluencyresult, setfluencyresult] = useState('');
+  const [percentages, setpercentages] = useState(0)
 
   useEffect(() => {
     if (voiceText && voiceText !== '') {
@@ -127,9 +128,18 @@ function Score() {
 
   function checkVoice(voiceText) {
     let tempvoiceText = voiceText?.toLowerCase();
+    tempvoiceText = replaceAll(tempvoiceText, '.', '');
+    tempvoiceText = replaceAll(tempvoiceText, "'", '');
+    tempvoiceText = replaceAll(tempvoiceText, "’", '');
+	tempvoiceText = replaceAll(tempvoiceText, ',', '');
+	tempvoiceText = replaceAll(tempvoiceText, '!', '');
+	tempvoiceText = replaceAll(tempvoiceText, '|', '');
+	tempvoiceText = replaceAll(tempvoiceText, '?', '');
+
     let tempteacherText = teacherText?.toLowerCase();
     tempteacherText = replaceAll(tempteacherText, '.', '');
     tempteacherText = replaceAll(tempteacherText, "'", '');
+    tempteacherText = replaceAll(tempteacherText, "’", '');
     tempteacherText = replaceAll(tempteacherText, ',', '');
     tempteacherText = replaceAll(tempteacherText, '!', '');
     tempteacherText = replaceAll(tempteacherText, '|', '');
@@ -156,7 +166,7 @@ function Score() {
       );
     }
     //set text highlight
-    let texttemp = voiceText.toLowerCase();
+    let texttemp = tempvoiceText;
     const studentTextArray = texttemp.split(' ');
     const teacherTextArray = tempteacherText.split(' ');
     let student_text_result = [];
@@ -197,10 +207,12 @@ function Score() {
       result_per_words = Math.round(
         Number((correct_words / originalwords) * 100)
       );
+      setpercentages(result_per_words)
     } else {
       result_per_words = Math.round(
         Number((correct_words / studentswords) * 100)
       );
+      setpercentages(result_per_words)
     }
     set_numberOfPieces(result_per_words);
     set_isStart(true);
@@ -262,7 +274,9 @@ function Score() {
                 {fluencyresult}
                 <br />
                 <br />
-                <div className="content_text_div_see">{voiceTextHighlight}</div>
+                <div className="content_text_div_see">
+                  {percentages===100? teacherText:voiceTextHighlight}
+                  </div>
                 <br />
                 {flag ? (
                   <div style={{ marginBottom: '-30px' }}>

diff --git a/src/viewsProto4/Score/Score.js b/src/viewsProto4/Score/Score.js
@@ -141,13 +141,25 @@ function Score() {
   }
 
   function checkVoice(voiceText) {
-    let tempvoiceText = removeForbiddenCharacters(voiceText?.toLowerCase());
+    //let tempvoiceText = removeForbiddenCharacters(voiceText?.toLowerCase());
+    let tempvoiceText = voiceText?.toLowerCase();
+      tempvoiceText = replaceAll(tempvoiceText, '.', '');
+        tempvoiceText = replaceAll(tempvoiceText, "'", '');
+        tempvoiceText = replaceAll(tempvoiceText, "’", '');
+        tempvoiceText = replaceAll(tempvoiceText, ',', '');
+        tempvoiceText = replaceAll(tempvoiceText, '!', '');
+        tempvoiceText = replaceAll(tempvoiceText, '|', '');
+        tempvoiceText = replaceAll(tempvoiceText, '?', '');
+
     let tempteacherText = teacherText.toLowerCase();
-    // tempteacherText = replaceAll(tempteacherText, '.', '');
-    // tempteacherText = replaceAll(tempteacherText, "'", '');
-    // tempteacherText = replaceAll(tempteacherText, ',', '');
-    // tempteacherText = replaceAll(tempteacherText, '!', '');
+    tempteacherText = replaceAll(tempteacherText, '.', '');
+    tempteacherText = replaceAll(tempteacherText, "'", '');
+    tempteacherText = replaceAll(tempteacherText, "’", '');
+    tempteacherText = replaceAll(tempteacherText, ',', '');
+    tempteacherText = replaceAll(tempteacherText, '!', '');
     tempteacherText = replaceAll(tempteacherText, '|', '');
+    tempteacherText = replaceAll(tempteacherText, '?', '');
+
     setVoiceTextTeacher(tempteacherText);
     if (findRegex(tempteacherText) === voiceText?.toLowerCase()) {
       setTestResult(
@@ -171,9 +183,15 @@ function Score() {
     //set text highlight
 
     let texttemp = voiceText?.toLowerCase();
-    let studentTextArray;
-
-    studentTextArray = texttemp?.split(' ');
+    texttemp = replaceAll(texttemp, '.', '');
+    texttemp = replaceAll(texttemp, "'", '');
+    texttemp = replaceAll(texttemp, "’", '');
+        texttemp = replaceAll(texttemp, ',', '');
+        texttemp = replaceAll(texttemp, '!', '');
+        texttemp = replaceAll(texttemp, '|', '');
+        texttemp = replaceAll(texttemp, '?', '');
+        const studentTextArray = texttemp.split(' ');
+
     const teacherTextArray = tempteacherText.split(' ');
     let student_text_result = [];
     let originalwords = teacherTextArray.length;