diff --git a/Kaizen/ClientApp/src/app/modules/activity-schedule/components/activity-detail/activity-detail.component.html b/Kaizen/ClientApp/src/app/modules/activity-schedule/components/activity-detail/activity-detail.component.html index ed95d5b7..9d43fc7f 100644 --- a/Kaizen/ClientApp/src/app/modules/activity-schedule/components/activity-detail/activity-detail.component.html +++ b/Kaizen/ClientApp/src/app/modules/activity-schedule/components/activity-detail/activity-detail.component.html @@ -13,73 +13,56 @@

Cargando actividad...

-

Actividad N° {{ activity.code }}

-

- Actividad agendada para visitar el cliente - {{ activity.client.firstName }} {{ activity.client.secondName }} - {{ activity.client.lastName }} {{ activity.client.secondLastName }} -

- -
-

Infomación del cliente

-
- business - {{ activity.client.tradeName }} -
-
- phone - {{ activity.client.firstPhoneNumber }} - - , {{ activity.client.secondPhoneNumber }} - -
-
- place - + + + + Actividad N° {{ activity.code }} + + + Estado: {{ activity.state | activityState }} + + + + + {{ activity.client.firstName }} {{ activity.client.secondName }} + {{ activity.client.lastName }} {{ activity.client.secondLastName }} + + + + {{ activity.client.tradeName }} + + + + {{ activity.client.firstPhoneNumber }} {{ activity.client.secondPhoneNumber }} + + + {{ activity.client.clientAddress.city }}, {{ activity.client.clientAddress.neighborhood }}, {{ activity.client.clientAddress.street }} - -
-

Infomación de la actividad

-
- today - {{ activity.date | date: "MMMM d, y, h:mm a" }} -
-
- repeat - {{ activity.periodicity | periodicity }} -
-
- flag - {{ activity.state | activityState }} -
-
- -
Servicios solicitados
- - offline_bolt - {{ service.code }} - {{ service.name }} : - {{ service.cost | currency: "COP":"symbol-narrow" }} - - -
-
- -
Empleados asignados
- - engineering - {{ employee.id }} - {{ employee.firstName }} - {{ employee.lastName }} - - -
-
+ + + + {{ activity.date | date: "MMMM d, y, h:mm a" }} + + + + {{ activity.periodicity | periodicity }} + + + + + {{ service.name }} + + + + + + {{ employee.firstName }} {{ employee.secondName }} {{ employee.lastName }} {{ employee.secondLastName }} + + + +
diff --git a/Kaizen/ClientApp/src/app/modules/certificates/components/certificate-detail/certificate-detail.component.html b/Kaizen/ClientApp/src/app/modules/certificates/components/certificate-detail/certificate-detail.component.html index 10368a53..cdedab79 100644 --- a/Kaizen/ClientApp/src/app/modules/certificates/components/certificate-detail/certificate-detail.component.html +++ b/Kaizen/ClientApp/src/app/modules/certificates/components/certificate-detail/certificate-detail.component.html @@ -18,47 +18,36 @@

Cargando certificado...

Certificado N° {{ certificate.id}} - Válido hasta {{ certificate.validity | date:"MMMM d 'del' y 'hasta las' h:mm a" }} + Válido hasta {{ certificate.validity | date:"MMMM d 'del' y" }} -
- today - {{ certificate.workOrder.executionDate | date }} -
-
- schedule - {{ certificate.workOrder.arrivalTime | date: "hh:mm a" }} -
-
- timer - {{ certificate.workOrder.departureTime | date: "hh:mm a" }} -
-
- - engineering - - - {{ certificate.workOrder.employee.firstName }} {{ certificate.workOrder.employee.secondName }} - {{ certificate.workOrder.employee.lastName }} {{ certificate.workOrder.employee.secondLastName }} + + {{ certificate.workOrder.executionDate | date }} + + + + {{ certificate.workOrder.arrivalTime | date: "hh:mm a" }} + + + + {{ certificate.workOrder.departureTime | date: "hh:mm a" }} + + + + {{ certificate.workOrder.employee.firstName }} {{ certificate.workOrder.employee.secondName }} + {{ certificate.workOrder.employee.lastName }} {{ certificate.workOrder.employee.secondLastName }} + + + + + {{ service.name }} -
-
- -
- Servicios aplicados -
- -
- bolt - {{ service.code }} - {{ service.name }} -
- - -
+ -

Observaciones

-

{{ certificate.workOrder.observations }}

+ + {{ certificate.workOrder.observations }} +

Firma del cliente

