Charts

.gitlab-ci.yml

@@ -0,0 +1,16 @@
+image:
+  illa/for_splinter:v1
+
+before_script:
+  - pip install celery
+  - pip install -r requirements.txt
+  - python setup.py develop
+  - pip install Django==1.8
+
+tests:
+  script:
+    - python manage.py test
+
+lint:
+  script:
+    - flake8

report_builder/api/serializers.py

@@ -60,7 +60,9 @@ class Meta:
         fields = (
             'id', 'name', 'description', 'modified', 'root_model', 'root_model_name',
             'displayfield_set', 'distinct', 'user_created', 'user_modified',
-            'filterfield_set', 'report_file', 'report_file_creation')
+            'filterfield_set', 'report_file', 'report_file_creation',
+            'chart_categories', 'chart_series', 'chart_values', 'chart_type', 'chart_style',
+            'chart_stacked', 'chart_labels', 'chart_total')
         read_only_fields = ('report_file', 'report_file_creation')
 
     def validate(self, data):
@@ -79,6 +81,14 @@ def update(self, instance, validated_data):
 
         with transaction.atomic():
             instance.name = validated_data.get('name', instance.name)
+            instance.chart_categories = validated_data.get('chart_categories', instance.chart_categories)
+            instance.chart_series = validated_data.get('chart_series', instance.chart_series)
+            instance.chart_values = validated_data.get('chart_values', instance.chart_values)
+            instance.chart_type = validated_data.get('chart_type', instance.chart_type)
+            instance.chart_style = validated_data.get('chart_style', instance.chart_style)
+            instance.chart_stacked = validated_data.get('chart_stacked', instance.chart_stacked)
+            instance.chart_labels = validated_data.get('chart_labels', instance.chart_labels)
+            instance.chart_total = validated_data.get('chart_total', instance.chart_total)
             instance.description = validated_data.get('description', instance.description)
             instance.distinct = validated_data.get(
                 'distinct', instance.distinct)

report_builder/migrations/0004_auto_20160906_1149.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('report_builder', '0003_auto_20150720_1549'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='report',
+            name='chart_categories',
+            field=models.IntegerField(null=True, blank=True),
+        ),
+        migrations.AddField(
+            model_name='report',
+            name='chart_series',
+            field=models.IntegerField(null=True, blank=True),
+        ),
+        migrations.AddField(
+            model_name='report',
+            name='chart_values',
+            field=models.IntegerField(null=True, blank=True),
+        ),
+    ]

report_builder/migrations/0005_report_chart_type.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('report_builder', '0004_auto_20160906_1149'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='report',
+            name='chart_type',
+            field=models.IntegerField(null=True, blank=True),
+        ),
+    ]

report_builder/migrations/0006_report_chart_style.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('report_builder', '0005_report_chart_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='report',
+            name='chart_style',
+            field=models.CharField(max_length=16, null=True, blank=True),
+        ),
+    ]

report_builder/migrations/0007_auto_20160909_0916.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('report_builder', '0006_report_chart_style'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='report',
+            name='chart_values',
+            field=models.CommaSeparatedIntegerField(max_length=64, null=True, blank=True),
+        ),
+    ]

report_builder/migrations/0008_auto_20160909_1231.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('report_builder', '0007_auto_20160909_0916'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='report',
+            name='chart_labels',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='report',
+            name='chart_stacked',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='report',
+            name='chart_total',
+            field=models.BooleanField(default=False),
+        ),
+    ]

report_builder/migrations/0009_auto_20160910_0937.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('report_builder', '0008_auto_20160909_1231'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='report',
+            name='chart_categories',
+            field=models.CommaSeparatedIntegerField(max_length=64, null=True, blank=True),
+        ),
+    ]

report_builder/migrations/0010_auto_20160910_1037.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('report_builder', '0009_auto_20160910_0937'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='report',
+            name='chart_series',
+            field=models.CommaSeparatedIntegerField(max_length=64, null=True, blank=True),
+        ),
+    ]

report_builder/models.py

@@ -86,6 +86,14 @@ def allowed_models():
         AUTH_USER_MODEL, blank=True,
         help_text="These users have starred this report for easy reference.",
         related_name="report_starred_set")
+    chart_style = models.CharField(max_length=16, null=True, blank=True)
+    chart_type = models.IntegerField(null=True, blank=True)
+    chart_categories = models.CommaSeparatedIntegerField(max_length=64, null=True, blank=True)
+    chart_series = models.CommaSeparatedIntegerField(max_length=64, null=True, blank=True)
+    chart_values = models.CommaSeparatedIntegerField(max_length=64, null=True, blank=True)
+    chart_stacked = models.BooleanField(default=False)
+    chart_labels = models.BooleanField(default=False)
+    chart_total = models.BooleanField(default=False)
 
     def save(self, *args, **kwargs):
         if not self.id: