migrations squashed clear adjustments button added to adjustment page

dm_regional_app/migrations/0004_remove_savedscenario_prediction_filters_and_more.py

@@ -1,6 +1,5 @@
-# Generated by Django 4.2.10 on 2024-05-21 13:56
+# Generated by Django 4.2.10 on 2024-06-18 14:46
 
-import django.core.serializers.json
 from django.db import migrations, models
 
 import dm_regional_app.utils
@@ -25,39 +24,101 @@ class Migration(migrations.Migration):
  name="adjusted_numbers",
  field=models.JSONField(
  decoder=dm_regional_app.utils.DateAwareJSONDecoder,
- default=None,
- encoder=django.core.serializers.json.DjangoJSONEncoder,
+ encoder=dm_regional_app.utils.SeriesAwareJSONEncoder,
+ null=True,
  ),
- preserve_default=False,
  ),
  migrations.AddField(
  model_name="savedscenario",
  name="adjusted_rates",
  field=models.JSONField(
  decoder=dm_regional_app.utils.DateAwareJSONDecoder,
- default=1,
- encoder=django.core.serializers.json.DjangoJSONEncoder,
+ encoder=dm_regional_app.utils.SeriesAwareJSONEncoder,
+ null=True,
  ),
- preserve_default=False,
  ),
  migrations.AddField(
  model_name="sessionscenario",
  name="adjusted_numbers",
  field=models.JSONField(
  decoder=dm_regional_app.utils.DateAwareJSONDecoder,
- default=1,
- encoder=django.core.serializers.json.DjangoJSONEncoder,
+ encoder=dm_regional_app.utils.SeriesAwareJSONEncoder,
+ null=True,
  ),
- preserve_default=False,
  ),
  migrations.AddField(
  model_name="sessionscenario",
  name="adjusted_rates",
  field=models.JSONField(
  decoder=dm_regional_app.utils.DateAwareJSONDecoder,
- default=1,
- encoder=django.core.serializers.json.DjangoJSONEncoder,
+ encoder=dm_regional_app.utils.SeriesAwareJSONEncoder,
+ null=True,
+ ),
+ ),
+ migrations.AlterField(
+ model_name="savedscenario",
+ name="adjusted_costs",
+ field=models.JSONField(
+ decoder=dm_regional_app.utils.DateAwareJSONDecoder,
+ encoder=dm_regional_app.utils.SeriesAwareJSONEncoder,
+ null=True,
+ ),
+ ),
+ migrations.AlterField(
+ model_name="savedscenario",
+ name="historic_filters",
+ field=models.JSONField(
+ decoder=dm_regional_app.utils.DateAwareJSONDecoder,
+ encoder=dm_regional_app.utils.SeriesAwareJSONEncoder,
+ ),
+ ),
+ migrations.AlterField(
+ model_name="savedscenario",
+ name="historic_stock",
+ field=models.JSONField(
+ decoder=dm_regional_app.utils.DateAwareJSONDecoder,
+ encoder=dm_regional_app.utils.SeriesAwareJSONEncoder,
+ ),
+ ),
+ migrations.AlterField(
+ model_name="savedscenario",
+ name="prediction_parameters",
+ field=models.JSONField(
+ decoder=dm_regional_app.utils.DateAwareJSONDecoder,
+ encoder=dm_regional_app.utils.SeriesAwareJSONEncoder,
+ ),
+ ),
+ migrations.AlterField(
+ model_name="sessionscenario",
+ name="adjusted_costs",
+ field=models.JSONField(
+ decoder=dm_regional_app.utils.DateAwareJSONDecoder,
+ encoder=dm_regional_app.utils.SeriesAwareJSONEncoder,
+ null=True,
+ ),
+ ),
+ migrations.AlterField(
+ model_name="sessionscenario",
+ name="historic_filters",
+ field=models.JSONField(
+ decoder=dm_regional_app.utils.DateAwareJSONDecoder,
+ encoder=dm_regional_app.utils.SeriesAwareJSONEncoder,
+ ),
+ ),
+ migrations.AlterField(
+ model_name="sessionscenario",
+ name="historic_stock",
+ field=models.JSONField(
+ decoder=dm_regional_app.utils.DateAwareJSONDecoder,
+ encoder=dm_regional_app.utils.SeriesAwareJSONEncoder,
+ ),
+ ),
+ migrations.AlterField(
+ model_name="sessionscenario",
+ name="prediction_parameters",
+ field=models.JSONField(
+ decoder=dm_regional_app.utils.DateAwareJSONDecoder,
+ encoder=dm_regional_app.utils.SeriesAwareJSONEncoder,
  ),
- preserve_default=False,
  ),
  ]

dm_regional_app/templates/dm_regional_app/views/adjusted.html

@@ -89,6 +89,7 @@ <h5 class="card-title">To make adjustments, you can view the table by:<br></h5>
  </tbody>
  </table>
  <div class="d-flex bd-highlight mb-3">
+ <div class="p-2 bd-highlight"><a class="btn btn-warning" href="clear_rates">Clear all rate adjustments</a></div>
  <div class="ms-auto p-2 bd-highlight"><a class="btn btn-primary" href="entry_rates">Edit this table</a></div>
  </div>
  </div>
@@ -106,6 +107,7 @@ <h5 class="card-title">To make adjustments, you can view the table by:<br></h5>
  </tbody>
  </table>
  <div class="d-flex bd-highlight mb-3">
+ <div class="p-2 bd-highlight"><a class="btn btn-warning" href="clear_rates">Clear all rate adjustments</a></div>
  <div class="ms-auto p-2 bd-highlight"><a class="btn btn-primary" href="exit_rates">Edit this table</a></div>
  </div>
  </div> 
@@ -123,6 +125,7 @@ <h5 class="card-title">To make adjustments, you can view the table by:<br></h5>
  </tbody>
  </table>
  <div class="d-flex bd-highlight mb-3">
+ <div class="p-2 bd-highlight"><a class="btn btn-warning" href="clear_rates">Clear all rate adjustments</a></div>
  <div class="ms-auto p-2 bd-highlight"><a class="btn btn-primary" href="{% url 'router_handler' %}?next_url_name=transition_rates">Edit this table</a></div>
  </div>
  </div>