From f6a458fe99f0911644e505281d8ad255a1ed4523 Mon Sep 17 00:00:00 2001
From: Marcoapu <m.cazzato@apuliasoftware.it>
Date: Fri, 25 Oct 2024 10:30:56 +0200
Subject: [PATCH 1/2] [UPD] controller moved based on commit comments

---
 controllo_accessi_inrim_app/__init__.py       |  3 ++-
 .../controllers/__init__.py                   |  1 +
 .../controllers/anag_tipologie_istanze.py     |  2 +-
 .../models/ca_punto_accesso.py                | 12 ------------
 .../views/ca_punto_accesso_views.xml          |  1 -
 .../controllers/__init__.py                   |  6 +-----
 inrim_controllo_accessi_custom/__init__.py    |  1 +
 .../__manifest__.py                           | 16 ++++++++++++++++
 .../models/__init__.py                        |  1 +
 .../models/ca_punto_accesso.py                | 19 +++++++++++++++++++
 .../views/ca_punto_accesso_views.xml          | 13 +++++++++++++
 .../__init__.py                               |  3 ++-
 .../controllers/__init__.py                   |  3 +++
 .../controllers/anag_avanzamento_rich.py      |  2 +-
 .../controllers/richiesta_accesso_persona.py  |  2 +-
 .../controllers/richiesta_servizi_persona.py  |  2 +-
 16 files changed, 63 insertions(+), 24 deletions(-)
 create mode 100644 controllo_accessi_inrim_app/controllers/__init__.py
 rename {inrim_controllo_accessi_api => controllo_accessi_inrim_app}/controllers/anag_tipologie_istanze.py (79%)
 create mode 100644 inrim_controllo_accessi_custom/__init__.py
 create mode 100644 inrim_controllo_accessi_custom/__manifest__.py
 create mode 100644 inrim_controllo_accessi_custom/models/__init__.py
 create mode 100644 inrim_controllo_accessi_custom/models/ca_punto_accesso.py
 create mode 100644 inrim_controllo_accessi_custom/views/ca_punto_accesso_views.xml
 create mode 100644 inrim_controllo_accessi_richieste_accesso/controllers/__init__.py
 rename {inrim_controllo_accessi_api => inrim_controllo_accessi_richieste_accesso}/controllers/anag_avanzamento_rich.py (79%)
 rename {inrim_controllo_accessi_api => inrim_controllo_accessi_richieste_accesso}/controllers/richiesta_accesso_persona.py (95%)
 rename {inrim_controllo_accessi_api => inrim_controllo_accessi_richieste_accesso}/controllers/richiesta_servizi_persona.py (95%)

diff --git a/controllo_accessi_inrim_app/__init__.py b/controllo_accessi_inrim_app/__init__.py
index 9a7e03e..38718f0 100644
--- a/controllo_accessi_inrim_app/__init__.py
+++ b/controllo_accessi_inrim_app/__init__.py
@@ -1 +1,2 @@
-from . import models
\ No newline at end of file
+from . import models
+from . import controllers
\ No newline at end of file
diff --git a/controllo_accessi_inrim_app/controllers/__init__.py b/controllo_accessi_inrim_app/controllers/__init__.py
new file mode 100644
index 0000000..7b77334
--- /dev/null
+++ b/controllo_accessi_inrim_app/controllers/__init__.py
@@ -0,0 +1 @@
+from . import anag_tipologie_istanze
\ No newline at end of file
diff --git a/inrim_controllo_accessi_api/controllers/anag_tipologie_istanze.py b/controllo_accessi_inrim_app/controllers/anag_tipologie_istanze.py
similarity index 79%
rename from inrim_controllo_accessi_api/controllers/anag_tipologie_istanze.py
rename to controllo_accessi_inrim_app/controllers/anag_tipologie_istanze.py
index 8845880..cc9af00 100644
--- a/inrim_controllo_accessi_api/controllers/anag_tipologie_istanze.py
+++ b/controllo_accessi_inrim_app/controllers/anag_tipologie_istanze.py
@@ -1,6 +1,6 @@
 from odoo import http
 
-from .api_controller_inrim import InrimApiController, BadRequest
+from ...inrim_controllo_accessi_api.controllers.api_controller_inrim import InrimApiController, BadRequest
 
 class InrimApiAnagTipologieIstanze(InrimApiController):
 
diff --git a/inrim_controllo_accessi/models/ca_punto_accesso.py b/inrim_controllo_accessi/models/ca_punto_accesso.py
index 434fb4d..5168f51 100644
--- a/inrim_controllo_accessi/models/ca_punto_accesso.py
+++ b/inrim_controllo_accessi/models/ca_punto_accesso.py
@@ -33,18 +33,6 @@ class CaPuntoAccesso(models.Model):
     ca_tag_lettore_ids = fields.One2many('ca.tag_lettore', 'ca_punto_accesso_id')
     remote_update = fields.Boolean(readonly=True)
     active = fields.Boolean(default=True)
