Merge pull request #136 from RamakrishnaVellala/17.0-develop

G2p-2145, G2p-2149 bugs fixing
OpenG2P · May 16, 2024 · 23682f2 · 23682f2
2 parents 86c588c + b868fec
commit 23682f2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/g2p_registry_individual/models/individual.py b/g2p_registry_individual/models/individual.py
@@ -45,6 +45,12 @@ def _compute_calc_age(self):
         for line in self:
             line.age = self.compute_age_from_dates(line.birthdate)
 
+    @api.constrains("age")
+    def _check_age_is_integer(self):
+        for record in self:
+            if record.age and not record.age.isdigit():
+                raise ValidationError(_("Age must be a valid integer."))
+
     def compute_age_from_dates(self, partner_dob):
         now = datetime.strptime(str(fields.Datetime.now())[:10], "%Y-%m-%d")
         if partner_dob:

diff --git a/g2p_registry_individual/views/individuals_view.xml b/g2p_registry_individual/views/individuals_view.xml
@@ -157,7 +157,7 @@
                                         colspan="2"
                                     >
                                         <tree decoration-danger="disabled">
-                                             <field
+                                            <field
                                                 name="phone_no"
                                                 string="Phone Numbers"
                                                 widget="phone"
@@ -175,7 +175,12 @@
                                     <field name="birth_place" readonly="disabled" />
                                 </group>
                                 <group colspan="3">
-                                    <field name="birthdate" readonly="disabled" colspan="2" />
+                                    <field
+                                        name="birthdate"
+                                        readonly="disabled"
+                                        colspan="2"
+                                        placeholder="mm/dd/yyyy"
+                                    />
                                     <field name="birthdate_not_exact" readonly="disabled" />
                                     <field name="age" readonly="disabled" />
                                     <field name="gender" readonly="disabled" />
@@ -330,7 +335,8 @@
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 Create a new individual registrant!
-            </p><p>
+            </p>
+            <p>
                 Click the create button to enter the new registrant's information.
             </p>
         </field>