pl report issue
This commit is contained in:
venbatechnologies@gmail.com
parent
ee9bc1eb84
commit
ec4d6fb648
@ -110,10 +110,9 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
|
|||||||
$scope.Net_Total = '';
|
$scope.Net_Total = '';
|
||||||
$scope.PLexceldetails='';
|
$scope.PLexceldetails='';
|
||||||
$scope.expense ='';
|
$scope.expense ='';
|
||||||
|
$scope.alldata='';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var response_data = {
|
var response_data = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: apiPoint.url + 'IncomeExpenseDetails/',
|
url: apiPoint.url + 'IncomeExpenseDetails/',
|
||||||
@ -125,10 +124,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
|
|||||||
from : $scope.filters.from_date,
|
from : $scope.filters.from_date,
|
||||||
to : $scope.filters.to_date
|
to : $scope.filters.to_date
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
$http(response_data).then(function (response) {
|
$http(response_data).then(function (response) {
|
||||||
@ -138,8 +134,12 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
|
|||||||
// console.log(response.data);
|
// console.log(response.data);
|
||||||
$scope.expense_data = response.data.expense_data;
|
$scope.expense_data = response.data.expense_data;
|
||||||
$scope.nonexp_data = response.data.expense_data_nonop;
|
$scope.nonexp_data = response.data.expense_data_nonop;
|
||||||
|
console.log($scope.expense_data);
|
||||||
|
console.log($scope.nonexp_data);
|
||||||
|
$scope.alldata = $scope.nonexp_data.concat($scope.expense_data);
|
||||||
|
console.log($scope.alldata);
|
||||||
|
|
||||||
if($scope.expense_data.length>0)
|
if($scope.alldata.length>0)
|
||||||
{
|
{
|
||||||
$scope.isLoaderShow =false;
|
$scope.isLoaderShow =false;
|
||||||
$scope.load = 'Loading....';
|
$scope.load = 'Loading....';
|
||||||
@ -150,46 +150,33 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
|
|||||||
$scope.load = "No Records Found";
|
$scope.load = "No Records Found";
|
||||||
}
|
}
|
||||||
|
|
||||||
if($scope.expense_data != undefined || $scope.expense_data != '')
|
if($scope.expense_data != undefined || $scope.expense_data != '')
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
angular.forEach(($scope.expense_data),function(expense_data,key)
|
angular.forEach(($scope.expense_data),function(expense_data,key)
|
||||||
{
|
{
|
||||||
|
|
||||||
if((expense_data.TID == 'I001'))
|
if((expense_data.TID == 'I001'))
|
||||||
{
|
{
|
||||||
$scope.Total_expense = parseFloat(expense_data.Expense);
|
$scope.Total_expense = parseFloat(expense_data.Expense);
|
||||||
|
|
||||||
|
|
||||||
//console.log($scope.Total_income)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if((expense_data.TID == 'I002'))
|
||||||
if((expense_data.TID == 'I002'))
|
{
|
||||||
{
|
$scope.Total_income = parseFloat(expense_data.Income);
|
||||||
$scope.Total_income = parseFloat(expense_data.Income);
|
|
||||||
//console.log($scope.Total_expense)
|
//console.log($scope.Total_expense)
|
||||||
|
}
|
||||||
}
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// $scope.Net_Total = $scope.Total_income -$scope.Total_expense;
|
// $scope.Net_Total = $scope.Total_income -$scope.Total_expense;
|
||||||
|
}
|
||||||
|
else
|
||||||
}
|
{
|
||||||
else {
|
|
||||||
$scope.message = response.data.message;
|
$scope.message = response.data.message;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -200,7 +200,7 @@ app.controller('nonoperationalCtrl', ["$scope", "$rootScope","$modal", "toaster"
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
$scope.noRecordFound = true;
|
//$scope.noRecordFound = true;
|
||||||
$scope.dataLength = 0;
|
$scope.dataLength = 0;
|
||||||
|
|
||||||
// get day book type name list
|
// get day book type name list
|
||||||
@ -223,6 +223,7 @@ app.controller('nonoperationalCtrl', ["$scope", "$rootScope","$modal", "toaster"
|
|||||||
$scope.datas = response.data.dayBookListDetails;
|
$scope.datas = response.data.dayBookListDetails;
|
||||||
// alert(JSON.stringify($scope.data));
|
// alert(JSON.stringify($scope.data));
|
||||||
console.log($scope.data);
|
console.log($scope.data);
|
||||||
|
console.log($scope.datas);
|
||||||
|
|
||||||
$scope.dataLength = $scope.data.length;
|
$scope.dataLength = $scope.data.length;
|
||||||
if ($scope.data.length !== 0) {
|
if ($scope.data.length !== 0) {
|
||||||
@ -318,6 +319,8 @@ $scope.loadStaring = true;
|
|||||||
value['SNo'] = element.ORDER_ID;
|
value['SNo'] = element.ORDER_ID;
|
||||||
value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
|
value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
|
||||||
var ListName = element.ListName;
|
var ListName = element.ListName;
|
||||||
|
value['ListName'] = element.ListName||'-';
|
||||||
|
|
||||||
value['PaidReceivedToFrom'] = element.PaidTo +' ' +Lastname || '-';
|
value['PaidReceivedToFrom'] = element.PaidTo +' ' +Lastname || '-';
|
||||||
var Sem = element.FeePaymentDetails || '-';
|
var Sem = element.FeePaymentDetails || '-';
|
||||||
var Course = element.CourseName || '-';
|
var Course = element.CourseName || '-';
|
||||||
@ -325,7 +328,7 @@ $scope.loadStaring = true;
|
|||||||
value['UnivCourseSem'] = University.concat('/ ' + Course, '/ ' + Sem);
|
value['UnivCourseSem'] = University.concat('/ ' + Course, '/ ' + Sem);
|
||||||
value['Type'] = element.TypeName || '-';
|
value['Type'] = element.TypeName || '-';
|
||||||
value['ReceiptNo'] = element.ReceiptNo || '-';
|
value['ReceiptNo'] = element.ReceiptNo || '-';
|
||||||
value['Comments'] = element.ReceiptNoComments || '-';
|
value['Comments'] = element.Description || '-';
|
||||||
value['ModeofPayment'] = getSortCutModeofPayment(element.ModeOfPayment) || '-';
|
value['ModeofPayment'] = getSortCutModeofPayment(element.ModeOfPayment) || '-';
|
||||||
value['Status'] = element.Status || '-';
|
value['Status'] = element.Status || '-';
|
||||||
value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-';
|
value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-';
|
||||||
@ -359,18 +362,15 @@ $scope.loadStaring = true;
|
|||||||
rows1 = o;
|
rows1 = o;
|
||||||
var headers = {
|
var headers = {
|
||||||
fila_1: {
|
fila_1: {
|
||||||
col_1: { text: 'SNo', style: 'tableHeader', alignment: 'center', bold: true },
|
col_1: { text: 'SNo', style: 'tableHeader', alignment: 'center', bold: true },
|
||||||
col_2: { text: 'Voucher Number Bill Number / DATE', style: 'tableHeader', alignment: 'center', bold: true },
|
col_2: { text: 'Income/Expense', style: 'tableHeader', alignment: 'center', bold: true },
|
||||||
col_3: { text: 'Paid To Received From', style: 'tableHeader', alignment: 'center', bold: true },
|
col_3: { text: 'Voucher Number Bill Number / DATE', style: 'tableHeader', alignment: 'center', bold: true },
|
||||||
col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true },
|
col_4: { text: 'Paid To Received From', style: 'tableHeader', alignment: 'center', bold: true },
|
||||||
col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true },
|
col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true },
|
||||||
col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true },
|
col_6: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true },
|
||||||
// col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true },
|
col_7: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true },
|
||||||
col_7: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true },
|
col_8: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true },
|
||||||
col_8: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true },
|
//col_9: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true },
|
||||||
col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true },
|
|
||||||
col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true },
|
|
||||||
col_11: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true },
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var body = [];
|
var body = [];
|
||||||
@ -386,9 +386,6 @@ $scope.loadStaring = true;
|
|||||||
row.push(header.col_6);
|
row.push(header.col_6);
|
||||||
row.push(header.col_7);
|
row.push(header.col_7);
|
||||||
row.push(header.col_8);
|
row.push(header.col_8);
|
||||||
row.push(header.col_9);
|
|
||||||
row.push(header.col_10);
|
|
||||||
row.push(header.col_11);
|
|
||||||
body.push(row);
|
body.push(row);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -397,14 +394,10 @@ $scope.loadStaring = true;
|
|||||||
var data = rows1[key];
|
var data = rows1[key];
|
||||||
var row = new Array();
|
var row = new Array();
|
||||||
row.push(data.SNo.toString());
|
row.push(data.SNo.toString());
|
||||||
|
row.push(data.ListName.toString());
|
||||||
row.push(data.Date.toString());
|
row.push(data.Date.toString());
|
||||||
row.push(data.PaidReceivedToFrom.toString());
|
row.push(data.PaidReceivedToFrom.toString());
|
||||||
row.push(data.UnivCourseSem.toString());
|
|
||||||
row.push(data.Type.toString());
|
row.push(data.Type.toString());
|
||||||
row.push(data.ReceiptNo.toString());
|
|
||||||
// row.push(data.Comments.toString());
|
|
||||||
row.push(data.ModeofPayment.toString());
|
|
||||||
row.push(data.Status.toString());
|
|
||||||
row.push(data.Amount.toString());
|
row.push(data.Amount.toString());
|
||||||
row.push(data.Balance.toString());
|
row.push(data.Balance.toString());
|
||||||
row.push(data.Comments.toString());
|
row.push(data.Comments.toString());
|
||||||
@ -421,7 +414,7 @@ $scope.loadStaring = true;
|
|||||||
margin: 0,
|
margin: 0,
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
text: ['DAYBOOK DETAILS' + '( ' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ' )'],
|
text: ['Non Operational Details' + '( ' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ' )'],
|
||||||
alignment: 'left', bold: true, margin: [20, 30, 0, 0], fontSize: 18
|
alignment: 'left', bold: true, margin: [20, 30, 0, 0], fontSize: 18
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -938,10 +931,10 @@ $scope.loadStaring = true;
|
|||||||
|
|
||||||
function styleXl() {
|
function styleXl() {
|
||||||
var mystyle = {
|
var mystyle = {
|
||||||
sheetid: 'DAYBOOK DETAILS',
|
sheetid: 'Non Operational Entry Details',
|
||||||
headers: true,
|
headers: true,
|
||||||
caption: {
|
caption: {
|
||||||
title: 'DAYBOOK DETAILS' + '(' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ')',
|
title: 'Non Operational Entry Details' + '(' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ')',
|
||||||
width: '300px',
|
width: '300px',
|
||||||
style: 'font-size:50px;color:blue;'
|
style: 'font-size:50px;color:blue;'
|
||||||
},
|
},
|
||||||
@ -953,7 +946,7 @@ $scope.loadStaring = true;
|
|||||||
return mystyle;
|
return mystyle;
|
||||||
}
|
}
|
||||||
$scope.exportData = function () {
|
$scope.exportData = function () {
|
||||||
alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, concat( PaidTo,Lastname )as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance, ReceiptNoComments as Comments, Reason, Activity INTO XLS("daybook_details.xls",?) FROM ?', [styleXl(), $scope.data]);
|
alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, concat( PaidTo,Lastname )as PaidToReceivedFrom,TypeName as Type, Amount as Amount,Balance as Balance, Description as Comments INTO XLS("daybook_details.xls",?) FROM ?', [styleXl(), $scope.data]);
|
||||||
};
|
};
|
||||||
|
|
||||||
//Modal for bill details
|
//Modal for bill details
|
||||||
|
|||||||
@ -139,7 +139,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div ng-if="expense_data.length>0">
|
<div ng-if="alldata.length>0">
|
||||||
|
|
||||||
|
|
||||||
<!-- hearde start -- >
|
<!-- hearde start -- >
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user