fix(timesheets: minor fix
This commit is contained in:
Matthieu Haineault
parent
9821b81afd
commit
c58e8db59f
|
|
@ -125,46 +125,6 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"/employees": {
|
|
||||||
"post": {
|
|
||||||
"operationId": "EmployeesController_create",
|
|
||||||
"parameters": [],
|
|
||||||
"requestBody": {
|
|
||||||
"required": true,
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/CreateEmployeeDto"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"responses": {
|
|
||||||
"201": {
|
|
||||||
"description": "Employee created",
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/CreateEmployeeDto"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"400": {
|
|
||||||
"description": "Incomplete task or invalid data"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"security": [
|
|
||||||
{
|
|
||||||
"access-token": []
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"summary": "Create employee",
|
|
||||||
"tags": [
|
|
||||||
"Employees"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/employees/employee-list": {
|
"/employees/employee-list": {
|
||||||
"get": {
|
"get": {
|
||||||
"operationId": "EmployeesController_findListEmployees",
|
"operationId": "EmployeesController_findListEmployees",
|
||||||
|
|
@ -1127,6 +1087,81 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"schemas": {
|
"schemas": {
|
||||||
|
"EmployeeListItemDto": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {}
|
||||||
|
},
|
||||||
|
"UpdateEmployeeDto": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"id": {
|
||||||
|
"type": "number",
|
||||||
|
"example": 1,
|
||||||
|
"description": "Unique ID of an employee(primary-key, auto-incremented)"
|
||||||
|
},
|
||||||
|
"user_id": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "0e6e2e1f-b157-4c7c-ae3f-999b3e4f914d",
|
||||||
|
"description": "UUID of the user linked to that employee"
|
||||||
|
},
|
||||||
|
"first_name": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "Frodo",
|
||||||
|
"description": "Employee`s first name"
|
||||||
|
},
|
||||||
|
"last_name": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "Baggins",
|
||||||
|
"description": "Employee`s last name"
|
||||||
|
},
|
||||||
|
"email": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "i_cant_do_this_sam@targointernet.com",
|
||||||
|
"description": "Employee`s email"
|
||||||
|
},
|
||||||
|
"phone_number": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "82538437464",
|
||||||
|
"description": "Employee`s phone number"
|
||||||
|
},
|
||||||
|
"residence": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "1 Bagshot Row, Hobbiton, The Shire, Middle-earth",
|
||||||
|
"description": "Employee`s residence"
|
||||||
|
},
|
||||||
|
"external_payroll_id": {
|
||||||
|
"type": "number",
|
||||||
|
"example": 7464,
|
||||||
|
"description": "external ID for the pay system"
|
||||||
|
},
|
||||||
|
"company_code": {
|
||||||
|
"type": "number",
|
||||||
|
"example": 335567447,
|
||||||
|
"description": "Employee`s company code"
|
||||||
|
},
|
||||||
|
"job_title": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "technicient",
|
||||||
|
"description": "employee`s job title"
|
||||||
|
},
|
||||||
|
"first_work_day": {
|
||||||
|
"format": "date-time",
|
||||||
|
"type": "string",
|
||||||
|
"example": "23/09/3018",
|
||||||
|
"description": "New hire date or undefined"
|
||||||
|
},
|
||||||
|
"last_work_day": {
|
||||||
|
"format": "date-time",
|
||||||
|
"type": "string",
|
||||||
|
"example": "25/03/3019",
|
||||||
|
"description": "Termination date (null to restore)"
|
||||||
|
},
|
||||||
|
"supervisor_id": {
|
||||||
|
"type": "number",
|
||||||
|
"description": "Supervisor ID"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"CreateEmployeeDto": {
|
"CreateEmployeeDto": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|
@ -1204,81 +1239,6 @@
|
||||||
"first_work_day"
|
"first_work_day"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"EmployeeListItemDto": {
|
|
||||||
"type": "object",
|
|
||||||
"properties": {}
|
|
||||||
},
|
|
||||||
"UpdateEmployeeDto": {
|
|
||||||
"type": "object",
|
|
||||||
"properties": {
|
|
||||||
"id": {
|
|
||||||
"type": "number",
|
|
||||||
"example": 1,
|
|
||||||
"description": "Unique ID of an employee(primary-key, auto-incremented)"
|
|
||||||
},
|
|
||||||
"user_id": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "0e6e2e1f-b157-4c7c-ae3f-999b3e4f914d",
|
|
||||||
"description": "UUID of the user linked to that employee"
|
|
||||||
},
|
|
||||||
"first_name": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "Frodo",
|
|
||||||
"description": "Employee`s first name"
|
|
||||||
},
|
|
||||||
"last_name": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "Baggins",
|
|
||||||
"description": "Employee`s last name"
|
|
||||||
},
|
|
||||||
"email": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "i_cant_do_this_sam@targointernet.com",
|
|
||||||
"description": "Employee`s email"
|
|
||||||
},
|
|
||||||
"phone_number": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "82538437464",
|
|
||||||
"description": "Employee`s phone number"
|
|
||||||
},
|
|
||||||
"residence": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "1 Bagshot Row, Hobbiton, The Shire, Middle-earth",
|
|
||||||
"description": "Employee`s residence"
|
|
||||||
},
|
|
||||||
"external_payroll_id": {
|
|
||||||
"type": "number",
|
|
||||||
"example": 7464,
|
|
||||||
"description": "external ID for the pay system"
|
|
||||||
},
|
|
||||||
"company_code": {
|
|
||||||
"type": "number",
|
|
||||||
"example": 335567447,
|
|
||||||
"description": "Employee`s company code"
|
|
||||||
},
|
|
||||||
"job_title": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "technicient",
|
|
||||||
"description": "employee`s job title"
|
|
||||||
},
|
|
||||||
"first_work_day": {
|
|
||||||
"format": "date-time",
|
|
||||||
"type": "string",
|
|
||||||
"example": "23/09/3018",
|
|
||||||
"description": "New hire date or undefined"
|
|
||||||
},
|
|
||||||
"last_work_day": {
|
|
||||||
"format": "date-time",
|
|
||||||
"type": "string",
|
|
||||||
"example": "25/03/3019",
|
|
||||||
"description": "Termination date (null to restore)"
|
|
||||||
},
|
|
||||||
"supervisor_id": {
|
|
||||||
"type": "number",
|
|
||||||
"description": "Supervisor ID"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"CreateWeekShiftsDto": {
|
"CreateWeekShiftsDto": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {}
|
"properties": {}
|
||||||
|
|
|
||||||
|
|
@ -189,7 +189,6 @@ export class TimesheetsQueryService {
|
||||||
date: formatDateISO(exp.date),
|
date: formatDateISO(exp.date),
|
||||||
amount: Number(exp.amount) || 0,
|
amount: Number(exp.amount) || 0,
|
||||||
mileage: exp.mileage != null ? Number(exp.mileage) : 0,
|
mileage: exp.mileage != null ? Number(exp.mileage) : 0,
|
||||||
km: exp.mileage != null ? Number(exp.mileage) : 0,
|
|
||||||
comment: exp.comment ?? '',
|
comment: exp.comment ?? '',
|
||||||
is_approved: exp.is_approved ?? false,
|
is_approved: exp.is_approved ?? false,
|
||||||
supervisor_comment: exp.supervisor_comment ?? '',
|
supervisor_comment: exp.supervisor_comment ?? '',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user