From 808f57adfb1d04166e1eeade38eb8146b96d9864 Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Fri, 14 Jul 2023 15:01:56 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E=E6=9F=A5?=
=?UTF-8?q?=E7=9C=8B=E6=97=A5=E5=8E=86=E6=8C=89=E9=94=AE=EF=BC=8C=E9=9A=90?=
=?UTF-8?q?=E8=97=8F=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_plan_management/models/base.py | 2 +-
sf_plan_management/models/calendar_base.py | 7 +++++++
sf_plan_management/views/menu_view.xml | 12 ++++++------
sf_plan_management/views/plan_base_view.xml | 6 +++++-
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/sf_plan_management/models/base.py b/sf_plan_management/models/base.py
index 57df9566..ca6e4693 100644
--- a/sf_plan_management/models/base.py
+++ b/sf_plan_management/models/base.py
@@ -36,7 +36,7 @@ class ProcedureEquipmentResourceSetting(models.Model):
@api.depends('work_center_name_id')
def _onchange_work_center_name_id(self):
for record in self:
- record.equipment_name_id = record.work_center_name_id.equipment_ids
+ record.equipment_name_id = record.work_center_name_id.equipment_id
@api.onchange('equipment_name_id')
def _onchange_equipment_name_id(self):
diff --git a/sf_plan_management/models/calendar_base.py b/sf_plan_management/models/calendar_base.py
index 6304d2e1..99e5f070 100644
--- a/sf_plan_management/models/calendar_base.py
+++ b/sf_plan_management/models/calendar_base.py
@@ -184,6 +184,7 @@ class WorkLogSetting(models.Model):
'name_id': self.id,
'calendar_code': self.code,
'date_time': single_date})
+
@staticmethod
def daterange(start_date, end_date):
"""
@@ -193,6 +194,12 @@ class WorkLogSetting(models.Model):
for n in range(int((end_date - start_date).days)):
yield start_date + timedelta(n)
+ def open_work_schedule_calendar(self):
+ action = self.env.ref('sf_plan_management.sf_work_schedule_calendar_act')
+ result = action.read()[0]
+ result['domain'] = [('name_id', '=', self.id)]
+ return result
+
class WorkingShift(models.Model):
_name = 'sf.working.shift'
diff --git a/sf_plan_management/views/menu_view.xml b/sf_plan_management/views/menu_view.xml
index 793f381d..e50f6fa9 100644
--- a/sf_plan_management/views/menu_view.xml
+++ b/sf_plan_management/views/menu_view.xml
@@ -40,10 +40,10 @@
sequence="15"
/>
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sf_plan_management/views/plan_base_view.xml b/sf_plan_management/views/plan_base_view.xml
index 16e25874..a10ccf89 100644
--- a/sf_plan_management/views/plan_base_view.xml
+++ b/sf_plan_management/views/plan_base_view.xml
@@ -16,7 +16,11 @@
-
+
From 9c4f51d5f6c734eba713423dcf866f7fae334f3d Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Fri, 14 Jul 2023 17:24:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=80=E5=85=B7?=
=?UTF-8?q?=E7=AE=A1=E7=90=86form=E8=A7=86=E5=9B=BE=E8=A1=A8=E5=90=8D?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_tool_management/models/base.py | 22 +++++++++---------
sf_tool_management/views/tool_base_views.xml | 24 ++++++++++----------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 29879b92..db0c13fb 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -110,7 +110,7 @@ class MachineTableToolChangingApply(models.Model):
# string='换刀需求信息',
# attrs="{'invisible': 1}")
- CNC_machine_table = fields.Char(string='CNC机床')
+ name = fields.Char(string='CNC机床')
# todo 机床类型和刀位号 为 Many2one
machine_table_type = fields.Char(string='机床类型')
machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}")
@@ -151,7 +151,7 @@ class MachineTableToolChangingApply(models.Model):
# todo 自动换刀申请条件需补充完善
if(self.functional_tool_status == '异常'):
self.env['sf.machine.table.tool.changing.apply'].search([
- ('CNC_machine_table', '=', self.CNC_machine_table)]).write({
+ ('name', '=', self.name)]).write({
'replacement_tool_code': self.functional_tool_code,
'replacement_tool_name': self.functional_tool_name,
'replacement_tool_type': self.functional_tool_type,
@@ -167,7 +167,7 @@ class MachineTableToolChangingApply(models.Model):
# 新建组装任务
self.env['sf.functional.tool.assembly'].create({
'functional_tool_code': self.functional_tool_code,
- 'functional_tool_name': self.functional_tool_name,
+ 'name': self.functional_tool_name,
'functional_tool_type': self.functional_tool_type,
'functional_tool_diameter': self.diameter,
'loading_task_source': '1',
@@ -189,7 +189,7 @@ class MachineTableToolChangingApply(models.Model):
"""
# 增加设置直径的值
tool_changing_apply = self.env['sf.machine.table.tool.changing.apply'].search(
- [('CNC_machine_table', '=', vals['machine_tool_name'])])
+ [('name', '=', vals['name'])])
vals['functional_tool_diameter'] = tool_changing_apply.diameter
self.env['sf.functional.tool.assembly'].create(vals)
@@ -201,7 +201,7 @@ class MachineTableToolChangingApply(models.Model):
:return:
"""
# 撤回数据更新
- self.env['sf.machine.table.tool.changing.apply'].search([('CNC_machine_table', '=', self.CNC_machine_table)]).write({
+ self.env['sf.machine.table.tool.changing.apply'].search([('name', '=', self.name)]).write({
'replacement_tool_code': None,
'replacement_tool_name': None,
'replacement_tool_type': None,
@@ -225,7 +225,7 @@ class MachineTableToolChangingApply(models.Model):
:return:
"""
self.env['sf.machine.table.tool.changing.apply'].search(
- [('CNC_machine_table', '=', self.CNC_machine_table)]).write({
+ [('name', '=', self.name)]).write({
'status': '0'
})
@@ -234,7 +234,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
_name = 'sf.cam.work.order.program.knife.plan'
_description = 'CAM工单程序用刀计划'
- ticket_task_code = fields.Char(string='工单任务编号')
+ name = fields.Char(string='工单任务编号')
cam_procedure_code = fields.Char(string='CAM程序编号')
cam_cutter_spacing_code = fields.Char(string='CAM刀位号')
functional_tool_code = fields.Char(string='功能刀具编码')
@@ -263,7 +263,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
"""
self.env['sf.functional.tool.assembly'].create({
'functional_tool_code': self.functional_tool_code,
- 'functional_tool_name': self.functional_tool_name,
+ 'name': self.functional_tool_name,
'functional_tool_type': self.functional_tool_type,
'functional_tool_diameter': self.diameter,
'functional_tool_length': self.tool_loading_length,
@@ -304,7 +304,7 @@ class FunctionalToolAssembly(models.Model):
_order = 'use_tool_time asc'
functional_tool_code = fields.Char(string='功能刀具编码')
- functional_tool_name = fields.Char(string='功能刀具名称')
+ name = fields.Char(string='功能刀具名称')
functional_tool_type = fields.Char(string='功能刀具类型')
functional_tool_diameter = fields.Char(string='功能刀具直径')
functional_tool_length = fields.Char(string='功能刀具伸出长')
@@ -389,7 +389,7 @@ class FunctionalToolAssembly(models.Model):
for val in vals:
self.env['sf.delivery.of.cargo.from.storage'].create({
'functional_tool_code': val.functional_tool_code,
- 'functional_tool_name': val.functional_tool_name,
+ 'name': val.name,
'functional_tool_type': val.functional_tool_type,
'production_line_name': val.production_line_name,
'machine_tool_code': val.machine_tool_code,
@@ -399,7 +399,7 @@ class FunctionalToolAssembly(models.Model):
else:
self.env['sf.delivery.of.cargo.from.storage'].create({
'functional_tool_code': self.functional_tool_code,
- 'functional_tool_name': self.functional_tool_name,
+ 'name': self.name,
'functional_tool_type': self.functional_tool_type,
'production_line_name': self.production_line_name,
'machine_tool_code': self.machine_tool_code,
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 8d1e61ce..aae16a8a 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -169,7 +169,7 @@
sf.machine.table.tool.changing.apply
-
+
@@ -189,7 +189,7 @@
-
+
@@ -279,7 +279,7 @@
sf.cam.work.order.program.knife.plan
-
+
@@ -303,12 +303,12 @@
-
+
@@ -375,7 +375,7 @@
-
+
@@ -404,7 +404,7 @@
context="{
'default_machine_tool_name': machine_tool_name,
'default_cutter_spacing_code': cutter_spacing_code,
- 'default_functional_tool_name': functional_tool_name,
+ 'default_name': name,
'default_functional_tool_type': functional_tool_type,
'default_functional_tool_length': functional_tool_length,
'default_effective_length': None,
@@ -449,7 +449,7 @@
-
+
From a4339d1d672caa629ed5b66097062b22086b225a Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Fri, 14 Jul 2023 17:25:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=80=E5=85=B7?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84form=E8=A7=86=E5=9B=BE=E8=A1=A8?=
=?UTF-8?q?=E5=90=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_tool_management/wizard/wizard.py | 20 ++++++++++----------
sf_tool_management/wizard/wizard_view.xml | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 4bb32b60..ae66a87c 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -7,7 +7,7 @@ class ToolChangeRequirementInformation(models.TransientModel):
# tool_change_to_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', string='机床换刀申请')
- CNC_machine_table = fields.Char(string='CNC机床', readonly=True)
+ name = fields.Char(string='CNC机床', readonly=True)
machine_tool_code = fields.Char(string='机台号', readonly=True)
cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
@@ -29,7 +29,7 @@ class ToolChangeRequirementInformation(models.TransientModel):
"""
# 封装数据
desc = {
- 'CNC_machine_table': self.CNC_machine_table,
+ 'name': self.name,
'machine_tool_code': self.machine_tool_code,
'cutter_spacing_code': self.cutter_spacing_code,
'replacement_tool_code': self.replacement_tool_code,
@@ -46,18 +46,18 @@ class ToolChangeRequirementInformation(models.TransientModel):
print('desc:', desc)
# 将数据更新到机台换刀申请界面
self.env['sf.machine.table.tool.changing.apply'].search(
- [('CNC_machine_table', '=', desc.get('CNC_machine_table'))]).write(desc)
+ [('name', '=', desc.get('name'))]).write(desc)
# 功能刀具组装创建新任务
self.env['sf.machine.table.tool.changing.apply'].new_assembly_task({
'functional_tool_code': self.replacement_tool_code,
- 'functional_tool_name': self.replacement_tool_name,
+ 'name': self.replacement_tool_name,
'functional_tool_type': self.replacement_tool_type,
'loading_task_source': '1',
'applicant': self.applicant,
'reason_for_applying': self.reason_for_applying,
'use_tool_time': self.used_tool_time,
- 'machine_tool_name': self.CNC_machine_table,
+ 'machine_tool_name': self.name,
'machine_tool_code': self.machine_tool_code,
'cutter_spacing_code': self.cutter_spacing_code
})
@@ -133,7 +133,7 @@ class ApplyForTooling(models.TransientModel):
"""
self.env['sf.functional.tool.assembly'].create({
'functional_tool_code': self.functional_tool_code,
- 'functional_tool_name': self.functional_tool_name,
+ 'name': self.functional_tool_name,
'functional_tool_type': self.functional_tool_type,
'functional_tool_diameter': self.diameter,
'functional_tool_length': self.tool_loading_length,
@@ -227,7 +227,7 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
order = fields.Integer(string='序')
functional_tool_code = fields.Char(string='功能刀具编码')
- functional_tool_name = fields.Char(string='功能刀具名称')
+ name = fields.Char(string='功能刀具名称')
functional_tool_type = fields.Char(string='功能刀具类型')
production_line_name = fields.Char(string='产线名称')
machine_tool_code = fields.Char(string='机台号')
@@ -244,7 +244,7 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
for val in vals:
self.env['sf.functional.tool.assembly'].search([
('functional_tool_code', '=', val.functional_tool_code),
- ('functional_tool_name', '=', val.functional_tool_name)
+ ('name', '=', val.name)
]).write({
'assemble_status': '2',
'receive_person': self.env.user.name,
@@ -253,13 +253,13 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
tool_assembly = self.env['sf.functional.tool.assembly'].search([
('functional_tool_code', '=', val.functional_tool_code),
- ('functional_tool_name', '=', val.functional_tool_name)
+ ('name', '=', val.name)
])
# 判断装刀任务来源，如果来源于CAM装刀，则修改CAM装刀的计划执行状态
if tool_assembly.loading_task_source == '0':
self.env['sf.cam.work.order.program.knife.plan'].search([
('functional_tool_code', '=', val.functional_tool_code),
- ('functional_tool_name', '=', val.functional_tool_name)
+ ('functional_tool_name', '=', val.name)
]).write({
'plan_execute_status': '2'
})
diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml
index e99f61ed..b0b345df 100644
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -10,7 +10,7 @@
-
+
@@ -275,7 +275,7 @@
-
+
From b74a029166ec939d29af8b46e263cad14f9fc2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?=
Date: Mon, 17 Jul 2023 10:15:50 +0800
Subject: [PATCH 4/4] =?UTF-8?q?tree=E8=A7=86=E5=9B=BE=E8=A1=A8=E5=A4=B4?=
=?UTF-8?q?=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../static/src/scss/list_view.scss | 958 +++++++++---------
1 file changed, 498 insertions(+), 460 deletions(-)
diff --git a/spiffy_theme_backend/static/src/scss/list_view.scss b/spiffy_theme_backend/static/src/scss/list_view.scss
index 5335d4b8..b008a0c4 100644
--- a/spiffy_theme_backend/static/src/scss/list_view.scss
+++ b/spiffy_theme_backend/static/src/scss/list_view.scss
@@ -1,519 +1,557 @@
body.o_web_client {
- .o_switch_company_menu {
- .o_user_lang .show {
- .dropdown-toggle {
- background-color: transparent !important
+ .o_switch_company_menu {
+ .o_user_lang .show {
+ .dropdown-toggle {
+ background-color: transparent !important
+ }
+ }
+ }
+
+ &.list_view_sticky_header {
+ // LIST VIEW STICKY HEADER AND FOOTER
+ .o_list_view {
+ .o_content .o_list_renderer.table-responsive {
+ overflow-x: initial;
+
+ .o_list_table {
+ thead, thead tr:nth-child(1) th {
+ position: sticky !important;
+ top: 0;
+ z-index: 1;
+ }
+
+ tfoot, tfoot tr:nth-child(1) td {
+ position: sticky !important;
+ bottom: 8px;
+ z-index: 1;
+ }
+
+ thead, tfoot {
+ box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.08) !important;
+ }
+ }
+ }
+ }
+
+ // LIST VIEW STICKY HEADER AND FOOTER END
+ }
+
+ &.list_compact {
+ .o_list_renderer {
+ --ListRenderer-thead-padding-v: 0.5rem;
+ }
+ }
+
+ .o_list_view {
+ .o_content .o_list_renderer.table-responsive {
+ .o_list_table {
+ table-layout: unset !important;
+
+ thead, thead tr:nth-child(1) th, tfoot, tfoot tr:nth-child(1) td {
+ background-color: var(--biz-theme-secondary-color) !important;
+ }
+
+ thead, tfoot {
+ border-radius: var(--border-radius-lg) !important;
+
+ th, td {
+ &:first-child {
+ border-top-left-radius: var(--border-radius-lg) !important;
+ border-bottom-left-radius: var(--border-radius-lg) !important;
}
- }
- }
-
- &.list_view_sticky_header{
- // LIST VIEW STICKY HEADER AND FOOTER
- .o_list_view{
- .o_content .o_list_renderer.table-responsive{
- overflow-x: initial;
- .o_list_table{
- thead, thead tr:nth-child(1) th {
- position: sticky !important;
- top: 0;
- z-index: 1;
- }
- tfoot, tfoot tr:nth-child(1) td {
- position: sticky !important;
- bottom: 8px;
- z-index: 1;
- }
- thead, tfoot{
- box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.08) !important;
- }
- }
+
+ &:last-child {
+ border-top-right-radius: var(--border-radius-lg) !important;
+ border-bottom-right-radius: var(--border-radius-lg) !important;
}
+ }
}
- // LIST VIEW STICKY HEADER AND FOOTER END
+ }
}
+ }
- &.list_compact{
- .o_list_renderer{
- --ListRenderer-thead-padding-v: 0.5rem;
+ .o_list_renderer {
+ .o_list_table {
+ background-color: unset !important;
+
+ thead, tfoot {
+ background-color: unset !important;
+ color: var(--biz-theme-body-text-color) !important;
+ }
+
+ .dropdown-toggle {
+ padding: 0 !important;
+ border: 0 !important;
+ }
+
+ tbody {
+ > tr > td:not(.o_list_record_selector).o_list_button > button {
+ padding: 0 5px !important;
}
+ }
}
+ }
- .o_list_view{
- .o_content .o_list_renderer.table-responsive{
- .o_list_table{
- thead, thead tr:nth-child(1) th, tfoot, tfoot tr:nth-child(1) td {
- background-color: var(--biz-theme-secondary-color) !important;
- }
- thead, tfoot{
- border-radius: var(--border-radius-lg) !important;
+ .o_content {
+ .o_list_renderer {
+ .o_list_table {
+ background-color: unset !important;
- th, td{
- &:first-child{
- border-top-left-radius: var(--border-radius-lg) !important;
- border-bottom-left-radius: var(--border-radius-lg) !important;
- }
- &:last-child{
- border-top-right-radius: var(--border-radius-lg) !important;
- border-bottom-right-radius: var(--border-radius-lg) !important;
- }
- }
+ thead {
+ color: var(--biz-theme-body-text-color) !important;
+ }
+
+ tbody {
+ tr {
+ &.o_group_header {
+ border-radius: var(--border-radius-md);
+
+ th {
+ &:first-child {
+ border-top-left-radius: var(--border-radius-md);
+ border-bottom-left-radius: var(--border-radius-md);
}
+
+ &:last-child {
+ border-top-right-radius: var(--border-radius-md);
+ border-bottom-right-radius: var(--border-radius-md);
+ }
+ }
}
+ }
}
- }
- .o_list_renderer{
- .o_list_table{
- background-color: unset !important;
- thead, tfoot {
+ tfoot {
+ background-color: var(--biz-theme-secondary-color) !important;
+ color: var(--biz-theme-secondary-text-color) !important;
+ }
+ }
+ }
+ }
+
+ .o_content {
+ transition: 00.5s;
+
+ .o_list_renderer {
+ &.table-responsive {
+ .o_list_table {
+ border-collapse: separate;
+ border-spacing: 0 var(--table-border-spacing);
+ overflow-x: auto;
+ width: 100%;
+
+ .o_list_record_remove {
+ button {
+ color: var(--biz-theme-body-text-color) !important;
+ }
+ }
+
+ thead {
+ background-color: transparent !important;
+ border: unset;
+
+ tr {
+ &:focus-within {
background-color: unset !important;
+ }
+
+ th {
+ border-top: 0 !important;
+ vertical-align: middle;
+ font-weight: 600 !important;
+ border-bottom: 0 !important;
+ border-left: 0 !important;
color: var(--biz-theme-body-text-color) !important;
- }
- .dropdown-toggle{
- padding: 0 !important;
- border: 0 !important;
- }
- tbody{
- > tr > td:not(.o_list_record_selector).o_list_button > button{
- padding: 0 5px !important;
- }
- }
- }
- }
- .o_content {
- .o_list_renderer {
- .o_list_table {
+ font-size: var(--spiffy-font-size-md);
background-color: unset !important;
+ box-shadow: none !important;
- thead{
- color: var(--biz-theme-body-text-color) !important;
- }
- tbody{
- tr{
- &.o_group_header {
- border-radius: var(--border-radius-md);
- th{
- &:first-child {
- border-top-left-radius: var(--border-radius-md);
- border-bottom-left-radius: var(--border-radius-md);
- }
- &:last-child {
- border-top-right-radius: var(--border-radius-md);
- border-bottom-right-radius: var(--border-radius-md);
- }
- }
- }
- }
- }
- tfoot{
- background-color: var(--biz-theme-secondary-color) !important;
- color: var(--biz-theme-secondary-text-color) !important;
+ &:focus-within {
+ background-color: unset !important;
}
+ }
}
- }
- }
+ .o_list_controller {
+ .dropdown-toggle {
+ border: 0;
+ padding: 0 !important;
+ color: var(--biz-theme-body-text-color) !important;
+ }
+ }
+ }
+
+ tbody {
+ & > tr.o_group_header > th {
+ vertical-align: middle !important;
+ border: 0 !important;
+ }
+
+ tr.o_data_row {
+ box-shadow: var(--box-shadow-common) !important;
+ border-radius: var(--border-radius-lg) !important;
+ background-color: var(--biz-theme-secondary-color);
+
+ &.o_is_line_section {
+ background-color: #f9f9f9 !important;
+ box-shadow: unset !important;
+ /* .o_section_and_note_text_cell{
+ border-top-right-radius: var(--border-radius-lg) !important;
+ border-bottom-right-radius: var(--border-radius-lg) !important;
+ } */
+ }
+
+ td, th {
+ &:first-child {
+ border-top-left-radius: var(--border-radius-lg) !important;
+ border-bottom-left-radius: var(--border-radius-lg) !important;
+ }
+
+ &:last-child {
+ border-top-right-radius: var(--border-radius-lg) !important;
+ border-bottom-right-radius: var(--border-radius-lg) !important;
+ }
+
+ box-shadow: none !important;
+ }
+
+ &.o_selected_row {
+ td {
+ &.o_data_cell {
+ &.o_image_cell {
+ overflow: visible;
+ }
+ }
+ }
+ }
+
+ &:hover {
+ td, th {
+ box-shadow: none !important;
+ }
+ }
+ }
+
+ .o_list_char {
+ font-weight: bold !important;
+ color: var(--biz-theme-primary-color) !important;
+ transition: 0.3s;
+
+ &:hover {
+ opacity: 0.6;
+ }
+ }
+
+ td {
+ &.o_list_record_selector, &.o_data_cell {
+ height: var(--list-table-height);
+ border: 0;
+ }
+
+ vertical-align: middle;
+ font-weight: 500 !important;
+ border-top: 0 !important;
+ }
+
+ td.o_data_cell {
+ vertical-align: middle;
+ }
+ }
+
+ .attachment_div {
+ display: flex;
+ height: 35px
+ }
+
+ @include media-breakpoint-down(lg) {
+ .biz_attachment_section {
+ flex-wrap: unset !important;
+ overflow-x: auto;
+ justify-content: unset !important;
+ padding: 0 15px;
+ scrollbar-width: none; // hide scrollbar in firefox
+ }
+ .biz_attachment_section::-webkit-scrollbar {
+ display: none;
+ }
+ }
+
+ .biz_attachment_section {
+ padding-top: 0 !important;
+
+ .attachment_box:not(.attachment_box_counter) {
+ .attachment-name {
+ width: 150px;
+ }
+ }
+
+ .attachment-name {
+ white-space: nowrap !important;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ line-height: normal;
+ }
+
+ .attachment_box {
+ padding: 0.2rem;
+ min-height: 36px;
+ border-radius: var(--border-radius-lg) !important;
+ }
+
+ .o_image {
+ width: 30px !important;
+ height: 30px !important;
+ background-size: 25px;
+ }
+ }
+ }
+
+ tfoot {
+ background-color: unset !important;
+ border: 0 !important;
+
+ tr td {
+ border: 0 !important;
+ }
+
+ .o_list_number {
+ color: var(--biz-theme-primary-color) !important;
+ }
+ }
+
+ .o_optional_columns_dropdown_toggle {
+ top: 10px !important;
+ }
+ }
+ }
+ }
+
+ &.list_compact {
.o_content {
- transition: 00.5s;
-
- .o_list_renderer {
- &.table-responsive {
- .o_list_table {
- border-collapse: separate;
- border-spacing: 0 var(--table-border-spacing);
- overflow-x: auto;
- width: 100%;
-
- .o_list_record_remove{
- button{
- color: var(--biz-theme-body-text-color) !important;
- }
- }
-
- thead {
- background-color: transparent !important;
- border: unset;
- tr {
- &:focus-within {
- background-color: unset !important;
- }
- th {
- border-top: 0 !important;
- vertical-align: middle;
- font-weight: 600 !important;
- border-bottom: 0 !important;
- border-left: 0 !important;
- color: var(--biz-theme-body-text-color) !important;
- font-size: var(--spiffy-font-size-md);
- background-color: unset !important;
- box-shadow: none !important;
- &:focus-within {
- background-color: unset !important;
- }
- }
- }
- .o_list_controller {
- .dropdown-toggle {
- border: 0;
- padding: 0 !important;
- color: var(--biz-theme-body-text-color) !important;
- }
- }
- }
-
- tbody {
- & > tr.o_group_header > th {
- vertical-align: middle !important;
- border: 0 !important;
- }
-
- tr.o_data_row {
- box-shadow: var(--box-shadow-common) !important;
- border-radius: var(--border-radius-lg) !important;
- background-color: var(--biz-theme-secondary-color);
-
- &.o_is_line_section {
- background-color: #f9f9f9 !important;
- box-shadow: unset !important;
- /* .o_section_and_note_text_cell{
- border-top-right-radius: var(--border-radius-lg) !important;
- border-bottom-right-radius: var(--border-radius-lg) !important;
- } */
- }
-
- td, th {
- &:first-child {
- border-top-left-radius: var(--border-radius-lg) !important;
- border-bottom-left-radius: var(--border-radius-lg) !important;
- }
-
- &:last-child {
- border-top-right-radius: var(--border-radius-lg) !important;
- border-bottom-right-radius: var(--border-radius-lg) !important;
- }
- box-shadow: none !important;
- }
-
- &.o_selected_row{
- td{
- &.o_data_cell {
- &.o_image_cell{
- overflow: visible;
- }
- }
- }
- }
- &:hover {
- td, th {
- box-shadow: none !important;
- }
- }
- }
-
- .o_list_char {
- font-weight: bold !important;
- color: var(--biz-theme-primary-color) !important;
- transition: 0.3s;
-
- &:hover {
- opacity: 0.6;
- }
- }
-
- td {
- &.o_list_record_selector, &.o_data_cell{
- height: var(--list-table-height);
- border: 0;
- }
- vertical-align: middle;
- font-weight: 500 !important;
- border-top: 0 !important;
- }
-
- td.o_data_cell {
- vertical-align: middle;
- }
- }
-
- .attachment_div {
- display: flex;
- height: 35px
- }
-
- @include media-breakpoint-down(lg){
- .biz_attachment_section {
- flex-wrap: unset !important;
- overflow-x: auto;
- justify-content: unset !important;
- padding: 0 15px;
- scrollbar-width: none; // hide scrollbar in firefox
- }
- .biz_attachment_section::-webkit-scrollbar {
- display: none;
- }
- }
-
- .biz_attachment_section {
- padding-top: 0 !important;
- .attachment_box:not(.attachment_box_counter){
- .attachment-name {
- width: 150px;
- }
- }
- .attachment-name {
- white-space: nowrap !important;
- overflow: hidden;
- text-overflow: ellipsis;
- line-height: normal;
- }
- .attachment_box {
- padding: 0.2rem;
- min-height: 36px;
- border-radius: var(--border-radius-lg) !important;
- }
- .o_image {
- width: 30px !important;
- height: 30px !important;
- background-size: 25px;
- }
- }
- }
-
- tfoot {
- background-color: unset !important;
- border: 0 !important;
- tr td {
- border: 0 !important;
- }
- .o_list_number {
- color: var(--biz-theme-primary-color) !important;
- }
- }
- .o_optional_columns_dropdown_toggle {
- top: 10px !important;
- }
+ .o_list_renderer {
+ &.table-responsive {
+ .o_list_table {
+ .attachment_div {
+ height: 30px;
}
- }
- }
- &.list_compact {
- .o_content {
- .o_list_renderer {
- &.table-responsive {
- .o_list_table {
- .attachment_div {
- height: 30px;
- }
- .biz_attachment_section {
- .attachment_box {
- padding-left: 0.5rem !important;
- min-height: 30px;
- }
- .o_image {
- width: 20px !important;
- height: 20px !important;
- background-size: 18px;
- }
- }
- }
- }
+ .biz_attachment_section {
+ .attachment_box {
+ padding-left: 0.5rem !important;
+ min-height: 30px;
+ }
+
+ .o_image {
+ width: 20px !important;
+ height: 20px !important;
+ background-size: 18px;
+ }
}
+ }
}
+ }
}
+ }
- .o_list_renderer .o_list_table .o_column_sortable:not(.o_handle_cell)::after {
- opacity: 1 !important;
- transition: 0.3s;
- }
+ .o_list_renderer .o_list_table .o_column_sortable:not(.o_handle_cell)::after {
+ opacity: 1 !important;
+ transition: 0.3s;
+ }
- .o_list_renderer .o_list_table .o_column_sortable:not(.o_handle_cell):hover::after {
- opacity: 1 !important;
- }
+ .o_list_renderer .o_list_table .o_column_sortable:not(.o_handle_cell):hover::after {
+ opacity: 1 !important;
+ }
- .table-hover tbody tr:hover {
- background-color: #d1ecf1 !important;
- color: #1b1b1b !important;
- }
+ .table-hover tbody tr:hover {
+ background-color: #d1ecf1 !important;
+ color: #1b1b1b !important;
+ }
}
.o_list_selection_box {
- background-color: var(--biz-theme-primary-color) !important;
- color: var(--biz-theme-primary-text-color) !important;
- margin-right: 8px;
- padding: 0.6rem 1rem;
- border-radius: var(--border-radius-md);
+ background-color: var(--biz-theme-primary-color) !important;
+ color: var(--biz-theme-primary-text-color) !important;
+ margin-right: 8px;
+ padding: 0.6rem 1rem;
+ border-radius: var(--border-radius-md);
}
body.o_web_client.dark_mode {
- .o_content {
- .o_list_renderer {
- .o_list_table {
- .o_data_row.o_selected_row > .o_data_cell:not(.o_readonly_modifier):not(.o_invisible_modifier) {
- &:not(.o_handle_cell) {
- background-color: lighten($color: #242424, $amount: 10%) !important;
- }
- }
- }
- thead {
- background-color: transparent !important;
- border: unset;
- }
- tbody {
- > tr.o_group_header{
- background-image: linear-gradient(to bottom, #242424, #343434) !important;
- }
- }
- &.table-responsive {
- .o_list_table {
- background-color: transparent !important;
- color: var(--biz-theme-body-text-color);
-
- .o_column_sortable:not(.o_handle_cell)::after {
- filter: brightness(0) invert(1);
- }
-
- tbody {
- tr.o_data_row {
- /* background: var(--biz-theme-secondary-color) !important;
- transition: 0.3s;
- &:hover{
- background: var(--biz-theme-primary-rgba) !important;
- } */
- &.o_is_line_section {
- background-color: #161616 !important;
- }
- td {
- &:first-child {
- border-top-left-radius: var(--border-radius-lg) !important;
- border-bottom-left-radius: var(--border-radius-lg) !important;
- }
-
- &:last-child {
- border-top-right-radius: var(--border-radius-lg) !important;
- border-bottom-right-radius: var(--border-radius-lg) !important;
- border: 0;
- height: var(--list-table-height);
- }
- }
-
- /* &:hover {
- color: unset !important;
- } */
- }
- }
-
-
- .o_field_widget.o_field_badge {
- color: white;
- }
-
- tfoot {
- background-color: unset !important;
- color: unset !important;
- }
- }
- }
+ .o_content {
+ .o_list_renderer {
+ .o_list_table {
+ .o_data_row.o_selected_row > .o_data_cell:not(.o_readonly_modifier):not(.o_invisible_modifier) {
+ &:not(.o_handle_cell) {
+ background-color: lighten($color: #242424, $amount: 10%) !important;
+ }
}
+ }
+
+ thead {
+ background-color: transparent !important;
+ border: unset;
+ }
+
+ tbody {
+ > tr.o_group_header {
+ background-image: linear-gradient(to bottom, #242424, #343434) !important;
+ }
+ }
+
+ &.table-responsive {
+ .o_list_table {
+ background-color: transparent !important;
+ color: var(--biz-theme-body-text-color);
+
+ .o_column_sortable:not(.o_handle_cell)::after {
+ filter: brightness(0) invert(1);
+ }
+
+ tbody {
+ tr.o_data_row {
+ /* background: var(--biz-theme-secondary-color) !important;
+ transition: 0.3s;
+ &:hover{
+ background: var(--biz-theme-primary-rgba) !important;
+ } */
+ &.o_is_line_section {
+ background-color: #161616 !important;
+ }
+
+ td {
+ &:first-child {
+ border-top-left-radius: var(--border-radius-lg) !important;
+ border-bottom-left-radius: var(--border-radius-lg) !important;
+ }
+
+ &:last-child {
+ border-top-right-radius: var(--border-radius-lg) !important;
+ border-bottom-right-radius: var(--border-radius-lg) !important;
+ border: 0;
+ height: var(--list-table-height);
+ }
+ }
+
+ /* &:hover {
+ color: unset !important;
+ } */
+ }
+ }
+
+
+ .o_field_widget.o_field_badge {
+ color: white;
+ }
+
+ tfoot {
+ background-color: unset !important;
+ color: unset !important;
+ }
+ }
+ }
}
+ }
}
.split_div > .o_view_controller > .o_content > .o_view_controller {
- position: unset !important;
+ position: unset !important;
}
body.o_web_client, .dark_mode {
- &.biz_theme_square {
- .o_content {
- .o_list_renderer {
- .o_list_table {
- tbody {
- tr {
- border-radius: 0 !important;
+ &.biz_theme_square {
+ .o_content {
+ .o_list_renderer {
+ .o_list_table {
+ tbody {
+ tr {
+ border-radius: 0 !important;
- td {
- &:first-child {
- border-top-left-radius: 0 !important;
- border-bottom-left-radius: 0 !important;
- }
-
- &:last-child {
- border-top-right-radius: 0 !important;
- border-bottom-right-radius: 0 !important;
- }
- }
- }
- }
+ td {
+ &:first-child {
+ border-top-left-radius: 0 !important;
+ border-bottom-left-radius: 0 !important;
}
- }
- }
- }
- span.o_pager_value {
- border: 0 !important;
+ &:last-child {
+ border-top-right-radius: 0 !important;
+ border-bottom-right-radius: 0 !important;
+ }
+ }
+ }
+ }
+ }
+ }
}
+ }
+
+ span.o_pager_value {
+ border: 0 !important;
+ }
}
body.o_web_client {
- .o_list_renderer {
- .o_field_widget.o_field_many2manytags {
- .o_tag_color_1 {
- background-color: transparent !important;
- color: #F06050 !important;
- border: 1px solid #F06050 !important;
- }
+ .o_list_renderer {
+ .o_field_widget.o_field_many2manytags {
+ .o_tag_color_1 {
+ background-color: transparent !important;
+ color: #F06050 !important;
+ border: 1px solid #F06050 !important;
+ }
- .o_tag_color_3 {
- background-color: transparent !important;
- color: #F7CD1F !important;
- border: 1px solid #F7CD1F !important;
- }
+ .o_tag_color_3 {
+ background-color: transparent !important;
+ color: #F7CD1F !important;
+ border: 1px solid #F7CD1F !important;
+ }
- .o_tag_color_5 {
- background-color: transparent !important;
- color: #814968 !important;
- border: 1px solid #814968 !important;
- }
+ .o_tag_color_5 {
+ background-color: transparent !important;
+ color: #814968 !important;
+ border: 1px solid #814968 !important;
+ }
- .o_tag_color_4 {
- background-color: transparent !important;
- color: #6CC1ED !important;
- border: 1px solid #6CC1ED !important;
- }
+ .o_tag_color_4 {
+ background-color: transparent !important;
+ color: #6CC1ED !important;
+ border: 1px solid #6CC1ED !important;
+ }
- .o_tag_color_6 {
- background-color: transparent !important;
- color: #EB7E7F !important;
- border: 1px solid #EB7E7F !important;
- }
+ .o_tag_color_6 {
+ background-color: transparent !important;
+ color: #EB7E7F !important;
+ border: 1px solid #EB7E7F !important;
+ }
- .o_tag_color_7 {
- background-color: transparent !important;
- color: #2C8397 !important;
- border: 1px solid #2C8397 !important;
- }
+ .o_tag_color_7 {
+ background-color: transparent !important;
+ color: #2C8397 !important;
+ border: 1px solid #2C8397 !important;
+ }
- .o_tag_color_2 {
- background-color: transparent !important;
- color: #F4A460 !important;
- border: 1px solid #F4A460 !important;
- }
- }
- .o_badge_cell {
- // .o_field_badge {
- // background-color: transparent !important;
- // color: rgba(163, 163, 163, 0.9) !important;
- // border: 1px solid #c3c3c3 !important;
- // }
- .bg-success-light {
- background-color: transparent !important;
- color: rgba(40, 167, 69, 0.9) !important;
- border: 1px solid #28a745b0 !important;
- }
- .bg-info-light {
- background-color: transparent !important;
- color: rgba(23, 162, 184, 0.9) !important;
- border: 1px solid #17a2b899 !important;
- }
- }
+ .o_tag_color_2 {
+ background-color: transparent !important;
+ color: #F4A460 !important;
+ border: 1px solid #F4A460 !important;
+ }
}
+
+ .o_badge_cell {
+ // .o_field_badge {
+ // background-color: transparent !important;
+ // color: rgba(163, 163, 163, 0.9) !important;
+ // border: 1px solid #c3c3c3 !important;
+ // }
+ .bg-success-light {
+ background-color: transparent !important;
+ color: rgba(40, 167, 69, 0.9) !important;
+ border: 1px solid #28a745b0 !important;
+ }
+
+ .bg-info-light {
+ background-color: transparent !important;
+ color: rgba(23, 162, 184, 0.9) !important;
+ border: 1px solid #17a2b899 !important;
+ }
+ }
+ }
}
\ No newline at end of file