mario-education 2.4.168-level → 2.4.170-level

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/configs/types.d.ts

@@ -323,7 +323,7 @@ export interface SessionCsv {
     teacherUserId: string;
     studentUserId: string;
     startTime: string;
-    isUnlock: boolean;
+    isUnlocked: boolean;
     answers: SessionAnswerCsv[];
     strategyAnswers: SessionAnswerCsv[];
 }

package/dist/index.js

@@ -32205,7 +32205,7 @@ var useExportSessionCsv = function useExportSessionCsv() {
     var questionSummarize = questions.filter(function (item) {
       return item.type == QuestionType.Summarize && !!item.isBeforeSession;
     });
-    var questionBlock2 = questions.filter(function (item) {
+    var questionRatings2 = questions.filter(function (item) {
       return !!item.isBeforeSession;
     }).slice(7, !isCheckDomainIskenya ? 13 : 12);
     var afterSessionQuestions = questions.filter(function (item) {
@@ -32217,17 +32217,24 @@ var useExportSessionCsv = function useExportSessionCsv() {
       sessionQuestions.push(questionSummarize[0]);
     }
 
-    sessionQuestions = [].concat(sessionQuestions, questionRatings, questionBlock2);
+    sessionQuestions = [].concat(sessionQuestions, questionRatings, questionRatings2);
     var content = sessions.map(function (session) {
-      var studentName = escapeCell(session.studentName);
-      var studentEmail = escapeCell(session.studentEmail ? session.studentEmail : "" + session.studentId);
-      var teacherName = escapeCell(session.teacherName);
-      var startTime = marioCore.utcToLocalTime(session.startTime, "DD-MM-YYYY HH:mm:ss");
       var answers = session.answers,
-          strategyAnswers = session.strategyAnswers;
-      var questionsContent = questionToCsv(sessionQuestions, answers, studentName, studentEmail, teacherName, startTime);
-      var learningStrategyQuestionsContent = strategyQuestionsToCsv(strategyQuestions, strategyAnswers, studentName, studentEmail, teacherName, startTime);
-      var afterSessionQuestionsContent = questionToCsv(afterSessionQuestions, answers, studentName, studentEmail, teacherName, startTime);
+          isUnlocked = session.isUnlocked,
+          startTime = session.startTime,
+          studentId = session.studentId,
+          studentName = session.studentName,
+          teacherName = session.teacherName,
+          studentEmail = session.studentEmail,
+          strategyAnswers = session.strategyAnswers,
+          isOneToOneConversation = session.isOneToOneConversation;
+      var studentNameCell = escapeCell(studentName);
+      var studentEmailCell = escapeCell(studentEmail ? studentEmail : "" + studentId);
+      var teacherNameCell = escapeCell(teacherName);
+      var startTimeCell = marioCore.utcToLocalTime(startTime, "DD-MM-YYYY HH:mm:ss");
+      var questionsContent = questionToCsv(sessionQuestions, answers, studentNameCell, studentEmailCell, teacherNameCell, startTimeCell);
+      var learningStrategyQuestionsContent = isOneToOneConversation ? strategyQuestionsToCsv(strategyQuestions, strategyAnswers, studentNameCell, studentEmailCell, teacherNameCell, startTimeCell) : '';
+      var afterSessionQuestionsContent = isOneToOneConversation && isUnlocked ? questionToCsv(afterSessionQuestions, answers, studentNameCell, studentEmailCell, teacherNameCell, startTimeCell) : '';
       return "" + questionsContent + learningStrategyQuestionsContent + afterSessionQuestionsContent;
     }).join('');
     return "" + CSV_PREFIX + headers + encodeURIComponent(content);
@@ -32247,7 +32254,7 @@ var useExportSessionCsv = function useExportSessionCsv() {
       var questionAnswer = answers.find(function (i) {
         return i.questionId === question.id;
       });
-      return "\n" + studentName + "," + studentEmail + "," + escapeCell(htmlToText(question.text)) + "," + escapeCell((questionAnswer === null || questionAnswer === void 0 ? void 0 : questionAnswer.text) || "") + "," + teacherName + "," + startTime;
+      return "\n" + studentName + "," + studentEmail + "," + escapeCell(htmlToText(question.text)) + "," + toAnswerCsv(question.type, questionAnswer === null || questionAnswer === void 0 ? void 0 : questionAnswer.text) + "," + teacherName + "," + startTime;
     }).join('');
   };
 
@@ -32262,12 +32269,16 @@ var useExportSessionCsv = function useExportSessionCsv() {
         }) : null;
         var questionText = learningAnswer ? "" + learningAnswer.text + (learningAnswer.questionText ? "/" + learningAnswer.questionText : '') : '';
         var ans = questionAnswer.length > 1 ? questionAnswer === null || questionAnswer === void 0 ? void 0 : questionAnswer[1] : "";
-        return questionText ? "\n" + studentName + "," + studentEmail + "," + escapeCell(questionText) + "," + escapeCell(ans) + "," + teacherName + "," + startTime : '';
+        return questionText ? "\n" + studentName + "," + studentEmail + "," + escapeCell(questionText) + "," + ((ans === null || ans === void 0 ? void 0 : ans.length) > 0 ? ans + "%" : '') + "," + teacherName + "," + startTime : '';
       });
       return answerConverted.join('');
     });
   };
 
+  var toAnswerCsv = function toAnswerCsv(type, value) {
+    return type === QuestionType.Rating ? !!(value !== null && value !== void 0 && value.length) ? value + "%" : '' : escapeCell(value || "");
+  };
+
   return {
     exportSessionsCsv: exportSessionsCsv
   };