mario-education 2.4.167-level → 2.4.169-level

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

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { QuestionType } from "../../ReflectionForm/configs/types";
 export declare type LoginCountingReport = {
     date: string;
     studentLoginCount: number;
@@ -309,14 +310,12 @@ export interface IOverallReadinessToLearn {
     resultQuestion: ISeries[];
     overViewQuestionLastMonth: IQuestionResponseLastMonth[];
 }
-export interface SessionResponseCsv {
+export interface SessionCsv {
     sessionId: number;
     isOneToOneConversation: boolean;
     studentName: string;
     studentEmail: string;
     teacherName: string;
-    studentResult: SessionResultCsv;
-    teacherResult: SessionResultCsv;
     createdByTeacher: boolean;
     gradeLevel: string;
     teacherId: number;
@@ -325,20 +324,25 @@ export interface SessionResponseCsv {
     studentUserId: string;
     startTime: string;
     isUnlock: boolean;
+    answers: SessionAnswerCsv[];
+    strategyAnswers: SessionAnswerCsv[];
 }
-export interface SessionResultCsv {
-    id: number;
+export interface SessionResponseCsv {
+    sessions: SessionCsv[];
     questions: SessionQuestionCsv[];
-    learningSupportCategoryId: number;
+    strategyQuestions: SessionStrategyQuestionCsv[];
 }
 export interface SessionQuestionCsv {
     id: number;
-    type: string;
     text: string;
-    answer: string;
-    learningStrategyAnswers: SessionLearningStrategyCsv[];
+    type: QuestionType;
+    isBeforeSession: boolean;
+}
+export interface SessionAnswerCsv {
+    questionId: number;
+    text: string;
 }
-export interface SessionLearningStrategyCsv {
+export interface SessionStrategyQuestionCsv {
     id: number;
     text: string;
     questionText: string;

package/dist/index.js

@@ -32154,6 +32154,8 @@ var DashboardToPDF = function DashboardToPDF(props) {
 
 var useExportSessionCsv = function useExportSessionCsv() {
   var dispatch = reactRedux.useDispatch();
+  var domainName = window.location.hostname;
+  var isCheckDomainIskenya = domainName.includes('iskenya');
 
   var exportSessionsCsv = function exportSessionsCsv(filters) {
     try {
@@ -32169,7 +32171,7 @@ var useExportSessionCsv = function useExportSessionCsv() {
           var encodedUri = convertDataExportSession(data, filters.startDate, filters.endDate);
           var link = document.createElement("a");
           link.href = encodedUri;
-          link.download = "CheckIn_Template.csv";
+          link.download = "CheckIns_Template_" + new Date().getTime() + ".csv";
           link.click();
         });
       }, function (err) {
@@ -32188,38 +32190,45 @@ var useExportSessionCsv = function useExportSessionCsv() {
   };
 
   var convertDataExportSession = function convertDataExportSession(data, startDate, endDate) {
-    var headers = "Student Name, ID/Email, Question, Answer, Teacher, Start Time";
+    var headers = "Student Name,ID/Email,Question,Answer,Teacher,Start Time";
 
     if (startDate || endDate) {
       headers = "" + (moment(startDate).isValid() ? moment(startDate).format("DD/MM/YYYY") : '') + (moment(startDate).isValid() && moment(endDate).isValid() ? '-' : '') + moment(endDate).format("DD/MM/YYYY") + "\n" + headers;
     }
 
-    var content = data.map(function (session) {
+    var questions = data.questions,
+        strategyQuestions = data.strategyQuestions,
+        sessions = data.sessions;
+    var questionRatings = questions.filter(function (item) {
+      return item.type == QuestionType.Rating && !!item.isBeforeSession;
+    }).slice(0, 6);
+    var questionSummarize = questions.filter(function (item) {
+      return item.type == QuestionType.Summarize && !!item.isBeforeSession;
+    });
+    var questionBlock2 = questions.filter(function (item) {
+      return !!item.isBeforeSession;
+    }).slice(7, !isCheckDomainIskenya ? 13 : 12);
+    var afterSessionQuestions = questions.filter(function (item) {
+      return !item.isBeforeSession;
+    }).slice(0, 4);
+    var sessionQuestions = [];
+
+    if (questionSummarize.length > 0) {
+      sessionQuestions.push(questionSummarize[0]);
+    }
+
+    sessionQuestions = [].concat(sessionQuestions, questionRatings, questionBlock2);
+    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 questions = session.studentResult.questions;
-      var learningStrategyQuestions = session.teacherResult.questions;
-      var questionsContent = questions.map(function (question) {
-        return "\n" + studentName + ", " + studentEmail + ", " + escapeCell(htmlToText(question.text)) + ", " + (question.type != "Rating" ? escapeCell(question.answer) : question.answer) + "," + teacherName + ", " + startTime;
-      });
-      var learningStrategyQuestionsContent = learningStrategyQuestions.map(function (learning) {
-        var learningStrategyAnswers = learning.learningStrategyAnswers,
-            answer = learning.answer;
-        var answers = (answer === null || answer === void 0 ? void 0 : answer.split(";")) || [];
-        var answerConverted = answers.map(function (a) {
-          var questionAnswer = a.split("|");
-          var learningAnswer = questionAnswer.length ? learningStrategyAnswers.find(function (i) {
-            return "" + i.id == (questionAnswer === null || questionAnswer === void 0 ? void 0 : questionAnswer[0]);
-          }) : 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 answerConverted.join('');
-      });
-      return "" + questionsContent.join('') + learningStrategyQuestionsContent.join('');
+      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);
+      return "" + questionsContent + learningStrategyQuestionsContent + afterSessionQuestionsContent;
     }).join('');
     return "" + CSV_PREFIX + headers + encodeURIComponent(content);
   };
@@ -32230,7 +32239,37 @@ var useExportSessionCsv = function useExportSessionCsv() {
 
   var escapeCell = function escapeCell(value) {
     if (!value) return "";
-    return "" + value.replaceAll("\n", " ").replaceAll(",", ";");
+    return "\"" + value.replace(/"/g, '""').replaceAll(/\n/g, " ") + "\"";
+  };
+
+  var questionToCsv = function questionToCsv(questions, answers, studentName, studentEmail, teacherName, startTime) {
+    return questions.map(function (question) {
+      var questionAnswer = answers.find(function (i) {
+        return i.questionId === question.id;
+      });
+      return "\n" + studentName + "," + studentEmail + "," + escapeCell(htmlToText(question.text)) + "," + toAnswerCsv(question.type, questionAnswer === null || questionAnswer === void 0 ? void 0 : questionAnswer.text) + "," + teacherName + "," + startTime;
+    }).join('');
+  };
+
+  var strategyQuestionsToCsv = function strategyQuestionsToCsv(questions, strategyAnswers, studentName, studentEmail, teacherName, startTime) {
+    return strategyAnswers.map(function (strategyAnswer) {
+      var answer = strategyAnswer.text;
+      var answers = (answer === null || answer === void 0 ? void 0 : answer.split(";")) || [];
+      var answerConverted = answers.map(function (a) {
+        var questionAnswer = a.split("|");
+        var learningAnswer = questionAnswer.length ? questions.find(function (i) {
+          return "" + i.id == (questionAnswer === null || questionAnswer === void 0 ? void 0 : questionAnswer[0]);
+        }) : 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) + "," + ((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 {
@@ -32382,7 +32421,7 @@ var Dashboard = function Dashboard() {
     alt: ""
   })), React__default.createElement("p", {
     className: styles$1["button-content"] + " mb-0"
-  }, "Export to CSV")), React__default.createElement("button", {
+  }, "Export Check-ins to CSV")), React__default.createElement("button", {
     className: styles$1["button-export"] + " d-flex align-items-center border-0 p-0",
     onClick: toggle
   }, React__default.createElement("div", {