This commit is contained in:
dineshkumarkannan 2018-06-13 15:33:26 +05:30
commit 9590d53a17
5 changed files with 160 additions and 102 deletions

View File

@ -957,17 +957,17 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
if(Details.InstallmentDetails != ''){
$scope.setFeesTotalAmount(Details,'2',Details);
$scope.setFeesTotalAmount(Details,'2',Details,'1');
}
else{
/*$scope.$watch('setModel.feesType.BatchCode', function(newValue, oldValue) {
if(newValue!=oldValue){
$rootScope.updateMoreItems=[];
$scope.setFeesTotalAmount(Details,'1',Details);
$scope.setFeesTotalAmount(Details,'1',Details,'1');
}
});*/
$scope.setFeesTotalAmount(Details,'1',Details);
$scope.setFeesTotalAmount(Details,'1',Details,'1');
}
@ -1134,10 +1134,10 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
$rootScope.lastInstallemtDate="";*/
$rootScope.updateMoreItems=[];
}
$scope.setFeesTotalAmount(model,'1',model);
$scope.setFeesTotalAmount(model,'1',model,'1');
}
else{
$scope.setFeesTotalAmount(model,'3',model);
$scope.setFeesTotalAmount(model,'3',model,'1');
}
@ -1149,7 +1149,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
/*
* get set fees total amount
* */
$scope.setFeesTotalAmount = function (values,type,beforeValues) {
$scope.setFeesTotalAmount = function (values,type,beforeValues,from) {
if(type==3 || values.Sem_Year=='TC' || values.Sem_Year=='PC' || values.Sem_Year=='DC' || values.Sem_Year=='MC' || values.Sem_Year=='OTHER'){
if(values.Valid=='0'){
@ -1189,6 +1189,12 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
}
else{
if($scope.setTotalAmount=='' || $scope.setTotalAmount==null || $scope.setTotalAmount==0){
$scope.beforeSetTotalAmount=0;
}
else{
$scope.beforeSetTotalAmount=$scope.setTotalAmount;
}
angular.forEach(values.batchDetails,function (values1,key) {
if(values1.BatchCode==values.BatchCode){
$scope.BatchDate = new Date(values1.BatchDate.substring(6,10)+'-'+values1.BatchDate.substring(3,5)+'-'+values1.BatchDate.substring(0,2));
@ -1225,16 +1231,25 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
}
$scope.setTotalAmount= parseInt($scope.actFees) + parseInt($scope.stfFees) + parseInt($scope.othersFees) - parseInt($scope.wiverFees);
if(values.InstallmentDetails=='' && $rootScope.updateMoreItems.length==0){
$scope.calculateInstallemnts(values,$scope.setTotalAmount);
}
else if(values.InstallmentDetails=='' && $rootScope.updateMoreItems.length<=2){
$scope.calculateDueAmount(values,beforeValues);
if(from=='1'){
$scope.calculateDueAmount($scope.setTotalAmount,$scope.setTotalAmount);
}
else{
$scope.calculateDueAmount($scope.beforeSetTotalAmount,$scope.setTotalAmount);
}
}
else{
$scope.calculateDueAmount(values,beforeValues);
if(from=='1'){
$scope.calculateDueAmount($scope.setTotalAmount,$scope.setTotalAmount);
}
else{
$scope.calculateDueAmount($scope.beforeSetTotalAmount,$scope.setTotalAmount);
}
}
}
@ -1266,17 +1281,26 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
else{
$scope.wiverFees=values.Waiver;
}
$scope.setTotalAmount= parseInt($scope.actFees) + parseInt($scope.stfFees) + parseInt($scope.othersFees) - parseInt($scope.wiverFees);
if(values.InstallmentDetails=='' && $rootScope.updateMoreItems.length==0){
$scope.calculateInstallemnts(values,$scope.setTotalAmount);
}
else if(values.InstallmentDetails=='' && $rootScope.updateMoreItems.length<=2){
$scope.calculateDueAmount(values,beforeValues);
if(from=='1'){
$scope.calculateDueAmount($scope.setTotalAmount,$scope.setTotalAmount);
}
else{
$scope.calculateDueAmount($scope.beforeSetTotalAmount,$scope.setTotalAmount);
}
}
else{
$scope.calculateDueAmount(values,beforeValues);
if(from=='1'){
$scope.calculateDueAmount($scope.setTotalAmount,$scope.setTotalAmount);
}
else{
$scope.calculateDueAmount($scope.beforeSetTotalAmount,$scope.setTotalAmount);
}
}
@ -1840,7 +1864,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
}
}
$scope.calculateDueAmount(values,values);
$scope.calculateDueAmount($scope.setTotalAmount,$scope.setTotalAmount);
}
@ -1851,8 +1875,31 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
/*while changing installment date/amount calculate fine amount
* created by kms
* */
$scope.calculateDueAmount = function (values,beforeValues) {
if(values.ActualFees=='' || values.ActualFees==undefined){
$scope.calculateDueAmount = function (beforeTot,afterTot) {
if(parseInt(beforeTot)<parseInt(afterTot)){
$scope.finalTotAmt=parseInt(afterTot)-parseInt(beforeTot);
}
else{
$scope.finalTotAmt=parseInt(afterTot)-parseInt(beforeTot);
}
if($rootScope.updateMoreItems.length>0){
if(parseInt($scope.finalTotAmt)>0){
$rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount = parseInt($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount) + parseInt($scope.finalTotAmt);
}
else{
if(parseInt($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount)<parseInt($scope.finalTotAmt)){
$rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount=0;
}
else{
$rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount=parseInt($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount) + parseInt($scope.finalTotAmt);
}
}
}
/* if(values.ActualFees=='' || values.ActualFees==undefined){
var gettotAmt = 0;
}
else{
@ -1900,7 +1947,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
$rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount = parseInt(lastInstallAmt) + parseInt(getSTFOrWR) + parseInt(getother);
}
}*/
$scope.dateValidations();

View File

@ -20,7 +20,7 @@ app.controller('generateHallTicketCtrl', ["$scope","$rootScope","toaster", "$fil
};
$rootScope.userType = JSON.parse(localStorage.getItem('localObj')).localType;
$scope.existSemesterSubjectMapDetails = [{"UniversityID":"2","UniversityName":"TWO","CourseName":"CNAME"},{"UniversityID":"3","UniversityName":"TWO","CourseName":"CNAME"},{"UniversityID":"4","UniversityName":"TWO","CourseName":"CNAME"}];
$scope.isTblShow = false;
$scope.isLoader = false;
@ -130,8 +130,7 @@ $scope.isLoaderTxt = "Loading...";
$scope.studentInfo = response.data.studentDetails;
$scope.isLoaderShow = false;
$scope.isTblShow = true;
// console.log('API');
//console.log($scope.studentInfo);
}
else
@ -157,8 +156,7 @@ $scope.isLoaderTxt = "Loading...";
$scope.isClick = function(e)
{
//console.log(e.target.id);
var ide = e.target;
var val = (ide.checked ? true : false);
var sid = e.target.id;
@ -170,23 +168,23 @@ $scope.isLoaderTxt = "Loading...";
});
var pos = $scope.selectedStudentsID.indexOf(sid);
//alert(val);
if(val)
{
if( pos == -1)
{
//console.log("PUSH");
$scope.selectedStudentsID.push(sid);
}
}
else
{
//console.log("POP");
$scope.selectedStudentsID.splice(pos,1);
}
//console.log($scope.selectedStudentsID);
}
@ -194,7 +192,7 @@ $scope.isLoaderTxt = "Loading...";
$scope.isCheckAll = function(e)
{
var val = (e.target.checked ? true : false);
//$scope.selectedStudentsID = [];
if(val)
{
var len = $scope.studentInfo.length;
@ -211,7 +209,7 @@ $scope.isLoaderTxt = "Loading...";
{
$scope.selectedStudentsID = [];
}
//console.log($scope.selectedStudentsID);
}
$scope.generateHallTicket = function()
@ -232,7 +230,7 @@ $scope.isLoaderTxt = "Loading...";
swal('Select Student(s)','','warning');return false;
}
//console.log($scope.selectedStudentsID);
var university = $scope.myModel.universityName;
var course = $scope.myModel.courseName;
var batch = $scope.myModel.batchName;
@ -258,12 +256,9 @@ $scope.isLoaderTxt = "Loading...";
$scope.pdfModel.universityDetails = response.data.hallTicketData.UniversityDetails;
$scope.pdfModel.studentDetails = response.data.hallTicketData.studentDetails;
//console.log('API');
//console.log($scope.pdfModel.studentDetails);
//console.log(response.data.hallTicketData.studentDetails.length);
$scope.pdfModel.batchDetails = $scope.myModel.batchName;
$scope.pdfModel.courseDetails = $scope.myModel.courseName;
$scope.pdfModel.batchDetails = $scope.selectedBatchName;
$scope.pdfModel.courseDetails = $scope.selectedCourseName;
$scope.pdfModel.centerDetails = $scope.myModel.centerName;
$scope.pdfModel.semDataType =response.data.semDataType;
@ -301,7 +296,17 @@ $scope.isLoaderTxt = "Loading...";
// generate pdf for student view
$scope.captureCourseName = function()
{
$scope.selectedCourseName = course.options[course.selectedIndex].text;
};
$scope.captureBatchName = function()
{
$scope.selectedBatchName = batch.options[batch.selectedIndex].text;
};
@ -311,23 +316,21 @@ $scope.isLoaderTxt = "Loading...";
// Controller for Hallticket Modal PDF
app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", function ($scope, $modalInstance, pdfitems) {
//console.log(pdfitems);
$scope.localPdfUniverityDetails = pdfitems.universityDetails;
$scope.universityNamePDF = $scope.localPdfUniverityDetails[0].UniversityName;
$scope.universityAddressPDF = $scope.localPdfUniverityDetails[0].Address;
$scope.universityEmailPDF = $scope.localPdfUniverityDetails[0].EmailID;
$scope.universityLogoPDF = $scope.localPdfUniverityDetails[0].ProfilePicPath;
$scope.batchNamePDF = pdfitems.batchDetails.BatchName;
$scope.courseNamePDF = pdfitems.courseDetails.CourseName;
$scope.batchNamePDF = pdfitems.batchDetails;//.BatchName;
$scope.courseNamePDF = pdfitems.courseDetails;//.CourseName;
$scope.centerNamePDF = pdfitems.centerDetails.CenterName+''+ pdfitems.centerDetails.CenterAddress;
$scope.semDataTypePDF = pdfitems.semDataType;
//console.log($scope.semDataTypePDF);
//console.log($scope.universityNamePDF+'-'+$scope.localPdfUniverityDetails.UniversityName);
$scope.localPdfStudentDetails = pdfitems.studentDetails;
$scope.printStudentDetails = function(hallticket_type) {
//console.log('FUNCTION CALLED-'+hallticket_type);
angular.forEach($scope.localPdfStudentDetails,function(value,key){
@ -335,18 +338,9 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
if(value.StudentID)
{
//console.log("Total NO of Sem"+value.FeeDetails.length);
// var imgData = '';
// html2canvas($("#university_header").get(0)).then(function (canvas) {
// var imgData = canvas.toDataURL("image/jpeg");
// //var imgData = imgData.replace("png", "jpeg");
// console.log(imgData);
// // // document.getElementById('uh').setAttribute('src', imgData);
// });
if(hallticket_type == 'SEM' || hallticket_type == 'REG' || hallticket_type == 'LAT'){
// console.log('hallticket_type == '+hallticket_type);
var semlength = value.FeeDetails.length;
if(hallticket_type == 'REG' || hallticket_type == 'LAT')
{
@ -357,7 +351,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
{
//console.log('FOR'+i);
var fileName = "DEFAULT.pdf";
var margins = {
top: 70,
@ -400,38 +394,30 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
styles: {cellPadding: 3.0, fontSize: 10},
headerStyles: {fillColor: [245, 245, 240], textColor: 0},
// columnStyles: {
// name: {fillColor: [245, 245, 240], textColor: 255, fontStyle: 'bold'}
// }
});
var firstTableID = tableid+i;
var SecTableID = (tableid+(i+1));
// console.log('iter-'+i+'ID-'+firstTableID+'-'+SecTableID);
if(document.getElementById(firstTableID))
{
// console.log(tableid+i);
var sem1 = doc.autoTableHtmlToJson(document.getElementById(firstTableID));
//console.log(sem1);
}
if(document.getElementById(SecTableID))
{
// console.log(tableid+(i+1));
var sem2 = doc.autoTableHtmlToJson(document.getElementById(SecTableID));
//console.log(sem2);
}
if(sem1 != "")
{
doc.autoTable(sem1.columns, sem1.data, {margin: {top: 170},theme:'grid'});
}
// var NewImage = new Image();
// NewImage.src = imgData;
var header = function(data) {
var examName = 'ADMIT CARD : '+$scope.courseNamePDF+' EXAMINATION ' +$scope.batchNamePDF;
@ -453,7 +439,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
doc.setFontSize(12);
doc.setTextColor(40);
doc.setFontStyle('normal');
// doc.addImage(imgData, 'png', 100, 100, 100, 100);
doc.addImage(dataURL, 'jpeg', 75, 35, 50, 50);//university logo location
doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
@ -493,32 +479,60 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
};
// var header = document.querySelector('.header');
var options = {
var autoTableEndPosYvalue = 0;
sem1 = "";
if(sem1 == "")
{
autoTableEndPosYvalue = 200;
}
else
{
autoTableEndPosYvalue = 350;
}
var options2 = {
addPageContent: header,
margin: {
top: 100
top: 100
},
startY: doc.autoTableEndPosY() + 20,
startY: doc.autoTableEndPosY() + autoTableEndPosYvalue,
theme :'grid'
};
var options1 = {
addPageContent: header,
margin: {
top: 200
},
theme :'grid'
};
if(sem1 != "")
{
doc.autoTable(sem1.columns, sem1.data, options1);
}
if(sem2 != "")
{
doc.autoTable(sem2.columns, sem2.data, options);
doc.autoTable(sem2.columns, sem2.data, options2);
}
// console.log('For END'+i);
if(sem2 != "" || sem1 != "")
{
doc.save(fileName);
}
// console.log('PDF DONE');
}//End of semlength for loop
@ -526,7 +540,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
else if(hallticket_type == 'YEAR')
{
//console.log('hallticket_type == '+hallticket_type);
var semlength = value.FeeDetails.length;
var i = 0;
for(i = 0; i <= semlength;i++)
@ -577,9 +591,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
styles: {cellPadding: 3.0, fontSize: 10},
headerStyles: {fillColor: [245, 245, 240], textColor: 0},
// columnStyles: {
// name: {fillColor: [245, 245, 240], textColor: 255, fontStyle: 'bold'}
// }
});
var firstTableID = "0";
@ -590,46 +602,46 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
var firstTableID = tableid+'year10';
var SecTableID = tableid+'year11';
semName = 'YEAR1';
//console.log(firstTableID+'-'+SecTableID);
break;
case 1:
var firstTableID = tableid+'year20';
var SecTableID = tableid+'year21';
semName = 'YEAR2';
//console.log(firstTableID+'-'+SecTableID);
break;
case 2:
var firstTableID = tableid+'year30';
var SecTableID = tableid+'year31';
semName = 'YEAR3';
//console.log(firstTableID+'-'+SecTableID);
break;
case 4:
var firstTableID = tableid+'year40';
var SecTableID = tableid+'year41';
semName = 'YEAR4';
//console.log(firstTableID+'-'+SecTableID);
break;
}
// console.log('iter-'+i+'ID-'+firstTableID+'-'+SecTableID);
if(document.getElementById(firstTableID))
{
// console.log(tableid+i);
var sem1 = doc.autoTableHtmlToJson(document.getElementById(firstTableID));
//console.log(sem1);
}
if(document.getElementById(SecTableID))
{
// console.log(tableid+(i+1));
var sem2 = doc.autoTableHtmlToJson(document.getElementById(SecTableID));
//console.log(sem2);
}
if(sem1 != "")
@ -638,8 +650,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
}
// var NewImage = new Image();
// NewImage.src = imgData;
var header = function(data) {
var examName = 'ADMIT CARD : '+$scope.courseNamePDF+' EXAMINATION ' +$scope.batchNamePDF;
@ -654,7 +665,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
doc.setFontSize(12);
doc.setTextColor(40);
doc.setFontStyle('normal');
// doc.addImage(imgData, 'png', 100, 100, 100, 100);
doc.addImage(dataURL, 'jpeg', 75, 35, 50, 50);//university logo location
doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
@ -694,7 +705,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
};
// var header = document.querySelector('.header');
var options = {
addPageContent: header,
@ -713,13 +724,13 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
doc.autoTable(sem2.columns, sem2.data, options);
}
//console.log('For END'+i);
/
if(sem2 != "" || sem1 != "")
{
doc.save(fileName);
}
// console.log('PDF DONE');
}//End of semlength for loop

View File

@ -62,7 +62,7 @@
Course
</label>
<select ui-select2 class="form-control" name="course" tabindex="4" id="course"
ng-model="myModel.courseName">
ng-model="myModel.courseName" ng-change="captureCourseName();">
<option value=""> Select Course</option>
<option ng-repeat="courseDetails in myModel.universityName.courseDetails" value="{{courseDetails.CourseID}}"><span ng-show="courseDetails.CourseCode != ''"><strong>{{courseDetails.CourseName}}</strong></span></option>
</select>
@ -76,7 +76,7 @@
Batch Name
</label>
<select ui-select2 class="form-control" name="batch" tabindex="4" id="batch"
ng-model="myModel.batchName"
ng-model="myModel.batchName" ng-change="captureBatchName()"
>
<option value=""> Select Batch</option>
<option ng-repeat="batchDetails in myModel.universityName.batchDetails" value="{{batchDetails.BatchCode}}"><span ng-show="batchDetails.BatchCode != ''"><strong>{{batchDetails.BatchName}}</strong></span></option>

View File

@ -36,7 +36,7 @@
<table width="100%" border="1" id = "" style="background-color:#fff;">
<tbody>
<tr>
<td><center>ADMIT CARD : EXAMINATION {{courseNamePDF}} - {{batchNamePDF}}</center></td><td rowspan="2" width="20%"><img src="images/{{studentObj.ProfilePicPath}}" id="sprofile" alt="NAN" height="100" width="100"/></td>
<td><center>ADMIT CARD : {{courseNamePDF}} EXAMINATION {{batchNamePDF}}</center></td><td rowspan="2" width="20%"><img src="images/{{studentObj.ProfilePicPath}}" id="sprofile" alt="NAN" height="100" width="100"/></td>
</tr>
<tr>

View File

@ -156,7 +156,7 @@
<input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="11" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="9"
ng-model="setModel.feesType.ActualFees" ng-pattern="/^[0-9]*$/" readonly required/>
ng-model="setModel.feesType.ActualFees" ng-pattern="/^[0-9]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" required/>
<span class="error text-small block"
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
ng-hide="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Fees amount is required</span>
@ -173,7 +173,7 @@
<input type="text" placeholder="Enter STF/WR Amount"
autofocus tabindex="12" class="form-control" name="STF" id="STF" ng-maxlength="9"
ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}});" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
<span class="error text-small block"
ng-if="Form.STF.$dirty && Form.STF.$invalid"
@ -190,7 +190,7 @@
<input type="text" placeholder="Enter Other Amount"
autofocus tabindex="13" class="form-control" name="others" id="others" ng-maxlength="9"
ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}});" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
<span class="error text-small block"
ng-if="Form.others.$dirty && Form.others.$invalid"
ng-hide="Form.others.$error.maxlength || Form.others.$error.pattern">Others amount is required</span>
@ -324,7 +324,7 @@
min-date="getDateArray[$index].Date"
max-date="getDateArray[$index+2].Date"
show-button-bar="false"
close-text="Close" ng-change="calculateDueAmount(setModel.feesType,setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-readonly="true" required="required"/>
close-text="Close" ng-change="calculateDueAmount(setTotalAmount,setTotalAmount);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-readonly="true" required="required"/>
<span class="error text-small block"
ng-if="n.DueDate==undefined">Date is required.</span>
<!--<span class="success text-small block"-->