From cba5b68cf3e0a9d2386f45ca8968c58ebeb29f7d Mon Sep 17 00:00:00 2001 From: sinergia Date: Mon, 27 Nov 2023 00:48:01 -0500 Subject: [PATCH] =?UTF-8?q?Fix:=20Se=20a=C3=B1ade=20campo=20de=20tecnico?= =?UTF-8?q?=20responsable=20al=20servicio=20de=20mantenimiento?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/es.po | 8 + maintenance.py | 21 ++ report/Maintenance_Timeline.fodt | 366 ++++++++++++++++-------------- view/maintenance_service_form.xml | 6 + 4 files changed, 226 insertions(+), 175 deletions(-) diff --git a/locale/es.po b/locale/es.po index 0f8add1..5773843 100644 --- a/locale/es.po +++ b/locale/es.po @@ -670,6 +670,14 @@ msgctxt "field:optical_equipment_maintenance.service,code:" msgid "Code" msgstr "Código" +msgctxt "field:optical_equipment_maintenance.service,technician_responsible:" +msgid "Technician Responsible" +msgstr "Técnico Reponsable" + +msgctxt "field:optical_equipment_maintenance.service,invima:" +msgid "Invima" +msgstr "Invima" + msgctxt "selection:optical_equipment.maintenance,maintenance_type:" msgid "Initial" msgstr "Inicial" diff --git a/maintenance.py b/maintenance.py index bdb7c0e..1e40407 100644 --- a/maintenance.py +++ b/maintenance.py @@ -103,6 +103,9 @@ class MaintenanceService(Workflow, ModelSQL, ModelView): 'readonly': Eval('state') == 'finished', 'required': If(Eval('state') == 'in_progress', True)},) + technician_responsible = fields.Char('Technician Responsible') + invima = fields.Char('Invima') + @fields.depends('maintenance_type', 'code') def get_rec_name(self, name): if self.maintenance_type and self.code: @@ -200,6 +203,24 @@ class MaintenanceService(Workflow, ModelSQL, ModelView): def default_state(self): return 'draft' + @classmethod + def default_technician_responsible(cls): + pool = Pool() + ConfigurationEquipment = pool.get('optical_equipment.configuration') + config = ConfigurationEquipment(1) + + if config.technician_responsible: + technician_responsible = config.technician_responsible + return technician_responsible.party.name + + @classmethod + def default_invima(cls): + pool = Pool() + ConfigurationEquipment = pool.get('optical_equipment.configuration') + config = ConfigurationEquipment(1) + if config.technician_responsible: + return config.technician_responsible.invima + @classmethod def _get_origin(cls): 'Return list of Model names for origin Reference' diff --git a/report/Maintenance_Timeline.fodt b/report/Maintenance_Timeline.fodt index 9da2fa6..94498ef 100644 --- a/report/Maintenance_Timeline.fodt +++ b/report/Maintenance_Timeline.fodt @@ -1,142 +1,144 @@ - 2022-11-03T17:09:30.5000787642023-05-25T14:08:20.082359739PT1H45M28S33LibreOffice/7.4.6.2$Linux_X86_64 LibreOffice_project/40$Build-2 + 2022-11-03T17:09:30.5000787642023-11-27T00:04:57.738332534PT1H47M16S34LibreOffice/7.5.8.2$Linux_X86_64 LibreOffice_project/50$Build-2 - 4838 + 9978 0 - 24343 - 10869 + 35003 + 16425 true false view2 - 4524 - 10135 + 8707 + 23334 0 - 4838 - 24342 - 15706 + 9978 + 35001 + 26402 0 1 false 140 false false - false false + false + false - false - false - false + true + false true - true + false true - true - true + false false 0 - false - false + true + false + false + true false - true + false false + true false - true true - false + + true false - false + true + false + true true - true true false - false - false false false + true false false - true true - false - true - false - false - false - false - true - 0 - 1 - true - true - - high-resolution - true - - - false - false - true - false - false - true - true - false - true - - true - 1743443 - - true - false - true - true - 0 - - false - false - false - true false - true - 0 - true - false - true - true - true - false - false - false - - false - false - true - false - true - false - false - false - false - false - false - true + false 687431 - false - false - true - false + false + + true + true + false + 1793342 + true + false + false + false + 1 + true + true + false + false + true + false + true + true + false + true false - true + true + 0 + false - true + true + false + true + + 0 + true + false + false + false + high-resolution true + true + false + true + true + true + false + false + false + true + + true + false + true + false + + false + false + true + true + true + false + false + false + false + false + false + false + false + false + 0 + true + false + + true @@ -157,14 +159,14 @@ - - + + - + @@ -175,17 +177,17 @@ - + - + - + @@ -195,16 +197,16 @@ - - + + - - + + @@ -223,8 +225,8 @@ - - + + @@ -233,7 +235,7 @@ - + @@ -241,10 +243,10 @@ - + - + @@ -259,10 +261,10 @@ - + - + @@ -318,17 +320,17 @@ - - + + $ - + - $ - + @@ -336,70 +338,70 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -418,7 +420,7 @@ - + @@ -434,7 +436,7 @@ - + @@ -450,7 +452,7 @@ - + @@ -486,7 +488,7 @@ - + @@ -533,38 +535,46 @@ + + + - + - + - + - + - + - + - + - - + + + + + + + @@ -657,29 +667,35 @@ - + - + - + - + + + + + + + - + - - + + - + @@ -695,7 +711,7 @@ - + /9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoM DAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsN FBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAAR @@ -1257,12 +1273,12 @@ <for each="maintenance in records"> - - CRONOGRAMA DE MANTENIMIENTO PREVENTIVO Y CALIBRACIÓN DE EQUIPOS - Fecha <maintenance.estimated_agended.date()> - Consecutivo <maintenance.code> - - INFORMACIÓN DEL PROPIETARIO + + CRONOGRAMA DE MANTENIMIENTO PREVENTIVO Y CALIBRACIÓN DE EQUIPOS + Fecha <maintenance.estimated_agended.date()> + Consecutivo <maintenance.code> + + INFORMACIÓN DEL PROPIETARIO @@ -1290,25 +1306,25 @@ - Equipo + Equipo - Serial + Serial - Mantenimiento - Preventivo + Mantenimiento + Preventivo - Calibración + Calibración - Fecha de Próximo mantenimiento + Fecha de Próximo mantenimiento - <for each="line in maintenance.lines"> + <for each="line in maintenance.lines"> @@ -1334,7 +1350,7 @@ - </for> + </for> @@ -1344,8 +1360,8 @@ - ANTHONY STIVEN RODRIGUEZ FONSECA - INVIMA : RH-202208-01301 + <maintenance.technician_responsible> + INVIMA : <maintenance.invima> </for> diff --git a/view/maintenance_service_form.xml b/view/maintenance_service_form.xml index 4737064..ede1d19 100644 --- a/view/maintenance_service_form.xml +++ b/view/maintenance_service_form.xml @@ -59,6 +59,12 @@