-    codice_lettore_grum = fields.Integer(
-        string='Codice Lettore GRUM',
-    )
-
-    @api.constrains('codice_lettore_grum', 'typology')
-    def _check_codice_lettore_grum(self):
-        for record in self:
-            if record.typology == 'stamping' and not record.codice_lettore_grum:
-                raise UserError("Il codice lettore GRUM è obbligatorio se la tipologia è: Timbratura.")
-            if record.codice_lettore_grum:
-                if not (20 <= record.codice_lettore_grum <= 999):
-                    raise UserError("Il codice lettore GRUM deve essere compreso tra 20 e 999.")
 
     @api.constrains('date_start', 'date_end')
     def _check_date(self):
diff --git a/inrim_controllo_accessi/views/ca_punto_accesso_views.xml b/inrim_controllo_accessi/views/ca_punto_accesso_views.xml
index d68706c..c4ac6a3 100644
--- a/inrim_controllo_accessi/views/ca_punto_accesso_views.xml
+++ b/inrim_controllo_accessi/views/ca_punto_accesso_views.xml
@@ -100,7 +100,6 @@
                             <field name="system_error"/>
                             <field name="direction"/>
                             <field name="typology"/>
-                            <field name="codice_lettore_grum" required="typology == 'stamping'"/>
                             <field name="type_ids" invisible="True"/>
                         </group>
                         <group>
diff --git a/inrim_controllo_accessi_api/controllers/__init__.py b/inrim_controllo_accessi_api/controllers/__init__.py
index a4937d3..08db174 100644
--- a/inrim_controllo_accessi_api/controllers/__init__.py
+++ b/inrim_controllo_accessi_api/controllers/__init__.py
@@ -8,8 +8,4 @@
 from . import documento
 from . import tag
 from . import settore_ente
-from . import anag_servizi
-from . import anag_avanzamento_rich
-from . import anag_tipologie_istanze
-from . import richiesta_servizi_persona
-from . import richiesta_accesso_persona
\ No newline at end of file
+from . import anag_servizi
\ No newline at end of file
diff --git a/inrim_controllo_accessi_custom/__init__.py b/inrim_controllo_accessi_custom/__init__.py
new file mode 100644
index 0000000..9a7e03e
--- /dev/null
+++ b/inrim_controllo_accessi_custom/__init__.py
@@ -0,0 +1 @@
+from . import models
\ No newline at end of file
diff --git a/inrim_controllo_accessi_custom/__manifest__.py b/inrim_controllo_accessi_custom/__manifest__.py
new file mode 100644
index 0000000..d1a680f
--- /dev/null
+++ b/inrim_controllo_accessi_custom/__manifest__.py
@@ -0,0 +1,16 @@
+{
+    'name': 'Inrim Controllo Accessi Custom',
+    'version': '17.0.1.0.0',
+    'description': "Inrim Controllo Accessi Custom",
+    "author": "Alessio Gerace - Inrim",
+    "website": "https://github.com/INRIM",
+    'depends': [
+        'inrim_controllo_accessi'
+    ],
+    'data': [
+        'views/ca_punto_accesso_views.xml',
+    ],
+    'demo': [],
+    'installable': True,
+    'application': True,
+}
diff --git a/inrim_controllo_accessi_custom/models/__init__.py b/inrim_controllo_accessi_custom/models/__init__.py
new file mode 100644
index 0000000..39987f2
--- /dev/null
+++ b/inrim_controllo_accessi_custom/models/__init__.py
@@ -0,0 +1 @@
+from . import ca_punto_accesso
\ No newline at end of file
diff --git a/inrim_controllo_accessi_custom/models/ca_punto_accesso.py b/inrim_controllo_accessi_custom/models/ca_punto_accesso.py
new file mode 100644
index 0000000..8b097e5
--- /dev/null
+++ b/inrim_controllo_accessi_custom/models/ca_punto_accesso.py
@@ -0,0 +1,19 @@
+from odoo import models, fields, api, _
+from odoo.exceptions import UserError
+
+
+class CaPuntoAccesso(models.Model):
+    _inherit = "ca.punto_accesso"
+
+    codice_lettore_grum = fields.Integer(
+        string='Codice Lettore GRUM',
+    )
+
+    @api.constrains('codice_lettore_grum', 'typology')
+    def _check_codice_lettore_grum(self):
+        for record in self:
+            if record.typology == 'stamping' and not record.codice_lettore_grum:
+                raise UserError("Il codice lettore GRUM è obbligatorio se la tipologia è: Timbratura.")
+            if record.codice_lettore_grum:
+                if not (20 <= record.codice_lettore_grum <= 999):
+                    raise UserError("Il codice lettore GRUM deve essere compreso tra 20 e 999.")
\ No newline at end of file
diff --git a/inrim_controllo_accessi_custom/views/ca_punto_accesso_views.xml b/inrim_controllo_accessi_custom/views/ca_punto_accesso_views.xml
new file mode 100644
index 0000000..48cee2c
--- /dev/null
+++ b/inrim_controllo_accessi_custom/views/ca_punto_accesso_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="ca_punto_accesso_view_form_inherit" model="ir.ui.view">
+        <field name="name">ca.punto_accesso.view.form.inherit</field>
+        <field name="model">ca.punto_accesso</field>
+        <field name="inherit_id" ref="inrim_controllo_accessi.ca_punto_accesso_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='typology']" position="after">
+                <field name="codice_lettore_grum" required="typology == 'stamping'"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/inrim_controllo_accessi_richieste_accesso/__init__.py b/inrim_controllo_accessi_richieste_accesso/__init__.py
index 9a7e03e..38718f0 100755
--- a/inrim_controllo_accessi_richieste_accesso/__init__.py
+++ b/inrim_controllo_accessi_richieste_accesso/__init__.py
@@ -1 +1,2 @@
-from . import models
\ No newline at end of file
+from . import models
+from . import controllers
\ No newline at end of file
diff --git a/inrim_controllo_accessi_richieste_accesso/controllers/__init__.py b/inrim_controllo_accessi_richieste_accesso/controllers/__init__.py
new file mode 100644
index 0000000..bb0f07a
--- /dev/null
+++ b/inrim_controllo_accessi_richieste_accesso/controllers/__init__.py
@@ -0,0 +1,3 @@
+from . import richiesta_accesso_persona
+from . import richiesta_servizi_persona
+from . import anag_avanzamento_rich
\ No newline at end of file
diff --git a/inrim_controllo_accessi_api/controllers/anag_avanzamento_rich.py b/inrim_controllo_accessi_richieste_accesso/controllers/anag_avanzamento_rich.py
similarity index 79%
rename from inrim_controllo_accessi_api/controllers/anag_avanzamento_rich.py
rename to inrim_controllo_accessi_richieste_accesso/controllers/anag_avanzamento_rich.py
index c198ea8..7b09d1d 100644
--- a/inrim_controllo_accessi_api/controllers/anag_avanzamento_rich.py
+++ b/inrim_controllo_accessi_richieste_accesso/controllers/anag_avanzamento_rich.py
@@ -1,6 +1,6 @@
 from odoo import http
 
