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

alignment issues fixed

Browse Source
This commit is contained in:
gandhimathi 2018-07-20 18:32:48 +05:30
parent 72df729da5
commit dbdbafcf3a
5 changed files with 65 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -262,7 +262,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
* created by kms
* */
$scope.changeTotalFees = function (model) {
$scope.updateModel.billAmount = model.BalanceAmount;
//User wants to manually enter fees amount
//$scope.updateModel.billAmount = model.BalanceAmount;
$scope.updateModel.date = $filter('date')(new Date(), 'dd-MM-yyyy');
@ -782,7 +783,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
$scope.updateModel = {
"feesType": $scope.studentFeesInfo[0],
"billAmount":$scope.studentFeesInfo[0].BalanceAmount,
//User wants to manually enter fees amount
//"billAmount":$scope.studentFeesInfo[0].BalanceAmount,
"date":$filter('date')(new Date(), 'dd-MM-yyyy')
};
@ -2261,8 +2263,17 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo
$scope.BranchLogo = pdfValue.LogoPath;
$scope.FeesReceiptTitle = pdfValue.FeesReceiptTitle;
$scope.receiptNo=pdfValue.ReceiptNo;
}
$scope.pdfPrint = function (pdf) {
//PDF print
var innerContents = document.getElementById(pdf).innerHTML;
var popupWinindow = window.open('', '_blank', 'width=600,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no');
popupWinindow.document.open();
popupWinindow.document.write('<html><head></head><body onload="window.print()">' + innerContents + '</html>');
popupWinindow.document.close();
}
$scope.mouseLeave = function(){
$scope.showButton = false;

2
Apollo/assets/js/controllers/studentViewCtrl.js
View File

@ -114,7 +114,7 @@ app.directive('fixedHeader', function($timeout){
tdElems.style.width = columnWidth + '150px';
}
if (thElem) {
thElem.style.width = columnWidth + '85px';
thElem.style.width = columnWidth + '150px';
}
});

39
Apollo/assets/views/status-update/updateFeesStatus.html
View File

@ -413,31 +413,32 @@
<h4 class="modal-title">{{items.FeesName}} Details</h4>
</div>
<div class="modal-body">
<table class="table">
<table class="table" width="100" style='table-layout:fixed'>
<thead>
<tr>
<th>Bill NO</th>
<th>Bill Date</th>
<th>Bill Amount</th>
<th>Receipt NO</th>
<th>Mode of Payment </th>
<th>Comments For Student </th>
<th>Comments For Internal </th>
<th>Print</th>
<th style="text-align:center;">Bill No</th>
<th style="text-align:center;">Bill Date</th>
<th style="text-align:center;">Bill Amount</th>
<th style="text-align:center;">Receipt No</th>
<th style="text-align:center;">Mode of Payment </th>
<th style="text-align:center;">Comments For Student </th>
<th style="text-align:center;">Comments For Internal </th>
<th style="text-align:center;">Print</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="v in items.paidDetails">
<td>{{v.BillNO}}</td>
<td>{{v.BillDate}}</td>
<td>{{v.BillAmount}}</td>
<td>{{v.ReceiptNo}}</td>
<td>{{v.ModeOfPayment}}</td>
<td><span style="white-space: pre-wrap">{{v.CommentsForStudent}}</span></td>
<td>{{v.InternalComments}}</td>
<td width="10" style="vertical-align: top;">{{v.BillNO}}</td>
<td width="10" style="vertical-align: top;text-align:center;">{{v.BillDate}}</td>
<td width="10" style="vertical-align:top;text-align:right;">{{v.BillAmount}}</td>
<td width="10" style="vertical-align:top;text-align:center;">{{v.ReceiptNo}}</td>
<td width="10" style="vertical-align:top;text-align:center;">{{v.ModeOfPayment}}</td>
<td width="20" style="vertical-align:top;text-align:left;white-space: nowrap;"><span style="white-space: normal;word-break: break-all;display: block;">{{v.CommentsForStudent}}</span></td>
<td width="20" style="vertical-align:top;text-align:left;white-space: nowrap;"><span style="white-space: normal;word-break: break-all;display: block;">{{v.InternalComments}}</span></td>
<td>
<a tooltip="Click to print" ng-mouseleave="mouseLeave()" pdf-save-button="{{v.BillNO}}" pdf-name="Billno-{{v.BillNO}}.pdf" class="btn"><i class="fa fa-print" ng-click="ShowHide(v)"></i></a>
<td width="10" style="vertical-align:top;text-align:center;">
<a tooltip="Click to print" ng-mouseleave="mouseLeave()" pdf-save-button="{{v.BillNO}}" pdf-name="Billno-{{v.BillNO}}.pdf" class="btn"><i class="fa fa-print" ng-click="pdfPrint(pdf)"></i></a>
</td>
</tr>
@ -445,7 +446,7 @@
</table>
<div pdf-save-content="{{billNo}}" visible='showButton'>
<div id="pdf" pdf-save-content="{{billNo}}" visible='showButton'>
<table style="border-collapse: collapse; color: black;" border="0" width="100%">
<tbody>

