diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index b5e3bc39..2d8b234c 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -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('' + innerContents + ''); + popupWinindow.document.close(); + } $scope.mouseLeave = function(){ $scope.showButton = false; diff --git a/Apollo/assets/js/controllers/studentViewCtrl.js b/Apollo/assets/js/controllers/studentViewCtrl.js index 61f98c94..a9c1e3a3 100755 --- a/Apollo/assets/js/controllers/studentViewCtrl.js +++ b/Apollo/assets/js/controllers/studentViewCtrl.js @@ -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'; } }); diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html index a3004bba..e898d353 100755 --- a/Apollo/assets/views/status-update/updateFeesStatus.html +++ b/Apollo/assets/views/status-update/updateFeesStatus.html @@ -413,31 +413,32 @@

{{items.FeesName}} Details

- +
- - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - @@ -445,7 +446,7 @@
Bill NOBill DateBill AmountReceipt NOMode of Payment Comments For Student Comments For Internal PrintBill NoBill DateBill AmountReceipt NoMode of Payment Comments For Student Comments For Internal Print
{{v.BillNO}}{{v.BillDate}}{{v.BillAmount}}{{v.ReceiptNo}}{{v.ModeOfPayment}}{{v.CommentsForStudent}}{{v.InternalComments}}{{v.BillNO}}{{v.BillDate}}{{v.BillAmount}}{{v.ReceiptNo}}{{v.ModeOfPayment}}{{v.CommentsForStudent}}{{v.InternalComments}} - + + +
-
+
diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index c2fc9903..2a8c911e 100755 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -245,15 +245,15 @@
- - - - - - - - - + + + + + + + + + @@ -270,22 +270,22 @@ - - - - - -
Sem/YearBatchSession From/Session ToSessionRoll NumberTotal Payable FeesReferral/WaiverPaid FeesBalance FeesSem/YearBatchSession From/Session ToSessionRoll NumberTotal Payable FeesReferral/WaiverPaid FeesBalance Fees {{fees.SessionName}}/{{fees.ToSessionName}} {{fees.SessionName}} {{fees.RollNo}} + {{fees.PayableAmount}} + {{fees.StudentWaiverRefAmount}} + {{fees.StudentPaidAmount}} + {{fees.BalanceAmount}} + + diff --git a/Apollo/assets/views/student/studentView.html b/Apollo/assets/views/student/studentView.html index c41f7c81..1f73618c 100755 --- a/Apollo/assets/views/student/studentView.html +++ b/Apollo/assets/views/student/studentView.html @@ -263,17 +263,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -289,22 +289,22 @@ - - - - -
Sem/YearBatchSession From/Session ToSessionRoll NumberTotal Payable FeesReferral/WaiverPaid FeesBalance FeesSem/YearBatchSession From/Session ToSessionRoll NumberTotal Payable FeesReferral/WaiverPaid FeesBalance Fees
{{fees.SessionName}} {{fees.RollNo}} + {{fees.PayableAmount}} {{fees.StudentWaiverRefAmount}} + {{fees.StudentPaidAmount}} + {{fees.BalanceAmount}} + +