-from .api_controller_inrim import InrimApiController, BadRequest
+from ...inrim_controllo_accessi_api.controllers.api_controller_inrim import InrimApiController, BadRequest
 
 class InrimApiAnagAvanzamentoRich(InrimApiController):
 
diff --git a/inrim_controllo_accessi_api/controllers/richiesta_accesso_persona.py b/inrim_controllo_accessi_richieste_accesso/controllers/richiesta_accesso_persona.py
similarity index 95%
rename from inrim_controllo_accessi_api/controllers/richiesta_accesso_persona.py
rename to inrim_controllo_accessi_richieste_accesso/controllers/richiesta_accesso_persona.py
index 57ced4e..c7b28f2 100644
--- a/inrim_controllo_accessi_api/controllers/richiesta_accesso_persona.py
+++ b/inrim_controllo_accessi_richieste_accesso/controllers/richiesta_accesso_persona.py
@@ -1,6 +1,6 @@
 from odoo import http
 
-from .api_controller_inrim import InrimApiController, BadRequest
+from ...inrim_controllo_accessi_api.controllers.api_controller_inrim import InrimApiController, BadRequest
 
 class InrimApiRichiestaAccessoPersona(InrimApiController):
 
diff --git a/inrim_controllo_accessi_api/controllers/richiesta_servizi_persona.py b/inrim_controllo_accessi_richieste_accesso/controllers/richiesta_servizi_persona.py
similarity index 95%
rename from inrim_controllo_accessi_api/controllers/richiesta_servizi_persona.py
rename to inrim_controllo_accessi_richieste_accesso/controllers/richiesta_servizi_persona.py
index 8a6b0fb..7f5e489 100644
--- a/inrim_controllo_accessi_api/controllers/richiesta_servizi_persona.py
+++ b/inrim_controllo_accessi_richieste_accesso/controllers/richiesta_servizi_persona.py
@@ -1,6 +1,6 @@
 from odoo import http
 
-from .api_controller_inrim import InrimApiController, BadRequest
+from ...inrim_controllo_accessi_api.controllers.api_controller_inrim import InrimApiController, BadRequest
 
 class InrimApiRichiestaServiziPersona(InrimApiController):
 

