mario-teacher-student-client 1.5.3 → 1.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.css CHANGED
@@ -77,7 +77,7 @@
77
77
  ._1bTW5 ._1gs0Z {
78
78
  width: 26%;
79
79
  padding-top: 0;
80
- font-size: 11px; } }
80
+ font-size: 12px; } }
81
81
 
82
82
  h2._13S5D {
83
83
  color: #2d3748;
@@ -151,8 +151,8 @@ p._1YLGi {
151
151
  @media (max-width: 767px) {
152
152
  ._1M6M1 ._1wmi8 {
153
153
  padding: 10px 0;
154
- margin-right: 8px;
155
- width: 34%; }
154
+ margin: 8px;
155
+ width: 20%; }
156
156
  ._1M6M1 ._1wmi8 img {
157
157
  width: 38px;
158
158
  height: 38px; }
@@ -174,7 +174,7 @@ p._1YLGi {
174
174
 
175
175
  @media (max-width: 480px) {
176
176
  ._1M6M1 ._1wmi8 {
177
- padding: 10px 4px; } }
177
+ padding: 4px; } }
178
178
 
179
179
  ._KKK4u {
180
180
  display: flex;
@@ -1278,7 +1278,7 @@ p._1YLGi {
1278
1278
  font-size: 18px;
1279
1279
  font-weight: 600; }
1280
1280
  ._3QPbd ._3Ti85 {
1281
- width: 30%;
1281
+ width: 33%;
1282
1282
  padding: 10px; }
1283
1283
  @media (max-width: 767px) {
1284
1284
  ._3QPbd ._3Ti85 {
@@ -3601,8 +3601,8 @@ h4._1gYmd > i {
3601
3601
  ._SX3F9 {
3602
3602
  margin-right: 20px; }
3603
3603
  ._SX3F9 img {
3604
- width: 100px;
3605
- height: 100px;
3604
+ width: 119px;
3605
+ height: 119px;
3606
3606
  border: 50%; }
3607
3607
 
3608
3608
  ._3-eOr {
@@ -3716,7 +3716,8 @@ h4._pDCgR {
3716
3716
  ._PaUcu ._nmBGv i {
3717
3717
  margin-left: 10px; } }
3718
3718
 
3719
- ._2pF1z, ._2W0UP {
3719
+ ._2pF1z,
3720
+ ._2W0UP {
3720
3721
  cursor: pointer; }
3721
3722
 
3722
3723
  @font-face {
package/dist/index.js CHANGED
@@ -19,6 +19,7 @@ var GroupIcon = _interopDefault(require('@material-ui/icons/Group'));
19
19
  var SettingsIcon = _interopDefault(require('@material-ui/icons/Settings'));
20
20
  var StudentsIcon = _interopDefault(require('@material-ui/icons/Wc'));
21
21
  var SchoolIcon = _interopDefault(require('@material-ui/icons/School'));
22
+ var Pusher = _interopDefault(require('pusher-js/with-encryption'));
22
23
  var dateFns = require('date-fns');
23
24
  var moment = _interopDefault(require('moment'));
24
25
  var FullCalendar = _interopDefault(require('@fullcalendar/react'));
@@ -45,7 +46,6 @@ var FilterListIcon = _interopDefault(require('@material-ui/icons/FilterList'));
45
46
  var StarBorderIcon = _interopDefault(require('@material-ui/icons/StarBorder'));
46
47
  var StarIcon = _interopDefault(require('@material-ui/icons/Star'));
47
48
  var _ = _interopDefault(require('lodash'));
48
- var Pusher = _interopDefault(require('pusher-js/with-encryption'));
49
49
  var TimelineIcon = _interopDefault(require('@material-ui/icons/Timeline'));
50
50
  var CloseIcon = _interopDefault(require('@material-ui/icons/Close'));
51
51
  var CreateIcon = _interopDefault(require('@material-ui/icons/Create'));
@@ -143,6 +143,8 @@ var getUnreadNotification = function getUnreadNotification() {
143
143
  return marioCore.api.get(NOTIFICATION_URL + "/unread");
144
144
  };
145
145
 
146
+ var NOTIFICATION_CHANNEL = "NOTIFICATION_CHANNEL";
147
+ var NEW_NOTIFICATION = "NEW_NOTIFICATION";
146
148
  var drawerWidth = 240;
147
149
  var headerHeightDesktop = 64;
148
150
  var headerHeightMobile = 55;
@@ -177,11 +179,22 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
177
179
  var history = reactRouterDom.useHistory();
178
180
  var location = reactRouterDom.useLocation();
179
181
  var dispatch = reactRedux.useDispatch();
182
+ var userId = reactRedux.useSelector(function (state) {
183
+ var _state$common, _state$common$user;
184
+
185
+ return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.id;
186
+ });
187
+ var pusherCluster = reactRedux.useSelector(function (state) {
188
+ return state.common.user.pusherCluster;
189
+ });
190
+ var pusherKey = reactRedux.useSelector(function (state) {
191
+ return state.common.user.pusherKey;
192
+ });
180
193
  var currentUrl = location.pathname;
181
194
  var roles = reactRedux.useSelector(function (state) {
182
- var _state$common, _state$common$user;
195
+ var _state$common2, _state$common2$user;
183
196
 
184
- return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
197
+ return (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : (_state$common2$user = _state$common2.user) === null || _state$common2$user === void 0 ? void 0 : _state$common2$user.roles;
185
198
  });
186
199
  var isTeacher = roles.includes("Teacher");
187
200
 
@@ -242,7 +255,22 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
242
255
  }, []);
243
256
  React.useEffect(function () {
244
257
  getUnreadNoti();
245
- }, [getUnreadNoti]);
258
+ var pusher;
259
+
260
+ if (pusherCluster && pusherKey) {
261
+ pusher = new Pusher(pusherKey, {
262
+ cluster: pusherCluster
263
+ });
264
+ var channel = pusher.subscribe(NOTIFICATION_CHANNEL + "-" + userId);
265
+ channel.bind(NEW_NOTIFICATION, function () {
266
+ getUnreadNoti();
267
+ });
268
+ }
269
+
270
+ return function () {
271
+ pusher && pusher.unsubscribe(NOTIFICATION_CHANNEL + "-" + userId);
272
+ };
273
+ }, []);
246
274
  var renderNotificationBadge = React.useCallback(function () {
247
275
  if (!unreadNoti) return React__default.createElement(NotificationsIcon, {
248
276
  onClick: function onClick() {
@@ -11336,8 +11364,8 @@ var useOverview = function useOverview(studentId) {
11336
11364
  setInformationWellbeing = _useState3[1];
11337
11365
 
11338
11366
  var _useState4 = React.useState({
11339
- startDate: Date.now(),
11340
- endDate: moment().add(7, "days").valueOf()
11367
+ startDate: moment().startOf("month").valueOf(),
11368
+ endDate: Date.now()
11341
11369
  }),
11342
11370
  filters = _useState4[0],
11343
11371
  setFilters = _useState4[1];
@@ -11508,14 +11536,12 @@ var OverviewWellbeing = function OverviewWellbeing(_ref) {
11508
11536
  chartData = _ref.chartData,
11509
11537
  width = _ref.width;
11510
11538
  var chartRef = React.useRef(null);
11511
- console.log("data 12");
11512
- console.log(width);
11513
11539
 
11514
11540
  var formatData = function formatData(labelData, data) {
11515
11541
  return {
11516
11542
  labels: labelData,
11517
11543
  datasets: [{
11518
- label: "Wellbeing Overview",
11544
+ label: "Overview",
11519
11545
  stack: "Stack 0",
11520
11546
  fill: false,
11521
11547
  data: data,
@@ -11539,9 +11565,6 @@ var OverviewWellbeing = function OverviewWellbeing(_ref) {
11539
11565
  options: {
11540
11566
  responsive: true,
11541
11567
  maintainAspectRatio: false,
11542
- tooltips: {
11543
- enabled: false
11544
- },
11545
11568
  elements: {
11546
11569
  line: {
11547
11570
  tension: 0
@@ -11553,6 +11576,13 @@ var OverviewWellbeing = function OverviewWellbeing(_ref) {
11553
11576
  legend: {
11554
11577
  display: false
11555
11578
  },
11579
+ tooltips: {
11580
+ callbacks: {
11581
+ label: function label(tooltipItem, data) {
11582
+ return "" + data['datasets'][0]['data'][tooltipItem['index']] * 10 || "";
11583
+ }
11584
+ }
11585
+ },
11556
11586
  scales: {
11557
11587
  xAxes: [{
11558
11588
  gridLines: {
@@ -11564,14 +11594,14 @@ var OverviewWellbeing = function OverviewWellbeing(_ref) {
11564
11594
  ticks: {
11565
11595
  beginAtZero: false,
11566
11596
  min: 0,
11567
- max: 5,
11597
+ max: 10,
11568
11598
  stepSize: 1,
11569
11599
  padding: 10,
11570
11600
  callback: function callback(value) {
11571
- var x = ["Awful", "", "", "", "", "Fantastic"];
11601
+ var x = ["Awful", "", "", "", "", "", "", "", "", "", "Fantastic"];
11572
11602
 
11573
- if (value >= 5) {
11574
- return x[5];
11603
+ if (value >= 10) {
11604
+ return x[10];
11575
11605
  }
11576
11606
 
11577
11607
  return x[value || 0];
@@ -11590,8 +11620,7 @@ var OverviewWellbeing = function OverviewWellbeing(_ref) {
11590
11620
  display: false
11591
11621
  }
11592
11622
  }]
11593
- },
11594
- events: []
11623
+ }
11595
11624
  }
11596
11625
  });
11597
11626
  }
@@ -11669,9 +11698,6 @@ var Overview = function Overview(props) {
11669
11698
 
11670
11699
  var overviewTotal = React.useMemo(function () {
11671
11700
  var currentYear = moment().format("YYYY");
11672
- console.log({
11673
- informationWellbeing: informationWellbeing
11674
- });
11675
11701
  return overviewCollap.map(function (item) {
11676
11702
  if (item.id == informationWellbeing.type) {
11677
11703
  return {
@@ -11726,7 +11752,14 @@ var Overview = function Overview(props) {
11726
11752
  var handleChange = function handleChange(type, panel) {
11727
11753
  return function () {
11728
11754
  setExpanded(expanded != panel ? panel : "");
11729
- panel != expanded && getInformationWellbeing(type, Date.now(), moment().add(7, "days").valueOf());
11755
+
11756
+ if (panel != expanded) {
11757
+ getInformationWellbeing(type, moment().startOf("month").valueOf(), Date.now());
11758
+ changeFilters({
11759
+ startDate: moment().startOf("month").valueOf(),
11760
+ endDate: Date.now()
11761
+ });
11762
+ }
11730
11763
  };
11731
11764
  };
11732
11765
 
@@ -11735,8 +11768,6 @@ var Overview = function Overview(props) {
11735
11768
 
11736
11769
  var widthOverview = ((_document$getElementB = document.getElementById('accordion-overview')) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.offsetWidth) || 840;
11737
11770
  setWidth(widthOverview);
11738
- console.log("data");
11739
- console.log(width);
11740
11771
  }, []);
11741
11772
  return React__default.createElement("div", {
11742
11773
  className: styles$3["box-overview"]
@@ -14245,13 +14276,13 @@ var StudentToDo = function StudentToDo() {
14245
14276
  fontWeight: 700,
14246
14277
  fontSize: 14,
14247
14278
  textTransform: "uppercase",
14248
- cursor: 'pointer'
14279
+ cursor: "pointer"
14249
14280
  },
14250
14281
  width: "20%",
14251
14282
  onClick: function onClick() {
14252
14283
  handleSort("classType");
14253
14284
  }
14254
- }, "CLASS TYPE", filters.sortBy === "classType" ? filters.sortOrder === 'DESC' ? React__default.createElement(ArrowDownwardIcon, {
14285
+ }, "CLASS TYPE", filters.sortBy === "classType" ? filters.sortOrder === "DESC" ? React__default.createElement(ArrowDownwardIcon, {
14255
14286
  color: "disabled",
14256
14287
  style: {
14257
14288
  marginLeft: "5px"
@@ -14266,13 +14297,13 @@ var StudentToDo = function StudentToDo() {
14266
14297
  fontWeight: 700,
14267
14298
  fontSize: 14,
14268
14299
  textTransform: "uppercase",
14269
- cursor: 'pointer'
14300
+ cursor: "pointer"
14270
14301
  },
14271
14302
  width: "20%",
14272
14303
  onClick: function onClick() {
14273
14304
  handleSort("classDate");
14274
14305
  }
14275
- }, "CLASS DATE", filters.sortBy === "classDate" ? filters.sortOrder === 'DESC' ? React__default.createElement(ArrowDownwardIcon, {
14306
+ }, "CLASS DATE", filters.sortBy === "classDate" ? filters.sortOrder === "DESC" ? React__default.createElement(ArrowDownwardIcon, {
14276
14307
  color: "disabled",
14277
14308
  style: {
14278
14309
  marginLeft: "5px"
@@ -14287,13 +14318,13 @@ var StudentToDo = function StudentToDo() {
14287
14318
  fontWeight: 700,
14288
14319
  fontSize: 14,
14289
14320
  textTransform: "uppercase",
14290
- cursor: 'pointer'
14321
+ cursor: "pointer"
14291
14322
  },
14292
14323
  width: "20%",
14293
14324
  onClick: function onClick() {
14294
14325
  handleSort("teacher");
14295
14326
  }
14296
- }, "TEACHER", filters.sortBy === "teacher" ? filters.sortOrder === 'DESC' ? React__default.createElement(ArrowDownwardIcon, {
14327
+ }, "TEACHER", filters.sortBy === "teacher" ? filters.sortOrder === "DESC" ? React__default.createElement(ArrowDownwardIcon, {
14297
14328
  color: "disabled",
14298
14329
  style: {
14299
14330
  marginLeft: "5px"
@@ -14327,7 +14358,7 @@ var StudentToDo = function StudentToDo() {
14327
14358
  className: "" + myStudent["time-Date"]
14328
14359
  }, " ", timeSplitArray[0], " ", React__default.createElement("span", {
14329
14360
  className: "" + myStudent["time-Hours-Minute"]
14330
- }, " - ", timeSplitArray[1], " "))), React__default.createElement(core.TableCell, {
14361
+ }, " ", "-", " ", timeSplitArray[1], " "))), React__default.createElement(core.TableCell, {
14331
14362
  align: "left",
14332
14363
  className: "" + myStudent["row_name"]
14333
14364
  }, React__default.createElement("img", {
@@ -14364,7 +14395,7 @@ var StudentToDo = function StudentToDo() {
14364
14395
  sm: 2,
14365
14396
  className: "" + myStudent["box-avatar"]
14366
14397
  }, React__default.createElement("img", {
14367
- src: DEFAULT_USER_AVATAR$b,
14398
+ src: renderUrlImage(row),
14368
14399
  alt: "",
14369
14400
  className: "" + myStudent["avatar_user"]
14370
14401
  })), React__default.createElement(core.Grid, {
@@ -14379,7 +14410,7 @@ var StudentToDo = function StudentToDo() {
14379
14410
  className: "" + myStudent["box-todo-class-date"]
14380
14411
  }, " ", React__default.createElement("span", {
14381
14412
  className: "" + myStudent["font-size-class-date"]
14382
- }, " Class Date: "), React__default.createElement(core.Typography, {
14413
+ }, " ", "Class Date:", " "), React__default.createElement(core.Typography, {
14383
14414
  className: "" + myStudent["class-date-p"]
14384
14415
  }, (!!row.classDate && dateFns.format(new Date(row.classDate), "dd MMM yyyy")) + " - ", React__default.createElement("strong", null, !!row.classDate && dateFns.format(new Date(row.classDate), "HH:mm aa"))))), React__default.createElement(core.Grid, {
14385
14416
  xs: 2,
@@ -14580,13 +14611,13 @@ var StudentHistory = function StudentHistory() {
14580
14611
  fontWeight: 700,
14581
14612
  fontSize: 14,
14582
14613
  textTransform: "uppercase",
14583
- cursor: 'pointer'
14614
+ cursor: "pointer"
14584
14615
  },
14585
14616
  width: "20%",
14586
14617
  onClick: function onClick() {
14587
14618
  handleSort("classType");
14588
14619
  }
14589
- }, "CLASS TYPE", filters.sortBy == "classType" && (filters.sortOrder === 'DESC' ? React__default.createElement(ArrowDownwardIcon, {
14620
+ }, "CLASS TYPE", filters.sortBy == "classType" && (filters.sortOrder === "DESC" ? React__default.createElement(ArrowDownwardIcon, {
14590
14621
  color: "disabled",
14591
14622
  style: {
14592
14623
  marginLeft: "5px"
@@ -14601,13 +14632,13 @@ var StudentHistory = function StudentHistory() {
14601
14632
  fontWeight: 700,
14602
14633
  fontSize: 14,
14603
14634
  textTransform: "uppercase",
14604
- cursor: 'pointer'
14635
+ cursor: "pointer"
14605
14636
  },
14606
14637
  width: "20%",
14607
14638
  onClick: function onClick() {
14608
14639
  handleSort("classDate");
14609
14640
  }
14610
- }, "CLASS DATE", filters.sortBy == "classDate" && (filters.sortOrder === 'DESC' ? React__default.createElement(ArrowDownwardIcon, {
14641
+ }, "CLASS DATE", filters.sortBy == "classDate" && (filters.sortOrder === "DESC" ? React__default.createElement(ArrowDownwardIcon, {
14611
14642
  color: "disabled",
14612
14643
  style: {
14613
14644
  marginLeft: "5px"
@@ -14622,13 +14653,13 @@ var StudentHistory = function StudentHistory() {
14622
14653
  fontWeight: 700,
14623
14654
  fontSize: 14,
14624
14655
  textTransform: "uppercase",
14625
- cursor: 'pointer'
14656
+ cursor: "pointer"
14626
14657
  },
14627
14658
  width: "20%",
14628
14659
  onClick: function onClick() {
14629
14660
  handleSort("teacher");
14630
14661
  }
14631
- }, "TEACHER", filters.sortBy == "teacher" && (filters.sortOrder === 'DESC' ? React__default.createElement(ArrowDownwardIcon, {
14662
+ }, "TEACHER", filters.sortBy == "teacher" && (filters.sortOrder === "DESC" ? React__default.createElement(ArrowDownwardIcon, {
14632
14663
  color: "disabled",
14633
14664
  style: {
14634
14665
  marginLeft: "5px"
@@ -14643,13 +14674,13 @@ var StudentHistory = function StudentHistory() {
14643
14674
  fontWeight: 700,
14644
14675
  fontSize: 14,
14645
14676
  textTransform: "uppercase",
14646
- cursor: 'pointer'
14677
+ cursor: "pointer"
14647
14678
  },
14648
14679
  width: "20%",
14649
14680
  onClick: function onClick() {
14650
14681
  handleSort("score");
14651
14682
  }
14652
- }, "CLASS IMPACT SCORE", filters.sortBy == "score" && (filters.sortOrder === 'DESC' ? React__default.createElement(ArrowDownwardIcon, {
14683
+ }, "CLASS IMPACT SCORE", filters.sortBy == "score" && (filters.sortOrder === "DESC" ? React__default.createElement(ArrowDownwardIcon, {
14653
14684
  color: "disabled",
14654
14685
  style: {
14655
14686
  marginLeft: "5px"
@@ -14664,13 +14695,13 @@ var StudentHistory = function StudentHistory() {
14664
14695
  fontWeight: 700,
14665
14696
  fontSize: 14,
14666
14697
  textTransform: "uppercase",
14667
- cursor: 'pointer'
14698
+ cursor: "pointer"
14668
14699
  },
14669
14700
  width: "10%",
14670
14701
  onClick: function onClick() {
14671
14702
  handleSort("state");
14672
14703
  }
14673
- }, "STATE", filters.sortBy == "state" && (filters.sortOrder === 'DESC' ? React__default.createElement(ArrowDownwardIcon, {
14704
+ }, "STATE", filters.sortBy == "state" && (filters.sortOrder === "DESC" ? React__default.createElement(ArrowDownwardIcon, {
14674
14705
  color: "disabled",
14675
14706
  style: {
14676
14707
  marginLeft: "5px"
@@ -14702,8 +14733,9 @@ var StudentHistory = function StudentHistory() {
14702
14733
  className: "" + myStudent["time-Date"]
14703
14734
  }, " ", timeSplitArray[0], " ", React__default.createElement("span", {
14704
14735
  className: "" + myStudent["time-Hours-Minute"]
14705
- }, " ", timeSplitArray[1], " ")), " "), React__default.createElement(core.TableCell, {
14706
- align: "left"
14736
+ }, " ", timeSplitArray[1], " ")), " "), React__default.createElement(core.TableCell, {
14737
+ align: "left",
14738
+ className: "" + myStudent["row_name"]
14707
14739
  }, React__default.createElement("img", {
14708
14740
  src: renderUrlImage(row),
14709
14741
  alt: "",
@@ -14748,7 +14780,7 @@ var StudentHistory = function StudentHistory() {
14748
14780
  sm: 2,
14749
14781
  className: "" + myStudent["box-avatar"]
14750
14782
  }, React__default.createElement("img", {
14751
- src: DEFAULT_USER_AVATAR$c,
14783
+ src: renderUrlImage(row),
14752
14784
  alt: "",
14753
14785
  className: "" + myStudent["avatar_user"]
14754
14786
  })), React__default.createElement(core.Grid, {
@@ -14759,7 +14791,7 @@ var StudentHistory = function StudentHistory() {
14759
14791
  className: "" + myStudent["box-todo-content-gr"]
14760
14792
  }, React__default.createElement(core.Grid, {
14761
14793
  className: "" + myStudent["box-todo-content"]
14762
- }, row.classType), React__default.createElement(core.Grid, {
14794
+ }, row.classType), !!row.status && React__default.createElement(core.Grid, {
14763
14795
  className: "" + myStudent["row_state_done"]
14764
14796
  }, row.status)), React__default.createElement(core.Typography, {
14765
14797
  className: "" + myStudent["box-todo-content"]
@@ -14771,7 +14803,7 @@ var StudentHistory = function StudentHistory() {
14771
14803
  className: "" + myStudent["time-Date"]
14772
14804
  }, " ", timeSplitArray[0], React__default.createElement("span", {
14773
14805
  className: "" + myStudent["time-Hours-Minute"]
14774
- }, " - ", timeSplitArray[1], " ")))), React__default.createElement(core.Grid, {
14806
+ }, " ", "-", " ", timeSplitArray[1], " ")))), React__default.createElement(core.Grid, {
14775
14807
  className: "" + myStudent["box-todo-info"]
14776
14808
  }, "Impact score:", " ", React__default.createElement(core.Typography, {
14777
14809
  className: "" + myStudent["box-todo-impart"]