Merge pull request #1154 from yilmazbekdemir/make-actuals-editable

make actuals field editable for indicator

indicators/migrations/0016_auto_20190118_0500.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.17 on 2019-01-18 13:00
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('indicators', '0015_auto_20190116_0452'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='historicalindicator',
+            name='actual_formula',
+            field=models.CharField(blank=True, max_length=15, null=True),
+        ),
+        migrations.AlterField(
+            model_name='indicator',
+            name='actual_formula',
+            field=models.CharField(blank=True, max_length=15, null=True),
+        ),
+    ]

indicators/models.py

@@ -397,7 +397,7 @@ class Indicator(models.Model):
     objects = IndicatorManager()
     calculation_type = models.CharField(blank=True, null=True, max_length=15, choices=CALCULATION_CHOICES)
     direction = models.CharField(blank=True, null=True, max_length=15, choices=DIRECTION_CHOICES)
-    actual_formula = models.CharField(blank=True, null=True, max_length=15, choices=ACTUAL_FORMULA_CHOICES)
+    actual_formula = models.CharField(blank=True, null=True, max_length=15)
     total_actual = models.ForeignKey('CollectedData', related_name='indicator_total_actual', on_delete=models.SET_NULL, verbose_name="Total Actual", blank=True, null=True, help_text="The collected data selected to be used in the actual formula")
 
     class Meta: