Code for #1214

public/js/ff/charts.js

@@ -58,49 +58,6 @@ Chart.defaults.global.animation.duration = 0;
 Chart.defaults.global.responsive = true;
 Chart.defaults.global.maintainAspectRatio = false;
 
-
-/**
- * Chart line thing
- */
-const verticalLinePlugin = {
-    getLinePosition: function (chart, pointIndex) {
-        const meta = chart.getDatasetMeta(0); // first dataset is used to discover X coordinate of a point
-        const data = meta.data;
-        return data[pointIndex]._model.x;
-    },
-    renderVerticalLine: function (chartInstance, pointIndex) {
-        const lineLeftOffset = this.getLinePosition(chartInstance, pointIndex);
-        const scale = chartInstance.scales['y-axis-0'];
-        const context = chartInstance.chart.ctx;
-
-        // render vertical line
-        context.beginPath();
-        context.strokeStyle = fillColors[3];
-        context.moveTo(lineLeftOffset, scale.top);
-        context.lineTo(lineLeftOffset, scale.bottom);
-        context.stroke();
-
-        // write label
-        context.fillStyle = "#444444";
-        context.textAlign = 'left';
-        if(pointIndex > 23) {
-            todayText = todayText + ' ';
-            context.textAlign = 'right';
-        }
-        context.fillText(todayText, lineLeftOffset, scale.top * 3); // (scale.bottom - scale.top) / 2 + scale.top
-    },
-
-    afterDatasetsDraw: function (chart, easing) {
-        if (chart.config.lineAtIndex) {
-            chart.config.lineAtIndex.forEach(function(pointIndex) {
-                this.renderVerticalLine(chart, pointIndex);
-            }, this);
-        }
-    }
-};
-
-Chart.plugins.register(verticalLinePlugin);
-
 /**
  *
  * @param data
@@ -132,16 +89,7 @@ function lineChart(URI, container) {
     var options = $.extend(true, {}, defaultChartOptions);
     var chartType = 'line';
 
-    drawAChart(URI, container, chartType, options, colorData, -1);
+    drawAChart(URI, container, chartType, options, colorData);
-}
-
-function lineChartWithDay(URI, container, today) {
-    "use strict";
-    var colorData = true;
-    var options = $.extend(true, {}, defaultChartOptions);
-    var chartType = 'line';
-
-    drawAChart(URI, container, chartType, options, colorData, today);
 }
 
 /**
@@ -302,7 +250,7 @@ function pieChart(URI, container) {
  * @param colorData
  * @param today
  */
-function drawAChart(URI, container, chartType, options, colorData, today) {
+function drawAChart(URI, container, chartType, options, colorData) {
     var containerObj = $('#' + container);
     if (containerObj.length === 0) {
         return;
@@ -343,10 +291,34 @@ function drawAChart(URI, container, chartType, options, colorData, today) {
                 type: chartType,
                 data: data,
                 options: options,
-                lineAtIndex: []
+                lineAtIndex: [],
+                annotation: {},
+            };
+            if (drawVerticalLine !== '') {
+                // draw line using annotation plugin.
+                console.log('Will draw line');
+                chartOpts.options.annotation = {
+                    annotations: [{
+                        type: 'line',
+                        id: 'a-line-1',
+                        mode: 'vertical',
+                        scaleID: 'x-axis-0',
+                        value: drawVerticalLine,
+                        borderColor: 'red',
+                        borderWidth: 1,
+                        label: {
+                            backgroundColor: 'rgba(0,0,0,0)',
+                            fontFamily: "sans-serif",
+                            fontSize: 12,
+                            fontColor: "#333",
+                            position: "right",
+                            xAdjust: 0,
+                            yAdjust: -120,
+                            enabled: true,
+                            content: todayText
+                        }
+                    }]
                 };
-            if (today >= 0) {
-                chartOpts.lineAtIndex.push(today - 1);
             }
             allCharts[container] = new Chart(ctx, chartOpts);
         }

public/js/ff/index.js

@@ -29,11 +29,7 @@ $(function () {
 
 function drawChart() {
     "use strict";
-    if (today >= 0) {
-        lineChartWithDay(accountFrontpageUri, 'accounts-chart', today);
-    } else {
     lineChart(accountFrontpageUri, 'accounts-chart');
-    }
 
     if (billCount > 0) {
         pieChart('chart/bill/frontpage', 'bills-chart');

resources/views/index.twig

@@ -189,16 +189,15 @@
         var accountExpenseUri = '{{ route('chart.account.expense') }}';
         var piggyInfoUri = '{{ route('json.fp.piggy-banks') }}';
         var todayText = ' {{ trans('firefly.today')|escape('js') }}';
-
+        var drawVerticalLine = '';
         {# render vertical line with text "today"  #}
         {% if start.lte(today) and end.gte(today) %}
-        var today = {{ today.diffInDays(start) + 1 }};
+        drawVerticalLine = '{{ today.formatLocalized(monthAndDayFormat) }}';
-        {% else %}
-        var today = -1;
         {% endif %}
     </script>
 
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
+    <script type="text/javascript" src="js/lib/chartjs-plugin-annotation.min.js?v={{ FF_VERSION }}"></script>
     <script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
     <script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
     <script type="text/javascript" src="js/ff/index.js?v={{ FF_VERSION }}"></script>