From 6ad5594540e5356094dfa07d024e2fbfe96dd075 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Mon, 5 Sep 2016 20:55:02 +0200
Subject: [PATCH 01/30] Detailed versions of dependencies.

---
 requirements.txt | 2 +-
 setup.py         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 17379d7a..83089ff8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 django-custom-field==2.5
 psycopg2
-django-extensions
+django-extensions==1.6.7
 Werkzeug
 ipdb
 celery[redis]
diff --git a/setup.py b/setup.py
index a9a8b5aa..0bdcfb0d 100644
--- a/setup.py
+++ b/setup.py
@@ -24,9 +24,9 @@
     ],
     install_requires=[
         'openpyxl==2.2.1',
-        'python-dateutil',
-        'django-report-utils>=0.3.15',
-        'djangorestframework>=3.0.4',
+        'python-dateutil==2.5.3',
+        'django-report-utils==0.3.15',
+        'djangorestframework==3.1',
         "six"
     ]
 )

From ede231688cba8c8ca5238e905ccfa59545394972 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Mon, 5 Sep 2016 20:57:37 +0200
Subject: [PATCH 02/30] Changed postgres to sqlite3.

---
 report_builder_demo/settings.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/report_builder_demo/settings.py b/report_builder_demo/settings.py
index 889939e5..5dd7f41a 100644
--- a/report_builder_demo/settings.py
+++ b/report_builder_demo/settings.py
@@ -62,11 +62,8 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'postgres',
-        'USER': 'postgres',
-        'HOST': 'db',
-        'PORT': 5432,
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
 }
 
@@ -114,7 +111,7 @@
 BROKER_URL = 'redis://{}:{}/0'.format(REDIS_ADDR, REDIS_PORT)
 CELERY_RESULT_BACKEND = BROKER_URL
 
-REPORT_BUILDER_ASYNC_REPORT = True
+REPORT_BUILDER_ASYNC_REPORT = False
 REPORT_BUILDER_GLOBAL_EXPORT = True
 REPORT_BUILDER_EMAIL_NOTIFICATION = False
 

From 3e29491709d84998974133b7257d65fff1b35260 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Mon, 5 Sep 2016 21:02:26 +0200
Subject: [PATCH 03/30] Added simple chart for report (type: column, x-axis:
 first column, y-axis: last column).

