tnx-shared 5.3.313 → 5.3.314

package/bundles/tnx-shared.umd.js

@@ -20893,11 +20893,8 @@
                                     finally { if (e_4) throw e_4.error; }
                                 }
                             }
-                            if (item.ngaySinh) {
-                                item.strNgaySinh = this._crudService.renderDate(item.ngaySinh, 'normal');
-                            }
-                            else {
-                                item.strNgaySinh = item.ngaySinh2;
+                            if (!item.ngaySinh && item.ngaySinh2) {
+                                item.ngaySinh = new Date(item.ngaySinh2);
                             }
                             item.hocHamHocVi
                                 = item.idHocHam && item.idHocVi
@@ -20989,7 +20986,8 @@
                 }),
                 new EntityPickerColumn({
                     label: 'Ngày sinh',
-                    code: 'strNgaySinh',
+                    code: 'ngaySinh',
+                    dataType: exports.DataType.date,
                     isSearchable: true,
                     width: '120px',
                     notInFields: true,
@@ -21068,8 +21066,9 @@
                 }),
                 new EntityPickerColumn({
                     label: 'Ngày sinh',
-                    code: 'strNgaySinh',
+                    code: 'ngaySinh',
                     isSearchable: true,
+                    dataType: exports.DataType.date,
                     width: '120px',
                     notInFields: true,
                     textAlign: 1,
@@ -53151,8 +53150,8 @@
         TnAppNotificationComponent.prototype.afterGetNotication = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var idsUserCreated, userRes, lstUserInfo;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             idsUserCreated = [];
                             this.notifications.forEach(function (element) {
@@ -53166,7 +53165,7 @@
                             }
                             return [4 /*yield*/, this._userV5Service.getAll([this.newFilter('id', exports.Operator.in, idsUserCreated)], 'avatar,id')];
                         case 1:
-                            userRes = _a.sent();
+                            userRes = _b.sent();
                             if (!userRes.success || !userRes.data || userRes.data.length === 0) {
                                 return [2 /*return*/];
                             }
@@ -53218,15 +53217,15 @@
         TnAppNotificationComponent.prototype.goToLink = function (item) {
             return __awaiter(this, void 0, void 0, function () {
                 var link;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             if (!!this.isReaded(item)) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.readById(item)];
                         case 1:
-                            _a.sent();
+                            _b.sent();
                             this.totalUnRead--;
-                            _a.label = 2;
+                            _b.label = 2;
                         case 2:
                             // Save current path to go back
                             localStorage.setItem('currentUrl', top.location.href);
@@ -53262,8 +53261,9 @@
             this.bounceNoti = false;
         };
         TnAppNotificationComponent.prototype.handleClicked = function () {
-            var thongBaoDomain = "/thong-bao";
-            window.open(thongBaoDomain);
+            var _a;
+            var appCode = (_a = window['appCode']) !== null && _a !== void 0 ? _a : '';
+            this._router.navigateByUrl("/" + appCode.toLowerCase() + "/thong-bao");
         };
         return TnAppNotificationComponent;
     }(ComponentBase));