TOLA-499: Removing codedfield and codedfielddata

factories/workflow_models.py

@@ -10,7 +10,6 @@
     ApprovalType as ApprovalTypeM,
     Award as AwardM,
     Budget as BudgetM,
-    CodedField as CodedFieldM,
     Country as CountryM,
     Documentation as DocumentationM,
     FundCode as FundCodeM,
@@ -269,37 +268,6 @@ class Meta:
     country = SubFactory(Country, country="Germany", code="DE")
 
 
-class CodedField(DjangoModelFactory):
-    class Meta:
-        model = CodedFieldM
-
-    name = 'coded_field_a'
-    label = 'CodedField A'
-    organization = SubFactory(Organization)
-
-    @post_generation
-    def workflowlevel1(self, create, extracted, **kwargs):
-        if not create:
-            # Simple build, do nothing.
-            return
-
-        if type(extracted) is list:
-            # A list of workflowlevel1 were passed in, use them
-            for workflowlevel1 in extracted:
-                self.workflowlevel1.add(workflowlevel1)
-
-    @post_generation
-    def workflowlevel2(self, create, extracted, **kwargs):
-        if not create:
-            # Simple build, do nothing.
-            return
-
-        if extracted:
-            # A list of workflowlevel2 were passed in, use them
-            for workflowlevel2 in extracted:
-                self.workflowlevel2.add(workflowlevel2)
-
-
 class Internationalization(DjangoModelFactory):
     class Meta:
         model = InternationalizationM

workflow/admin.py

@@ -14,7 +14,7 @@
                      Stakeholder, StakeholderType, TolaUser, TolaSites,
                      FormGuidance, TolaUserProxy, TolaBookmarks, Currency,
                      ApprovalWorkflow, ApprovalType, FundCode, RiskRegister,
-                     IssueRegister, CodedField, WorkflowModules, Milestone,
+                     IssueRegister, WorkflowModules, Milestone,
                      Portfolio, SectorRelated, WorkflowLevel1Sector)
 
 
@@ -105,12 +105,6 @@ class IssueRegisterAdmin(ImportExportModelAdmin):
     list_filter = ('workflowlevel2', 'type')
 
 
-class CodedFieldAdmin(ImportExportModelAdmin):
-    list_display = ('name', 'type','is_universal')
-    display = 'Coded Fields'
-    list_filter = ('type', 'is_universal')
-
-
 class TolaUserProxyResource(resources.ModelResource):
     country = fields.Field(column_name='country', attribute='country', widget=ForeignKeyWidget(Country, 'country'))
     user = fields.Field(column_name='user', attribute='user', widget=ForeignKeyWidget(User, 'username'))
@@ -262,7 +256,6 @@ class WorkflowLevel1SectorAdmin(admin.ModelAdmin):
 admin.site.register(FundCode, FundCodeAdmin)
 admin.site.register(RiskRegister, RiskRegisterAdmin)
 admin.site.register(IssueRegister, IssueRegisterAdmin)
-admin.site.register(CodedField, CodedFieldAdmin)
 admin.site.register(WorkflowModules, WorkflowModulesAdmin)
 admin.site.register(Milestone, MilestoneAdmin)
 admin.site.register(Portfolio, PortfolioAdmin)

workflow/migrations/0001_initial.py

@@ -84,40 +84,6 @@ class Migration(migrations.Migration):
                 'ordering': ('contributor',),
             },
         ),