From 84454b3f7c1ebf4ce56eb47336e93c16542a83da Mon Sep 17 00:00:00 2001
From: Marcoapu <m.cazzato@apuliasoftware.it>
Date: Fri, 25 Oct 2024 10:36:50 +0200
Subject: [PATCH 2/2] [FIX] fixed unit tests

---
 .../data/ca_punto_accesso_data.xml            |  2 --
 inrim_controllo_accessi/tests/test_inrim.py   |  2 --
 .../data/ca_punto_accesso_data.xml            | 26 +++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 inrim_controllo_accessi_custom/data/ca_punto_accesso_data.xml

diff --git a/inrim_controllo_accessi/data/ca_punto_accesso_data.xml b/inrim_controllo_accessi/data/ca_punto_accesso_data.xml
index d5f17d0..41fc8de 100644
--- a/inrim_controllo_accessi/data/ca_punto_accesso_data.xml
+++ b/inrim_controllo_accessi/data/ca_punto_accesso_data.xml
@@ -6,7 +6,6 @@
             <field name="ca_lettore_id" eval="ref('inrim_anagrafiche.inrim_demo_ca_lettore_1')"/>
             <field name="direction">in</field>
             <field name="typology">stamping</field>
-            <field name="codice_lettore_grum">20</field>
             <field name="enable_sync">True</field>
             <field name="date_start" eval="datetime.today()"/>
             <field name="date_end" eval="datetime.today() + timedelta(days=15)"/>
@@ -17,7 +16,6 @@
             <field name="ca_lettore_id" eval="ref('inrim_anagrafiche.inrim_demo_ca_lettore_2')"/>
             <field name="direction">out</field>
             <field name="typology">stamping</field>
-            <field name="codice_lettore_grum">20</field>
             <field name="enable_sync">True</field>
             <field name="date_start" eval="datetime.today()"/>
             <field name="date_end" eval="datetime.today() + timedelta(days=15)"/>
diff --git a/inrim_controllo_accessi/tests/test_inrim.py b/inrim_controllo_accessi/tests/test_inrim.py
index 3e373c5..2c515e9 100644
--- a/inrim_controllo_accessi/tests/test_inrim.py
+++ b/inrim_controllo_accessi/tests/test_inrim.py
@@ -116,7 +116,6 @@ def test_5(self):
             'ca_spazio_id': self.spazio_8.id,
             'ca_lettore_id': self.lettore_3.id,
             'typology': 'stamping',
-            'codice_lettore_grum': 20,
             'date_start': date.today(),
             'date_end': date.today() + relativedelta(days=30)
         })
@@ -180,7 +179,6 @@ def test_7(self):
             'ca_spazio_id': self.spazio_3.id,
             'ca_lettore_id': self.lettore_3.id,
             'typology': 'stamping',
-            'codice_lettore_grum': 20,
             'enable_sync': False,
             'date_start': date.today(),
             'date_end': date.today() + relativedelta(days=30),
diff --git a/inrim_controllo_accessi_custom/data/ca_punto_accesso_data.xml b/inrim_controllo_accessi_custom/data/ca_punto_accesso_data.xml
new file mode 100644
index 0000000..ba5ca74
--- /dev/null
+++ b/inrim_controllo_accessi_custom/data/ca_punto_accesso_data.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="inrim_controllo_accessi.ca_punto_accesso_1p001" model="ca.punto_accesso">
+            <field name="ca_spazio_id" eval="ref('inrim_anagrafiche.ca_spazio_1p001')"/>
+            <field name="ca_lettore_id" eval="ref('inrim_anagrafiche.inrim_demo_ca_lettore_1')"/>
+            <field name="direction">in</field>
+            <field name="typology">stamping</field>
+            <field name="codice_lettore_grum">20</field>
+            <field name="enable_sync">True</field>
+            <field name="date_start" eval="datetime.today()"/>
+            <field name="date_end" eval="datetime.today() + timedelta(days=15)"/>
+        </record>
+    
+        <record id="inrim_controllo_accessi.ca_punto_accesso_1p002" model="ca.punto_accesso">
+            <field name="ca_spazio_id" eval="ref('inrim_anagrafiche.ca_spazio_1p002')"/>
+            <field name="ca_lettore_id" eval="ref('inrim_anagrafiche.inrim_demo_ca_lettore_2')"/>
+            <field name="direction">out</field>
+            <field name="typology">stamping</field>
+            <field name="codice_lettore_grum">20</field>
+            <field name="enable_sync">True</field>
+            <field name="date_start" eval="datetime.today()"/>
+            <field name="date_end" eval="datetime.today() + timedelta(days=15)"/>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file