mario-education 2.4.12-beta → 2.4.13-beta

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

@@ -15,3 +15,4 @@ export declare const LEARNING_STRATEGY_CHART_COLORS: string[];
 export declare const LEARNING_STRATEGY_INIT: {
     learningStrategies: never[];
 };
+export declare const GRAGE_DEFAULT: number[];

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

@@ -25,7 +25,8 @@ export declare const genderOptions: {
 }[];
 export declare const learningStrategyChartOptions: (labelNames: string[], usageCountList: number[]) => ApexOptions;
 export declare const ReadinessToLearnOptions: (questionTexts: string[]) => ApexOptions;
-export declare const optionsChartGrade: (maxDatas: number, grades: string[]) => ApexOptions;
+export declare const optionsChartGrade: (maxDatas: number, colorCharts: string[]) => ApexOptions;
 export declare const seriesConvert: (gradeAndQuantity: IStudentByGrade[]) => ISeries[];
 export declare const maxSeries: (series: ISeries[]) => number;
 export declare const average: (arr: number[]) => number;
+export declare const colorCharts: (series: ISeries[]) => string[];

package/dist/MarioFramework.Education/ClientApp/src/containers/QuestionScaffolding/hooks/useQuestionDetail.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="react" />
+import { TypeScaffolding } from "../ultis/ultis";
 declare type ScaffoldingDetail = {
     question: string;
     category: string;
     level: string;
+    typeScaffolding: TypeScaffolding;
 };
 declare const useQuestionDetail: () => {
     id: number;

package/dist/MarioFramework.Education/ClientApp/src/containers/QuestionScaffolding/ultis/ultis.d.ts

@@ -13,4 +13,8 @@ export declare const questionScaffoldingHeaders: {
     name: string;
     column: string;
 }[];
+export declare const enum TypeScaffolding {
+    OneToOne = 0,
+    Conference = 1
+}
 export declare const SORT_DATA_DEFAULT: any[];

package/dist/index.css

@@ -298,6 +298,20 @@ h6._3zOGW {
     line-height: 116%;
 }
 
+._3Y-Dd{
+  overflow: hidden;
+  height: 416px;
+}
+
+@media (min-width: 2250px){
+  ._3Y-Dd{
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+
 ._2Q9xO{
   border-radius: 50%;
   display: flex;

package/dist/index.js

@@ -9039,13 +9039,27 @@ var WelcomeEmailResend = function WelcomeEmailResend() {
 var schema$9 = yup.object({
   question: yup.string().required("Question is required")
 });
+var options$1 = [{
+  value: 0,
+  label: "One To One",
+  text: "OneToOne"
+}, {
+  value: 1,
+  label: "Conference",
+  text: "Conference"
+}];
 
-var SubjectDetailModal$2 = function SubjectDetailModal(props, ref) {
+var QuestionDetailModal = function QuestionDetailModal(props, ref) {
   var header = props.header,
       confirmText = props.confirmText,
       onConfirm = props.onConfirm,
       questionDetail = props.questionDetail,
       _onCancel = props.onCancel;
+
+  var _useState = React.useState(0),
+      typeQuestion = _useState[0],
+      setTypeQuestion = _useState[1];
+
   return React__default.createElement(formik.Formik, {
     initialValues: questionDetail,
     enableReinitialize: true,
@@ -9065,10 +9079,17 @@ var SubjectDetailModal$2 = function SubjectDetailModal(props, ref) {
         handleBlur = formikProps.handleBlur,
         handleSubmit = formikProps.handleSubmit,
         resetForm = formikProps.resetForm;
+    React.useEffect(function () {
+      if (!!values.typeScaffolding) {
+        setTypeQuestion(values.typeScaffolding);
+      }
+    }, [values]);
     return React__default.createElement(marioCore.CommonModal, {
       header: header,
       confirmText: confirmText,
       onCancel: function onCancel() {
+        setTypeQuestion(values.typeScaffolding);
+
         _onCancel();
 
         resetForm();
@@ -9102,7 +9123,8 @@ var SubjectDetailModal$2 = function SubjectDetailModal(props, ref) {
       },
       onBlur: handleBlur("level")
     }))), React__default.createElement(reactstrap.Col, {
-      md: 12
+      md: 12,
+      className: "mb-2"
     }, React__default.createElement(reactstrap.Label, null, "Category"), React__default.createElement(reactstrap.Input, {
       name: "category",
       placeholder: "Category",
@@ -9111,11 +9133,26 @@ var SubjectDetailModal$2 = function SubjectDetailModal(props, ref) {
         handleChange(e);
       },
       onBlur: handleBlur("category")
+    })), React__default.createElement(reactstrap.Col, {
+      md: 12,
+      className: "mb-2"
+    }, React__default.createElement(reactstrap.Label, null, "Use for"), React__default.createElement(marioCore.CustomSelector, {
+      name: "typeScaffolding",
+      isRequired: true,
+      value: options$1.find(function (o) {
+        return o.value == typeQuestion || o.text == typeQuestion;
+      }),
+      options: options$1,
+      onChange: function onChange(option) {
+        values.typeScaffolding = option.value;
+        setTypeQuestion(option.value);
+      },
+      onBlur: handleBlur("typeScaffolding")
     }))));
   });
 };
 
-var QuestionDetailModal = React.forwardRef(SubjectDetailModal$2);
+var QuestionDetailModal$1 = React.forwardRef(QuestionDetailModal);
 
 var SCAFFOLDING_URL = marioCore.BASE_URL + "/api/ScaffoldingQuestion";
 var get$e = function get(filter) {
@@ -9139,7 +9176,8 @@ var remove$d = function remove(id) {
 var initValue$c = {
   question: "",
   category: "",
-  level: ""
+  level: "",
+  typeScaffolding: 0
 };
 
 var useQuestionDetail = function useQuestionDetail() {
@@ -9281,6 +9319,9 @@ var questionScaffoldingHeaders = [{
 }, {
   name: "Category",
   column: "Category"
+}, {
+  name: "Type Question",
+  column: "TypeScaffolding"
 }];
 var SORT_DATA_DEFAULT = new Array(questionScaffoldingHeaders.length).fill("default");
 
@@ -9452,9 +9493,6 @@ var QuestionScaffolding = function QuestionScaffolding() {
   };
 
   var onConfirm = function onConfirm(values) {
-    console.log({
-      values: values
-    });
     confirmData(values, function () {
       modal && modal.current && modal.current.toggle();
       getData();
@@ -9472,7 +9510,7 @@ var QuestionScaffolding = function QuestionScaffolding() {
 
   return React__default.createElement("div", {
     className: "fadeIn animated"
-  }, React__default.createElement(QuestionDetailModal, {
+  }, React__default.createElement(QuestionDetailModal$1, {
     ref: modal,
     header: !!id ? "Edit Question" : "Create Question",
     confirmText: !!id ? "Update" : "Create",
@@ -9488,7 +9526,7 @@ var QuestionScaffolding = function QuestionScaffolding() {
   }), React__default.createElement(reactstrap.Row, {
     className: "my-2"
   }, React__default.createElement(reactstrap.Col, {
-    md: 4
+    md: 8
   }, React__default.createElement(marioCore.AddButton, {
     text: "Create Question",
     onClick: function onClick() {
@@ -9500,7 +9538,7 @@ var QuestionScaffolding = function QuestionScaffolding() {
   }, "Total of questions: ", totalItems)), React__default.createElement(reactstrap.Row, {
     className: "mb-2"
   }, React__default.createElement(reactstrap.Col, {
-    md: 8
+    md: 12
   }, questionScaffoldingList && questionScaffoldingList.length > 0 ? React__default.createElement(reactstrap.Table, {
     bordered: true,
     hover: true,
@@ -9545,6 +9583,8 @@ var QuestionScaffolding = function QuestionScaffolding() {
     }, record.level), React__default.createElement("td", {
       className: "align-middle"
     }, record.category), React__default.createElement("td", {
+      className: "align-middle"
+    }, record.typeScaffolding), React__default.createElement("td", {
       className: "text-center align-middle"
     }, React__default.createElement(marioCore.DeleteButtonIcon, {
       onClick: function onClick() {
@@ -9554,7 +9594,7 @@ var QuestionScaffolding = function QuestionScaffolding() {
   }))) : React__default.createElement(marioCore.EmptyDataAlert, {
     label: "question"
   })), React__default.createElement(reactstrap.Col, {
-    md: 8
+    md: 12
   }, React__default.createElement(marioCore.CustomPagination, {
     filters: filters,
     totalRecordCount: totalItems,
@@ -9645,7 +9685,7 @@ var SetupContainer = function SetupContainer() {
   });
 };
 
-var options$1 = [{
+var options$2 = [{
   value: false,
   label: "Student default questions"
 }, {
@@ -9665,7 +9705,7 @@ var DefaultQuestionStudentTeacherFilter = function DefaultQuestionStudentTeacher
       onChange = _ref.onChange,
       placeholder = _ref.placeholder,
       isDefaultGeneralClass = _ref.isDefaultGeneralClass;
-  var value = options$1.find(function (option) {
+  var value = options$2.find(function (option) {
     return option.value === isDefaultQuestionTeacher;
   });
 
@@ -9684,7 +9724,7 @@ var DefaultQuestionStudentTeacherFilter = function DefaultQuestionStudentTeacher
   };
   return React__default.createElement(marioCore.CustomSelector, {
     isClearable: true,
-    options: isDefaultGeneralClass ? optionGenerals : options$1,
+    options: isDefaultGeneralClass ? optionGenerals : options$2,
     placeholder: placeholder,
     value: value,
     onChange: onChange,
@@ -19047,6 +19087,7 @@ var INITIAL_ACTIVITY_FRIENDS = {
 var LEARNING_STRATEGY_INIT = {
   learningStrategies: []
 };
+var GRAGE_DEFAULT = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
 
 var TITLE$s = "Dashboard";
 
@@ -19167,11 +19208,11 @@ var useDashboard = function useDashboard() {
     }
 
     if (m > 0) {
-      hTime += m + "m";
+      hTime += " " + m + "m";
     }
 
     if (s > 0) {
-      hTime += s + "s";
+      hTime += " " + s + "s";
     }
 
     return hTime;
@@ -19245,7 +19286,7 @@ var useDashboard = function useDashboard() {
   };
 };
 
-var styles$1 = {"dashboard-card":"_1Jgr2","quantity-table":"_3Thdy","size-icon":"_1WLBo","block-dashboard":"_10Pgm","size-arrow":"_3jPb_","color-down":"_1c43y","color-up":"_F1afY","box-filter":"_1kqUQ","title-card":"_10hbz","value-card":"_2rmw_","deviant-card":"_1tdQu","filter-card":"_2BvFN","box-skill-item":"_2TBTW","numerical-order":"_3XXJp","backoround-top-skill":"_LCuWQ","color-filter":"_3x9D7","btn-filter":"_2In63","block-collapse":"_1Vhg_","form-date-picker":"_6yLxd","bock-filter-left":"_h74SO","bock-filter-right":"_3e2pi","form-filter-gender":"_31VDE","form-filter-grade":"_1Pm1w","title-card-box":"_3hSow","box-item":"_1yuC9","image-no-data":"_2PMoX","chart-data":"_2asi-","apexcharts-datalabels":"_muT01","apexcharts-pie-label":"_35BzZ","image-custom":"_3pkbc","image-special-need":"_16MpB","title-dashboard":"_CHu-i"};
+var styles$1 = {"dashboard-card":"_1Jgr2","quantity-table":"_3Thdy","size-icon":"_1WLBo","block-dashboard":"_10Pgm","size-arrow":"_3jPb_","color-down":"_1c43y","color-up":"_F1afY","box-filter":"_1kqUQ","title-card":"_10hbz","value-card":"_2rmw_","deviant-card":"_1tdQu","filter-card":"_2BvFN","box-skill-item":"_2TBTW","numerical-order":"_3XXJp","backoround-top-skill":"_LCuWQ","color-filter":"_3x9D7","btn-filter":"_2In63","block-collapse":"_1Vhg_","form-date-picker":"_6yLxd","bock-filter-left":"_h74SO","bock-filter-right":"_3e2pi","form-filter-gender":"_31VDE","form-filter-grade":"_1Pm1w","title-card-box":"_3hSow","box-item":"_1yuC9","image-no-data":"_2PMoX","chart-data":"_2asi-","apexcharts-datalabels":"_muT01","apexcharts-pie-label":"_35BzZ","image-custom":"_3pkbc","image-special-need":"_16MpB","title-dashboard":"_CHu-i","box-chart":"_3Y-Dd"};
 
 var DashboardCard = function DashboardCard(_ref) {
   var label = _ref.label,
@@ -19377,15 +19418,21 @@ var learningStrategyChartOptions = function learningStrategyChartOptions(labelNa
     },
     colors: ["#1a55ae", "#ff0000"],
     tooltip: {
+      x: {
+        formatter: function formatter(value) {
+          return value.toString();
+        }
+      },
       y: {
         formatter: function formatter(value, _ref3) {
           var seriesIndex = _ref3.seriesIndex,
               dataPointIndex = _ref3.dataPointIndex;
-          return (seriesIndex ? usageCountList[dataPointIndex] : value).toString();
+          return (seriesIndex ? usageCountList[dataPointIndex] : value.toFixed(2)).toString();
         }
       }
     },
     chart: {
+      width: '100%',
       stacked: true,
       toolbar: {
         show: false
@@ -19436,6 +19483,8 @@ var learningStrategyChartOptions = function learningStrategyChartOptions(labelNa
 var ReadinessToLearnOptions = function ReadinessToLearnOptions(questionTexts) {
   return {
     chart: {
+      width: 300,
+      height: 300,
       toolbar: {
         show: false
       }
@@ -19481,7 +19530,7 @@ var ReadinessToLearnOptions = function ReadinessToLearnOptions(questionTexts) {
       labels: {
         show: true,
         offsetX: 10,
-        offsetY: 0,
+        offsetY: 5,
         rotate: 0
       },
       tickAmount: 5,
@@ -19489,34 +19538,12 @@ var ReadinessToLearnOptions = function ReadinessToLearnOptions(questionTexts) {
       max: 100
     },
     responsive: [{
-      breakpoint: 2900,
+      breakpoint: 4000,
       options: {
         chart: {
-          width: "100%",
-          height: 460
-        },
-        legend: {
-          show: true,
-          position: "left",
-          width: 195,
-          offsetX: 0,
-          offsetY: 40,
-          fontSize: "14px",
-          wordBreak: "break-word"
-        },
-        plotOptions: {
-          radialBar: {
-            offsetX: 0,
-            offsetY: 0
-          }
-        }
-      }
-    }, {
-      breakpoint: 2400,
-      options: {
-        chart: {
-          width: "100%",
-          height: 400
+          width: 600,
+          height: 600,
+          offsetY: 40
         }
       }
     }, {
@@ -19524,79 +19551,28 @@ var ReadinessToLearnOptions = function ReadinessToLearnOptions(questionTexts) {
       options: {
         chart: {
           width: "100%",
-          height: 385
-        }
-      }
-    }, {
-      breakpoint: 2100,
-      options: {
-        chart: {
-          width: "100%",
-          height: 377
-        }
-      }
-    }, {
-      breakpoint: 1850,
-      options: {
-        chart: {
-          width: "100%",
-          height: 363
+          height: 650,
+          offsetY: -80,
+          offsetX: 15
         }
       }
     }, {
-      breakpoint: 1800,
+      breakpoint: 1590,
       options: {
         chart: {
           width: "100%",
-          height: 345
+          height: 600,
+          offsetY: -80,
+          offsetX: -10
         }
       }
     }, {
-      breakpoint: 1750,
+      breakpoint: 1200,
       options: {
         chart: {
           width: "100%",
-          height: 338
-        }
-      }
-    }, {
-      breakpoint: 1735,
-      options: {
-        chart: {
-          width: "100%",
-          height: 326
-        }
-      }
-    }, {
-      breakpoint: 1720,
-      options: {
-        chart: {
-          width: "100%",
-          height: 313
-        }
-      }
-    }, {
-      breakpoint: 1700,
-      options: {
-        chart: {
-          width: "100%",
-          height: 303
-        }
-      }
-    }, {
-      breakpoint: 1650,
-      options: {
-        chart: {
-          width: "100%",
-          height: 287
-        }
-      }
-    }, {
-      breakpoint: 1600,
-      options: {
-        chart: {
-          width: "100%",
-          height: 390
+          height: 500,
+          offsetY: 10
         },
         legend: {
           show: true,
@@ -19614,17 +19590,18 @@ var ReadinessToLearnOptions = function ReadinessToLearnOptions(questionTexts) {
         }
       }
     }, {
-      breakpoint: 1280,
+      breakpoint: 700,
       options: {
         chart: {
           width: "100%",
-          height: 393
+          height: 500,
+          offsetY: 40
         }
       }
     }]
   };
 };
-var optionsChartGrade = function optionsChartGrade(maxDatas, grades) {
+var optionsChartGrade = function optionsChartGrade(maxDatas, colorCharts) {
   return {
     chart: {
       type: "bar",
@@ -19646,7 +19623,7 @@ var optionsChartGrade = function optionsChartGrade(maxDatas, grades) {
     grid: {
       show: false
     },
-    colors: ["#1D74C5", "#78B6E2", "#78B6E2", "#A4D1F0", "#4B92CE"],
+    colors: colorCharts,
     dataLabels: {
       enabled: true,
       offsetX: 30,
@@ -19659,7 +19636,7 @@ var optionsChartGrade = function optionsChartGrade(maxDatas, grades) {
       show: false
     },
     xaxis: {
-      categories: grades,
+      categories: GRAGE_DEFAULT,
       labels: {
         show: false
       },
@@ -19701,6 +19678,29 @@ var average = function average(arr) {
     return a + b;
   }, 0) / arr.length;
 };
+var colorCharts = function colorCharts(series) {
+  return series[0].data.map(function (i) {
+    switch (Math.floor(i / 10)) {
+      case 0:
+        return "#D6ECFB";
+
+      case 1:
+        return "#A4D1F0";
+
+      case 2:
+        return "#78B6E2";
+
+      case 3:
+        return "#4B92CE";
+
+      case 4:
+        return "#1e78cc";
+
+      default:
+        return "#0f69bd";
+    }
+  });
+};
 
 var ReadinessToLearn = function ReadinessToLearn(_ref) {
   var data = _ref.data;
@@ -19714,7 +19714,7 @@ var ReadinessToLearn = function ReadinessToLearn(_ref) {
     })
   }];
   return React__default.createElement("div", {
-    className: "d-flex justify-content-center"
+    className: "w-100 " + styles$1["box-chart"]
   }, series.length > 0 ? React__default.createElement(ReactApexChart, {
     options: ReadinessToLearnOptions(questionTexts),
     series: series,
@@ -19769,9 +19769,9 @@ var TopLearningStrategy = function TopLearningStrategy(_ref) {
     })
   }];
   return React__default.createElement("div", {
-    className: "d-flex h-100 justify-content-center"
+    className: "h-100 w-100"
   }, React__default.createElement("div", {
-    className: "d-flex align-items-end justify-content-center"
+    className: "h-100 w-100"
   }, serieslearningStrategy.some(function (i) {
     return i.data;
   }) ? React__default.createElement(ReactApexChart, {
@@ -19945,13 +19945,19 @@ var StudentByGrade = function StudentByGrade(_ref) {
   var _series$, _series$$data;
 
   var data = _ref.data;
-  var series = seriesConvert(data);
+  var newData = GRAGE_DEFAULT.map(function (i) {
+    return data.find(function (j) {
+      return i === parseInt(j.grade);
+    }) || {
+      grade: i.toString(),
+      quantity: 0
+    };
+  });
+  var series = seriesConvert(newData);
   return React__default.createElement("div", null, (_series$ = series[0]) !== null && _series$ !== void 0 && (_series$$data = _series$.data) !== null && _series$$data !== void 0 && _series$$data.some(function (i) {
     return i;
   }) ? React__default.createElement(ReactApexChart, {
-    options: optionsChartGrade(maxSeries(series), data.map(function (i) {
-      return i.grade;
-    })),
+    options: optionsChartGrade(maxSeries(series), colorCharts(series)),
     series: series,
     type: "bar",
     width: "100%",
@@ -20333,18 +20339,12 @@ var Dashboard = function Dashboard() {
   var questionOneToOne = ["Well-being", "Growth", "Relations", "Productivity", "Academic", "Self-Efficacy", "Happiness", "Energy", "Focus"];
   var questionClassReflection = ["Focus", "Energy", "Happiness", "Stress", "Productivity"];
   var questionConferences = ["Organization", "Self-Awareness", "Self-Directed Learning", "Self-Management", "Self-Management", "Self-Advocacy"];
-  var cards = [{
+  var listChartLeft = [{
     label: "Top learning strategies",
     children: React__default.createElement(TopLearningStrategy, {
       data: topLearningStrategies
     })
   }, {
-    label: "Readiness to learn",
-    children: React__default.createElement(ReadinessToLearn, {
-      data: readinessToLearning
-    })
-  }];
-  var listChartLeft = [{
     label: "1-to-1",
     children: React__default.createElement(CustomBarChart, {
       data: chartOneToOneData,
@@ -20382,6 +20382,11 @@ var Dashboard = function Dashboard() {
     })
   }];
   var listChartRight = [{
+    label: "Readiness to learn",
+    children: React__default.createElement(ReadinessToLearn, {
+      data: readinessToLearning
+    })
+  }, {
     label: "Students by Gender",
     children: React__default.createElement(StudentByGender, {
       data: studentByGender
@@ -20556,38 +20561,26 @@ var Dashboard = function Dashboard() {
       deviant: item.deviant,
       filter: item.filter
     });
-  })), React__default.createElement(reactstrap.Row, {
-    className: "mb-2 px-3"
-  }, cards.map(function (card) {
-    return React__default.createElement(reactstrap.Col, {
-      key: card.label,
-      xs: 12,
-      md: 6,
-      className: "mb-4"
-    }, React__default.createElement(DashboardCard, {
-      label: card.label,
-      children: card.children
-    }));
   })), React__default.createElement(reactstrap.Row, {
     className: "my-2"
   }, React__default.createElement(reactstrap.Col, {
     xs: 12,
-    xl: 7
+    xl: 8
   }, listChartLeft.map(function (i) {
     return React__default.createElement(reactstrap.Col, {
       key: i.label,
-      className: "mb-4"
+      className: "mb-4 p-0"
     }, React__default.createElement(DashboardCard, {
       label: i.label,
       children: i.children
     }));
   })), React__default.createElement(reactstrap.Col, {
     xs: 12,
-    xl: 5
+    xl: 4
   }, listChartRight.map(function (i) {
     return React__default.createElement(reactstrap.Col, {
       key: i.label,
-      className: "mb-4"
+      className: "mb-4 p-0"
     }, React__default.createElement(DashboardCard, {
       label: i.label,
       children: i.children