30
Apollo/assets/views/student/studentDetailsModal.html
View File

@ -245,15 +245,15 @@
<table class="table no-margin height-200 ng-scope" ng-if="course.feesDetails!=false" fixed-header>
<thead>
<tr>
<th>Sem/Year</th>
<th>Batch</th>
<th ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">Session From/Session To</th>
<th ng-if="course.feesDetails[0].ProgramType=='Y001'">Session</th>
<th>Roll Number</th>
<th>Total Payable Fees</th>
<th>Referral/Waiver</th>
<th>Paid Fees</th>
<th>Balance Fees</th>
<th style="text-align:center;">Sem/Year</th>
<th style="text-align:center;">Batch</th>
<th style="text-align:center;" ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">Session From/Session To</th>
<th style="text-align:center;" ng-if="course.feesDetails[0].ProgramType=='Y001'">Session</th>
<th style="text-align:center;">Roll Number</th>
<th style="text-align:center;">Total Payable Fees</th>
<th style="text-align:center;">Referral/Waiver</th>
<th style="text-align:center;">Paid Fees</th>
<th style="text-align:center;">Balance Fees</th>
<th></th>
<th></th>
@ -270,22 +270,22 @@
<td ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">{{fees.SessionName}}/{{fees.ToSessionName}}</td>
<td ng-if="course.feesDetails[0].ProgramType=='Y001'">{{fees.SessionName}}</td>
<td> <span>{{fees.RollNo}}</span></td>
<td>
<td style="text-align:right;">
<span>{{fees.PayableAmount}}</span></td>
<td>
<td style="text-align:right;">
<span>{{fees.StudentWaiverRefAmount}}</span>
</td>
<td>
<td style="text-align:right;">
<span>{{fees.StudentPaidAmount}}</span></td>
<td>
<td style="text-align:right;">
<span>{{fees.BalanceAmount}}</span></td>
<td><span>
<td style="text-align:right;"><span>
<a tooltip="Installment Details" ng-click="open1(fees,'1')">
<i class="fa fa-eye text-blue text-large"></i>
</a> </span>
</td>
<td><span>
<td style="text-align:right;"><span>
<a tooltip="Bill Details" ng-click="open1(fees,'2')">
<i class="fa fa-eye text-green text-large"></i>
</a> </span>

32
Apollo/assets/views/student/studentView.html
View File

@ -263,17 +263,17 @@
<table class="table height-200 no-margin ng-scope" ng-controller="FeesModalDemoCtrl" ng-if="course.feesDetails!=false" fixed-header>
<thead>
<tr>
<th>Sem/Year</th>
<th>Batch</th>
<th ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">Session From/Session To</th>
<th ng-if="course.feesDetails[0].ProgramType=='Y001'">Session</th>
<th>Roll Number</th>
<th>Total Payable Fees</th>
<th>Referral/Waiver</th>
<th>Paid Fees</th>
<th>Balance Fees</th>
<th></th>
<th></th>
<th style="text-align:center;">Sem/Year</th>
<th style="text-align:center;">Batch</th>
<th style="text-align:center;" ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">Session From/Session To</th>
<th style="text-align:center;" ng-if="course.feesDetails[0].ProgramType=='Y001'">Session</th>
<th style="text-align:center;">Roll Number</th>
<th style="text-align:center;">Total Payable Fees</th>
<th style="text-align:center;">Referral/Waiver</th>
<th style="text-align:center;">Paid Fees</th>
<th style="text-align:center;">Balance Fees</th>
<th style="text-align:center;"></th>
<th style="text-align:center;"></th>
</tr>
</thead>
@ -289,22 +289,22 @@
<td ng-if="course.feesDetails[0].ProgramType=='Y001'">{{fees.SessionName}}</td>
<td>
<span>{{fees.RollNo}}</span></td>
<td>
<td style="text-align:right;">
<span>{{fees.PayableAmount}}</span></td>
<td>
<span>{{fees.StudentWaiverRefAmount}}</span>
</td>
<td>
<td style="text-align:right;">
<span>{{fees.StudentPaidAmount}}</span></td>
<td>
<td style="text-align:right;">
<span>{{fees.BalanceAmount}}</span></td>
<td ng-click="open(fees,'1',course)">
<td style="text-align:right;" ng-click="open(fees,'1',course)">
<a tooltip="Installment Details">
<i class="fa fa-eye text-blue text-large"></i>
</a> </span>
</td>
<td ng-click="open(fees,'2',course)"><span>
<td style="text-align:right;" ng-click="open(fees,'2',course)"><span>
<a tooltip="{{dynamicTooltip}}">
<i class="fa fa-eye text-green text-large"></i>
</a> </span>