Final set of route changes.

This commit is contained in:
James Cole
2016-12-06 09:07:50 +01:00
parent 628c7cd055
commit c799fc655d
15 changed files with 99 additions and 62 deletions

View File

@@ -1,4 +1,4 @@
/* globals startDate, showOnlyTop, showFullList, endDate, reportType, expenseReportUri, accountIds, incExpReportUri,accountReportUri, incomeReportUri */
/* globals startDate, showOnlyTop, showFullList, endDate, expenseReportUri, accountIds, incExpReportUri,accountReportUri, incomeReportUri */
/*
* all.js
* Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -39,10 +39,9 @@ function clickInfoButton(e) {
// add some more elements:
attributes.startDate = startDate;
attributes.endDate = endDate;
attributes.reportType = reportType;
attributes.accounts = accountIds;
$.getJSON('popup/report', {attributes: attributes}).done(respondInfoButton).fail(errorInfoButton);
$.getJSON('popup/general', {attributes: attributes}).done(respondInfoButton).fail(errorInfoButton);
}
function errorInfoButton(data) {

View File

@@ -1,19 +1,17 @@
/* globals budgetMultiUri, accountIds */
$(function () {
"use strict";
drawChart();
loadAjaxPartial('budgetPeriodReport', budgetPeriodReportUri);
loadAjaxPartial('categoryPeriodReport', categoryPeriodReportUri);
loadAjaxPartial('categoryExpense', categoryExpenseUri);
loadAjaxPartial('categoryIncome', categoryIncomeUri);
});
function drawChart() {
"use strict";
// income and expense over multi year:
lineChart('chart/report/net-worth/' + startDate + '/' + endDate + '/' + accountIds, 'net-worth');
columnChart('chart/report/in-out/' + startDate + '/' + endDate + '/' + accountIds, 'income-expenses-chart');
columnChart('chart/report/in-out-sum/' + startDate + '/' + endDate + '/' + accountIds, 'income-expenses-sum-chart');
lineChart(netWorthUri, 'net-worth');
columnChart(opChartUri, 'income-expenses-chart');
columnChart(sumChartUri, 'income-expenses-sum-chart');
}