add filter and search mission

This commit is contained in:
Bakry 2024-08-12 14:16:27 +03:00
parent cab395c7ce
commit fd3dafe0d0
7 changed files with 83 additions and 14 deletions

View File

@ -1150,9 +1150,15 @@ msgstr "رقم الموظف"
#: model:ir.model.fields,field_description:employee_requests.field_employee_effective_form__employee_no
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_tree_view
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_form_view
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_effective_form_filter
#: model:ir.model.fields,field_description:employee_requests.field_hr_clearance_form__employee_no
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_clearance_form_form_view
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_clearance_form_tree_view
#: model_terms:ir.ui.view,arch_db:employee_requests.hr_clearance_form_filter
#: model:ir.model.fields,field_description:employee_requests.field_employee_department_jobs__employee_no
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_form_view
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_tree_view
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_filter
msgid "Employee Number"
msgstr "رقم الموظف"

View File

@ -69,7 +69,6 @@
<group>
<group>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<field name="employee_no" string="Employee Number" readonly="1"/>
<field name="promotion_type" string="Promotion Type" required="1"
attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="new_department_id" string="New Department"

View File

@ -589,8 +589,9 @@ msgstr "إيفاد"
#: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission__department_id
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_official_mission_form_view
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_training_form_view
#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_mission_filter
msgid "Department"
msgstr "الادارة"
msgstr "الهيكل الإداري"
#. module: exp_official_mission
#: code:addons/exp_official_mission/models/hr_official_mission.py:0
@ -711,8 +712,6 @@ msgstr "إبتعاث"
#: model:ir.model,name:exp_official_mission.model_hr_employee
#: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission__employee_ids
#: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission_employee__employee_id
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_official_mission_form_view
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_training_form_view
msgid "Employee"
msgstr "الموظف"
@ -1241,6 +1240,9 @@ msgstr "طلب المهمة"
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_training_form_view
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_training_tree_view
#: model_terms:ir.ui.view,arch_db:exp_official_mission.mission_type_settings_tree_view
#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_mission_filter
#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_filter_training
#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_filter_especially_hours
msgid "Mission Type"
msgstr "نوع المهمة"
@ -2361,6 +2363,8 @@ msgstr "إسم الموظف"
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_official_mission_form_view
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_training_form_view
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_training_tree_view
#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_mission_filter
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_especially_hours_tree_view
msgid "Responsible"
msgstr "مقدم الطلب"
@ -2412,4 +2416,22 @@ msgstr "تذاكر سفر"
msgid "All"
msgstr "الكـــل"
#. module: exp_official_mission
#: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission__employee_no
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_official_mission_form_view
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_training_form_view
#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_especially_hours_form_view
#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_mission_filter
#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_filter_training
#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_filter_especially_hours
msgid "Employee Number"
msgstr "رقم الموظف"
#. module: exp_official_mission
#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_mission_filter
#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_filter_training
#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_filter_especially_hours
msgid "My Requests"
msgstr "طلبـاتي"

View File

@ -81,6 +81,7 @@ class HrOfficialMission(models.Model):
employee_id = fields.Many2one('hr.employee', 'Responsible', default=lambda item: item.get_user_id(),
domain=[('state', '=', 'open')])
employee_no = fields.Char(related='employee_id.emp_no', readonly=True,string='Employee Number', store=True)
reference = fields.Char(string="Reference Number")
company_id = fields.Many2one('res.company',string="Company", default=lambda self: self.env.user.company_id)

View File

