Skip to content

Commit

Permalink
Merge pull request #534 from RetroRabbit/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
DewanAlberts authored Jul 5, 2024
2 parents 8eb56b4 + 824b768 commit 9cf2aa3
Show file tree
Hide file tree
Showing 27 changed files with 221 additions and 779 deletions.
4 changes: 2 additions & 2 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ import { EmployeeApprovalsComponent } from './components/hris/employees/employee
import { TopNavComponent } from './components/hris/nav-bar/types/top-nav/top-nav.component';
import { SideNavComponent } from './components/hris/nav-bar/types/side-nav/side-nav.component';
import { CareerSummaryQualificationsComponent } from './components/hris/employees/employee-profile/accordions/accordion-career-summary/accordion-career-summary-qualifications/accordion-career-summary-qualifications.component';
import { AccordionEmployeeDocumentsComponent } from './components/hris/employees/employee-profile/accordions/accordion-employee-documents/accordion-employee-documents.component';
import { AccordionEmployeeDocumentsComponent } from './components/hris/employees/employee-profile/accordions/accordion-documents/accordion-employee-documents/accordion-employee-documents.component';
import { AccordionDocumentsCustomDocumentsComponent } from './components/hris/employees/employee-profile/accordions/accordion-documents/accordion-additional-documents/accordion-additional-documents.component';
import { AccordionCertificatesComponent } from './components/hris/employees/employee-profile/accordions/accordion-career-summary/accordion-certificates/accordion-certificates.component';
import { AccordionAdministrativeDocumentsComponent } from './components/hris/employees/employee-profile/accordions/accordion-administrative-documents/accordion-administrative-documents.component';
import { AccordionAdministrativeDocumentsComponent } from './components/hris/employees/employee-profile/accordions/accordion-documents/accordion-administrative-documents/accordion-administrative-documents.component';
import { AccordionCareerAdditionalInformationComponent } from './components/hris/employees/employee-profile/accordions/accordion-profile/accordion-career-additional-information/accordion-career-additional-information.component';
import { AccordionCareerWorkExperienceComponent } from './components/hris/employees/employee-profile/accordions/accordion-career-summary/accordion-career-work-experience/accordion-career-work-experience.component';
import { AccordionSalaryDetailsComponent } from './components/hris/employees/employee-profile/accordions/accordion-career-summary/accordion-salary-details/accordion-salary-details.component';
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/hris/charts/charts.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { ChartType } from 'chart.js';
import ChartDataLabels from 'chartjs-plugin-datalabels'
import { Renderer2, Inject } from '@angular/core';
import { DOCUMENT } from '@angular/common';
import { EmployeeProfile } from 'src/app/models/hris/employee-profile.interface';
import { EmployeeFilterView } from 'src/app/models/hris/employee-filter-view.interface';
import { EmployeeService } from 'src/app/services/hris/employee/employee.service';
import { EmployeeType } from 'src/app/models/hris/constants/employeeTypes.constants';
import { Chart } from 'chart.js';
Expand Down Expand Up @@ -207,7 +207,7 @@ export class ChartComponent implements OnInit {

fetchPeopleChampionEmployees() {
this.employeeService.filterEmployees(0, EmployeeType.PeopleChampion).subscribe({
next: (employees: EmployeeProfile[]) => {
next: (employees: EmployeeFilterView[]) => {
employees.forEach((employee) => {
if (employee.id) {
this.employeeNames[employee.id] = `${employee.name} ${employee.surname}`;
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 9cf2aa3

Please sign in to comment.