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

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

@@ -5864,6 +5864,9 @@ var WorkshiftHistoryListComponent = /** @class */ (function (_super) {
         this.setStorageFiltersIntoForm(this.filterFormGroup);
         this.gridColumns = this.getGridColumns();
         this.filterFields = this.getFilterFields();
+        this.filterFormGroup.get('employer').valueChanges.pipe(takeUntil(this.ngUnsubscribe)).subscribe(function () {
+            _this.filterFormGroup.get('companyBranch').setValue(null);
+        });
         this.setHotkeys();
         /*{CA:ON_INIT_END:START}*/
         if (this.permissions.incluir) {
@@ -6573,6 +6576,11 @@ var WorkshiftHistoryListComponent = /** @class */ (function (_super) {
         })
             .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 })
@@ -6614,6 +6622,11 @@ var WorkshiftHistoryListComponent = /** @class */ (function (_super) {
         })
             .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 })
@@ -8645,6 +8658,9 @@ var AnnotationHistoryListComponent = /** @class */ (function (_super) {
         this.setStorageFiltersIntoForm(this.filterFormGroup);
         this.gridColumns = this.getGridColumns();
         this.filterFields = this.getFilterFields();
+        this.filterFormGroup.get('employer').valueChanges.pipe(takeUntil(this.ngUnsubscribe)).subscribe(function () {
+            _this.filterFormGroup.get('companyBranch').setValue(null);
+        });
         this.setHotkeys();
         /*{CA:ON_INIT_END:START}*/
         if (this.permissions.incluir) {
@@ -9385,6 +9401,11 @@ var AnnotationHistoryListComponent = /** @class */ (function (_super) {
         })
             .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 })
@@ -9426,6 +9447,11 @@ var AnnotationHistoryListComponent = /** @class */ (function (_super) {
         })
             .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 })
@@ -12803,6 +12829,9 @@ var LeaveHistoryListComponent = /** @class */ (function (_super) {
         this.setStorageFiltersIntoForm(this.filterFormGroup);
         this.gridColumns = this.getGridColumns();
         this.filterFields = this.getFilterFields();
+        this.filterFormGroup.get('employer').valueChanges.pipe(takeUntil(this.ngUnsubscribe)).subscribe(function () {
+            _this.filterFormGroup.get('companyBranch').setValue(null);
+        });
         this.setHotkeys();
         if (this.permissions.incluir) {
             this.collectiveActions.push({
@@ -13198,6 +13227,11 @@ var LeaveHistoryListComponent = /** @class */ (function (_super) {
         })
             .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 })
@@ -13235,6 +13269,11 @@ var LeaveHistoryListComponent = /** @class */ (function (_super) {
         })
             .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 })
@@ -15103,12 +15142,12 @@ var EmployeeDependentComplementTabComponent = /** @class */ (function () {
         return [
             new 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: FieldType.Integer,
             }),
             new 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: FieldType.String,
             }),
         ];