Merge b9e223f into 93dbe5e

open-synergy · Sep 24, 2018 · 17bf3f0 · 17bf3f0
2 parents 93dbe5e + b9e223f
commit 17bf3f0
Show file tree

Hide file tree

Showing 5 changed files with 229 additions and 74 deletions.
diff --git a/hr_attendance_import_from_machine/__openerp__.py b/hr_attendance_import_from_machine/__openerp__.py
@@ -4,7 +4,7 @@
 # pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Import Attendance Data From Machine",
-    "version": "8.0.1.0.0",
+    "version": "8.0.1.2.0",
     "website": "https://opensynergy-indonesia.com",
     "author": "OpenSynergy Indonesia",
     "license": "AGPL-3",

diff --git a/hr_attendance_import_from_machine/models/hr_attendance_machine.py b/hr_attendance_import_from_machine/models/hr_attendance_machine.py
@@ -33,14 +33,21 @@ class HrAttendanceMachine(models.Model):
     )
     sign_in_code = fields.Char(
         string="Sign In Code",
-        required=True,
+        required=False,
     )
     sign_out_code = fields.Char(
         string="Sign Out Code",
-        required=True,
+        required=False,
     )
-    delimiter = fields.Char(
+    delimiter = fields.Selection(
         string="Delimiter",
+        selection=[
+            (",", ","),
+            (";", ";"),
+            (":", ":"),
+            ("\t", "{tab}"),
+            (" ", "{space}")
+        ],
         default=",",
         required=True,
     )

diff --git a/hr_attendance_import_from_machine/models/hr_attendance_machine_csv_detail.py b/hr_attendance_import_from_machine/models/hr_attendance_machine_csv_detail.py
@@ -26,6 +26,23 @@ class HrAttendanceMachineCsvDetail(models.Model):
         domain="[('model', '=', 'hr.attendance')]",
         required=True,
     )
+    field_type = fields.Char(
+        string="Field Type"
+    )
+    date_format = fields.Selection(
+        string="Format Date",
+        selection=[
+            ("datetime", "Datetime"),
+            ("date", "Date"),
+            ("time", "Time")
+        ],
+    )
+
+    @api.onchange("field_id")
+    def onchange_field_type(self):
+        if self.field_id:
+            self.field_type = self.field_id.ttype
+            self.date_format = False
 
     @api.constrains("attendance_machine_id", "csv_column")
     def _check_duplicate_column(self):
@@ -46,6 +63,7 @@ def _check_duplicate_field(self):
             ("id", "!=", self.id),
             ("field_id.id", "=", self.field_id.id),
             ("attendance_machine_id", "=", self.attendance_machine_id.id),
+            ("field_id.ttype", "<>", "datetime")
         ]
         result = obj_machine.search_count(criteria)
         if result > 0:

diff --git a/hr_attendance_import_from_machine/views/hr_attendance_machine_views.xml b/hr_attendance_import_from_machine/views/hr_attendance_machine_views.xml
@@ -42,6 +42,8 @@
                                 <tree editable="bottom">
                                     <field name="csv_column"/>
                                     <field name="field_id"/>
+                                    <field name="field_type" invisible="0"/>
+                                    <field name="date_format" attrs="{'readonly':[('field_type','&lt;&gt;','datetime')],'required':[('field_type','=','datetime')]}" />
                                 </tree>
                             </field>
                         </page>