Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expense report fixes

Browse Source
This commit is contained in:
gandhimathi 2018-10-04 16:38:06 +05:30
parent c02f6401ad
commit 78173a5d71
2 changed files with 293 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Apollo/assets/js/controllers/report_expenseCtrl.js
View File

@ -64,8 +64,12 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
} }
}); });
} }
$scope.expense_data = '';
$scope.expense = '';
$scope.totArray = '';
$scope.show = false; $scope.show = false;
$scope.Total = 0;
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
var firstError = null; var firstError = null;
if (form.$invalid) { if (form.$invalid) {
@ -85,7 +89,7 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
angular.element('.ng-invalid[toDate=' + firstError + ']').focus(); angular.element('.ng-invalid[toDate=' + firstError + ']').focus();
} else { } else {
//alert($scope.batch.name); //alert($scope.batch.name);
$scope.expense_data = '';
$scope.message = ''; $scope.message = '';
var response_data = { var response_data = {
method: 'POST', method: 'POST',
@ -113,15 +117,35 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
} }
}); });
$scope.getTotal = function () { $scope.getTotal = function () {
var total = 0; var total = 0;
for (var i = 0; i < $scope.expense_data.length; i++) { for (var i = 0; i < $scope.expense_data.length; i++) {
var item = $scope.expense_data[i]; var item = $scope.expense_data[i];
total += parseFloat(item.total); total += parseFloat(item.total);
} }
return total; } $scope.Total = total;
$scope.totArray = {
Expense_name:"Grand Total",
total: $scope.Total
} }
// console.log($scope.Total);
$scope.expense = $scope.expense_data.concat($scope.totArray);
// console.log($scope.expense_data);
// console.log($scope.totArray);
// console.log($scope.expense);
return total;
}
}
}; };
var mystyle = { var mystyle = {
@ -138,8 +162,11 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
}, },
}; };
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Expense_name as ExpenseName,CAST(January as NUMBER) as January,CAST(February as NUMBER) as February,CAST(March as NUMBER) as March,CAST(April as NUMBER) as April,CAST(May as NUMBER) as May,CAST(June as NUMBER) as June,CAST(July as NUMBER) as July,CAST(August as NUMBER) as August,CAST(September as NUMBER) as September,CAST(October as NUMBER) as October,CAST(November as NUMBER) as November,CAST(December as NUMBER) as December,CAST(total as NUMBER) as Amount INTO XLS("Expense_report.xls",?) FROM ?',[mystyle,$scope.expense]);
};
//pdf //pdf
var rows1 = 0;
$scope.generatePFD = function (datas) { $scope.generatePFD = function (datas) {
$scope.loadStaring = true; $scope.loadStaring = true;
@ -150,24 +177,24 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
for (var i = 0; i <= datas.length - 1; ++i) { for (var i = 0; i <= datas.length - 1; ++i) {
var element = datas[i]; var element = datas[i];
//var element = datas[i-1]; //var element = datas[i-1];
console.log('staff or trainee'); console.log(datas);
var value = {}; var value = {};
value['SL_NO'] = element.ORDER_ID; value['SL_NO'] = element.SL_NO || '';
value['Expense_name'] = element.VoucherNumber; value['Expense_name'] = element.Expense_name || '-';
value['January'] = element.PaidTo; value['January'] = element.January || '';
value['February'] = University; value['February'] =element. February || '';
value['March'] = element.Ty; value['March'] = element.March || '';
value['April'] = element.ReceiptNo || '-'; value['April'] = element.April || '';
value['May'] = element.ReceiptNoComments || '-'; value['May'] = element.May || '';
value['June'] = element.ModeOfPayment || '-'; value['June'] = element.June || '';
value['July'] = element.Status || '-'; value['July'] = element.July || '';
value['August'] = element.Status; value['August'] = element.August || '';
value['September'] = element.Balance || '-'; value['September'] = element.September || '';
value['October'] = element.Balance || '-'; value['October'] = element.October || '';
value['November'] = element.Balance || '-'; value['November'] = element.November || '';
value['December'] = element.Balance || '-'; value['December'] = element.December || '';
value['total'] = element.Balance || '-'; value['total'] = element.total || 0;
o[intDate] = value; o[intDate] = value;
intDate++; intDate++;
intDataSNo++; intDataSNo++;
@ -217,9 +244,11 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
body.push(row); body.push(row);
} }
} }
console.log(rows1);
for (var key in rows1) { for (var key in rows1) {
if (rows1.hasOwnProperty(key)) { if (rows1.hasOwnProperty(key)) {
var data = rows1[key]; var data = rows1[key];
var row = new Array(); var row = new Array();
row.push(data.SL_NO.toString()); row.push(data.SL_NO.toString());
row.push(data.Expense_name.toString()); row.push(data.Expense_name.toString());
@ -260,7 +289,7 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
return { return {
columns: [ columns: [
{ {
text: ['Note'], text: [''],
alignment: 'left', margin: [10, 0, 0, 0], fontSize: 8 alignment: 'left', margin: [10, 0, 0, 0], fontSize: 8
}, },
{ text: ['\n Page ' + currentPage.toString() + ' of ' + pageCount], alignment: 'right', margin: [0, 10, 10, 0], fontSize: 10 } { text: ['\n Page ' + currentPage.toString() + ' of ' + pageCount], alignment: 'right', margin: [0, 10, 10, 0], fontSize: 10 }
@ -336,9 +365,7 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
} }
//end of pdf //end of pdf
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Expense_name as ExpenseName,CAST(January as NUMBER) as January,CAST(February as NUMBER) as February,CAST(March as NUMBER) as March,CAST(April as NUMBER) as April,CAST(May as NUMBER) as May,CAST(June as NUMBER) as June,CAST(July as NUMBER) as July,CAST(August as NUMBER) as August,CAST(September as NUMBER) as September,CAST(October as NUMBER) as October,CAST(November as NUMBER) as November,CAST(December as NUMBER) as December,CAST(total as NUMBER) as Amount INTO XLS("Expense_report.xls",?) FROM ?',[mystyle,$scope.expense_data]);
};
}]); }]);

4
Apollo/assets/views/report_expense.html
View File

@ -83,9 +83,9 @@
</div> </div>
<!-- <button pdf-save-button="getpdf" pdf-name="Expense_Report.pdf" class="btn btn-success btn-o">PDF</button> --> <!-- <button pdf-save-button="getpdf" pdf-name="Expense_Report.pdf" class="btn btn-success btn-o">PDF</button> -->
<button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button> <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
<!--<button ng-disabled="loadStaring" ng-click="generatePFD(datas)" class="btn btn-sm btn-default"> <button ng-disabled="loadStaring" ng-click="generatePFD(expense)" class="btn btn-success btn-o">
Export As PDF Export As PDF
</button>--> </button>
</div> </div>
<div pdf-save-content="getpdf" class="table-responsive" style="margin-top: 20px;"> <div pdf-save-content="getpdf" class="table-responsive" style="margin-top: 20px;">
<h4 style="text-align:center;">Apollo Distance Education College - {{expense_data[0].branch}}</h4> <h4 style="text-align:center;">Apollo Distance Education College - {{expense_data[0].branch}}</h4>