touchstudy-core 0.1.77 → 0.1.79

package/dist/components/Print/PrintExamView2.d.ts

@@ -2,7 +2,8 @@ import React from "react";
 import { Role } from "../../utils/constants";
 declare type Props = {
     role: Role;
+    history: any;
     dataExamSession?: any;
 };
-declare const PrintExamView2: ({ role, dataExamSession }: Props) => React.JSX.Element;
+declare const PrintExamView2: ({ history, role, dataExamSession }: Props) => React.JSX.Element;
 export default PrintExamView2;

package/dist/components/Print/configs/types.d.ts

@@ -6,6 +6,7 @@ export declare type ExamSessionData = {
 export declare type ExamSessionEventData = {
     message: string;
     examSessionId?: string;
+    studentId?: string;
     code?: string;
 };
 export declare enum PrintState {

package/dist/index.js

@@ -834,6 +834,7 @@ var useLogin$1 = function useLogin(homeAcademyUrl, homeUrl) {
         scope: "email"
       });
     };
+    console.info("GOOGLE_CLIENT_ID: ", GOOGLE_CLIENT_ID);
     !!gapiScript.gapi && gapiScript.gapi.load("client:auth2", start);
   }, [gapiScript.gapi]);
   React.useEffect(function () {
@@ -16714,9 +16715,9 @@ var PrintState$1;
 
 var TOTAL = 3;
 var PrintExamView2 = function PrintExamView2(_ref) {
-  var role = _ref.role,
+  var history = _ref.history,
+    role = _ref.role,
     dataExamSession = _ref.dataExamSession;
-  var history = reactRouterDom.useHistory();
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var isTeacher = exports.Role.Teacher === role;
@@ -16758,23 +16759,36 @@ var PrintExamView2 = function PrintExamView2(_ref) {
     var examSessionId = _ref2.examSessionId,
       studentId = _ref2.studentId,
       code = _ref2.code;
+    var width = 200;
+    var height = 200;
+    var left = window.screenX + window.outerWidth / 2 - width / 2;
+    var top = window.screenY + window.outerHeight / 2 - height / 2;
     var url = isTeacher ? window.location.origin + "/teacher/exam-results/" + examSessionId + "/students/" + studentId + "/print" : window.location.origin + "/student/exam-results/" + code + "/print";
     var windowName = isTeacher ? "popup-" + examSessionId + "-" + studentId : "popup-" + code;
-    var windowSpecs = "left=" + (window.innerWidth - 100) + ",top=" + (window.innerHeight - 100) + ",width=100,height=100,location=yes,resizable=yes,scrollbars=yes,status=yes";
+    var windowSpecs = "left=" + left + ",top=" + top + ",width=" + width + ",height=" + height + ",location=yes,resizable=yes,scrollbars=yes,status=yes";
     var childWindow = window.open(url, windowName, windowSpecs);
     if (childWindow == null) {
       setErrorLinks(function (prev) {
         return [].concat(prev, [{
           code: code,
           examSessionId: "" + examSessionId,
+          studentId: "" + studentId,
           message: isTeacher ? "/teacher/exam-results/" + examSessionId + "/students/" + studentId + "/print" : "/student/exam-results/" + code + "/print"
         }]);
       });
-      setData(function (es) {
-        return [].concat(es.filter(function (i) {
-          return i.code !== code;
-        }));
-      });
+      if (!isTeacher) {
+        setData(function (es) {
+          return [].concat(es.filter(function (i) {
+            return i.code !== code;
+          }));
+        });
+      } else {
+        setData(function (es) {
+          return [].concat(es.filter(function (i) {
+            return i.examSessionId !== examSessionId || i.studentId !== studentId;
+          }));
+        });
+      }
       return;
     }
     if (!isTeacher) {
@@ -16845,6 +16859,7 @@ var PrintExamView2 = function PrintExamView2(_ref) {
           return [].concat(prev, [{
             code: (_event$data = event.data) === null || _event$data === void 0 ? void 0 : _event$data.code,
             examSessionId: (_event$data2 = event.data) === null || _event$data2 === void 0 ? void 0 : _event$data2.examSessionId,
+            studentId: "" + studentId,
             message: isTeacher ? "/teacher/exam-results/" + event.data.examSessionId + "/students/" + event.data.studentId + "/print" : "/student/exam-results/" + event.data.code + "/print"
           }]);
         });
@@ -16885,16 +16900,18 @@ var PrintExamView2 = function PrintExamView2(_ref) {
   }, t("download_failed"), ":"), Array.from(new Set(errorLinks)).map(function (i) {
     var _info$createdBy;
     var info = isTeacher ? dataExamSession.find(function (exam) {
-      return (exam === null || exam === void 0 ? void 0 : exam.examSessionId.toString()) === (i === null || i === void 0 ? void 0 : i.examSessionId);
-    }) : dataExamSession.find();
+      return "" + (exam === null || exam === void 0 ? void 0 : exam.examSessionId) === "" + (i === null || i === void 0 ? void 0 : i.examSessionId) && "" + (exam === null || exam === void 0 ? void 0 : exam.studentId) === "" + (i === null || i === void 0 ? void 0 : i.studentId);
+    }) : dataExamSession.find(function (exam) {
+      return (exam === null || exam === void 0 ? void 0 : exam.code) === (i === null || i === void 0 ? void 0 : i.code);
+    });
     return React__default.createElement(material.Stack, {
       borderBottom: 1,
       borderColor: theme.palette.grey[500]
-    }, React__default.createElement(reactRouterDom.Link, {
-      to: i.message,
+    }, React__default.createElement("a", {
+      href: i.message,
       target: "_blank",
       rel: "noopener noreferrer"
-    }, (info === null || info === void 0 ? void 0 : info.studentName) || (info === null || info === void 0 ? void 0 : (_info$createdBy = info.createdBy) === null || _info$createdBy === void 0 ? void 0 : _info$createdBy.fullName)), (info === null || info === void 0 ? void 0 : info.title) && React__default.createElement(material.Typography, null, t("exam") + ": " + (info === null || info === void 0 ? void 0 : info.title)), (info === null || info === void 0 ? void 0 : info.startTime) && React__default.createElement(material.Typography, null, t("start_time") + ": " + utcToLocalTime(info === null || info === void 0 ? void 0 : info.startTime, "YYYY-MM-DD")));
+    }, (info === null || info === void 0 ? void 0 : info.studentName) || (info === null || info === void 0 ? void 0 : (_info$createdBy = info.createdBy) === null || _info$createdBy === void 0 ? void 0 : _info$createdBy.fullName)), (info === null || info === void 0 ? void 0 : info.title) && React__default.createElement(material.Typography, null, t("exam") + ": " + (info === null || info === void 0 ? void 0 : info.title)), (info === null || info === void 0 ? void 0 : info.startTime) && React__default.createElement(material.Typography, null, t("start_time") + ": " + utcToLocalTime(info === null || info === void 0 ? void 0 : info.startTime, t("date_time_format"))));
   })), React__default.createElement(material.Stack, {
     direction: "column",
     className: "mt-3"