@senior-gestao-pessoas/hcm-contract-employee-history 5.6.4 → 5.7.0-bugfix-hcmfnd-6392-ad9ee246

package/bundles/senior-gestao-pessoas-hcm-contract-employee-history.umd.js

@@ -6044,6 +6044,9 @@
             this.setStorageFiltersIntoForm(this.filterFormGroup);
             this.gridColumns = this.getGridColumns();
             this.filterFields = this.getFilterFields();
+            this.filterFormGroup.get('employer').valueChanges.pipe(operators.takeUntil(this.ngUnsubscribe)).subscribe(function () {
+                _this.filterFormGroup.get('companyBranch').setValue(null);
+            });
             this.setHotkeys();
             /*{CA:ON_INIT_END:START}*/
             if (this.permissions.incluir) {
@@ -6753,6 +6756,11 @@
             })
                 .filter(function (value) { return !!value; })
                 .join(" or ");
+            var employer = this.filterFormGroup.get('employer').value;
+            if (employer) {
+                var companyFilter = "e070emp.codEmp eq " + employer.codEmp;
+                filterQuery = filterQuery ? filterQuery + " and " + companyFilter : companyFilter;
+            }
             var displayFields = mergeUnique(this.companyBranchLookupDisplayFields, this.companyBranchAdvancedDisplayFields);
             this.companyBranchService
                 .list({ filterQuery: filterQuery, displayFields: displayFields, sort: sort })
@@ -6794,6 +6802,11 @@
             })
                 .filter(function (value) { return !!value; })
                 .join(" and ");
+            var employer = this.filterFormGroup.get('employer').value;
+            if (employer) {
+                var companyFilter = "e070emp.codEmp eq " + employer.codEmp;
+                filterQuery = filterQuery ? filterQuery + " and " + companyFilter : companyFilter;
+            }
             var displayFields = mergeUnique(this.companyBranchLookupDisplayFields, this.companyBranchAdvancedDisplayFields);
             this.companyBranchService
                 .list({ page: page, sort: sort, filterQuery: filterQuery, displayFields: displayFields })
@@ -8825,6 +8838,9 @@
             this.setStorageFiltersIntoForm(this.filterFormGroup);
             this.gridColumns = this.getGridColumns();
             this.filterFields = this.getFilterFields();
+            this.filterFormGroup.get('employer').valueChanges.pipe(operators.takeUntil(this.ngUnsubscribe)).subscribe(function () {
+                _this.filterFormGroup.get('companyBranch').setValue(null);
+            });
             this.setHotkeys();
             /*{CA:ON_INIT_END:START}*/
             if (this.permissions.incluir) {
@@ -9565,6 +9581,11 @@
             })
                 .filter(function (value) { return !!value; })
                 .join(" or ");
+            var employer = this.filterFormGroup.get('employer').value;
+            if (employer) {
+                var companyFilter = "e070emp.codEmp eq " + employer.codEmp;
+                filterQuery = filterQuery ? filterQuery + " and " + companyFilter : companyFilter;
+            }
             var displayFields = mergeUnique(this.companyBranchLookupDisplayFields, this.companyBranchAdvancedDisplayFields);
             this.companyBranchService
                 .list({ filterQuery: filterQuery, displayFields: displayFields, sort: sort })
@@ -9606,6 +9627,11 @@
             })
                 .filter(function (value) { return !!value; })
                 .join(" and ");
+            var employer = this.filterFormGroup.get('employer').value;
+            if (employer) {
+                var companyFilter = "e070emp.codEmp eq " + employer.codEmp;
+                filterQuery = filterQuery ? filterQuery + " and " + companyFilter : companyFilter;
+            }
             var displayFields = mergeUnique(this.companyBranchLookupDisplayFields, this.companyBranchAdvancedDisplayFields);
             this.companyBranchService
                 .list({ page: page, sort: sort, filterQuery: filterQuery, displayFields: displayFields })
@@ -12983,6 +13009,9 @@
             this.setStorageFiltersIntoForm(this.filterFormGroup);
             this.gridColumns = this.getGridColumns();
             this.filterFields = this.getFilterFields();
+            this.filterFormGroup.get('employer').valueChanges.pipe(operators.takeUntil(this.ngUnsubscribe)).subscribe(function () {
+                _this.filterFormGroup.get('companyBranch').setValue(null);
+            });
             this.setHotkeys();
             if (this.permissions.incluir) {
                 this.collectiveActions.push({
@@ -13378,6 +13407,11 @@
             })
                 .filter(function (value) { return !!value; })
                 .join(" or ");
+            var employer = this.filterFormGroup.get('employer').value;
+            if (employer) {
+                var companyFilter = "e070emp.codEmp eq " + employer.codEmp;
+                filterQuery = filterQuery ? filterQuery + " and " + companyFilter : companyFilter;
+            }
             var displayFields = mergeUnique(this.companyBranchLookupDisplayFields, this.companyBranchAdvancedDisplayFields);
             this.companyBranchService
                 .list({ filterQuery: filterQuery, displayFields: displayFields, sort: sort })
@@ -13415,6 +13449,11 @@
             })
                 .filter(function (value) { return !!value; })
                 .join(" and ");
+            var employer = this.filterFormGroup.get('employer').value;
+            if (employer) {
+                var companyFilter = "e070emp.codEmp eq " + employer.codEmp;
+                filterQuery = filterQuery ? filterQuery + " and " + companyFilter : companyFilter;
+            }
             var displayFields = mergeUnique(this.companyBranchLookupDisplayFields, this.companyBranchAdvancedDisplayFields);
             this.companyBranchService
                 .list({ page: page, sort: sort, filterQuery: filterQuery, displayFields: displayFields })
@@ -15283,12 +15322,12 @@
             return [
                 new angularComponents.FormField({
                     name: "code",
-                    label: this.translateService.instant("hcm_contract.employment_contract.employee_dependent_nom_pes"),
+                    label: this.translateService.instant("hcm_contract.employment_contract.employee_dependent_cod_pes"),
                     type: angularComponents.FieldType.Integer,
                 }),
                 new angularComponents.FormField({
                     name: "name",
-                    label: this.translateService.instant("hcm_contract.employment_contract.employee_dependent_cod_pes"),
+                    label: this.translateService.instant("hcm_contract.employment_contract.employee_dependent_nom_pes"),
                     type: angularComponents.FieldType.String,
                 }),
             ];