---
 .../static/report_builder/controllers.js      | 32 +++++++++++++++++++
 .../report_builder/partials/show_report.html  |  6 +++-
 .../templates/report_builder/spa.html         |  1 +
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index aeb0a310..29e57853 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -257,6 +257,7 @@ reportBuilderApp.controller('ReportFilterCtrl', function($scope) {
 
 reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
   $scope.getPreview = function() {
+    $scope.reportData.chart = false;
     $scope.reportData.statusMessage = null;
     $scope.reportData.refresh = true;
     reportService.getPreview($scope.report.id).then(function(data) {
@@ -275,6 +276,37 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     });
   };
 
+  $scope.createChart = function() {
+    $scope.reportData.chart = true;
+    $scope.reportData.statusMessage = null;
+    $scope.reportData.refresh = true;
+    reportService.getPreview($scope.report.id).then(function(data) {
+      var chart_data = data.map(function(row) {
+        return [ row[0], row[row.length-1]];
+      });
+      var categories = chart_data.map(function(row) {
+        return row[0];
+      });
+      Highcharts.chart('highchart_container', {
+        chart: {
+          type: 'column'
+        },
+        xAxis: {
+            categories: categories,
+        },
+        title: {
+            text: $scope.report.name,
+        },
+        series: [{
+            data: chart_data,
+        }]
+      });
+      $scope.reportData.refresh = false;
+    }, function(response) {
+      $scope.reportData.refresh = false;
+      $scope.reportData.statusMessage = "Error with status code " + response.status;
+    });
+  };
   $scope.save = function() {
     angular.forEach($scope.report.displayfield_set, function(value, index) {
       value.position = index;
diff --git a/report_builder/static/report_builder/partials/show_report.html b/report_builder/static/report_builder/partials/show_report.html
index 30f58823..7bc5b249 100644
--- a/report_builder/static/report_builder/partials/show_report.html
+++ b/report_builder/static/report_builder/partials/show_report.html
@@ -4,6 +4,7 @@
         <md-button ng-click="getPreview()">Preview</md-button>
         <md-button ng-click="downloadReport('xlsx')"><a ng-href="">xlsx</a></md-button>
         <md-button ng-click="downloadReport('csv')"><a ng-href="">csv</a></md-button>
+        <md-button ng-click="createChart()"><a ng-href="">chart</a></md-button>
         <span ng-if="report.lastSaved == null">
             Changes have not been saved
         </span>
@@ -54,7 +55,10 @@ <h4>Filter Field Errors</h4>
                 </ul>
             </div>
         </div>
-        <div class="fullheight" style="width:100%; overflow: auto" ng-if="reportData.refresh == false">
+        <div ng-show="reportData.chart" class="fullheight" style="width:100%; overflow: auto">
+           <div id="highchart_container"></div>
+        </div>
+        <div ng-hide="reportData.chart" class="fullheight" style="width:100%; overflow: auto" ng-if="reportData.refresh == false">
             <hot-table id="previewTable"
                 columnHeaders="true"
                 settings="htSettings"
diff --git a/report_builder/templates/report_builder/spa.html b/report_builder/templates/report_builder/spa.html
index 462f69f5..c4aaf744 100644
--- a/report_builder/templates/report_builder/spa.html
+++ b/report_builder/templates/report_builder/spa.html
@@ -9,6 +9,7 @@
     <script src="{% static 'report_builder/bower_components/angular-route/angular-route.min.js' %}"></script>
     <script src="{% static 'report_builder/bower_components/lodash/dist/lodash.min.js' %}"></script>
     <script src="{% static 'report_builder/bower_components/restangular/dist/restangular.min.js' %}"></script>
+    <script src="http://code.highcharts.com/highcharts.js"></script>
 
     <script>
       var STATIC_URL = '{{ STATIC_URL|escapejs }}';

From cab19949c39b24fa87be93aa9e3b85544b5ee7d2 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Tue, 6 Sep 2016 08:53:57 +0200
Subject: [PATCH 04/30] Added chart with series.

categories: first colum
series: second colum
values on y: last column.
---
 .../static/report_builder/controllers.js      | 61 ++++++++++++++++---
 1 file changed, 51 insertions(+), 10 deletions(-)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index 29e57853..26bcc4b1 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -256,6 +256,53 @@ reportBuilderApp.controller('ReportFilterCtrl', function($scope) {
 });
 
 reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
+
+  function simple_chart(data) {
+    var categories = data.map(function(row) {
+      return row[0];
+    });
+    var series_data = data.map(function(row) {
+      return [ row[0], row[row.length-1]];
+    });
+    return {
+      categories: categories,
+      series: [{ data: series_data }],
+    };
+  }
+
+  function chart_with_series(data) {
+    var x1 = 0;
+    var x2 = 1;
+    var y = 0;
+    if (data.length > 0) {
+      y = data[0].length-1;
+    }
+    var categories = [];
+    for (var i = 0; i < data.length; i++) {
+      if (categories.indexOf(data[i][x1]) < 0) {
+        categories.push(data[i][x1]);
+      }
+    }
+    var series_data_dict = {};
+    for (i = 0; i < data.length; i++) {
+      if (! (data[i][x2] in series_data_dict)) {
+        series_data_dict[data[i][x2]] = [];
+      }
+      series_data_dict[data[i][x2]].push([data[i][x1], data[i][y]]);
+    }
+    var series_data = [];
+    for (var key in series_data_dict) {
+      series_data.push({
+        name: key,
+        data: series_data_dict[key]
+      });
+    }
+    return {
+      categories: categories,
+      series: series_data,
+    };
+  }
+
   $scope.getPreview = function() {
     $scope.reportData.chart = false;
     $scope.reportData.statusMessage = null;
@@ -281,25 +328,18 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     $scope.reportData.statusMessage = null;
     $scope.reportData.refresh = true;
     reportService.getPreview($scope.report.id).then(function(data) {
-      var chart_data = data.map(function(row) {
-        return [ row[0], row[row.length-1]];
-      });
-      var categories = chart_data.map(function(row) {
-        return row[0];
-      });
+      var chart_data = chart_with_series(data);
       Highcharts.chart('highchart_container', {
         chart: {
           type: 'column'
         },
         xAxis: {
-            categories: categories,
+            categories: chart_data.categories,
         },
         title: {
             text: $scope.report.name,
         },
-        series: [{
-            data: chart_data,
-        }]
+        series: chart_data.series,
       });
       $scope.reportData.refresh = false;
     }, function(response) {
@@ -307,6 +347,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
       $scope.reportData.statusMessage = "Error with status code " + response.status;
     });
   };
+
   $scope.save = function() {
     angular.forEach($scope.report.displayfield_set, function(value, index) {
       value.position = index;

From 6ea7d728dcca05511e017d6d234d7316b47921fb Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Tue, 6 Sep 2016 09:35:14 +0200
Subject: [PATCH 05/30] Added tab 'Chart options'.

---
 .../static/report_builder/controllers.js      | 10 +++++++++-
 .../partials/chart_options.html               | 19 +++++++++++++++++++
 .../static/report_builder/partials/home.html  |  8 +++++++-
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 report_builder/static/report_builder/partials/chart_options.html

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index 26bcc4b1..876201a4 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -254,6 +254,9 @@ reportBuilderApp.controller('ReportFilterCtrl', function($scope) {
     field.remove();
   };
 });
+reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
+  $scope.report.chart_type = 2;
+});
 
 reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
 
@@ -328,7 +331,12 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     $scope.reportData.statusMessage = null;
     $scope.reportData.refresh = true;
     reportService.getPreview($scope.report.id).then(function(data) {
-      var chart_data = chart_with_series(data);
+      var chart_data = {};
+      if ($scope.report.chart_type == 2) {
+        chart_data = simple_chart(data);
+      } else {
+        chart_data = chart_with_series(data);
+      }
       Highcharts.chart('highchart_container', {
         chart: {
           type: 'column'
diff --git a/report_builder/static/report_builder/partials/chart_options.html b/report_builder/static/report_builder/partials/chart_options.html
new file mode 100644
index 00000000..bd85278f
--- /dev/null
+++ b/report_builder/static/report_builder/partials/chart_options.html
@@ -0,0 +1,19 @@
+<md-content class="md-padding" ng-controller="ChartOptionsCtrl">
+<md-list>
+    <md-list-item> 
+        <md-radio-group ng-model="report.chart_type">
+            <p><strong>Type</strong></p>
+            <md-radio-button value="2">
+            SIMPLE (categories, values)
+            </md-radio-button>
+
+            <md-radio-button ng-value="3">
+            ADVANCED (categories, series, values)
+            </md-radio-button>
+
+        </md-radio-group>
+
+    </md-list-item>
+</md-list>
+</md-content>
+    
diff --git a/report_builder/static/report_builder/partials/home.html b/report_builder/static/report_builder/partials/home.html
index 3beb6c73..44e791fc 100644
--- a/report_builder/static/report_builder/partials/home.html
+++ b/report_builder/static/report_builder/partials/home.html
@@ -124,12 +124,18 @@ <h1 class="md-toolbar-tools">
             </md-tab-body>
           </md-tab>
           <md-tab id="tab3" aria-controls="tab3-content">
+            <md-tab-label>Chart options</md-tab-label>
+            <md-tab-body>
+              <div ng-include="static('report_builder/partials/chart_options.html')"></div>
+            </md-tab-body>
+          </md-tab>
+          <md-tab id="tab4" aria-controls="tab4-content">
             <md-tab-label>Report</md-tab-label>
             <md-tab-body>
               <div class="fullheight" ng-include="static('report_builder/partials/show_report.html')"></div>
             </md-tab-body>
           </md-tab>
-          <md-tab id="tab4" aria-controls="tab3-content">
+          <md-tab id="tab5" aria-controls="tab5-content">
             <md-tab-label>Options</md-tab-label>
             <md-tab-body>
               <div ng-include="static('report_builder/partials/options.html')"></div>

From fb20592d2bfcf27a4f29878e403f15705430d624 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Tue, 6 Sep 2016 12:01:59 +0200
Subject: [PATCH 06/30] More options of chart: user can choose columns:
 categories, values, series and groups.

---
 .../static/report_builder/controllers.js      | 19 +++----
 .../partials/chart_options.html               | 50 +++++++++++++++++--
 .../static/report_builder/partials/home.html  |  6 +--
 3 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index 876201a4..5d6b62c1 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -255,17 +255,16 @@ reportBuilderApp.controller('ReportFilterCtrl', function($scope) {
   };
 });
 reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
-  $scope.report.chart_type = 2;
 });
 
 reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
 
-  function simple_chart(data) {
+  function simple_chart(data, x, y) {
     var categories = data.map(function(row) {
-      return row[0];
+      return row[x];
     });
     var series_data = data.map(function(row) {
-      return [ row[0], row[row.length-1]];
+      return [ row[x], row[y]];
     });
     return {
       categories: categories,
@@ -273,13 +272,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     };
   }
 
-  function chart_with_series(data) {
-    var x1 = 0;
-    var x2 = 1;
-    var y = 0;
-    if (data.length > 0) {
-      y = data[0].length-1;
-    }
+  function chart_with_series(data, x1, x2, y) {
     var categories = [];
     for (var i = 0; i < data.length; i++) {
       if (categories.indexOf(data[i][x1]) < 0) {
@@ -333,9 +326,9 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     reportService.getPreview($scope.report.id).then(function(data) {
       var chart_data = {};
       if ($scope.report.chart_type == 2) {
-        chart_data = simple_chart(data);
+        chart_data = simple_chart(data, $scope.report.categories, $scope.report.values);
       } else {
-        chart_data = chart_with_series(data);
+        chart_data = chart_with_series(data, $scope.report.categories, $scope.report.series, $scope.report.values);
       }
       Highcharts.chart('highchart_container', {
         chart: {
diff --git a/report_builder/static/report_builder/partials/chart_options.html b/report_builder/static/report_builder/partials/chart_options.html
index bd85278f..51cd0122 100644
--- a/report_builder/static/report_builder/partials/chart_options.html
+++ b/report_builder/static/report_builder/partials/chart_options.html
@@ -1,6 +1,6 @@
 <md-content class="md-padding" ng-controller="ChartOptionsCtrl">
 <md-list>
-    <md-list-item> 
+    <md-list-item>
         <md-radio-group ng-model="report.chart_type">
             <p><strong>Type</strong></p>
             <md-radio-button value="2">
@@ -8,12 +8,56 @@
             </md-radio-button>
 
             <md-radio-button ng-value="3">
-            ADVANCED (categories, series, values)
+            NORMAL (categories, series, values)
+            </md-radio-button>
+
+            <md-radio-button ng-value="4">
+            ADVANCED (categories, series, groups, values)
             </md-radio-button>
 
         </md-radio-group>
+    </md-list-item>
 
+    <md-list-item>
+        <label><strong>Categories: &nbsp; &nbsp;</strong></label>
+        <select ng-model="report.categories">
+          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index == report.categories">
+                {{ field.path_verbose ? '(' + field.path_verbose + ') ' : '' }}
+                {{ field.name }}
+          </option>
+        </select>
     </md-list-item>
+
+    <md-list-item ng-show="report.chart_type > 2">
+        <label><strong>Series: &nbsp; &nbsp;</strong></label>
+        <select ng-model="report.series">
+          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index == report.series">
+                {{ field.path_verbose ? '(' + field.path_verbose + ') ' : '' }}
+                {{ field.name }}
+          </option>
+        </select>
+    </md-list-item>
+
+    <md-list-item ng-show="report.chart_type > 3">
+        <label><strong>Groups: &nbsp; &nbsp;</strong></label>
+        <select ng-model="report.groups">
+          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index == report.groups">
+                {{ field.path_verbose ? '(' + field.path_verbose + ') ' : '' }}
+                {{ field.name }}
+          </option>
+        </select>
+    </md-list-item>
+
+    <md-list-item>
+        <label><strong>Values: &nbsp; &nbsp;</strong></label>
+        <select ng-model="report.values">
+          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index == report.values">
+                {{ field.path_verbose ? '(' + field.path_verbose + ') ' : '' }}
+                {{ field.name }}
+          </option>
+        </select>
+    </md-list-item>
+
 </md-list>
 </md-content>
-    
+
diff --git a/report_builder/static/report_builder/partials/home.html b/report_builder/static/report_builder/partials/home.html
index 44e791fc..1cf5c926 100644
--- a/report_builder/static/report_builder/partials/home.html
+++ b/report_builder/static/report_builder/partials/home.html
@@ -123,19 +123,19 @@ <h1 class="md-toolbar-tools">
               <div ng-include="static('report_builder/partials/filters.html')"></div>
             </md-tab-body>
           </md-tab>
-          <md-tab id="tab3" aria-controls="tab3-content">
+          <md-tab id="tab5" aria-controls="tab5-content">
             <md-tab-label>Chart options</md-tab-label>
             <md-tab-body>
               <div ng-include="static('report_builder/partials/chart_options.html')"></div>
             </md-tab-body>
           </md-tab>
-          <md-tab id="tab4" aria-controls="tab4-content">
+          <md-tab id="tab3" aria-controls="tab3-content">
             <md-tab-label>Report</md-tab-label>
             <md-tab-body>
               <div class="fullheight" ng-include="static('report_builder/partials/show_report.html')"></div>
             </md-tab-body>
           </md-tab>
-          <md-tab id="tab5" aria-controls="tab5-content">
+          <md-tab id="tab4" aria-controls="tab3-content">
             <md-tab-label>Options</md-tab-label>
             <md-tab-body>
               <div ng-include="static('report_builder/partials/options.html')"></div>

From c754e97a7e0d090e77190f4091a49121ab085f9f Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Tue, 6 Sep 2016 13:58:09 +0200
Subject: [PATCH 07/30] Added fields to Report model for storing columns for
 charts.

---
 report_builder/api/serializers.py             |  3 +-
 .../migrations/0004_auto_20160906_1149.py     | 29 +++++++++++++++++++
 report_builder/models.py                      |  3 ++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 report_builder/migrations/0004_auto_20160906_1149.py

diff --git a/report_builder/api/serializers.py b/report_builder/api/serializers.py
index 61064f5d..847b83aa 100644
--- a/report_builder/api/serializers.py
+++ b/report_builder/api/serializers.py
@@ -60,7 +60,8 @@ 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')
         read_only_fields = ('report_file', 'report_file_creation')
 
     def validate(self, data):
diff --git a/report_builder/migrations/0004_auto_20160906_1149.py b/report_builder/migrations/0004_auto_20160906_1149.py
new file mode 100644
index 00000000..c83ab58e
--- /dev/null
+++ b/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),
+        ),
+    ]
diff --git a/report_builder/models.py b/report_builder/models.py
index 7083a97b..e7868fad 100644
--- a/report_builder/models.py
+++ b/report_builder/models.py
@@ -86,6 +86,9 @@ 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_categories = models.IntegerField(null=True, blank=True)
+    chart_series = models.IntegerField(null=True, blank=True)
+    chart_values = models.IntegerField(null=True, blank=True)
 
     def save(self, *args, **kwargs):
         if not self.id:

From 787687dfe7a678c0e44292588154042bf4ff1298 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Tue, 6 Sep 2016 14:52:24 +0200
Subject: [PATCH 08/30] Saving chart infromation in database.

---
 report_builder/api/serializers.py                  |  3 +++
 .../report_builder/partials/chart_options.html     | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/report_builder/api/serializers.py b/report_builder/api/serializers.py
index 847b83aa..1b3874ec 100644
--- a/report_builder/api/serializers.py
+++ b/report_builder/api/serializers.py
@@ -80,6 +80,9 @@ 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.description = validated_data.get('description', instance.description)
             instance.distinct = validated_data.get(
                 'distinct', instance.distinct)
diff --git a/report_builder/static/report_builder/partials/chart_options.html b/report_builder/static/report_builder/partials/chart_options.html
index 51cd0122..3ed4af1c 100644
--- a/report_builder/static/report_builder/partials/chart_options.html
+++ b/report_builder/static/report_builder/partials/chart_options.html
@@ -20,8 +20,8 @@
 
     <md-list-item>
         <label><strong>Categories: &nbsp; &nbsp;</strong></label>
-        <select ng-model="report.categories">
-          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index == report.categories">
+        <select ng-model="report.chart_categories">
+          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index === report.chart_categories">
                 {{ field.path_verbose ? '(' + field.path_verbose + ') ' : '' }}
                 {{ field.name }}
           </option>
@@ -30,8 +30,8 @@
 
     <md-list-item ng-show="report.chart_type > 2">
         <label><strong>Series: &nbsp; &nbsp;</strong></label>
-        <select ng-model="report.series">
-          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index == report.series">
+        <select ng-model="report.chart_series">
+          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index === report.chart_series">
                 {{ field.path_verbose ? '(' + field.path_verbose + ') ' : '' }}
                 {{ field.name }}
           </option>
@@ -41,7 +41,7 @@
     <md-list-item ng-show="report.chart_type > 3">
         <label><strong>Groups: &nbsp; &nbsp;</strong></label>
         <select ng-model="report.groups">
-          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index == report.groups">
+          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index === report.groups">
                 {{ field.path_verbose ? '(' + field.path_verbose + ') ' : '' }}
                 {{ field.name }}
           </option>
@@ -50,8 +50,8 @@
 
     <md-list-item>
         <label><strong>Values: &nbsp; &nbsp;</strong></label>
-        <select ng-model="report.values">
-          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index == report.values">
+        <select ng-model="report.chart_values">
+          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index === report.chart_values">
                 {{ field.path_verbose ? '(' + field.path_verbose + ') ' : '' }}
                 {{ field.name }}
           </option>

From 6188df3f4470540c91c2a5ab5232b1f268dd6e0a Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Tue, 6 Sep 2016 18:07:07 +0200
Subject: [PATCH 09/30] Added 'chart_type' to Report model.

---
 report_builder/api/serializers.py             |  3 ++-
 .../migrations/0005_report_chart_type.py      | 19 +++++++++++++++++++
 report_builder/models.py                      |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 report_builder/migrations/0005_report_chart_type.py

diff --git a/report_builder/api/serializers.py b/report_builder/api/serializers.py
index 1b3874ec..a5dc85a8 100644
--- a/report_builder/api/serializers.py
+++ b/report_builder/api/serializers.py
@@ -61,7 +61,7 @@ class Meta:
             'id', 'name', 'description', 'modified', 'root_model', 'root_model_name',
             'displayfield_set', 'distinct', 'user_created', 'user_modified',
             'filterfield_set', 'report_file', 'report_file_creation',
-            'chart_categories', 'chart_series', 'chart_values')
+            'chart_categories', 'chart_series', 'chart_values', 'chart_type')
         read_only_fields = ('report_file', 'report_file_creation')
 
     def validate(self, data):
@@ -83,6 +83,7 @@ def update(self, instance, validated_data):
             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.description = validated_data.get('description', instance.description)
             instance.distinct = validated_data.get(
                 'distinct', instance.distinct)
diff --git a/report_builder/migrations/0005_report_chart_type.py b/report_builder/migrations/0005_report_chart_type.py
new file mode 100644
index 00000000..aacc112e
--- /dev/null
+++ b/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),
+        ),
+    ]
diff --git a/report_builder/models.py b/report_builder/models.py
index e7868fad..bf41b648 100644
--- a/report_builder/models.py
+++ b/report_builder/models.py
@@ -86,6 +86,7 @@ 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_type = models.IntegerField(null=True, blank=True)
     chart_categories = models.IntegerField(null=True, blank=True)
     chart_series = models.IntegerField(null=True, blank=True)
     chart_values = models.IntegerField(null=True, blank=True)

From bf1fbde2c39ffbc2e379875e09a7e3ab4f368aae Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Tue, 6 Sep 2016 18:09:41 +0200
Subject: [PATCH 10/30] Fixed displaying options in select elements. Fixed
 names of report properties.

---
 .../static/report_builder/controllers.js      |  9 +++--
 .../partials/chart_options.html               | 35 ++-----------------
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index 5d6b62c1..87d8f2a4 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -254,7 +254,12 @@ reportBuilderApp.controller('ReportFilterCtrl', function($scope) {
     field.remove();
   };
 });
+
 reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
+    $scope.$watch('report.displayfield_set', function(newValue, oldValue) {
+      $scope.report_fields_indexes = newValue.map(function(el, idx) { return idx; });
+      $scope.report_fields_names = newValue.map(function(el, idx) { return el.name; });
+    }, true);
 });
 
 reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
@@ -326,9 +331,9 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     reportService.getPreview($scope.report.id).then(function(data) {
       var chart_data = {};
       if ($scope.report.chart_type == 2) {
-        chart_data = simple_chart(data, $scope.report.categories, $scope.report.values);
+        chart_data = simple_chart(data, $scope.report.chart_categories, $scope.report.chart_values);
       } else {
-        chart_data = chart_with_series(data, $scope.report.categories, $scope.report.series, $scope.report.values);
+        chart_data = chart_with_series(data, $scope.report.chart_categories, $scope.report.chart_series, $scope.report.chart_values);
       }
       Highcharts.chart('highchart_container', {
         chart: {
diff --git a/report_builder/static/report_builder/partials/chart_options.html b/report_builder/static/report_builder/partials/chart_options.html
index 3ed4af1c..5d6ff9de 100644
--- a/report_builder/static/report_builder/partials/chart_options.html
+++ b/report_builder/static/report_builder/partials/chart_options.html
@@ -11,51 +11,22 @@
             NORMAL (categories, series, values)
             </md-radio-button>
 
-            <md-radio-button ng-value="4">
-            ADVANCED (categories, series, groups, values)
-            </md-radio-button>
-
         </md-radio-group>
     </md-list-item>
 
     <md-list-item>
         <label><strong>Categories: &nbsp; &nbsp;</strong></label>
-        <select ng-model="report.chart_categories">
-          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index === report.chart_categories">
-                {{ field.path_verbose ? '(' + field.path_verbose + ') ' : '' }}
-                {{ field.name }}
-          </option>
-        </select>
+        <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_categories"></select>
     </md-list-item>
 
     <md-list-item ng-show="report.chart_type > 2">
         <label><strong>Series: &nbsp; &nbsp;</strong></label>
-        <select ng-model="report.chart_series">
-          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index === report.chart_series">
-                {{ field.path_verbose ? '(' + field.path_verbose + ') ' : '' }}
-                {{ field.name }}
-          </option>
-        </select>
-    </md-list-item>
-
-    <md-list-item ng-show="report.chart_type > 3">
-        <label><strong>Groups: &nbsp; &nbsp;</strong></label>
-        <select ng-model="report.groups">
-          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index === report.groups">
-                {{ field.path_verbose ? '(' + field.path_verbose + ') ' : '' }}
-                {{ field.name }}
-          </option>
-        </select>
+        <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_series"></select>
     </md-list-item>
 
     <md-list-item>
         <label><strong>Values: &nbsp; &nbsp;</strong></label>
-        <select ng-model="report.chart_values">
-          <option ng-repeat="field in report.displayfield_set" value="{{$index}}" ng-selected="$index === report.chart_values">
-                {{ field.path_verbose ? '(' + field.path_verbose + ') ' : '' }}
-                {{ field.name }}
-          </option>
-        </select>
+        <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_values"></select>
     </md-list-item>
 
 </md-list>

From ae990bd87a93b376e0cdc7e894801c719843121b Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Tue, 6 Sep 2016 18:12:21 +0200
Subject: [PATCH 11/30] Added exporting chart to image.

---
 report_builder/templates/report_builder/spa.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/report_builder/templates/report_builder/spa.html b/report_builder/templates/report_builder/spa.html
index c4aaf744..9218cc1d 100644
--- a/report_builder/templates/report_builder/spa.html
+++ b/report_builder/templates/report_builder/spa.html
@@ -10,6 +10,8 @@
     <script src="{% static 'report_builder/bower_components/lodash/dist/lodash.min.js' %}"></script>
     <script src="{% static 'report_builder/bower_components/restangular/dist/restangular.min.js' %}"></script>
     <script src="http://code.highcharts.com/highcharts.js"></script>
+    <script src="http://code.highcharts.com/modules/exporting.js"></script>
+    <script src="http://code.highcharts.com/modules/offline-exporting.js"></script>
 
     <script>
       var STATIC_URL = '{{ STATIC_URL|escapejs }}';

From 1eda9f4998ae96dd4e3f789f31d5587d9ce22214 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Wed, 7 Sep 2016 08:03:24 +0200
Subject: [PATCH 12/30] Added availability of choosing style of chart (e.g.
 line, column,...).

---
 report_builder/static/report_builder/controllers.js      | 3 ++-
 .../static/report_builder/partials/chart_options.html    | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index 87d8f2a4..aca9e950 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -260,6 +260,7 @@ reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http,
       $scope.report_fields_indexes = newValue.map(function(el, idx) { return idx; });
       $scope.report_fields_names = newValue.map(function(el, idx) { return el.name; });
     }, true);
+    $scope.chart_styles = ['area', 'bar', 'column', 'line', 'pie']
 });
 
 reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
@@ -337,7 +338,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
       }
       Highcharts.chart('highchart_container', {
         chart: {
-          type: 'column'
+          type: $scope.report.chart_style,
         },
         xAxis: {
             categories: chart_data.categories,
diff --git a/report_builder/static/report_builder/partials/chart_options.html b/report_builder/static/report_builder/partials/chart_options.html
index 5d6ff9de..1f6d5096 100644
--- a/report_builder/static/report_builder/partials/chart_options.html
+++ b/report_builder/static/report_builder/partials/chart_options.html
@@ -29,6 +29,15 @@
         <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_values"></select>
     </md-list-item>
 
+    <md-list-item>
+        <md-radio-group ng-model="report.chart_style">
+            <p><strong>Style</strong></p>
+            <md-radio-button ng-repeat="style in chart_styles" value="{{style}}">
+            {{ style }}
+            </md-radio-button>
+        </md-radio-group>
+    </md-list-item>
+
 </md-list>
 </md-content>
 

From 6ba4be641023e210907688aec3d48f6554060465 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Wed, 7 Sep 2016 08:14:20 +0200
Subject: [PATCH 13/30] Added chart_style field to Report model.

---
 report_builder/api/serializers.py             |  3 ++-
 .../migrations/0006_report_chart_style.py     | 19 +++++++++++++++++++
 report_builder/models.py                      |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 report_builder/migrations/0006_report_chart_style.py

diff --git a/report_builder/api/serializers.py b/report_builder/api/serializers.py
index a5dc85a8..c2bfa865 100644
--- a/report_builder/api/serializers.py
+++ b/report_builder/api/serializers.py
@@ -61,7 +61,7 @@ class Meta:
             'id', 'name', 'description', 'modified', 'root_model', 'root_model_name',
             'displayfield_set', 'distinct', 'user_created', 'user_modified',
             'filterfield_set', 'report_file', 'report_file_creation',
-            'chart_categories', 'chart_series', 'chart_values', 'chart_type')
+            'chart_categories', 'chart_series', 'chart_values', 'chart_type', 'chart_style')
         read_only_fields = ('report_file', 'report_file_creation')
 
     def validate(self, data):
@@ -84,6 +84,7 @@ def update(self, instance, validated_data):
             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.description = validated_data.get('description', instance.description)
             instance.distinct = validated_data.get(
                 'distinct', instance.distinct)
diff --git a/report_builder/migrations/0006_report_chart_style.py b/report_builder/migrations/0006_report_chart_style.py
new file mode 100644
index 00000000..b70ebf75
--- /dev/null
+++ b/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),
+        ),
+    ]
diff --git a/report_builder/models.py b/report_builder/models.py
index bf41b648..2a05fd2d 100644
--- a/report_builder/models.py
+++ b/report_builder/models.py
@@ -86,6 +86,7 @@ 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.IntegerField(null=True, blank=True)
     chart_series = models.IntegerField(null=True, blank=True)

From 4e0cc18621aa2293bd83a65cebdb670086b67c9f Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Thu, 8 Sep 2016 18:46:59 +0200
Subject: [PATCH 14/30] Added new chart options: stacked, labels and total.

---
 .../static/report_builder/controllers.js      | 23 +++++++++++++++----
 .../partials/chart_options.html               | 14 +++++++++--
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index aca9e950..9db99b55 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -336,18 +336,33 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
       } else {
         chart_data = chart_with_series(data, $scope.report.chart_categories, $scope.report.chart_series, $scope.report.chart_values);
       }
-      Highcharts.chart('highchart_container', {
+      var chart_dict = {
         chart: {
           type: $scope.report.chart_style,
         },
         xAxis: {
-            categories: chart_data.categories,
+          categories: chart_data.categories,
         },
         title: {
-            text: $scope.report.name,
+          text: $scope.report.name,
+        },
+        yAxis: {
+          stackLabels: {
+            enabled: $scope.report.chart_total,
+            formatter: function() {return 'total: ' + this.total},
+          }
         },
         series: chart_data.series,
-      });
+      };
+      chart_dict['plotOptions'] = {};
+      chart_dict['plotOptions'][$scope.report.chart_style] = {
+        dataLabels: {
+          enabled: $scope.report.chart_labels,
+        },
+        stacking: $scope.report.chart_stacked ? 'normal' : false,
+      };
+      Highcharts.chart('highchart_container', chart_dict);
+
       $scope.reportData.refresh = false;
     }, function(response) {
       $scope.reportData.refresh = false;
diff --git a/report_builder/static/report_builder/partials/chart_options.html b/report_builder/static/report_builder/partials/chart_options.html
index 1f6d5096..7171ab8c 100644
--- a/report_builder/static/report_builder/partials/chart_options.html
+++ b/report_builder/static/report_builder/partials/chart_options.html
@@ -2,7 +2,7 @@
 <md-list>
     <md-list-item>
         <md-radio-group ng-model="report.chart_type">
-            <p><strong>Type</strong></p>
+            <p><strong>Type:</strong></p>
             <md-radio-button value="2">
             SIMPLE (categories, values)
             </md-radio-button>
@@ -31,13 +31,23 @@
 
     <md-list-item>
         <md-radio-group ng-model="report.chart_style">
-            <p><strong>Style</strong></p>
+            <p><strong>Style:</strong></p>
             <md-radio-button ng-repeat="style in chart_styles" value="{{style}}">
             {{ style }}
             </md-radio-button>
         </md-radio-group>
     </md-list-item>
 
+    <md-list-item>
+        <md-item-content>
+        <p><strong>Others options:</strong></p>
+            <md-checkbox ng-model="report.chart_stacked"> Stacked </md-checkbox>
+            <md-checkbox ng-model="report.chart_labels"> Labels </md-checkbox>
+            <md-checkbox ng-model="report.chart_total"> Total </md-checkbox>
+        </md-item-content>
+    </md-list-item>
+
+
 </md-list>
 </md-content>
 

From b58f94eee8c1119e7dd2a50791f58fc26fa3c74d Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Fri, 9 Sep 2016 11:44:12 +0200
Subject: [PATCH 15/30] Chart with series from few columns can be created.

Chart Options tab is not working properly now.
---
 .../migrations/0007_auto_20160909_0916.py     | 19 ++++++++++
 report_builder/models.py                      |  2 +-
 .../static/report_builder/controllers.js      | 37 +++++++++++++------
 3 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 report_builder/migrations/0007_auto_20160909_0916.py

diff --git a/report_builder/migrations/0007_auto_20160909_0916.py b/report_builder/migrations/0007_auto_20160909_0916.py
new file mode 100644
index 00000000..2da3a83c
--- /dev/null
+++ b/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),
+        ),
+    ]
diff --git a/report_builder/models.py b/report_builder/models.py
index 2a05fd2d..0229709c 100644
--- a/report_builder/models.py
+++ b/report_builder/models.py
@@ -90,7 +90,7 @@ def allowed_models():
     chart_type = models.IntegerField(null=True, blank=True)
     chart_categories = models.IntegerField(null=True, blank=True)
     chart_series = models.IntegerField(null=True, blank=True)