diff --git a/Kaizen/ClientApp/src/app/modules/employees/components/employee-detail/employee-detail.component.html b/Kaizen/ClientApp/src/app/modules/employees/components/employee-detail/employee-detail.component.html index 344c0675..f7e2d3a6 100644 --- a/Kaizen/ClientApp/src/app/modules/employees/components/employee-detail/employee-detail.component.html +++ b/Kaizen/ClientApp/src/app/modules/employees/components/employee-detail/employee-detail.component.html @@ -20,33 +20,25 @@

Cargando empleado...

{{ employee.lastName }} {{ employee.secondLastName }} - Identificado con {{ employee.id }} + C.C. {{ employee.id }} -
- engineering - {{ employee.employeeCharge.charge }} -
-
- - assignment - - {{ employee.employeeContract.contractCode }} -
-
- - date_range - - - {{ employee.employeeContract.startDate | date: "MMMM d, y" }} - - {{ employee.employeeContract.endDate | date: "MMMM d, y" }} - -
+ + {{ employee.employeeCharge.charge }} + + + + {{ employee.employeeContract.contractCode }} + + + + {{ employee.employeeContract.startDate | date: "MMMM d, y" }} + + + + {{ employee.employeeContract.endDate | date: "MMMM d, y" }} + Cargando equipo... {{ equipment.name }} - Código de equipo: {{ equipment.code }} + Código del equipo: {{ equipment.code }} -
- event - - {{ equipment.maintenanceDate | date: "MMMM d, y hh:mm a" }} - -
-
- - all_inbox - - {{ equipment.amount }} -
-
- - monetization_on - - - {{ equipment.price | currency: "COP":"symbol-narrow" }} - -
-
- - description - - - {{ equipment.description }} - -
+ + {{ equipment.maintenanceDate | date: "MMMM d, y hh:mm a" }} + + + + {{ equipment.amount }} + + + + {{ equipment.price | currency: "COP":"symbol-narrow" }} + + + + {{ equipment.description }} + Cargando producto... {{ product.name }} - Código de producto: {{ product.code }} + Código del producto: {{ product.code }} -
- - all_inbox - - {{ product.amount }} -
-
- - assignment - - {{ product.presentation }} -
-
- - monetization_on - - - {{ product.price | currency: "COP":"symbol-narrow" }} - -
-
- - date_range - - - {{ product.applicationMonths | applicationMonths }} - -
-
- - description - - - {{ product.description }} - -
+ + {{ product.amount }} + + + + {{ product.presentation }} + + + + {{ product.price | currency: "COP":"symbol-narrow" }} + + + + {{ product.applicationMonths | applicationMonths }} + + + + {{ product.description }} + -
- - date_range - - - {{ invoice.generationDate | date: "MMMM d, y, h:mm a" }} - -
-
- more - - {{ invoice.state | invoiceState }} - -
-
-
- - payments - - - {{ invoice.paymentMethod | paymentMethod }} - -
-
- - receipt_long - - - {{ invoice.paymentDate | date: "MMMM d, y, h:mm a" }} - -
-
-
-
- person - - {{ invoice.client?.id }}, - {{ invoice.client?.firstName }} - {{ invoice.client?.secondName }} - {{ invoice.client?.lastName }} - {{ invoice.client?.secondLastName }}, - {{ invoice.client?.tradeName }} - -
-
+ + {{ invoice.generationDate | date: "MMMM d, y, h:mm a" }} + + + + {{ invoice.paymentMethod | paymentMethod }} + + + + {{ invoice.paymentDate | date: "MMMM d, y, h:mm a" }} + + + + {{ invoice.client?.id }}, + {{ invoice.client?.firstName }} + {{ invoice.client?.secondName }} + {{ invoice.client?.lastName }} + {{ invoice.client?.secondLastName }} +
diff --git a/Kaizen/ClientApp/src/app/modules/payments/components/service-invoice-detail/service-invoice-detail.component.html b/Kaizen/ClientApp/src/app/modules/payments/components/service-invoice-detail/service-invoice-detail.component.html index 20c3064a..d80bcd3f 100644 --- a/Kaizen/ClientApp/src/app/modules/payments/components/service-invoice-detail/service-invoice-detail.component.html +++ b/Kaizen/ClientApp/src/app/modules/payments/components/service-invoice-detail/service-invoice-detail.component.html @@ -20,49 +20,32 @@

