From 8b081c0c43b331008747ef653ee27182b27ba586 Mon Sep 17 00:00:00 2001
From: Dibik <dibik@openg2p.org>
Date: Mon, 5 Aug 2024 19:50:16 +0530
Subject: [PATCH] G2P-2717: Feedback changes on views and model file

---
 g2p_enumerator/models/g2p_enumerator.py      |  7 +++---
 g2p_enumerator/models/res_partner.py         |  5 +++-
 g2p_enumerator/views/g2p_enumerator_view.xml | 24 +++++++++++++++++--
 g2p_enumerator/views/group_view.xml          | 25 ++++----------------
 4 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/g2p_enumerator/models/g2p_enumerator.py b/g2p_enumerator/models/g2p_enumerator.py
index 66562d2..55a74a1 100644
--- a/g2p_enumerator/models/g2p_enumerator.py
+++ b/g2p_enumerator/models/g2p_enumerator.py
@@ -3,10 +3,11 @@
 
 class G2PEnumerator(models.Model):
     _name = "g2p.enumerator"
+    _rec = "name"
 
     # Enum Details
-    enumerator_name = fields.Char()
-    enumerator_id = fields.Char()
+    name = fields.Char()
+    enumerator_user_id = fields.Char()
     data_collection_date = fields.Date()
 
     # Location
@@ -14,5 +15,3 @@ class G2PEnumerator(models.Model):
     enum_longitude = fields.Float(string="Longitude", digits=(10, 7))
     enum_altitude = fields.Float(string="Altitude")
     enum_accuracy = fields.Float(string="Accuracy")
-
-    partner_id = fields.Many2one("res.partner")
diff --git a/g2p_enumerator/models/res_partner.py b/g2p_enumerator/models/res_partner.py
index ff47b1b..c856cba 100644
--- a/g2p_enumerator/models/res_partner.py
+++ b/g2p_enumerator/models/res_partner.py
@@ -5,4 +5,7 @@
 class G2PRegistrant(models.Model):
     _inherit = "res.partner"
 
-    enumerator_ids = fields.One2many("g2p.enumerator", "partner_id")
+    enumerator_id = fields.Many2one("g2p.enumerator")
+    enumerator_user_id = fields.Char(related="enumerator_id.enumerator_user_id")
+
+    data_collection_date = fields.Date(related="enumerator_id.data_collection_date")
diff --git a/g2p_enumerator/views/g2p_enumerator_view.xml b/g2p_enumerator/views/g2p_enumerator_view.xml
index 8496f38..8233549 100644
--- a/g2p_enumerator/views/g2p_enumerator_view.xml
+++ b/g2p_enumerator/views/g2p_enumerator_view.xml
@@ -8,8 +8,8 @@
         <field name="model">g2p.enumerator</field>
         <field name="arch" type="xml">
             <tree>
-                <field name="enumerator_name" />
-                <field name="enumerator_id" />
+                <field name="name" string="Enumerator" />
+                <field name="enumerator_user_id" />
                 <field name="data_collection_date" />
                 <field name="enum_latitude" />
                 <field name="enum_longitude" />
@@ -19,6 +19,26 @@
         </field>
     </record>
 
+    <record id="view_enumerator_config_fomr" model="ir.ui.view">
+        <field name="name">view_enumerator_config_form</field>
+        <field name="model">g2p.enumerator</field>
+        <field name="arch" type="xml">
+            <form>
+                <group string="Enumerator Details">
+                    <field name="name" string="Enumerator Name" />
+                    <field name="enumerator_user_id" string="Enumerator User ID" />
+                    <field name="data_collection_date" />
+                </group>
+                <group string="Enumerator Location">
+                    <field name="enum_latitude" />
+                    <field name="enum_longitude" />
+                    <field name="enum_altitude" />
+                    <field name="enum_accuracy" />
+                </group>
+            </form>
+        </field>
+    </record>
+
     <record id="action_enumerator_action" model="ir.actions.act_window">
         <field name="name">enumerator action</field>
         <field name="type">ir.actions.act_window</field>
diff --git a/g2p_enumerator/views/group_view.xml b/g2p_enumerator/views/group_view.xml
index eb3f4a2..172c760 100644
--- a/g2p_enumerator/views/group_view.xml
+++ b/g2p_enumerator/views/group_view.xml
@@ -10,26 +10,11 @@
         <field name="arch" type="xml">
             <xpath expr="//page[@name='other']" position="after">
                 <page string="Enumerator Details" name="enumerator_details">
-                    <field name="enumerator_ids" nolabel="1" colspan="2">
-                        <tree>
-                            <field name="enumerator_name" />
-                            <field name="enumerator_id" string="Enumerator ID" />
-                            <field name="data_collection_date" />
-                        </tree>
-                        <form>
-                            <group string="Enumerator Info">
-                                <field name="enumerator_name" />
-                                <field name="enumerator_id" string="Enumerator ID" />
-                                <field name="data_collection_date" />
-                            </group>
-                            <group string="Enumerator Location">
-                                <field name="enum_latitude" />
-                                <field name="enum_longitude" />
-                                <field name="enum_altitude" />
-                                <field name="enum_accuracy" />
-                            </group>
-                        </form>
-                    </field>
+                    <group>
+                        <field name="enumerator_id" string="Enumerator" />
+                        <field name="enumerator_user_id" string="Enumerator User ID" />
+                        <field name="data_collection_date" />
+                    </group>
                 </page>
             </xpath>
         </field>