-    chart_values = models.IntegerField(null=True, blank=True)
+    chart_values = models.CommaSeparatedIntegerField(max_length=64,null=True, blank=True)
 
     def save(self, *args, **kwargs):
         if not self.id:
diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index 9db99b55..1fa78d21 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -265,24 +265,33 @@ reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http,
 
 reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
 
-  function simple_chart(data, x, y) {
+  function chart_series_from_columns(data, x, y, titles) {
     var categories = data.map(function(row) {
-      return row[x];
-    });
-    var series_data = data.map(function(row) {
-      return [ row[x], row[y]];
+      return '' + row[x];
     });
+    console.log(data)
+    console.log(y)
+    var series_data = [];
+    for (var i = 0; i < y.length; i++) {
+      series_data.push({
+        name: titles[y[i]],
+        data: data.map(function(row) {
+          return [ '' + row[x], row[y[i]]];
+        }),
+      });
+    }
+    console.log(series_data);
     return {
       categories: categories,
-      series: [{ data: series_data }],
+      series: series_data,
     };
   }
 
-  function chart_with_series(data, x1, x2, y) {
+  function chart_series_from_rows(data, x1, x2, y) {
     var categories = [];
     for (var i = 0; i < data.length; i++) {
       if (categories.indexOf(data[i][x1]) < 0) {
-        categories.push(data[i][x1]);
+        categories.push('' + data[i][x1]);
       }
     }
     var series_data_dict = {};
@@ -290,7 +299,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
       if (! (data[i][x2] in series_data_dict)) {
         series_data_dict[data[i][x2]] = [];
       }
-      series_data_dict[data[i][x2]].push([data[i][x1], data[i][y]]);
+      series_data_dict[data[i][x2]].push('' + [data[i][x1], data[i][y]]);
     }
     var series_data = [];
     for (var key in series_data_dict) {
@@ -330,11 +339,17 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     $scope.reportData.statusMessage = null;
     $scope.reportData.refresh = true;
     reportService.getPreview($scope.report.id).then(function(data) {
+      console.log($scope.report.chart_type)
+      console.log($scope.report.chart_values)
+      var chart_values_list = $scope.report.chart_values.split(',');
       var chart_data = {};
       if ($scope.report.chart_type == 2) {
-        chart_data = simple_chart(data, $scope.report.chart_categories, $scope.report.chart_values);
+        chart_data = chart_series_from_columns(data, $scope.report.chart_categories, chart_values_list, data.meta.titles);
+      }
+      else if ($scope.report.chart_type == 3) {
+        chart_data = chart_series_from_rows(data, $scope.report.chart_categories, $scope.report.chart_series, chart_values_list[0]);
       } else {
-        chart_data = chart_with_series(data, $scope.report.chart_categories, $scope.report.chart_series, $scope.report.chart_values);
+        return;
       }
       var chart_dict = {
         chart: {

From f1f30d37b5080af333bbc779d0f87d4821090781 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Fri, 9 Sep 2016 14:04:56 +0200
Subject: [PATCH 16/30] Added columns for series to 'Chart options' tab.

---
 .../static/report_builder/controllers.js      | 27 +++++++++++++------
 .../partials/chart_options.html               | 10 ++++---
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index 1fa78d21..be01aa25 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -256,11 +256,26 @@ reportBuilderApp.controller('ReportFilterCtrl', function($scope) {
 });
 
 reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
+    $scope.chart_styles = ['area', 'bar', 'column', 'line', 'pie'];
+
     $scope.$watch('report.displayfield_set', function(newValue, oldValue) {
       $scope.report_fields_indexes = newValue.map(function(el, idx) { return idx; });
       $scope.report_fields_names = newValue.map(function(el, idx) { return el.name; });
     }, true);
-    $scope.chart_styles = ['area', 'bar', 'column', 'line', 'pie']
+    $scope.$watch('report.chart_values', function(newValue, oldValue) {
+      if (newValue === undefined || newValue === null) {
+        $scope.report.chart_values_list = [];
+      } else {
+        $scope.report.chart_values_list = newValue.split(',').map(function(el) { return parseInt(el);});
+      }
+    }, true);
+
+    $scope.remove_from_chart_values = function(index) {
+      $scope.report.chart_values_list.splice(index, 1);
+    };
+    $scope.add_to_chart_values = function() {
+      $scope.report.chart_values_list.push(null);
+    };
 });
 
 reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
@@ -269,10 +284,9 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     var categories = data.map(function(row) {
       return '' + row[x];
     });
-    console.log(data)
-    console.log(y)
     var series_data = [];
     for (var i = 0; i < y.length; i++) {
+      if (y[i] == null) continue;
       series_data.push({
         name: titles[y[i]],
         data: data.map(function(row) {
@@ -339,15 +353,12 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     $scope.reportData.statusMessage = null;
     $scope.reportData.refresh = true;
     reportService.getPreview($scope.report.id).then(function(data) {
-      console.log($scope.report.chart_type)
-      console.log($scope.report.chart_values)
-      var chart_values_list = $scope.report.chart_values.split(',');
       var chart_data = {};
       if ($scope.report.chart_type == 2) {
-        chart_data = chart_series_from_columns(data, $scope.report.chart_categories, chart_values_list, data.meta.titles);
+        chart_data = chart_series_from_columns(data, $scope.report.chart_categories, $scope.report.chart_values_list, data.meta.titles);
       }
       else if ($scope.report.chart_type == 3) {
-        chart_data = chart_series_from_rows(data, $scope.report.chart_categories, $scope.report.chart_series, chart_values_list[0]);
+        chart_data = chart_series_from_rows(data, $scope.report.chart_categories, $scope.report.chart_series, $scope.report.chart_values_list[0]);
       } else {
         return;
       }
diff --git a/report_builder/static/report_builder/partials/chart_options.html b/report_builder/static/report_builder/partials/chart_options.html
index 7171ab8c..3e5729bd 100644
--- a/report_builder/static/report_builder/partials/chart_options.html
+++ b/report_builder/static/report_builder/partials/chart_options.html
@@ -4,11 +4,11 @@
         <md-radio-group ng-model="report.chart_type">
             <p><strong>Type:</strong></p>
             <md-radio-button value="2">
-            SIMPLE (categories, values)
+            Series from columns
             </md-radio-button>
 
             <md-radio-button ng-value="3">
-            NORMAL (categories, series, values)
+            Series from rows
             </md-radio-button>
 
         </md-radio-group>
@@ -26,7 +26,11 @@
 
     <md-list-item>
         <label><strong>Values: &nbsp; &nbsp;</strong></label>
-        <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_values"></select>
+        <span ng-repeat="(idx, el) in report.chart_values_list track by $index">
+            <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_values_list[idx]"></select>
+            <img ng-click="remove_from_chart_values(idx)" src="{{ static('report_builder/img/delete.svg') }}"></img>
+        </span>
+        <img style="margin-left: 30px;" ng-click="add_to_chart_values()" src="{{ static('report_builder/img/add.svg') }}"></img>
     </md-list-item>
 
     <md-list-item>

From 1af237efcdbc672e945701cd36cda5aba69a2201 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Fri, 9 Sep 2016 14:21:23 +0200
Subject: [PATCH 17/30] Added saving many series columns indexes in database.

---
 report_builder/static/report_builder/controllers.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index be01aa25..246ed22e 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -406,6 +406,11 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     angular.forEach($scope.report.filterfield_set, function(value, index) {
       value.position = index;
     });
+    var chart_values = $scope.report.chart_values_list;
+    chart_values = chart_values.filter(function(el) {
+      return (el != null);
+    });
+    $scope.report.chart_values = chart_values.join(',');
     $scope.report.save().then(function(result) {
       $scope.report.lastSaved = new Date();
       $scope.reportData.reportErrors = null;

From 0f779e0d8c1233632b80d4595146c3429aa44754 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Fri, 9 Sep 2016 14:33:38 +0200
Subject: [PATCH 18/30] Added saving chart options: 'stacked', 'labels' and
 'total'.

---
 report_builder/api/serializers.py             |  6 +++-
 .../migrations/0008_auto_20160909_1231.py     | 29 +++++++++++++++++++
 report_builder/models.py                      |  3 ++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 report_builder/migrations/0008_auto_20160909_1231.py

diff --git a/report_builder/api/serializers.py b/report_builder/api/serializers.py
index c2bfa865..2d790ca5 100644
--- a/report_builder/api/serializers.py
+++ b/report_builder/api/serializers.py
@@ -61,7 +61,8 @@ class Meta:
             'id', 'name', 'description', 'modified', 'root_model', 'root_model_name',
             'displayfield_set', 'distinct', 'user_created', 'user_modified',
             'filterfield_set', 'report_file', 'report_file_creation',
-            'chart_categories', 'chart_series', 'chart_values', 'chart_type', 'chart_style')
+            '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):
@@ -85,6 +86,9 @@ def update(self, instance, validated_data):
             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)
diff --git a/report_builder/migrations/0008_auto_20160909_1231.py b/report_builder/migrations/0008_auto_20160909_1231.py
new file mode 100644
index 00000000..7820018f
--- /dev/null
+++ b/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),
+        ),
+    ]
diff --git a/report_builder/models.py b/report_builder/models.py
index 0229709c..d2e2c637 100644
--- a/report_builder/models.py
+++ b/report_builder/models.py
@@ -91,6 +91,9 @@ def allowed_models():
     chart_categories = models.IntegerField(null=True, blank=True)
     chart_series = models.IntegerField(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:

From 2cfd77d639f1f7ed264398add8ec647bea238803 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Fri, 9 Sep 2016 15:21:32 +0200
Subject: [PATCH 19/30] Chart categories can be based on few columns now.

It works only locally now - chart information in database doesn't change yet.
---
 .../static/report_builder/controllers.js      | 41 +++++++++++++++----
 .../partials/chart_options.html               |  6 ++-
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index 246ed22e..b44f8c5d 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -269,6 +269,13 @@ reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http,
         $scope.report.chart_values_list = newValue.split(',').map(function(el) { return parseInt(el);});
       }
     }, true);
+    $scope.$watch('report.chart_categories', function(newValue, oldValue) {
+      if (newValue === undefined || newValue === null || typeof newValue == 'number') {
+        $scope.report.chart_categories_list = [];
+      } else {
+        $scope.report.chart_categories_list = newValue.split(',').map(function(el) { return parseInt(el);});
+      }
+    }, true);
 
     $scope.remove_from_chart_values = function(index) {
       $scope.report.chart_values_list.splice(index, 1);
@@ -276,27 +283,44 @@ reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http,
     $scope.add_to_chart_values = function() {
       $scope.report.chart_values_list.push(null);
     };
+
+    $scope.remove_from_chart_categories = function(index) {
+      $scope.report.chart_categories_list.splice(index, 1);
+    };
+    $scope.add_to_chart_categories = function() {
+      $scope.report.chart_categories_list.push(null);
+    };
+
 });
 
 reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
 
   function chart_series_from_columns(data, x, y, titles) {
-    var categories = data.map(function(row) {
-      return '' + row[x];
-    });
+    var categories = [];
+    var unique_categories = [];
+    data.forEach(function(row, idx) {
+        var row_category = "";
+        for (var i = 0; i < x.length; i++) {
+          row_category += row[x[i]];
+        }
+        categories.push(row_category);
+        if (unique_categories.indexOf(row_category) < 0) {
+          unique_categories.push(row_category);
+        }
+      }
+    );
     var series_data = [];
     for (var i = 0; i < y.length; i++) {
       if (y[i] == null) continue;
       series_data.push({
         name: titles[y[i]],
-        data: data.map(function(row) {
-          return [ '' + row[x], row[y[i]]];
+        data: data.map(function(row, idx) {
+          return [ categories[idx], row[y[i]]];
         }),
       });
     }
-    console.log(series_data);
     return {
-      categories: categories,
+      categories: unique_categories,
       series: series_data,
     };
   }
@@ -355,7 +379,8 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     reportService.getPreview($scope.report.id).then(function(data) {
       var chart_data = {};
       if ($scope.report.chart_type == 2) {
-        chart_data = chart_series_from_columns(data, $scope.report.chart_categories, $scope.report.chart_values_list, data.meta.titles);
+        chart_data = chart_series_from_columns(data, $scope.report.chart_categories_list,
+                                               $scope.report.chart_values_list, data.meta.titles);
       }
       else if ($scope.report.chart_type == 3) {
         chart_data = chart_series_from_rows(data, $scope.report.chart_categories, $scope.report.chart_series, $scope.report.chart_values_list[0]);
diff --git a/report_builder/static/report_builder/partials/chart_options.html b/report_builder/static/report_builder/partials/chart_options.html
index 3e5729bd..5d62d5a5 100644
--- a/report_builder/static/report_builder/partials/chart_options.html
+++ b/report_builder/static/report_builder/partials/chart_options.html
@@ -16,7 +16,11 @@
 
     <md-list-item>
         <label><strong>Categories: &nbsp; &nbsp;</strong></label>
-        <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_categories"></select>
+        <span ng-repeat="(idx, el) in report.chart_categories_list track by $index">
+            <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_categories_list[idx]"></select>
+            <img ng-click="remove_from_chart_categories(idx)" src="{{ static('report_builder/img/delete.svg') }}"></img>
+        </span>
+        <img style="margin-left: 30px;" ng-click="add_to_chart_categories()" src="{{ static('report_builder/img/add.svg') }}"></img>
     </md-list-item>
 
     <md-list-item ng-show="report.chart_type > 2">

From 88b968a6a896a832dfcc6be45f2b74647e2492f0 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Sat, 10 Sep 2016 11:45:51 +0200
Subject: [PATCH 20/30] Changes of charts_categories can be saved in database
 now.

---
 .../migrations/0009_auto_20160910_0937.py     | 19 +++++++++++++++++++
 report_builder/models.py                      |  2 +-
 .../static/report_builder/controllers.js      | 14 ++++++++------
 3 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 report_builder/migrations/0009_auto_20160910_0937.py

diff --git a/report_builder/migrations/0009_auto_20160910_0937.py b/report_builder/migrations/0009_auto_20160910_0937.py
new file mode 100644
index 00000000..6813ffbd
--- /dev/null
+++ b/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),
+        ),
+    ]
diff --git a/report_builder/models.py b/report_builder/models.py
index d2e2c637..d9cfea23 100644
--- a/report_builder/models.py
+++ b/report_builder/models.py
@@ -88,7 +88,7 @@ def allowed_models():
         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.IntegerField(null=True, blank=True)
+    chart_categories = models.CommaSeparatedIntegerField(max_length=64,null=True, blank=True)
     chart_series = models.IntegerField(null=True, blank=True)
     chart_values = models.CommaSeparatedIntegerField(max_length=64,null=True, blank=True)
     chart_stacked = models.BooleanField(default=False)
diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index b44f8c5d..2e24614e 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -270,7 +270,7 @@ reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http,
       }
     }, true);
     $scope.$watch('report.chart_categories', function(newValue, oldValue) {
-      if (newValue === undefined || newValue === null || typeof newValue == 'number') {
+      if (newValue === undefined || newValue === null) {
         $scope.report.chart_categories_list = [];
       } else {
         $scope.report.chart_categories_list = newValue.split(',').map(function(el) { return parseInt(el);});
@@ -301,6 +301,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     data.forEach(function(row, idx) {
         var row_category = "";
         for (var i = 0; i < x.length; i++) {
+          if (x[i] == null) continue;
           row_category += row[x[i]];
         }
         categories.push(row_category);
@@ -421,6 +422,10 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     });
   };
 
+  function isNotNull(value) {
+    return value != null;
+  }
+
   $scope.save = function() {
     angular.forEach($scope.report.displayfield_set, function(value, index) {
       value.position = index;
@@ -431,11 +436,8 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     angular.forEach($scope.report.filterfield_set, function(value, index) {
       value.position = index;
     });
-    var chart_values = $scope.report.chart_values_list;
-    chart_values = chart_values.filter(function(el) {
-      return (el != null);
-    });
-    $scope.report.chart_values = chart_values.join(',');
+    $scope.report.chart_categories = $scope.report.chart_categories_list.filter(isNotNull).join(',');
+    $scope.report.chart_values = $scope.report.chart_values_list.filter(isNotNull).join(',');
     $scope.report.save().then(function(result) {
       $scope.report.lastSaved = new Date();
       $scope.reportData.reportErrors = null;

From 3158f89f89335320e3a3d00b0dcde0151d1bb7c5 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Sat, 10 Sep 2016 14:44:24 +0200
Subject: [PATCH 21/30] Chart with complex names of series can be created.

(When chart of type 3 is selected).
---
 .../migrations/0010_auto_20160910_1037.py     | 19 ++++++
 report_builder/models.py                      |  2 +-
 .../static/report_builder/controllers.js      | 61 ++++++++++++-------
 .../partials/chart_options.html               | 21 +++++--
 4 files changed, 73 insertions(+), 30 deletions(-)
 create mode 100644 report_builder/migrations/0010_auto_20160910_1037.py

diff --git a/report_builder/migrations/0010_auto_20160910_1037.py b/report_builder/migrations/0010_auto_20160910_1037.py
new file mode 100644
index 00000000..bd9baace
--- /dev/null
+++ b/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),
+        ),
+    ]
diff --git a/report_builder/models.py b/report_builder/models.py
index d9cfea23..a6606f1d 100644
--- a/report_builder/models.py
+++ b/report_builder/models.py
@@ -89,7 +89,7 @@ def allowed_models():
     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.IntegerField(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)
diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index 2e24614e..3932a03a 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -263,32 +263,32 @@ reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http,
       $scope.report_fields_names = newValue.map(function(el, idx) { return el.name; });
     }, true);
     $scope.$watch('report.chart_values', function(newValue, oldValue) {
-      if (newValue === undefined || newValue === null) {
+      if (newValue === undefined || newValue === null || newValue === "") {
         $scope.report.chart_values_list = [];
       } else {
         $scope.report.chart_values_list = newValue.split(',').map(function(el) { return parseInt(el);});
       }
     }, true);
     $scope.$watch('report.chart_categories', function(newValue, oldValue) {
-      if (newValue === undefined || newValue === null) {
+      if (newValue === undefined || newValue === null || newValue === "") {
         $scope.report.chart_categories_list = [];
       } else {
         $scope.report.chart_categories_list = newValue.split(',').map(function(el) { return parseInt(el);});
       }
     }, true);
+    $scope.$watch('report.chart_series', function(newValue, oldValue) {
+      if (newValue === undefined || newValue === null || newValue === "") {
+        $scope.report.chart_series_list = [];
+      } else {
+        $scope.report.chart_series_list = newValue.split(',').map(function(el) { return parseInt(el);});
+      }
+    }, true);
 
-    $scope.remove_from_chart_values = function(index) {
-      $scope.report.chart_values_list.splice(index, 1);
-    };
-    $scope.add_to_chart_values = function() {
-      $scope.report.chart_values_list.push(null);
-    };
-
-    $scope.remove_from_chart_categories = function(index) {
-      $scope.report.chart_categories_list.splice(index, 1);
+    $scope.remove_from_list = function(index, list_name) {
+      $scope.report['chart_' + list_name + '_list'].splice(index, 1);
     };
-    $scope.add_to_chart_categories = function() {
-      $scope.report.chart_categories_list.push(null);
+    $scope.add_to_list = function(list_name) {
+      $scope.report['chart_' + list_name + '_list'].push(null);
     };
 
 });
@@ -328,17 +328,31 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
 
   function chart_series_from_rows(data, x1, x2, y) {
     var categories = [];
-    for (var i = 0; i < data.length; i++) {
-      if (categories.indexOf(data[i][x1]) < 0) {
-        categories.push('' + data[i][x1]);
+    var unique_categories = [];
+    data.forEach(function(row, idx) {
+        var row_category = "";
+        for (var i = 0; i < x1.length; i++) {
+          if (x1[i] == null) continue;
+          row_category += row[x1[i]];
+        }
+        categories.push(row_category);
+        if (unique_categories.indexOf(row_category) < 0) {
+          unique_categories.push(row_category);
+        }
       }
-    }
+    );
+
     var series_data_dict = {};
     for (i = 0; i < data.length; i++) {
-      if (! (data[i][x2] in series_data_dict)) {
-        series_data_dict[data[i][x2]] = [];
+      var row_series = "";
+      for (var j = 0; j < x2.length; j++) {
+          if (x2[j] == null) continue;
+          row_series += data[i][x2[j]];
+        }
+      if (! (row_series in series_data_dict)) {
+        series_data_dict[row_series] = [];
       }
-      series_data_dict[data[i][x2]].push('' + [data[i][x1], data[i][y]]);
+      series_data_dict[row_series].push([categories[i], data[i][y]]);
     }
     var series_data = [];
     for (var key in series_data_dict) {
@@ -348,7 +362,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
       });
     }
     return {
-      categories: categories,
+      categories: unique_categories,
       series: series_data,
     };
   }
@@ -384,7 +398,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
                                                $scope.report.chart_values_list, data.meta.titles);
       }
       else if ($scope.report.chart_type == 3) {
-        chart_data = chart_series_from_rows(data, $scope.report.chart_categories, $scope.report.chart_series, $scope.report.chart_values_list[0]);
+        chart_data = chart_series_from_rows(data, $scope.report.chart_categories_list, $scope.report.chart_series_list, $scope.report.chart_values_list[0]);
       } else {
         return;
       }
@@ -423,7 +437,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
   };
 
   function isNotNull(value) {
-    return value != null;
+    return value !== undefined && value !== null;
   }
 
   $scope.save = function() {
@@ -438,6 +452,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     });
     $scope.report.chart_categories = $scope.report.chart_categories_list.filter(isNotNull).join(',');
     $scope.report.chart_values = $scope.report.chart_values_list.filter(isNotNull).join(',');
+    $scope.report.chart_series = $scope.report.chart_series_list.filter(isNotNull).join(',');
     $scope.report.save().then(function(result) {
       $scope.report.lastSaved = new Date();
       $scope.reportData.reportErrors = null;
diff --git a/report_builder/static/report_builder/partials/chart_options.html b/report_builder/static/report_builder/partials/chart_options.html
index 5d62d5a5..266b87da 100644
--- a/report_builder/static/report_builder/partials/chart_options.html
+++ b/report_builder/static/report_builder/partials/chart_options.html
@@ -18,23 +18,32 @@
         <label><strong>Categories: &nbsp; &nbsp;</strong></label>
         <span ng-repeat="(idx, el) in report.chart_categories_list track by $index">
             <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_categories_list[idx]"></select>
-            <img ng-click="remove_from_chart_categories(idx)" src="{{ static('report_builder/img/delete.svg') }}"></img>
+            <img ng-click="remove_from_list(idx, 'categories')" src="{{ static('report_builder/img/delete.svg') }}"></img>
         </span>
-        <img style="margin-left: 30px;" ng-click="add_to_chart_categories()" src="{{ static('report_builder/img/add.svg') }}"></img>
+        <img style="margin-left: 30px;" ng-click="add_to_list('categories')" src="{{ static('report_builder/img/add.svg') }}"></img>
     </md-list-item>
 
     <md-list-item ng-show="report.chart_type > 2">
         <label><strong>Series: &nbsp; &nbsp;</strong></label>
-        <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_series"></select>
+        <span ng-repeat="(idx, el) in report.chart_series_list track by $index">
+            <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_series_list[idx]"></select>
+            <img ng-click="remove_from_list(idx, 'series')" src="{{ static('report_builder/img/delete.svg') }}"></img>
+        </span>
+        <img style="margin-left: 30px;" ng-click="add_to_list('series')" src="{{ static('report_builder/img/add.svg') }}"></img>
     </md-list-item>
 
-    <md-list-item>
+    <md-list-item ng-hide="report.chart_type == 3">
         <label><strong>Values: &nbsp; &nbsp;</strong></label>
         <span ng-repeat="(idx, el) in report.chart_values_list track by $index">
             <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_values_list[idx]"></select>
-            <img ng-click="remove_from_chart_values(idx)" src="{{ static('report_builder/img/delete.svg') }}"></img>
+            <img ng-click="remove_from_list(idx, 'values')" src="{{ static('report_builder/img/delete.svg') }}"></img>
         </span>
-        <img style="margin-left: 30px;" ng-click="add_to_chart_values()" src="{{ static('report_builder/img/add.svg') }}"></img>
+        <img style="margin-left: 30px;" ng-click="add_to_list('values')" src="{{ static('report_builder/img/add.svg') }}"></img>
+    </md-list-item>
+
+    <md-list-item ng-show="report.chart_type == 3">
+        <label><strong>Values: &nbsp; &nbsp;</strong></label>
+        <select ng-options="it as report_fields_names[it] for it in report_fields_indexes track by it" ng-model="report.chart_values_list[0]"></select>
     </md-list-item>
 
     <md-list-item>

From c1c9c8e82c8fe4b3973ef1f2b4a84fbafcefb43a Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Sun, 11 Sep 2016 20:25:56 +0200
Subject: [PATCH 22/30] All tests pass.

---
 report_builder/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report_builder/tests.py b/report_builder/tests.py
index 43be14d0..731f0f73 100644
--- a/report_builder/tests.py
+++ b/report_builder/tests.py
@@ -78,7 +78,7 @@ def test_get_direct_fields_from_model(self):
         self.assertTrue('description' in names)
         self.assertTrue('distinct' in names)
         self.assertTrue('id' in names)
-        self.assertEquals(len(names), 9)
+        self.assertEquals(len(names), 17)
 
     def test_get_gfk_fields_from_model(self):
         fields = get_direct_fields_from_model(Comment)

From a7466d8da8c2a3cb5a5d5c09da0544474b2ce857 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Mon, 12 Sep 2016 09:45:27 +0200
Subject: [PATCH 23/30] Added file for gitlab ci.

---
 .gitlab-ci.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..550cba8c
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,12 @@
+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

From 0b81f0a0cb4e9bc232b0bfafd6a64bf8b115356b Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Mon, 12 Sep 2016 10:48:40 +0200
Subject: [PATCH 24/30] Added lint.

---
 .gitlab-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 550cba8c..21f00cff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,3 +10,7 @@ before_script:
 tests:
   script:
     - python manage.py test
+
+lint:
+  script:
+    - flake8

From a291bd5f8e68471ce50624f6af528afd6531b5b4 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Mon, 12 Sep 2016 11:01:29 +0200
Subject: [PATCH 25/30] Fixed code style.

---
 report_builder/models.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/report_builder/models.py b/report_builder/models.py
index a6606f1d..3fdd3af9 100644
--- a/report_builder/models.py
+++ b/report_builder/models.py
@@ -88,9 +88,9 @@ def allowed_models():
         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_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)

From fa6d75fdf2c903c19731e3d5fc1d6db52d931aa1 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Mon, 12 Sep 2016 14:19:37 +0200
Subject: [PATCH 26/30] Fixed $scope.report undefined problem.

---
 report_builder/static/report_builder/controllers.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index 3932a03a..e788b72b 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -259,10 +259,12 @@ reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http,
     $scope.chart_styles = ['area', 'bar', 'column', 'line', 'pie'];
 
     $scope.$watch('report.displayfield_set', function(newValue, oldValue) {
+      if (newValue === undefined || $scope.report === undefined) return;
       $scope.report_fields_indexes = newValue.map(function(el, idx) { return idx; });
       $scope.report_fields_names = newValue.map(function(el, idx) { return el.name; });
     }, true);
     $scope.$watch('report.chart_values', function(newValue, oldValue) {
+      if ($scope.report === undefined) return;
       if (newValue === undefined || newValue === null || newValue === "") {
         $scope.report.chart_values_list = [];
       } else {
@@ -270,6 +272,7 @@ reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http,
       }
     }, true);
     $scope.$watch('report.chart_categories', function(newValue, oldValue) {
+      if ($scope.report === undefined) return;
       if (newValue === undefined || newValue === null || newValue === "") {
         $scope.report.chart_categories_list = [];
       } else {
@@ -277,6 +280,7 @@ reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http,
       }
     }, true);
     $scope.$watch('report.chart_series', function(newValue, oldValue) {
+      if ($scope.report === undefined) return;
       if (newValue === undefined || newValue === null || newValue === "") {
         $scope.report.chart_series_list = [];
       } else {

From e24fbb60649174a086479fcf2439af4ab53efd3d Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Tue, 13 Sep 2016 11:32:54 +0200
Subject: [PATCH 27/30] If in some column 'total' is selected, chart will not
 show data from two last rows.

... and fixed code style.
---
 .../static/report_builder/controllers.js      | 133 ++++++++++--------
 1 file changed, 71 insertions(+), 62 deletions(-)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index e788b72b..23fa4787 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -256,45 +256,44 @@ reportBuilderApp.controller('ReportFilterCtrl', function($scope) {
 });
 
 reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
-    $scope.chart_styles = ['area', 'bar', 'column', 'line', 'pie'];
-
-    $scope.$watch('report.displayfield_set', function(newValue, oldValue) {
-      if (newValue === undefined || $scope.report === undefined) return;
-      $scope.report_fields_indexes = newValue.map(function(el, idx) { return idx; });
-      $scope.report_fields_names = newValue.map(function(el, idx) { return el.name; });
-    }, true);
-    $scope.$watch('report.chart_values', function(newValue, oldValue) {
-      if ($scope.report === undefined) return;
-      if (newValue === undefined || newValue === null || newValue === "") {
-        $scope.report.chart_values_list = [];
-      } else {
-        $scope.report.chart_values_list = newValue.split(',').map(function(el) { return parseInt(el);});
-      }
-    }, true);
-    $scope.$watch('report.chart_categories', function(newValue, oldValue) {
-      if ($scope.report === undefined) return;
-      if (newValue === undefined || newValue === null || newValue === "") {
-        $scope.report.chart_categories_list = [];
-      } else {
-        $scope.report.chart_categories_list = newValue.split(',').map(function(el) { return parseInt(el);});
-      }
-    }, true);
-    $scope.$watch('report.chart_series', function(newValue, oldValue) {
-      if ($scope.report === undefined) return;
-      if (newValue === undefined || newValue === null || newValue === "") {
-        $scope.report.chart_series_list = [];
-      } else {
-        $scope.report.chart_series_list = newValue.split(',').map(function(el) { return parseInt(el);});
-      }
-    }, true);
-
-    $scope.remove_from_list = function(index, list_name) {
-      $scope.report['chart_' + list_name + '_list'].splice(index, 1);
-    };
-    $scope.add_to_list = function(list_name) {
-      $scope.report['chart_' + list_name + '_list'].push(null);
-    };
+  $scope.chart_styles = ['area', 'bar', 'column', 'line', 'pie'];
+
+  $scope.$watch('report.displayfield_set', function(newValue, oldValue) {
+    if (newValue === undefined || $scope.report === undefined) return;
+    $scope.report_fields_indexes = newValue.map(function(el, idx) { return idx; });
+    $scope.report_fields_names = newValue.map(function(el, idx) { return el.name; });
+  }, true);
+  $scope.$watch('report.chart_values', function(newValue, oldValue) {
+    if ($scope.report === undefined) return;
+    if (newValue === undefined || newValue === null || newValue === "") {
+      $scope.report.chart_values_list = [];
+    } else {
+      $scope.report.chart_values_list = newValue.split(',').map(function(el) { return parseInt(el);});
+    }
+  }, true);
+  $scope.$watch('report.chart_categories', function(newValue, oldValue) {
+    if ($scope.report === undefined) return;
+    if (newValue === undefined || newValue === null || newValue === "") {
+      $scope.report.chart_categories_list = [];
+    } else {
+      $scope.report.chart_categories_list = newValue.split(',').map(function(el) { return parseInt(el);});
+    }
+  }, true);
+  $scope.$watch('report.chart_series', function(newValue, oldValue) {
+    if ($scope.report === undefined) return;
+    if (newValue === undefined || newValue === null || newValue === "") {
+      $scope.report.chart_series_list = [];
+    } else {
+      $scope.report.chart_series_list = newValue.split(',').map(function(el) { return parseInt(el);});
+    }
+  }, true);
 
+  $scope.remove_from_list = function(index, list_name) {
+    $scope.report['chart_' + list_name + '_list'].splice(index, 1);
+  };
+  $scope.add_to_list = function(list_name) {
+    $scope.report['chart_' + list_name + '_list'].push(null);
+  };
 });
 
 reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $timeout, $mdToast, reportService) {
@@ -303,17 +302,16 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     var categories = [];
     var unique_categories = [];
     data.forEach(function(row, idx) {
-        var row_category = "";
-        for (var i = 0; i < x.length; i++) {
-          if (x[i] == null) continue;
-          row_category += row[x[i]];
-        }
-        categories.push(row_category);
-        if (unique_categories.indexOf(row_category) < 0) {
-          unique_categories.push(row_category);
-        }
+      var row_category = "";
+      for (var i = 0; i < x.length; i++) {
+        if (x[i] == null) continue;
+        row_category += row[x[i]];
       }
-    );
+      categories.push(row_category);
+      if (unique_categories.indexOf(row_category) < 0) {
+        unique_categories.push(row_category);
+      }
+    });
     var series_data = [];
     for (var i = 0; i < y.length; i++) {
       if (y[i] == null) continue;
@@ -334,25 +332,23 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     var categories = [];
     var unique_categories = [];
     data.forEach(function(row, idx) {
-        var row_category = "";
-        for (var i = 0; i < x1.length; i++) {
-          if (x1[i] == null) continue;
-          row_category += row[x1[i]];
-        }
-        categories.push(row_category);
-        if (unique_categories.indexOf(row_category) < 0) {
-          unique_categories.push(row_category);
-        }
+      var row_category = "";
+      for (var i = 0; i < x1.length; i++) {
+        if (x1[i] == null) continue;
+        row_category += row[x1[i]];
       }
-    );
-
+      categories.push(row_category);
+      if (unique_categories.indexOf(row_category) < 0) {
+        unique_categories.push(row_category);
+      }
+    });
     var series_data_dict = {};
     for (i = 0; i < data.length; i++) {
       var row_series = "";
       for (var j = 0; j < x2.length; j++) {
-          if (x2[j] == null) continue;
-          row_series += data[i][x2[j]];
-        }
+        if (x2[j] == null) continue;
+        row_series += data[i][x2[j]];
+      }
       if (! (row_series in series_data_dict)) {
         series_data_dict[row_series] = [];
       }
@@ -371,6 +367,18 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     };
   }
 
+  function prepare_for_chart(data, report) {
+    var totals = false;
+    report.displayfield_set.forEach(function(field) {
+      if (field.total) {
+        totals = true;
+      }
+    });
+    if (totals) {
+      data.splice(data.length - 2, 2);
+    }
+  }
+
   $scope.getPreview = function() {
     $scope.reportData.chart = false;
     $scope.reportData.statusMessage = null;
@@ -396,6 +404,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
     $scope.reportData.statusMessage = null;
     $scope.reportData.refresh = true;
     reportService.getPreview($scope.report.id).then(function(data) {
+      prepare_for_chart(data, $scope.report);
       var chart_data = {};
       if ($scope.report.chart_type == 2) {
         chart_data = chart_series_from_columns(data, $scope.report.chart_categories_list,

From 74c9d16eded6994294761a472dd9d3a4e47356ed Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Tue, 13 Sep 2016 12:52:31 +0200
Subject: [PATCH 28/30] If in bar type chart there are many categories or
 series, chart will be resized.

---
 report_builder/static/report_builder/controllers.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index 23fa4787..f830e8df 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -418,6 +418,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
       var chart_dict = {
         chart: {
           type: $scope.report.chart_style,
+          height: 450,
         },
         xAxis: {
           categories: chart_data.categories,
@@ -440,7 +441,15 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
         },
         stacking: $scope.report.chart_stacked ? 'normal' : false,
       };
-      Highcharts.chart('highchart_container', chart_dict);
+      var chart = Highcharts.chart('highchart_container', chart_dict);
+      if ($scope.report.chart_style == 'bar' && chart_data.categories.length * chart_data.series.length > 15 ) {
+        var series_size = 1;
+        if (chart_data.series.length > 1) {
+           series_size = chart_data.series.length / 2;
+        }
+        var size = chart_data.categories.length * series_size * 20;
+        chart.setSize(null, Math.max(size + 100, 450));
+      }
 
       $scope.reportData.refresh = false;
     }, function(response) {

From 0bbcfb37d58f3df01cdefaddf88abafd4d8ff8a0 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Thu, 15 Sep 2016 13:20:05 +0200
Subject: [PATCH 29/30] Fixed a little code style (semicolons).

---
 .../static/report_builder/controllers.js      | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index f830e8df..a1244d4e 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -8,7 +8,7 @@ reportBuilderApp.controller('addCtrl', function($scope, $location, reportService
         $location.path('/report/' + result.id, true);
       });
     }
-  }
+  };
 });
 
 reportBuilderApp.controller('homeCtrl', function($scope, $routeParams, $location, $mdSidenav, reportService) {
@@ -38,7 +38,7 @@ reportBuilderApp.controller('homeCtrl', function($scope, $routeParams, $location
       return true;
     }
     return false;
-  }
+  };
 
   $scope.requestFullscreen = function() {
     var
@@ -61,14 +61,14 @@ reportBuilderApp.controller('homeCtrl', function($scope, $routeParams, $location
         field_name: '',
         path: '',
         model_id: report.root_model
-      }
+      };
       data = {
         "model": report.root_model,
         "path": "",
         "path_verbose": "",
         "field": ""
-      }
-      $scope.related_fields = [root_related_field]
+      };
+      $scope.related_fields = [root_related_field];
       reportService.getRelatedFields(data).then(function(result) {
         root_related_field.related_fields = result;
         var help_text = 'This model is included in report builder.';
@@ -172,7 +172,7 @@ reportBuilderApp.controller('LeftCtrl', function($scope, $routeParams, $mdSidena
   if (!$routeParams.reportId) {
     $mdSidenav('left').open();
   }
-})
+});
 
 reportBuilderApp.controller('FieldsCtrl', function($scope, $mdSidenav, reportService) {
   $scope.load_fields = function(field) {
@@ -181,7 +181,7 @@ reportBuilderApp.controller('FieldsCtrl', function($scope, $mdSidenav, reportSer
       "path": field.path,
       "path_verbose": field.path_verbose,
       "field": field.field_name
-    }
+    };
     $scope.help_text = field.help_text;
     $scope.fields_header = field.verbose_name;
     reportService.getFields(data).then(function(result) {
@@ -195,7 +195,7 @@ reportBuilderApp.controller('FieldsCtrl', function($scope, $mdSidenav, reportSer
       }
       $scope.help_text = help_text;
     });
-  }
+  };
 
   $scope.toggle_related_fields = function(node) {
     field = node.$nodeScope.$modelValue;
@@ -204,7 +204,7 @@ reportBuilderApp.controller('FieldsCtrl', function($scope, $mdSidenav, reportSer
       "model": field.model_id,
       "path": parent_field.path,
       "field": field.field_name
-    }
+    };
     reportService.getRelatedFields(data).then(function(result) {
       field.related_fields = result;
     });
@@ -246,7 +246,7 @@ reportBuilderApp.controller('ReportOptionsCtrl', function($scope, $location, $wi
         // $location.path('/report/' + list[0].id, true);
       });
     });
-  }
+  };
 });
 
 reportBuilderApp.controller('ReportFilterCtrl', function($scope) {
@@ -429,7 +429,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
         yAxis: {
           stackLabels: {
             enabled: $scope.report.chart_total,
-            formatter: function() {return 'total: ' + this.total},
+            formatter: function() {return 'total: ' + this.total;},
           }
         },
         series: chart_data.series,
@@ -492,7 +492,7 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
   };
 
   $scope.downloadReport = function(filetype) {
-    base_url = BASE_URL + 'report/' + $scope.report.id
+    base_url = BASE_URL + 'report/' + $scope.report.id;
     url = base_url + '/download_file/' + filetype + '/';
     $scope.workerStatus = 'Requesting report';
     if (ASYNC_REPORT === "True") {
@@ -519,12 +519,12 @@ reportBuilderApp.controller('ReportShowCtrl', function($scope, $window, $http, $
                 $timeout(checkPoller, 1000 + (500 * attempts));
               }
             }
-          })
+          });
         };
         $timeout(checkPoller, 100);
       });
     } else {
       $window.location.href = url;
     }
