Choices frontend

report_builder/api/serializers.py

@@ -29,8 +29,8 @@ class Meta:
         model = FilterField
         fields = ('id', 'path', 'path_verbose', 'field', 'field_verbose',
                   'field_type', 'filter_type', 'filter_value', 'filter_value2',
-                  'exclude', 'position', 'report')
-        read_only_fields = ('id', 'field_type')
+                  'exclude', 'position', 'report', 'choices')
+        read_only_fields = ('id', 'field_type', 'choices')
 
 
 class UserSerializer(serializers.ModelSerializer):

report_builder/api/views.py

@@ -191,7 +191,7 @@ def post(self, request):
                 'field_type': new_field.get_internal_type(),
                 'is_default': True if defaults is None or
                 new_field.name in defaults else False,
-                'field_choices': new_field.choices,
+                'choices': list(new_field.choices),
                 'can_filter': True if filters is None or
                 new_field.name in filters else False,
                 'path': field_data['path'],
@@ -214,7 +214,7 @@ def post(self, request):
                         'field': field,
                         'field_verbose': field,
                         'field_type': 'Property',
-                        'field_choices': None,
+                        'choices': None,
                         'can_filter': True if filters is None or
                         field in filters else False,
                         'path': field_data['path'],
@@ -234,7 +234,7 @@ def post(self, request):
                     'field': field.name,
                     'field_verbose': field.name,
                     'field_type': 'Custom Field',
-                    'field_choices': getattr(field, 'choices', None),
+                    'choices': getattr(field, 'choices', None),
                     'can_filter': True if filters is None or
                     field.name in filters else False,
                     'path': field_data['path'],

report_builder/models.py

@@ -557,7 +557,7 @@ def get_choices(self, model, field_name):
         except:
             model_field = None
         if model_field and model_field.choices:
-            return model_field.choices
+            return list(model_field.choices)
 
     def filter_property(self, value):
         """ Determine if passed value should be filtered or not """

report_builder/static/report_builder/partials/filter_renderer.html

@@ -41,7 +41,8 @@
           <div ng-switch-when="BooleanField">
             <md-checkbox ng-model="field.filter_value">
           </div>
-          <input ng-switch-default type="text" ng-model="field.filter_value"></input>
+          <input ng-if="!field.choices" ng-switch-default type="text" ng-model="field.filter_value"></input>
+          <select ng-if="!!field.choices" ng-model="field.filter_value" ng-options="choice[0] as choice[1] for choice in field.choices"></select>
           <div ng-if="field.filter_type == 'range'" flex="" ng-switch="field.field_type">
             <input ng-switch-when="DateField" pikaday="pikaday" format="YYYY-MM-DD" ng-model="field.filter_value2"></input>
             <input ng-switch-default type="text" ng-model="field.filter_value2"></input>

report_builder/tests.py

@@ -257,7 +257,7 @@ def test_report_builder_choices(self):
             '/report_builder/api/fields/',
             {"model": ct.id, "path": "", "path_verbose": "", "field": ""})
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, 'field_choices')
+        self.assertContains(response, 'choices')
         self.assertContains(response, '[["CH","CHECK"],["MA","CHECKMATE"]]')
 
     def test_report_builder_can_filter(self):

report_builder_demo/demo_models/migrations/0010_bar_status.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('demo_models', '0009_auto_20151209_2136'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bar',
+            name='status',
+            field=models.PositiveIntegerField(default=0, choices=[(0, b'Pending'), (1, b'Approved'), (2, b'Rejected')]),
+        ),
+    ]

report_builder_demo/demo_models/models.py

@@ -3,6 +3,7 @@
 from django.utils.functional import cached_property
 
 from djmoney.models.fields import MoneyField
+from model_utils import Choices
 
 
 class Foo(models.Model):
@@ -28,13 +29,20 @@ class Bar(models.Model):
         (CHECK, 'CHECK'),
         (MATE, 'CHECKMATE'),
     )
+    STATUS_CHOICES = Choices(
+        (0, "Pending"),
+        (1, "Approved"),
+        (2, "Rejected"),
+    )
 
     check_mate_status = models.CharField(
         max_length=2,
         choices=CHESS_CHOICES,
         default=CHECK
     )
 
+    status = models.PositiveIntegerField(choices=STATUS_CHOICES, default=0)
+
     @property
     def i_want_char_field(self):
         return 'lol no'

requirements.txt

@@ -7,3 +7,6 @@ celery[redis]
 flake8
 django-money==0.9.1
 djangorestframework==3.4.3
+python-dateutil==2.6.0
+openpyxl==2.4.1
+django-model-utils==2.6