diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 53c624b..613be4a 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -19,7 +19,7 @@ model Users { first_name String last_name String email String @unique - phone_number Int @unique + phone_number String @unique residence String? role Roles @default(GUEST) diff --git a/src/modules/employees/dtos/create-employee.dto.ts b/src/modules/employees/dtos/create-employee.dto.ts index bfdc973..2fb22aa 100644 --- a/src/modules/employees/dtos/create-employee.dto.ts +++ b/src/modules/employees/dtos/create-employee.dto.ts @@ -62,10 +62,9 @@ export class CreateEmployeeDto { example: '82538437464', description: 'Employee`s phone number', }) - @Type(() => Number) - @IsInt() + @IsString() @IsPositive() - phone_number: number; + phone_number: string; @ApiProperty({ example: '1 Bagshot Row, Hobbiton, The Shire, Middle-earth', diff --git a/src/modules/employees/dtos/profil-employee.dto.ts b/src/modules/employees/dtos/profil-employee.dto.ts index d790558..c6836cf 100644 --- a/src/modules/employees/dtos/profil-employee.dto.ts +++ b/src/modules/employees/dtos/profil-employee.dto.ts @@ -6,7 +6,7 @@ export class EmployeeProfileItemDto { company_name: number | null; job_title: string | null; email: string | null; - phone_number: number; + phone_number: string; first_work_day: string; last_work_day?: string | null; residence: string | null; diff --git a/src/modules/employees/dtos/update-employee.dto.ts b/src/modules/employees/dtos/update-employee.dto.ts index 517c48f..3bf49bd 100644 --- a/src/modules/employees/dtos/update-employee.dto.ts +++ b/src/modules/employees/dtos/update-employee.dto.ts @@ -18,5 +18,5 @@ export class UpdateEmployeeDto extends PartialType(CreateEmployeeDto) { supervisor_id?: number; @Max(2147483647) - phone_number: number; + phone_number: string; } diff --git a/src/modules/pay-periods/services/pay-periods-query.service.ts b/src/modules/pay-periods/services/pay-periods-query.service.ts index 8e20b08..9e7cb9b 100644 --- a/src/modules/pay-periods/services/pay-periods-query.service.ts +++ b/src/modules/pay-periods/services/pay-periods-query.service.ts @@ -113,12 +113,13 @@ export class PayPeriodsQueryService { payday : period.payday, pay_year : period.pay_year, label : period.label, + //add is_approved }, { filtered_employee_ids: crew_ids, seed_names }); } private async buildOverview( period: { period_start: string | Date; period_end: string | Date; payday: string | Date; - period_no: number; pay_year: number; label: string; }, + period_no: number; pay_year: number; label: string; }, //add is_approved options?: { filtered_employee_ids?: number[]; seed_names?: Map} ): Promise { const toDateString = (d: Date) => d.toISOString().slice(0, 10); @@ -287,6 +288,7 @@ export class PayPeriodsQueryService { period_start: period.period_start, period_end: period.period_end, label: period.label, + //add is_approved })); } diff --git a/src/modules/users-management/dtos/user.dto.ts b/src/modules/users-management/dtos/user.dto.ts index 24cf8e4..8598b1f 100644 --- a/src/modules/users-management/dtos/user.dto.ts +++ b/src/modules/users-management/dtos/user.dto.ts @@ -30,7 +30,7 @@ export class UserDto { example: 5141234567, description: 'Unique phone number', }) - phone_number: number; + phone_number: string; @ApiProperty({ example: 'Minas Tirith, Gondor',