-  }
+  };
 });

From a6e6559c87c8b19c656864d28d260cef3fd061b7 Mon Sep 17 00:00:00 2001
From: illa1 <joanna.cislo@gmail.com>
Date: Fri, 16 Sep 2016 14:04:29 +0200
Subject: [PATCH 30/30] Chart categories, series and values will be shown
 properly if user open another report.

---
 .../static/report_builder/controllers.js      | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/report_builder/static/report_builder/controllers.js b/report_builder/static/report_builder/controllers.js
index a1244d4e..1774c707 100644
--- a/report_builder/static/report_builder/controllers.js
+++ b/report_builder/static/report_builder/controllers.js
@@ -56,6 +56,7 @@ reportBuilderApp.controller('homeCtrl', function($scope, $routeParams, $location
       $scope.fields_header = report.root_model_name;
       $scope.report = report;
       $scope.report.lastSaved = null;
+      $scope.report.create_chart_lists = true;
       root_related_field = {
         verbose_name: report.root_model_name,
         field_name: '',
@@ -263,36 +264,39 @@ reportBuilderApp.controller('ChartOptionsCtrl', function($scope, $window, $http,
     $scope.report_fields_indexes = newValue.map(function(el, idx) { return idx; });
     $scope.report_fields_names = newValue.map(function(el, idx) { return el.name; });
   }, true);
-  $scope.$watch('report.chart_values', function(newValue, oldValue) {
-    if ($scope.report === undefined) return;
-    if (newValue === undefined || newValue === null || newValue === "") {
-      $scope.report.chart_values_list = [];
-    } else {
-      $scope.report.chart_values_list = newValue.split(',').map(function(el) { return parseInt(el);});
-    }
-  }, true);
-  $scope.$watch('report.chart_categories', function(newValue, oldValue) {
-    if ($scope.report === undefined) return;
-    if (newValue === undefined || newValue === null || newValue === "") {
-      $scope.report.chart_categories_list = [];
+
+  function isNotEmpty(string) {
+    return string !== '';
+  }
+
+  function parseInt1(el) {
+    return parseInt(el);
+  }
+
+  function toListOfInts(element_name, list_name) {
+    if ($scope.report[element_name] === null) {
+      $scope.report[list_name] = [];
     } else {
-      $scope.report.chart_categories_list = newValue.split(',').map(function(el) { return parseInt(el);});
+      $scope.report[list_name] = $scope.report[element_name].split(',').filter(isNotEmpty).map(parseInt1);
     }
-  }, true);
-  $scope.$watch('report.chart_series', function(newValue, oldValue) {
-    if ($scope.report === undefined) return;
-    if (newValue === undefined || newValue === null || newValue === "") {
-      $scope.report.chart_series_list = [];
-    } else {
-      $scope.report.chart_series_list = newValue.split(',').map(function(el) { return parseInt(el);});
+  }
+
+  $scope.$watch('report.create_chart_lists', function(newValue, oldValue) {
+    if (newValue) {
+      toListOfInts('chart_categories', 'chart_categories_list');
+      toListOfInts('chart_series', 'chart_series_list');
+      toListOfInts('chart_values', 'chart_values_list');
+      $scope.report.create_chart_lists = false;
     }
-  }, true);
+  });
 
   $scope.remove_from_list = function(index, list_name) {
-    $scope.report['chart_' + list_name + '_list'].splice(index, 1);
+    var name = 'chart_' + list_name + '_list';
+    $scope.report[name].splice(index, 1);
   };
   $scope.add_to_list = function(list_name) {
-    $scope.report['chart_' + list_name + '_list'].push(null);
+    var name = 'chart_' + list_name + '_list';
+    $scope.report[name].push(null);
   };
 });