Merge pull request #80 from AppBakerZ/ReportsBugs

Report bug fixing issue #45
AppBakerZ · Apr 10, 2017 · 6821c80 · 6821c80
2 parents b6ff4b5 + 6cbfe67
commit 6821c80
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/imports/api/statistics/methods.js b/imports/api/statistics/methods.js
@@ -17,6 +17,8 @@ import { Expenses } from '../expences/expenses.js';
 import { Incomes } from '../incomes/incomes.js';
 import { Accounts } from '../accounts/accounts.js';
 import { Categories } from '../categories/categories.js';
+import { accountHelpers } from '/imports/helpers/accountHelpers.js'
+
 
 export const incomesGroupByMonth = new ValidatedMethod({
     name: 'statistics.incomesGroupByMonth',
@@ -256,10 +258,11 @@ export const generateReport = new ValidatedMethod({
         /*Todo use later relation */
         Template.report.helpers({
             accountName : (id) => {
-                return Accounts.findOne({_id : id, owner: this.userId}).name;
+                let account = Accounts.findOne({_id : id, owner: this.userId});
+                return accountHelpers.alterName(account.bank)
             },
-            categoryName : function(id){
-                return Categories.findOne({_id : id}).name;
+            categoryName : function(category){
+                return Categories.findOne({_id : category._id}).name;
             },
             totalIncome : function(){
                 if(params.date){

diff --git a/imports/ui/components/dashboard/Dashboard.jsx b/imports/ui/components/dashboard/Dashboard.jsx
@@ -166,6 +166,15 @@ class DashboardPage extends Component {
             date : dateHelpers.filterByDate(this.state.filterBy, {}, this),
             report : report
         };
+      // prevent window popup block
+        let win = window.open('');
+        win.document.write("<p> Loading...</p>");
+        window.oldOpen = window.open;
+        window.open = function(url) {
+            win.location = url;
+            window.open = oldOpen;
+            win.focus();
+        }
 
         Meteor.call('statistics.generateReport', {params } , function(err, res){
             if (err) {