-        migrations.CreateModel(
-            name='CodedField',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(blank=True, max_length=255, null=True, verbose_name='Field Name')),
-                ('label', models.CharField(blank=True, max_length=255, null=True, verbose_name='Field Label')),
-                ('is_required', models.BooleanField(default=0, verbose_name='Required Field?')),
-                ('is_universal', models.BooleanField(default=0, verbose_name='Available in Every Level 2 Form?')),
-                ('type', models.CharField(blank=True, max_length=255, null=True, verbose_name='Field Type')),
-                ('default_value', models.CharField(blank=True, max_length=255, null=True, verbose_name='Field Default Value')),
-                ('api_url', models.CharField(blank=True, max_length=255, null=True, verbose_name='Associated API URL')),
-                ('api_token', models.CharField(blank=True, max_length=255, null=True, verbose_name='Associated API Token')),
-                ('create_date', models.DateTimeField(blank=True, null=True)),
-                ('edit_date', models.DateTimeField(blank=True, null=True)),
-            ],
-            options={
-                'ordering': ('name', 'type'),
-                'verbose_name_plural': 'CodedFields',
-            },
-        ),
-        migrations.CreateModel(
-            name='CodedFieldValues',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('value', models.CharField(blank=True, max_length=255, null=True, verbose_name='Value')),
-                ('create_date', models.DateTimeField(blank=True, null=True)),
-                ('edit_date', models.DateTimeField(blank=True, null=True)),
-                ('coded_field', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='workflow.CodedField')),
-            ],
-            options={
-                'ordering': ('value', 'coded_field', 'workflowlevel2__name'),
-                'verbose_name_plural': 'CodedFields',
-            },
-        ),
         migrations.CreateModel(
             name='Contact',
             fields=[
@@ -1164,26 +1130,6 @@ class Migration(migrations.Migration):
             name='workflowlevel1',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='workflow.WorkflowLevel1'),
         ),
-        migrations.AddField(
-            model_name='codedfieldvalues',
-            name='workflowlevel2',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='workflow.WorkflowLevel2'),
-        ),
-        migrations.AddField(
-            model_name='codedfield',
-            name='organization',
-            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='workflow.Organization'),
-        ),
-        migrations.AddField(
-            model_name='codedfield',
-            name='workflowlevel1',
-            field=models.ManyToManyField(blank=True, to='workflow.WorkflowLevel1'),
-        ),
-        migrations.AddField(
-            model_name='codedfield',
-            name='workflowlevel2',
-            field=models.ManyToManyField(blank=True, to='workflow.WorkflowLevel2'),
-        ),
         migrations.AddField(
             model_name='budget',
             name='donor_currency',

workflow/models.py

@@ -1173,56 +1173,6 @@ def __unicode__(self):
         return unicode(self.workflowlevel1)
 
 
-class CodedField(models.Model):
-    name = models.CharField("Field Name", max_length=255, blank=True, null=True)
-    label = models.CharField("Field Label", max_length=255, blank=True, null=True)
-    is_required = models.BooleanField("Required Field?", default=0)
-    is_universal = models.BooleanField("Available in Every Level 2 Form?", default=0)
-    type = models.CharField("Field Type", max_length=255, blank=True, null=True)
-    organization = models.ForeignKey(Organization, default=1)
-    default_value = models.CharField("Field Default Value", max_length=255, blank=True, null=True)
-    api_url = models.CharField("Associated API URL", max_length=255, blank=True, null=True)
-    api_token = models.CharField("Associated API Token", max_length=255, blank=True, null=True)
-    workflowlevel2 = models.ManyToManyField(WorkflowLevel2, blank=True)
-    workflowlevel1 = models.ManyToManyField(WorkflowLevel1, blank=True)
-    create_date = models.DateTimeField(null=True, blank=True)
-    edit_date = models.DateTimeField(null=True, blank=True)
-
-    class Meta:
-        ordering = ('name', 'type')
-        verbose_name_plural = "CodedFields"
-
-    def save(self, *args, **kwargs):
-        if self.create_date == None:
-            self.create_date = timezone.now()
-        self.edit_date = timezone.now()
-        super(CodedField, self).save()
-
-    def __unicode__(self):
-        return unicode(self.name)
-
-
-class CodedFieldValues(models.Model):
-    value = models.CharField("Value", null=True, blank=True, max_length=255)
-    coded_field = models.ForeignKey(CodedField)
-    workflowlevel2 = models.ForeignKey(WorkflowLevel2, null=True, blank=True)
-    create_date = models.DateTimeField(null=True, blank=True)
-    edit_date = models.DateTimeField(null=True, blank=True)
-
-    class Meta:
-        ordering = ('value', 'coded_field', 'workflowlevel2__name')
-        verbose_name_plural = "CodedFields"
-
-    def save(self, *args, **kwargs):
-        if self.create_date == None:
-            self.create_date = timezone.now()
-        self.edit_date = timezone.now()
-        super(CodedFieldValues, self).save()
-
-    def __unicode__(self):
-        return unicode(self.value)
-
-
 class Documentation(models.Model):
     document_uuid = models.CharField(max_length=255, verbose_name='Document UUID', default=uuid.uuid4, unique=True, blank=True)
     name = models.CharField("Name of Document", max_length=255, blank=True, null=True)