Feature/variable hourly dist table
Compare changes
Files
2- emanuel buzey authored
- Relational fields are incorporated to facilitate the visualization of data imported from the DistributionTableVariableCoefficient model. - A new conditional group is introduced in the DistributionTable view to specifically handle the 'variable_schedule' type, showing the 'hour', 'cups_id' and 'coefficient' fields only when applicable. - Implemented display logic to hide the actual value of 'coefficient', displaying a static value '*' instead. _________________________________________________ / \ | Enrico, Daniil: Thanks for everything I'm going | | to miss you. Som IT <3 | \ / ================================================= \ \ ^__^ (oo)\_______ (__)\ )\/\ ||----w | || ||
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -9,6 +9,10 @@ import werkzeug
@@ -9,6 +9,10 @@ import werkzeug
@@ -36,7 +40,7 @@ class DistributionTableImportWizard(models.TransientModel):
@@ -36,7 +40,7 @@ class DistributionTableImportWizard(models.TransientModel):
@@ -45,19 +49,48 @@ class DistributionTableImportWizard(models.TransientModel):
@@ -45,19 +49,48 @@ class DistributionTableImportWizard(models.TransientModel):
@@ -97,9 +130,110 @@ class DistributionTableImportWizard(models.TransientModel):
@@ -97,9 +130,110 @@ class DistributionTableImportWizard(models.TransientModel):