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

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

@@ -5494,6 +5494,9 @@ let WorkshiftHistoryListComponent = class WorkshiftHistoryListComponent extends
         this.setStorageFiltersIntoForm(this.filterFormGroup);
         this.gridColumns = this.getGridColumns();
         this.filterFields = this.getFilterFields();
+        this.filterFormGroup.get('employer').valueChanges.pipe(takeUntil(this.ngUnsubscribe)).subscribe(() => {
+            this.filterFormGroup.get('companyBranch').setValue(null);
+        });
         this.setHotkeys();
         /*{CA:ON_INIT_END:START}*/
         if (this.permissions.incluir) {
@@ -6135,7 +6138,7 @@ let WorkshiftHistoryListComponent = class WorkshiftHistoryListComponent extends
         /*{CA:ON_EMPLOYER_LOOKUP_REQUEST_START:START}*/
         /*{CA:ON_EMPLOYER_LOOKUP_REQUEST_START:END}*/
         const sort = this.companyBranchLookupDisplayFields.map((field) => ({ field, order: 1 }));
-        const filterQuery = this.getCompanyBranchSearchFields()
+        let filterQuery = this.getCompanyBranchSearchFields()
             .filter(({ type }) => isValidFilter(type, value))
             .map(({ name, type }) => {
             if (typeof value == "number")
@@ -6153,6 +6156,11 @@ let WorkshiftHistoryListComponent = class WorkshiftHistoryListComponent extends
         })
             .filter(value => !!value)
             .join(" or ");
+        const employer = this.filterFormGroup.get('employer').value;
+        if (employer) {
+            const companyFilter = `e070emp.codEmp eq ${employer.codEmp}`;
+            filterQuery = filterQuery ? `${filterQuery} and ${companyFilter}` : companyFilter;
+        }
         const displayFields = mergeUnique(this.companyBranchLookupDisplayFields, this.companyBranchAdvancedDisplayFields);
         this.companyBranchService
             .list({ filterQuery, displayFields, sort })
@@ -6168,7 +6176,7 @@ let WorkshiftHistoryListComponent = class WorkshiftHistoryListComponent extends
         const { first, rows, multiSortMeta, filterData } = event;
         const page = first / rows;
         const sort = multiSortMeta;
-        const filterQuery = this.getCompanyBranchSearchFields()
+        let filterQuery = this.getCompanyBranchSearchFields()
             .filter(({ name }) => filterData[name] != undefined && filterData[name] != "")
             .map(({ name, type }) => {
             const value = filterData[name];
@@ -6189,6 +6197,11 @@ let WorkshiftHistoryListComponent = class WorkshiftHistoryListComponent extends
         })
             .filter(value => !!value)
             .join(" and ");
+        const employer = this.filterFormGroup.get('employer').value;
+        if (employer) {
+            const companyFilter = `e070emp.codEmp eq ${employer.codEmp}`;
+            filterQuery = filterQuery ? `${filterQuery} and ${companyFilter}` : companyFilter;
+        }
         const displayFields = mergeUnique(this.companyBranchLookupDisplayFields, this.companyBranchAdvancedDisplayFields);
         this.companyBranchService
             .list({ page, sort, filterQuery, displayFields })
@@ -8126,6 +8139,9 @@ let AnnotationHistoryListComponent = class AnnotationHistoryListComponent extend
         this.setStorageFiltersIntoForm(this.filterFormGroup);
         this.gridColumns = this.getGridColumns();
         this.filterFields = this.getFilterFields();
+        this.filterFormGroup.get('employer').valueChanges.pipe(takeUntil(this.ngUnsubscribe)).subscribe(() => {
+            this.filterFormGroup.get('companyBranch').setValue(null);
+        });
         this.setHotkeys();
         /*{CA:ON_INIT_END:START}*/
         if (this.permissions.incluir) {
@@ -8798,7 +8814,7 @@ let AnnotationHistoryListComponent = class AnnotationHistoryListComponent extend
         /*{CA:ON_EMPLOYER_LOOKUP_REQUEST_START:START}*/
         /*{CA:ON_EMPLOYER_LOOKUP_REQUEST_START:END}*/
         const sort = this.companyBranchLookupDisplayFields.map((field) => ({ field, order: 1 }));
-        const filterQuery = this.getCompanyBranchSearchFields()
+        let filterQuery = this.getCompanyBranchSearchFields()
             .filter(({ type }) => isValidFilter(type, value))
             .map(({ name, type }) => {
             if (typeof value == "number")
@@ -8816,6 +8832,11 @@ let AnnotationHistoryListComponent = class AnnotationHistoryListComponent extend
         })
             .filter(value => !!value)
             .join(" or ");
+        const employer = this.filterFormGroup.get('employer').value;
+        if (employer) {
+            const companyFilter = `e070emp.codEmp eq ${employer.codEmp}`;
+            filterQuery = filterQuery ? `${filterQuery} and ${companyFilter}` : companyFilter;
+        }
         const displayFields = mergeUnique(this.companyBranchLookupDisplayFields, this.companyBranchAdvancedDisplayFields);
         this.companyBranchService
             .list({ filterQuery, displayFields, sort })
@@ -8831,7 +8852,7 @@ let AnnotationHistoryListComponent = class AnnotationHistoryListComponent extend
         const { first, rows, multiSortMeta, filterData } = event;
         const page = first / rows;
         const sort = multiSortMeta;
-        const filterQuery = this.getCompanyBranchSearchFields()
+        let filterQuery = this.getCompanyBranchSearchFields()
             .filter(({ name }) => filterData[name] != undefined && filterData[name] != "")
             .map(({ name, type }) => {
             const value = filterData[name];
@@ -8852,6 +8873,11 @@ let AnnotationHistoryListComponent = class AnnotationHistoryListComponent extend
         })
             .filter(value => !!value)
             .join(" and ");
+        const employer = this.filterFormGroup.get('employer').value;
+        if (employer) {
+            const companyFilter = `e070emp.codEmp eq ${employer.codEmp}`;
+            filterQuery = filterQuery ? `${filterQuery} and ${companyFilter}` : companyFilter;
+        }
         const displayFields = mergeUnique(this.companyBranchLookupDisplayFields, this.companyBranchAdvancedDisplayFields);
         this.companyBranchService
             .list({ page, sort, filterQuery, displayFields })
@@ -12140,6 +12166,9 @@ let LeaveHistoryListComponent = class LeaveHistoryListComponent extends BaseColl
         this.setStorageFiltersIntoForm(this.filterFormGroup);
         this.gridColumns = this.getGridColumns();
         this.filterFields = this.getFilterFields();
+        this.filterFormGroup.get('employer').valueChanges.pipe(takeUntil(this.ngUnsubscribe)).subscribe(() => {
+            this.filterFormGroup.get('companyBranch').setValue(null);
+        });
         this.setHotkeys();
         if (this.permissions.incluir) {
             this.collectiveActions.push({
@@ -12481,7 +12510,7 @@ let LeaveHistoryListComponent = class LeaveHistoryListComponent extends BaseColl
     }
     onCompanyBranchLookupRequest(value) {
         const sort = this.companyBranchLookupDisplayFields.map((field) => ({ field, order: 1 }));
-        const filterQuery = this.getCompanyBranchSearchFields()
+        let filterQuery = this.getCompanyBranchSearchFields()
             .filter(({ type }) => isValidFilter(type, value))
             .map(({ name, type }) => {
             if (typeof value == "number")
@@ -12499,6 +12528,11 @@ let LeaveHistoryListComponent = class LeaveHistoryListComponent extends BaseColl
         })
             .filter(value => !!value)
             .join(" or ");
+        const employer = this.filterFormGroup.get('employer').value;
+        if (employer) {
+            const companyFilter = `e070emp.codEmp eq ${employer.codEmp}`;
+            filterQuery = filterQuery ? `${filterQuery} and ${companyFilter}` : companyFilter;
+        }
         const displayFields = mergeUnique(this.companyBranchLookupDisplayFields, this.companyBranchAdvancedDisplayFields);
         this.companyBranchService
             .list({ filterQuery, displayFields, sort })
@@ -12510,7 +12544,7 @@ let LeaveHistoryListComponent = class LeaveHistoryListComponent extends BaseColl
         const { first, rows, multiSortMeta, filterData } = event;
         const page = first / rows;
         const sort = multiSortMeta;
-        const filterQuery = this.getCompanyBranchSearchFields()
+        let filterQuery = this.getCompanyBranchSearchFields()
             .filter(({ name }) => filterData[name] != undefined && filterData[name] != "")
             .map(({ name, type }) => {
             const value = filterData[name];
@@ -12531,6 +12565,11 @@ let LeaveHistoryListComponent = class LeaveHistoryListComponent extends BaseColl
         })
             .filter(value => !!value)
             .join(" and ");
+        const employer = this.filterFormGroup.get('employer').value;
+        if (employer) {
+            const companyFilter = `e070emp.codEmp eq ${employer.codEmp}`;
+            filterQuery = filterQuery ? `${filterQuery} and ${companyFilter}` : companyFilter;
+        }
         const displayFields = mergeUnique(this.companyBranchLookupDisplayFields, this.companyBranchAdvancedDisplayFields);
         this.companyBranchService
             .list({ page, sort, filterQuery, displayFields })
@@ -14286,12 +14325,12 @@ let EmployeeDependentComplementTabComponent = class EmployeeDependentComplementT
         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,
             }),
         ];