Skip to content
Snippets Groups Projects

View fixes, bound dimension fixes, code QoL

Merged Houzefa Abbasbhay requested to merge topic/16.0/zouzou into branch/16.0
2 files
+ 8
8
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -228,7 +228,7 @@
@@ -228,7 +228,7 @@
src_dim = self.get_ordering_dimensions(model)
src_dim = self.get_ordering_dimensions(model)
if dest_model is None or dest_model == model:
if dest_model is None or dest_model == model:
for slots in list(src_dim.values()):
for slots in src_dim.values():
for slot in slots:
for slot in slots:
dest_slot = slot
dest_slot = slot
add_field()
add_field()
@@ -236,7 +236,7 @@
@@ -236,7 +236,7 @@
else:
else:
dest_dim = self.get_ordering_dimensions(dest_model)
dest_dim = self.get_ordering_dimensions(dest_model)
for dimension, slots in list(src_dim.items()):
for dimension, slots in src_dim.items():
if dimension in dest_dim:
if dimension in dest_dim:
dest_slots = dest_dim[dimension]
dest_slots = dest_dim[dimension]
slots_number = len(slots)
slots_number = len(slots)
@@ -287,10 +287,10 @@
@@ -287,10 +287,10 @@
return {ans.ordering: ans.nd_id.name for ans in self.get_structures(model)}
return {ans.ordering: ans.nd_id.name for ans in self.get_structures(model)}
@api.model
@api.model
def analytic_fields_get(self, model, fields, prefix="a", suffix="id"):
def analytic_fields_get(self, model, field_get_ret, prefix="a", suffix="id"):
"""Set the label values for the analytic fields."""
"""Set the label values for the analytic fields."""
ans_dict = self.get_dimensions_names(model._analytic_name)
ans_dict = self.get_dimensions_names(model._analytic_name)
regex = r"{pre}(\d+)_{suf}".format(pre=prefix, suf=suffix)
regex = r"{pre}(\d+)_{suf}".format(pre=prefix, suf=suffix)
match_fct = re.compile(regex).search
match_fct = re.compile(regex).search
@@ -291,11 +291,11 @@
@@ -291,11 +291,11 @@
"""Set the label values for the analytic fields."""
"""Set the label values for the analytic fields."""
ans_dict = self.get_dimensions_names(model._analytic_name)
ans_dict = self.get_dimensions_names(model._analytic_name)
regex = r"{pre}(\d+)_{suf}".format(pre=prefix, suf=suffix)
regex = r"{pre}(\d+)_{suf}".format(pre=prefix, suf=suffix)
match_fct = re.compile(regex).search
match_fct = re.compile(regex).search
matches = [_f for _f in map(match_fct, list(fields.keys())) if _f]
matches = [_f for _f in map(match_fct, field_get_ret.keys()) if _f]
for match in matches:
for match in matches:
field = match.group(0)
field = match.group(0)
slot = match.group(1)
slot = match.group(1)
@@ -298,8 +298,8 @@
@@ -298,8 +298,8 @@
for match in matches:
for match in matches:
field = match.group(0)
field = match.group(0)
slot = match.group(1)
slot = match.group(1)
fields[field]["string"] = ans_dict.get(
field_get_ret[field]["string"] = ans_dict.get(
"{0}".format(slot), "{0}{1}".format(prefix.upper(), slot)
"{0}".format(slot), "{0}{1}".format(prefix.upper(), slot)
)
)
@@ -303,7 +303,7 @@
@@ -303,7 +303,7 @@
"{0}".format(slot), "{0}{1}".format(prefix.upper(), slot)
"{0}".format(slot), "{0}{1}".format(prefix.upper(), slot)
)
)
return fields
return field_get_ret
@api.model
@api.model
def analytic_get_view(self, model, view, prefix="a", suffix="id", subfield=None):
def analytic_get_view(self, model, view, prefix="a", suffix="id", subfield=None):
@@ -389,7 +389,7 @@
@@ -389,7 +389,7 @@
registry = self.env.registry
registry = self.env.registry
return [
return [
model
model
for name, model in list(registry.items())
for name, model in registry.items()
if getattr(model, "_analytic", False)
if getattr(model, "_analytic", False)
]
]
Loading