tnx-shared 5.1.429 → 5.1.431

package/bundles/tnx-shared.umd.js

@@ -6261,7 +6261,7 @@
         CrudService.prototype.getRefDataInDatasource = function (dataSource, schemas, callBackAfterGetRefDataDropdown) {
             if (callBackAfterGetRefDataDropdown === void 0) { callBackAfterGetRefDataDropdown = null; }
             return __awaiter(this, void 0, void 0, function () {
-                var dicData, schemas_1, schemas_1_1, schema, promise, data, lstData, _loop_1, this_1, index;
+                var schemaHasOrder, dicData, schemas_1, schemas_1_1, schema, promise, data, lstData, _loop_1, this_1, index;
                 var e_1, _a;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -6270,6 +6270,12 @@
                                 return [2 /*return*/];
                             if (!schemas || !schemas.length)
                                 return [2 /*return*/];
+                            schemaHasOrder = schemas.filter(function (x) { return Number.isInteger(x.order); });
+                            if (!schemaHasOrder) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.getRefDataInDatasourceWithOrder(dataSource, schemaHasOrder, callBackAfterGetRefDataDropdown)];
+                        case 1: return [2 /*return*/, _b.sent()];
+                        case 2:
+                            schemas = schemas.filter(function (x) { return !Number.isInteger(x.order); });
                             dicData = [];
                             try {
                                 // preprocess schema, them schema vao arr voi index = schema.order
@@ -6332,10 +6338,103 @@
                             };
                             this_1 = this;
                             index = 0;
+                            _b.label = 3;
+                        case 3:
+                            if (!(index < lstData.length)) return [3 /*break*/, 6];
+                            return [5 /*yield**/, _loop_1(index)];
+                        case 4:
+                            _b.sent();
+                            _b.label = 5;
+                        case 5:
+                            index++;
+                            return [3 /*break*/, 3];
+                        case 6: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        CrudService.prototype.getRefDataInDatasourceWithOrder = function (dataSource, schemas, callBackAfterGetRefDataDropdown) {
+            if (callBackAfterGetRefDataDropdown === void 0) { callBackAfterGetRefDataDropdown = null; }
+            return __awaiter(this, void 0, void 0, function () {
+                var dicData, _loop_2, schemas_2, schemas_2_1, schema, lstData, _loop_3, this_2, index;
+                var e_2, _a;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            schemas.sort(function (a, b) { return a.order - b.order; });
+                            dicData = [];
+                            _loop_2 = function (schema) {
+                                var funcGetPromise = function (__dataSource) {
+                                    return schema.baseService ? _this.processSchemaWithBaseService(schema, __dataSource) : new Promise(function (resolve) { return resolve(true); });
+                                };
+                                var data = dicData[schema.order];
+                                if (data == null) {
+                                    dicData[schema.order] = {
+                                        promises: [funcGetPromise],
+                                        schemas: [schema]
+                                    };
+                                    return "continue";
+                                }
+                                data.schemas.push(schema);
+                                data.promises.push(funcGetPromise);
+                            };
+                            try {
+                                // preprocess schema, them schema vao arr voi index = schema.order        
+                                for (schemas_2 = __values(schemas), schemas_2_1 = schemas_2.next(); !schemas_2_1.done; schemas_2_1 = schemas_2.next()) {
+                                    schema = schemas_2_1.value;
+                                    _loop_2(schema);
+                                }
+                            }
+                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                            finally {
+                                try {
+                                    if (schemas_2_1 && !schemas_2_1.done && (_a = schemas_2.return)) _a.call(schemas_2);
+                                }
+                                finally { if (e_2) throw e_2.error; }
+                            }
+                            lstData = Object.values(dicData);
+                            _loop_3 = function (index) {
+                                var data, promises, schemaDatas, promiseAll, arrRes;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            data = lstData[index];
+                                            if (data == null) {
+                                                return [2 /*return*/, "continue"];
+                                            }
+                                            promises = data.promises;
+                                            schemaDatas = data.schemas;
+                                            if (promises.length === 0) {
+                                                return [2 /*return*/, "continue"];
+                                            }
+                                            promiseAll = promises.map(function (x) { return x(dataSource); });
+                                            return [4 /*yield*/, Promise.all(promiseAll)];
+                                        case 1:
+                                            arrRes = _a.sent();
+                                            schemaDatas.forEach(function (schema, resIndex) {
+                                                var schemaData = arrRes[resIndex] === true ? schema.dataSource : arrRes[resIndex];
+                                                if (schema.callbackDataFinish) {
+                                                    schema.callbackDataFinish({
+                                                        data: schemaData
+                                                    });
+                                                }
+                                                schema.dataSource = schemaData;
+                                                if (callBackAfterGetRefDataDropdown) {
+                                                    callBackAfterGetRefDataDropdown(schema.field);
+                                                }
+                                            });
+                                            this_2.mergeRefDatasToDatasource(dataSource, schemaDatas);
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            };
+                            this_2 = this;
+                            index = 0;
                             _b.label = 1;
                         case 1:
                             if (!(index < lstData.length)) return [3 /*break*/, 4];
-                            return [5 /*yield**/, _loop_1(index)];
+                            return [5 /*yield**/, _loop_3(index)];
                         case 2:
                             _b.sent();
                             _b.label = 3;
@@ -6391,12 +6490,12 @@
             return schema.funcGetLabel ? schema.funcGetLabel : function (item) { return item[schema.displayFieldInGrid] || item[schema.displayField] || item['ten']; };
         };
         CrudService.prototype.mergeRefDatasToDatasource = function (dataSource, schemas, callBackAfterGetRefDataDropdown) {
-            var e_2, _a, e_3, _b;
+            var e_3, _a, e_4, _b;
             try {
                 // #region set default function
                 for (var dataSource_1 = __values(dataSource), dataSource_1_1 = dataSource_1.next(); !dataSource_1_1.done; dataSource_1_1 = dataSource_1.next()) {
                     var rowData = dataSource_1_1.value;
-                    var _loop_2 = function (schema) {
+                    var _loop_4 = function (schema) {
                         var data = schema.dataSource;
                         var field = schema.field;
                         if (!data || !data.length) {
@@ -6409,7 +6508,7 @@
                         if (fieldData == null) {
                             return "continue";
                         }
-                        var funcGetLabel = this_2.getFuntionGetLabel(schema);
+                        var funcGetLabel = this_3.getFuntionGetLabel(schema);
                         var funcSetValueRow = schema.funcSetValueRow
                             ? schema.funcSetValueRow
                             : function (rowItem, data) {
@@ -6447,7 +6546,7 @@
                         // #endregion
                         if (schema.multiple) {
                             var ids_1 = [];
-                            this_2.mapValueMultiple(ids_1, fieldData, schema);
+                            this_3.mapValueMultiple(ids_1, fieldData, schema);
                             var refItems = data.filter(function (i) { return ids_1.some(function (q) { return schema.funcCompare(i, q); }); });
                             if (refItems.length > 0) {
                                 rowData['str' + field] = funcGetRefDataRow(refItems);
@@ -6459,31 +6558,31 @@
                         }
                         funcGetRefDataSingle(rowData);
                     };
-                    var this_2 = this;
+                    var this_3 = this;
                     try {
-                        for (var schemas_2 = (e_3 = void 0, __values(schemas)), schemas_2_1 = schemas_2.next(); !schemas_2_1.done; schemas_2_1 = schemas_2.next()) {
-                            var schema = schemas_2_1.value;
-                            _loop_2(schema);
+                        for (var schemas_3 = (e_4 = void 0, __values(schemas)), schemas_3_1 = schemas_3.next(); !schemas_3_1.done; schemas_3_1 = schemas_3.next()) {
+                            var schema = schemas_3_1.value;
+                            _loop_4(schema);
                         }
                     }
-                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
                     finally {
                         try {
-                            if (schemas_2_1 && !schemas_2_1.done && (_b = schemas_2.return)) _b.call(schemas_2);
+                            if (schemas_3_1 && !schemas_3_1.done && (_b = schemas_3.return)) _b.call(schemas_3);
                         }
-                        finally { if (e_3) throw e_3.error; }
+                        finally { if (e_4) throw e_4.error; }
                     }
                     // if (callBackAfterGetRefDataDropdown) {
                     //     callBackAfterGetRefDataDropdown(rowData);
                     // }
                 }
             }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
                     if (dataSource_1_1 && !dataSource_1_1.done && (_a = dataSource_1.return)) _a.call(dataSource_1);
                 }
-                finally { if (e_2) throw e_2.error; }
+                finally { if (e_3) throw e_3.error; }
             }
         };
         CrudService.prototype.mergeRefDataToDatasource = function (dataSource, schema, data) {
@@ -6971,7 +7070,7 @@
             }
         };
         CrudService.prototype.getValueFilter = function (filter, model, rootModel) {
-            var e_4, _a;
+            var e_5, _a;
             var _this = this;
             var sourceField = filter.sourceField;
             var subField = filter.subField;
@@ -7017,12 +7116,12 @@
                         }
                     }
                 }
-                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
                 finally {
                     try {
                         if (fields_1_1 && !fields_1_1.done && (_a = fields_1.return)) _a.call(fields_1);
                     }
-                    finally { if (e_4) throw e_4.error; }
+                    finally { if (e_5) throw e_5.error; }
                 }
                 return tryGetBySubField(temp[subField]);
             }
@@ -42785,6 +42884,95 @@
         CanBoHoSoService.prototype.getListTreeDonViQuanLyByUser = function () {
             return this.defaultGet(this.serviceUri + "/GetListTreeDonViQuanLyByUser");
         };
+        CanBoHoSoService.prototype.getModelSchemas = function () {
+            return [
+                new ModelSchema({
+                    field: 'code',
+                    name: 'Mã',
+                    fullName: 'Mã',
+                    description: 'Mã',
+                }),
+                new ModelSchema({
+                    field: 'id',
+                    name: 'id',
+                    fullName: 'id',
+                    description: 'id',
+                }),
+                new ModelSchema({
+                    field: 'idHocVien',
+                    name: 'id',
+                    fullName: 'id',
+                    description: 'id',
+                }),
+                new ModelSchema({
+                    field: 'hoVaTen',
+                    name: 'Họ và tên',
+                    fullName: 'Họ và tên',
+                    description: 'Họ và tên',
+                }),
+                new ModelSchema({
+                    field: 'ngaySinh',
+                    name: 'Ngày sinh',
+                    fullName: 'Ngày sinh',
+                    description: 'Ngày sinh',
+                }),
+                new ModelSchema({
+                    field: 'dienThoaiDiDong',
+                    name: 'Số điện thoại',
+                    fullName: 'Số điện thoại',
+                    description: 'Số điện thoại',
+                }),
+                new ModelSchema({
+                    field: 'email',
+                    name: 'Email',
+                    fullName: 'Email',
+                    description: 'Email',
+                }),
+                new ModelSchema({
+                    field: 'donViChucVus',
+                    name: 'Đơn vị - Chức vụ',
+                    fullName: 'Đơn vị - Chức vụ',
+                    description: 'Đơn vị - Chức vụ',
+                })
+            ];
+        };
+        CanBoHoSoService.prototype.getColumnSchemaBase = function () {
+            return [
+                new ColumnSchemaBase({
+                    field: 'code',
+                    width: '150px'
+                }),
+                new ColumnSchemaBase({
+                    field: 'idHocVien',
+                    includeSelect: false,
+                    visible: false
+                }),
+                new ColumnSchemaBase({
+                    field: 'hoVaTen',
+                    width: '200px'
+                }),
+                new ColumnSchemaBase({
+                    field: 'ngaySinh',
+                    dataType: 'date',
+                    width: '110px'
+                }),
+                new ColumnSchemaBase({
+                    field: 'dienThoaiDiDong',
+                    width: '110px'
+                }),
+                new ColumnSchemaBase({
+                    field: 'email',
+                    width: '180px'
+                }),
+                new ColumnSchemaBase({
+                    field: 'donViChucVus',
+                    allowFilter: false,
+                    sort: false,
+                    includeSelect: false,
+                    width: '250px'
+                })
+            ];
+        };
         return CanBoHoSoService;
     }(BaseService));
     CanBoHoSoService.ɵprov = i0.ɵɵdefineInjectable({ factory: function CanBoHoSoService_Factory() { return new CanBoHoSoService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: CanBoHoSoService, providedIn: "root" });