@ -66,8 +66,9 @@
<field name="company_id" groups="base.group_multi_company" attrs="{'readonly': [('state','!=', 'draft')]}"/>
<field name="date" string="Date Request" attrs="{'readonly':[('state','!=','draft')]}"
required="1"/>
<field name="employee_id" string="Responsible " required="1"
<field name="employee_id" string="Responsible" required="1"
attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="employee_no" string="Employee Number" readonly="1"/>
<!--field name="note" string='Comments' attrs="{'readonly':[('state','!=','draft')]}" /-->
<field name="hour_from" string="Hour From" widget="float_time"
attrs="{'required': [('state', '=', 'direct_manager')],
@ -135,6 +136,8 @@
<field name="arch" type="xml">
<tree decoration-danger="state == 'refused'" decoration-info="state == 'draft'"
string="Employee Especially Hours">
<field name="employee_no" string="Employee Number"/>
<field name="employee_id" string="Responsible"/>
<field name="mission_type" string="Mission Type"/>
<field name="date" string="Date Request"/>
<field name="date_from" string="Date From"/>
@ -151,8 +154,20 @@
<field name="model">hr.official.mission</field>
<field name="type">search</field>
<field name="arch" type="xml">
<field name="mission_type"/>
<field name="state"/>
<search>
<field name="mission_type"/>
<field name="employee_id"/>
<field name="employee_no"/>
<field name="state"/>
<group expand="0" string="Group By">
<filter name="group_employee" string="Employee" domain="[]" context="{'group_by': 'employee_id'}"/>
<filter name="group_type" string="Mission Type" domain="[]" context="{'group_by': 'mission_type'}"/>
</group>
<separator/>
<filter string="My Requests" name="my_request" domain="[('employee_id.user_id', '=', uid)]"/>
<separator/>
</search>
</field>
</record>

View File

@ -82,6 +82,7 @@
<group>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<field name="employee_id" string="Responsible " required="1" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="employee_no" string="Employee Number" readonly="1"/>
<field name="date" string="Date Request" attrs="{'readonly':[('state','!=','draft')]}" required="1"/>
<field name="department_id" string="Department" widget="many2many_tags"
attrs="{'readonly':[('state','not in',('draft','direct_manager','depart_manager','send'))] }"/>
@ -240,13 +241,24 @@
<field name="model">hr.official.mission</field>
<field name="type">search</field>
<field name="arch" type="xml">
<field name="mission_type"/>
<field name="destination"/>
<field name="state"/>
<search>
<field name="mission_type"/>
<field name="employee_id"/>
<field name="employee_no"/>
<field name="destination"/>
<field name="state"/>
<group expand="0" string="Group By">
<filter name="group_employee" string="Employee" domain="[]" context="{'group_by': 'employee_id'}"/>
<filter name="group_type" string="Mission Type" domain="[]" context="{'group_by': 'mission_type'}"/>
</group>
<separator/>
<filter string="My Requests" name="my_request" domain="[('employee_id.user_id', '=', uid)]"/>
<separator/>
</search>
</field>
</record>
<record id="action_mission_tree" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>

View File

@ -89,6 +89,7 @@
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<field name="employee_id" string="Responsible" required="1"
attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="employee_no" string="Employee Number" readonly="1"/>
<field name="date" string="Date Request" attrs="{'readonly':[('state','!=','draft')]}"
required="1"/>
<field name="department_id" string="Department" widget="many2many_tags"
@ -278,9 +279,22 @@
<field name="model">hr.official.mission</field>
<field name="type">search</field>
<field name="arch" type="xml">
<field name="course_name"/>
<field name="train_category"/>
<field name="state"/>
<search>
<field name="course_name"/>
<field name="mission_type"/>
<field name="employee_id"/>
<field name="employee_no"/>
<field name="destination"/>
<field name="train_category"/>
<field name="state"/>
<group expand="0" string="Group By">
<filter name="group_employee" string="Employee" domain="[]" context="{'group_by': 'employee_id'}"/>
<filter name="group_type" string="Mission Type" domain="[]" context="{'group_by': 'mission_type'}"/>
</group>
<separator/>
<filter string="My Requests" name="my_request" domain="[('employee_id.user_id', '=', uid)]"/>
<separator/>
</search>
</field>
</record>