Factura de servicio N° {{ serviceInvoice.id }} + + Estado: {{ serviceInvoice.state | invoiceState }} + -
- -
-
- -
Se facturan los siguientes servicios
- -
- offline_bolt - {{detail.serviceName}} -
- - - -
-
-
- payments - - Sub total: - {{ - serviceInvoice.subTotal | currency: "COP":"symbol-narrow" - }} - -
-
- shopping_bag - IVA: {{ serviceInvoice.iva * 100 }}% -
-
- monetization_on - - Total a pagar: - - {{ serviceInvoice.total | currency: "COP":"symbol-narrow" }} - - -
-
+ + + + + {{ detail.serviceName }} + + + + + {{ + serviceInvoice.subTotal | currency: "COP":"symbol-narrow" + }} + + + + {{ serviceInvoice.iva * 100 }}% + + + + {{ serviceInvoice.total | currency: "COP":"symbol-narrow" }} +
-

Solicitud N° {{ serviceRequest.code }}

-

- Solicitud del servicio hecha por el cliente - {{ serviceRequest.client.firstName }} - {{ serviceRequest.client.secondName }} - {{ serviceRequest.client.lastName }} - {{ serviceRequest.client.secondLastName }}. -

-
- -
- La solicitud fue hecha para aplicar los siguientes servicios: -
- - offline_bolt - - {{ service.code }} - {{ service.name }} : - {{ service.cost | currency: "COP":"symbol-narrow" }} + + + Solicitud de servicio N° {{ serviceRequest.code }} + + + + {{ serviceRequest.client.firstName }} + {{ serviceRequest.client.secondName }} + {{ serviceRequest.client.lastName }} + {{ serviceRequest.client.secondLastName }} + + + + {{ serviceRequest.client.tradeName }} + + + + {{ serviceRequest.client.firstPhoneNumber }} {{ serviceRequest.client.secondPhoneNumber }} + + + + {{ serviceRequest.date | date: "MMMM d, y, h:mm a" }} + + + + {{ serviceRequest.periodicity | periodicity }} + + + + + {{ service.name }} - - - -
-
- today - - {{ serviceRequest.date | date: "MMMM d, y, h:mm a" }} - -
-
- repeat - - {{ serviceRequest.periodicity | periodicity }}. - -
-
-
+ + +
diff --git a/Kaizen/ClientApp/src/app/modules/services/components/service-detail/service-detail.component.html b/Kaizen/ClientApp/src/app/modules/services/components/service-detail/service-detail.component.html index 862619f5..635790de 100755 --- a/Kaizen/ClientApp/src/app/modules/services/components/service-detail/service-detail.component.html +++ b/Kaizen/ClientApp/src/app/modules/services/components/service-detail/service-detail.component.html @@ -19,64 +19,31 @@

Cargando servicio...

Código: {{ service.code }} -
- - monetization_on - - {{ service.cost | currency: "COP":"symbol-narrow" }} -
-
- - batch_prediction - - {{ service.serviceType.name }} -
-
- -
Productos utilizados
- -
- eco - {{ product.code }} - {{ product.name }} -
- - - -
-
- -
Equipos utilizados
- -
- construction - {{ equipment.code }} - {{ equipment.name }} -
- - - -
-
- -
Empleados asignados
- -
- engineering - - {{ employee.id }} - {{ employee.firstName }} - {{ employee.secondName }} {{ employee.lastName }} - {{ employee.secondLastName }} - -
- - - -
+ + {{ service.serviceType.name }} + + + + {{ service.cost | currency: "COP":"symbol-narrow" }} + + + + + {{ product.name }} + + + + + + {{ equipment.name }} + + + + + + {{ employee.firstName }} {{ employee.secondName }} {{ employee.lastName }} {{ employee.secondLastName }} + +
- + Orden de trabajo N° {{ workOrder.code }} @@ -26,41 +26,32 @@

-
- - calendar_today - - {{ workOrder.executionDate | date }} -
-
- schedule - {{ workOrder.arrivalTime | date: "h:mm a" }} -
-
- flag - {{ workOrder.workOrderState | workOrderState }} -
-
- timer - - {{ workOrder.departureTime | date: "h:mm a" }} - -
-
- - engineering - - - {{ workOrder?.employee?.firstName }} - {{ workOrder?.employee?.secondName }} - {{ workOrder?.employee?.lastName }} - {{ workOrder?.employee?.secondLastName }} - -
-
- assignment - {{ workOrder.observations }} -
+ + {{ workOrder.executionDate | date }} + + + + {{ workOrder.arrivalTime | date: "h:mm a" }} + + + + {{ workOrder.workOrderState | workOrderState }} + + + + {{ workOrder.departureTime | date: "h:mm a" }} + + + + {{ workOrder?.employee?.firstName }} + {{ workOrder?.employee?.secondName }} + {{ workOrder?.employee?.lastName }} + {{ workOrder?.employee?.secondLastName }} + + + + {{ workOrder.observations }} +