tnx-shared 5.3.312 → 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,
@@ -47830,7 +47829,7 @@
     EntityPickerComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'entity-picker',
-                    template: "<crud-list #crudList [templates]=\"children\" [model]=\"model\" [setting]=\"setting\" [dataSource]=\"model.dataSource\"\n    [hiddenDelete]=\"readOnly\" (onReload)=\"_triggerProcessData($event)\" (onAdd)=\"_add($event)\" (onEdit)=\"_edit($event)\"\n    (onView)=\"_view($event)\" (onDelete)=\"_delete($event)\" (onDeleteMultiple)=\"_deleteMultiple($event)\"\n    (onReloaded)=\"_unmarkLoading()\" class=\"--no-wrapper-padding\">\n    <ng-template #toolbar let-crudList=\"crudList\">\n        <button *ngIf=\"!readOnly\" type=\"button\" pButton icon=\"pi pi-external-link\" class=\"p-button-text\"\n            [label]=\"control.title\" [disabled]=\"control.disabled\" (click)=\"selectEntity()\"></button>\n        <ng-container *ngIf=\"required\">\n            <span class=\"star-required\">*</span>\n        </ng-container>\n        <ng-container *ngIf=\"control.multiple && !readOnly && !setting.hiddenCheckbox\">\n            <button type=\"button\" pButton class=\"p-button-warning p-button-text p-button-rounded link-or-action\"\n                icon=\"pi pi-trash\" label=\"B\u1ECF m\u1EE5c \u0111\u00E3 ch\u1ECDn\" tooltipPosition=\"top\"\n                [disabled]=\"model.selectedItems.length == 0\" (click)=\"handleUnMultiPickEntity()\"></button>\n        </ng-container>\n    </ng-template>\n    <ng-template #function let-crudList=\"crudList\" let-rowData=\"rowData\" let-index=\"index\">\n        <div *ngIf=\"!control.rowButtonTemplate && !readOnly\" class=\"p-toolbar-group-center button-group\">\n            <ng-container *ngIf=\"control.rowButtonBeforeTemplate\" class=\"p-toolbar-group-center button-group\">\n                <ng-container\n                    *ngTemplateOutlet=\"control.rowButtonBeforeTemplate; context: {rowData: rowData, rowIndex: index, control: control}\">\n                </ng-container>\n            </ng-container>\n            <button type=\"button\" pButton class=\"p-button-warning p-button-text p-button-rounded link-or-action\"\n                icon=\"pi pi-trash\" pTooltip=\"B\u1ECF ch\u1ECDn m\u1EE5c n\u00E0y\" tooltipPosition=\"top\"\n                (click)=\"handleUnPickEntity(rowData)\"></button>\n        </div>\n        <div *ngIf=\"control.rowButtonTemplate\" class=\"p-toolbar-group-center button-group\">\n            <ng-container\n                *ngTemplateOutlet=\"control.rowButtonTemplate; context: {rowData: rowData, rowIndex: index, control: control}\">\n            </ng-container>\n        </div>\n    </ng-template>\n</crud-list>\n<tn-dialog #dialog *ngIf=\"showDetailForm\" styleClass=\"entity-picker-box-dialog no-padding\" [useDefaultScrollBar]=\"true\"\n    [header]=\"control.title | translate\" [popupSize]=\"popupSize\" (onHide)=\"handleHide($event)\">\n    <entity-picker-box #entityPickerBox [control]=\"control\" [parentSetting]=\"setting\" [advanceData]=\"advanceData\"\n        (onRowSelect)=\"handleEntityPickerBoxRowSelect($event)\" [selectedValue]=\"selectedValue\"\n        (onChanged)=\"handleChangeEntity($event)\" (onSelect)=\"handleSelectEntity($event)\"\n        (onUnSelect)=\"handleUnSelectEntity($event)\" (onDone)=\"handleHide($event)\">\n    </entity-picker-box>\n    <ng-template #footer>\n        <button type=\"button\" pButton class=\"p-button-text\" (click)=\"onClickSubmitButton($event, entityPickerBox)\"\n            [label]=\"'Ho\u00E0n th\u00E0nh' | translate\" icon=\"pi pi-check\"></button>\n    </ng-template>\n</tn-dialog>",
+                    template: "<crud-list #crudList [templates]=\"children\" [model]=\"model\" [setting]=\"setting\" [dataSource]=\"model.dataSource\"\n    [hiddenDelete]=\"readOnly\" (onReload)=\"_triggerProcessData($event)\" (onAdd)=\"_add($event)\" (onEdit)=\"_edit($event)\"\n    (onView)=\"_view($event)\" (onDelete)=\"_delete($event)\" (onDeleteMultiple)=\"_deleteMultiple($event)\"\n    [showScrollHorizontal]=\"true\" (onReloaded)=\"_unmarkLoading()\" class=\"--no-wrapper-padding\">\n    <ng-template #toolbar let-crudList=\"crudList\">\n        <button *ngIf=\"!readOnly\" type=\"button\" pButton icon=\"pi pi-external-link\" class=\"p-button-text\"\n            [label]=\"control.title\" [disabled]=\"control.disabled\" (click)=\"selectEntity()\"></button>\n        <ng-container *ngIf=\"required\">\n            <span class=\"star-required\">*</span>\n        </ng-container>\n        <ng-container *ngIf=\"control.multiple && !readOnly && !setting.hiddenCheckbox\">\n            <button type=\"button\" pButton class=\"p-button-warning p-button-text p-button-rounded link-or-action\"\n                icon=\"pi pi-trash\" label=\"B\u1ECF m\u1EE5c \u0111\u00E3 ch\u1ECDn\" tooltipPosition=\"top\"\n                [disabled]=\"model.selectedItems.length == 0\" (click)=\"handleUnMultiPickEntity()\"></button>\n        </ng-container>\n    </ng-template>\n    <ng-template #function let-crudList=\"crudList\" let-rowData=\"rowData\" let-index=\"index\">\n        <div *ngIf=\"!control.rowButtonTemplate && !readOnly\" class=\"p-toolbar-group-center button-group\">\n            <ng-container *ngIf=\"control.rowButtonBeforeTemplate\" class=\"p-toolbar-group-center button-group\">\n                <ng-container\n                    *ngTemplateOutlet=\"control.rowButtonBeforeTemplate; context: {rowData: rowData, rowIndex: index, control: control}\">\n                </ng-container>\n            </ng-container>\n            <button type=\"button\" pButton class=\"p-button-warning p-button-text p-button-rounded link-or-action\"\n                icon=\"pi pi-trash\" pTooltip=\"B\u1ECF ch\u1ECDn m\u1EE5c n\u00E0y\" tooltipPosition=\"top\"\n                (click)=\"handleUnPickEntity(rowData)\"></button>\n        </div>\n        <div *ngIf=\"control.rowButtonTemplate\" class=\"p-toolbar-group-center button-group\">\n            <ng-container\n                *ngTemplateOutlet=\"control.rowButtonTemplate; context: {rowData: rowData, rowIndex: index, control: control}\">\n            </ng-container>\n        </div>\n    </ng-template>\n</crud-list>\n<tn-dialog #dialog *ngIf=\"showDetailForm\" styleClass=\"entity-picker-box-dialog no-padding\" [useDefaultScrollBar]=\"true\"\n    [header]=\"control.title | translate\" [popupSize]=\"popupSize\" (onHide)=\"handleHide($event)\">\n    <entity-picker-box #entityPickerBox [control]=\"control\" [parentSetting]=\"setting\" [advanceData]=\"advanceData\"\n        (onRowSelect)=\"handleEntityPickerBoxRowSelect($event)\" [selectedValue]=\"selectedValue\"\n        (onChanged)=\"handleChangeEntity($event)\" (onSelect)=\"handleSelectEntity($event)\"\n        (onUnSelect)=\"handleUnSelectEntity($event)\" (onDone)=\"handleHide($event)\">\n    </entity-picker-box>\n    <ng-template #footer>\n        <button type=\"button\" pButton class=\"p-button-text\" (click)=\"onClickSubmitButton($event, entityPickerBox)\"\n            [label]=\"'Ho\u00E0n th\u00E0nh' | translate\" icon=\"pi pi-check\"></button>\n    </ng-template>\n</tn-dialog>",
                     providers: [
                         {
                             provide: forms.NG_VALUE_ACCESSOR,
@@ -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,11 +53261,9 @@
             this.bounceNoti = false;
         };
         TnAppNotificationComponent.prototype.handleClicked = function () {
-            if (!this.environment.clientDomain.thongbaoDomain) {
-                return this._notifierService.showWarning('Thiếu cấu hình domain thông báo');
-            }
-            var thongBaoDomain = this.environment.clientDomain.thongbaoDomain + "/quanly-thongbao-noibo";
-            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));