diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index becec604..99e94d3b 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -2323,7 +2323,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout",
//testing for print
$scope.printPdf = function (print) {
-
+
var innerContents = document.getElementById(print).innerHTML;
var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no');
@@ -2565,148 +2565,168 @@ $scope.open = function(coursefiltered,Subjects,sem){
});
};
$scope.generatePDF = function(){
- var sem = "Sem/Year:"+$scope.sem;
+ var innerContents = document.getElementById("reregisterform").innerHTML;
+
+ var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no');
+ popupWinindow.document.open();
+ popupWinindow.document.write('');
+ popupWinindow.document.write('');
+ popupWinindow.document.write(innerContents);
+ popupWinindow.document.write('');
+ popupWinindow.document.write('');
+ popupWinindow.document.write('');
+ popupWinindow.document.write('');
+ //popupWinindow.document.write(innerContents);
+ popupWinindow.document.write('');
+ popupWinindow.document.close();
+ popupWinindow.focus();
+ popupWinindow.print();
+ popupWinindow.close();
+ // var sem = "Sem/Year:"+$scope.sem;
- var universityaddress = encodeURIComponent($scope.Course.Address).replace(/[%2C %20]/g,' ');
- $scope.universityAddress = universityaddress.replace(" "," ");;
- $scope.universitydetails = "Mobile: "+$scope.Course.UnivMobileNumber+",E-mail id:"+$scope.Course.EmailID;
- $scope.Enroll = "Enrolment No: ";
- $scope.courseDetails = "Course Name: "+$scope.Course.CourseName+" specialization: "+$scope.Course.Specilization +sem
+ // var universityaddress = encodeURIComponent($scope.Course.Address).replace(/[%2C %20]/g,' ');
+ // $scope.universityAddress = universityaddress.replace(" "," ");;
+ // $scope.universitydetails = "Mobile: "+$scope.Course.UnivMobileNumber+",E-mail id:"+$scope.Course.EmailID;
+ // $scope.Enroll = "Enrolment No: ";
+ // $scope.courseDetails = "Course Name: "+$scope.Course.CourseName+" specialization: "+$scope.Course.Specilization +sem
- $scope.StudentName = "Name of the Candidate: "+$scope.Course.Firstname +' '+ $scope.Course.Lastname;
- $scope.StudentFatername = "Father's Name: "+$scope.Course.Fathername;
- $scope.StudentMotherName = "Mother's Name: "+$scope.Course.MotherName;
- //var str = $scope.Student.PresentAddress;
+ // $scope.StudentName = "Name of the Candidate: "+$scope.Course.Firstname +' '+ $scope.Course.Lastname;
+ // $scope.StudentFatername = "Father's Name: "+$scope.Course.Fathername;
+ // $scope.StudentMotherName = "Mother's Name: "+$scope.Course.MotherName;
+ // //var str = $scope.Student.PresentAddress;
- var str = encodeURIComponent($scope.Course.PermanentAddress).replace(/[%2C %20 %0A]/g,' ');
+ // var str = encodeURIComponent($scope.Course.PermanentAddress).replace(/[%2C %20 %0A]/g,' ');
- // str.replace("%0A"," ");
- // str.replace("%20"," ");
- // str.replace("%2C"," ");
- $scope.StudnetAddress = "Address: "+ str.replace(" "," ");
- $scope.StudentPin = "Pincode: .................. Mobile No: "+$scope.Course.MobileNumber+" Email ID: "+$scope.Course.EmailID;
+ // // str.replace("%0A"," ");
+ // // str.replace("%20"," ");
+ // // str.replace("%2C"," ");
+ // $scope.StudnetAddress = "Address: "+ str.replace(" "," ");
+ // $scope.StudentPin = "Pincode: .................. Mobile No: "+$scope.Course.MobileNumber+" Email ID: "+$scope.Course.EmailID;
- // var sem1 = doc.autoTableHtmlToJson(document.getElementById(subject));
- var universityname = $scope.Course.UniversityName;
- var universityCap = universityname.toUpperCase();
- var doc = new jsPDF('A4');
- var img = document.getElementById("logo");
- var canvas = document.createElement("canvas");
- canvas.width = 100;
- canvas.height = 100;
- var ctx = canvas.getContext("2d");
- ctx.drawImage(img, 0, 0,100,100);
- var dataURL = canvas.toDataURL("image/png");
+ // // var sem1 = doc.autoTableHtmlToJson(document.getElementById(subject));
+ // var universityname = $scope.Course.UniversityName;
+ // var universityCap = universityname.toUpperCase();
+ // var doc = new jsPDF('A4');
+ // var img = document.getElementById("logo");
+ // var canvas = document.createElement("canvas");
+ // canvas.width = 100;
+ // canvas.height = 100;
+ // var ctx = canvas.getContext("2d");
+ // ctx.drawImage(img, 0, 0,100,100);
+ // var dataURL = canvas.toDataURL("image/png");
- doc.rect(10, 10, 190, 280);
+ // doc.rect(10, 10, 190, 280);
- doc.text(70, 20, universityCap);
- doc.text(80, 26,$scope.universityAddress);
- doc.addImage(dataURL, 'jpeg', 50, 13, 10, 10);
- doc.setFontSize(14);
- doc.text(70,32,"RE-REGISTRATION FORM");
- doc.setFontSize(12);
+ // doc.text(70, 20, universityCap);
+ // doc.text(80, 26,$scope.universityAddress);
+ // doc.addImage(dataURL, 'jpeg', 50, 13, 10, 10);
+ // doc.setFontSize(14);
+ // doc.text(70,32,"RE-REGISTRATION FORM");
+ // doc.setFontSize(12);
- doc.text(40,42,$scope.universitydetails);
- doc.setFontSize(10);
- doc.setFontSize(10);
- var formdetails = "The form should be complete in all respects and to be filled by student in English CAPITAL letters in blue /black ink.";
- var details = doc.splitTextToSize(formdetails,200);
- doc.text(15,50,details);
+ // doc.text(40,42,$scope.universitydetails);
+ // doc.setFontSize(10);
+ // doc.setFontSize(10);
+ // var formdetails = "The form should be complete in all respects and to be filled by student in English CAPITAL letters in blue /black ink.";
+ // var details = doc.splitTextToSize(formdetails,200);
+ // doc.text(15,50,details);
- doc.setFontSize(12);
- doc.line(10, 45, 200, 45);
- var col = 45;
- var EnLen = $scope.Course.EnrollmentID.length;
- //console.log(EnLen);
- var k = 0;
- if(EnLen !=0){
- while( k<= EnLen-1){
- //console.log(k);
+ // doc.setFontSize(12);
+ // doc.line(10, 45, 200, 45);
+ // var col = 45;
+ // var EnLen = $scope.Course.EnrollmentID.length;
+ // //console.log(EnLen);
+ // var k = 0;
+ // if(EnLen !=0){
+ // while( k<= EnLen-1){
+ // //console.log(k);
- doc.text(15,60,$scope.Enroll);doc.rect(col,57,5,5);
- col = col+1;
- doc.text(col,61,$scope.Course.EnrollmentID[k]);
- col = parseInt(col)+4;
- k++;
- }
- }else{
- doc.text(15,60,$scope.Enroll); doc.rect(45,55,5,5);doc.rect(50,55,5,5);doc.rect(55,55,5,5);doc.rect(60,55,5,5);doc.rect(65,55,5,5);doc.rect(70,55,5,5);doc.rect(75,55,5,5);doc.rect(80,55,5,5);doc.rect(85,55,5,5);doc.rect(90,55,5,5);doc.rect(95,55,5,5);doc.rect(100,55,5,5);doc.rect(105,55,5,5);doc.rect(110,55,5,5);doc.rect(115,55,5,5);doc.rect(120,55,5,5);doc.rect(125,55,5,5);
- // doc.text(46,59,$scope.Student.EnrollmentID[0]);doc.text(51,59,$scope.Student.EnrollmentID[1]);doc.text(56,59,$scope.Student.EnrollmentID[2]);doc.text(61,59,$scope.Student.EnrollmentID[3]);doc.text(66,59,$scope.Student.EnrollmentID[4]);
- // doc.text(71,59,$scope.Student.EnrollmentID[5]);doc.text(76,59,$scope.Student.EnrollmentID[6]);doc.text(81,59,$scope.Student.EnrollmentID[7]);doc.text(86,59,$scope.Student.EnrollmentID[8]);doc.text(91,59,$scope.Student.EnrollmentID[9]);
- // doc.text(96,59,$scope.Student.EnrollmentID[10]);doc.text(101,59,$scope.Student.EnrollmentID[11]);doc.text(106,59,$scope.Student.EnrollmentID[12]);
- // //doc.text(111,59,$scope.Student.EnrollmentID[13]);doc.text(116,59,$scope.Student.EnrollmentID[14]);doc.text(121,59,$scope.Student.EnrollmentID[15]);
- }
- doc.setFontSize(10);
- doc.text(15,70,$scope.courseDetails);
- doc.setFontSize(12);
- doc.text(15,80,"Examination Session: January ");doc.rect(73,77,5,5);doc.text(80,80,"June");doc.rect(90,77,5,5);doc.text(100,80,"Semester Mode");doc.rect(131,77,5,5);doc.text(140,80,"Yearly Mode");doc.rect(165,77,5,5);
- // doc.autoTable(sem1.columns, sem1.data, {margin: {top: 100},theme:'grid'});
+ // doc.text(15,60,$scope.Enroll);doc.rect(col,57,5,5);
+ // col = col+1;
+ // doc.text(col,61,$scope.Course.EnrollmentID[k]);
+ // col = parseInt(col)+4;
+ // k++;
+ // }
+ // }else{
+ // doc.text(15,60,$scope.Enroll); doc.rect(45,55,5,5);doc.rect(50,55,5,5);doc.rect(55,55,5,5);doc.rect(60,55,5,5);doc.rect(65,55,5,5);doc.rect(70,55,5,5);doc.rect(75,55,5,5);doc.rect(80,55,5,5);doc.rect(85,55,5,5);doc.rect(90,55,5,5);doc.rect(95,55,5,5);doc.rect(100,55,5,5);doc.rect(105,55,5,5);doc.rect(110,55,5,5);doc.rect(115,55,5,5);doc.rect(120,55,5,5);doc.rect(125,55,5,5);
+ // // doc.text(46,59,$scope.Student.EnrollmentID[0]);doc.text(51,59,$scope.Student.EnrollmentID[1]);doc.text(56,59,$scope.Student.EnrollmentID[2]);doc.text(61,59,$scope.Student.EnrollmentID[3]);doc.text(66,59,$scope.Student.EnrollmentID[4]);
+ // // doc.text(71,59,$scope.Student.EnrollmentID[5]);doc.text(76,59,$scope.Student.EnrollmentID[6]);doc.text(81,59,$scope.Student.EnrollmentID[7]);doc.text(86,59,$scope.Student.EnrollmentID[8]);doc.text(91,59,$scope.Student.EnrollmentID[9]);
+ // // doc.text(96,59,$scope.Student.EnrollmentID[10]);doc.text(101,59,$scope.Student.EnrollmentID[11]);doc.text(106,59,$scope.Student.EnrollmentID[12]);
+ // // //doc.text(111,59,$scope.Student.EnrollmentID[13]);doc.text(116,59,$scope.Student.EnrollmentID[14]);doc.text(121,59,$scope.Student.EnrollmentID[15]);
+ // }
+ // doc.setFontSize(10);
+ // doc.text(15,70,$scope.courseDetails);
+ // doc.setFontSize(12);
+ // doc.text(15,80,"Examination Session: January ");doc.rect(73,77,5,5);doc.text(80,80,"June");doc.rect(90,77,5,5);doc.text(100,80,"Semester Mode");doc.rect(131,77,5,5);doc.text(140,80,"Yearly Mode");doc.rect(165,77,5,5);
+ // // doc.autoTable(sem1.columns, sem1.data, {margin: {top: 100},theme:'grid'});
- doc.line(10, 83, 200, 83);
- doc.text(15,88,$scope.StudentName);
- doc.text(60,89,"......................................................................................................................");
- doc.text(15,95,$scope.StudentFatername);
- doc.text(43,96,"....................................................................................................................................");
- doc.text(15,102,$scope.StudentMotherName);
- doc.text(43,103,"....................................................................................................................................");
+ // doc.line(10, 83, 200, 83);
+ // doc.text(15,88,$scope.StudentName);
+ // doc.text(60,89,"......................................................................................................................");
+ // doc.text(15,95,$scope.StudentFatername);
+ // doc.text(43,96,"....................................................................................................................................");
+ // doc.text(15,102,$scope.StudentMotherName);
+ // doc.text(43,103,"....................................................................................................................................");
- doc.text(15,110,$scope.StudnetAddress);
- doc.text(30,111,"................................................................................................................................................");
- doc.text(15,121,$scope.StudentPin);
- doc.text
- doc.line(10, 125, 200,125);
- doc.text(45,130,"SUBJECT / PAPER IN WHICH CANDIDATE APPEARING")
- doc.line(10, 131, 200, 131);
- doc.text(20,135,"SR.NO");
+ // doc.text(15,110,$scope.StudnetAddress);
+ // doc.text(30,111,"................................................................................................................................................");
+ // doc.text(15,121,$scope.StudentPin);
+ // doc.text
+ // doc.line(10, 125, 200,125);
+ // doc.text(45,130,"SUBJECT / PAPER IN WHICH CANDIDATE APPEARING")
+ // doc.line(10, 131, 200, 131);
+ // doc.text(20,135,"SR.NO");
- doc.text(60,135,"Subject Code");
- doc.text(110,135,"Subject/Paper Code");
- doc.line(10,137,200,137);
- var row = 137;
- var no = 1;
- //console.log();
- angular.forEach($scope.Subject[0],function(subjectData,key){
- //for(var i=0;i<=$scope.Subject[key].length-1;i++){
- // console.log(subjectData);
- doc.line(10,row,200,row);
- no = no.toString();
- doc.text(20,row+5,no);
- doc.text(65,row+5,subjectData.SubjectCode);
- doc.setFontSize(10);
- doc.text(100,row+5,subjectData.SubjectName);
+ // doc.text(60,135,"Subject Code");
+ // doc.text(110,135,"Subject/Paper Code");
+ // doc.line(10,137,200,137);
+ // var row = 137;
+ // var no = 1;
+ // //console.log();
+ // angular.forEach($scope.Subject[0],function(subjectData,key){
+ // //for(var i=0;i<=$scope.Subject[key].length-1;i++){
+ // // console.log(subjectData);
+ // doc.line(10,row,200,row);
+ // no = no.toString();
+ // doc.text(20,row+5,no);
+ // doc.text(65,row+5,subjectData.SubjectCode);
+ // doc.setFontSize(10);
+ // doc.text(100,row+5,subjectData.SubjectName);
- row = row+6;
- no = parseInt(no)+1;
- doc.line(10,row,200,row);
+ // row = row+6;
+ // no = parseInt(no)+1;
+ // doc.line(10,row,200,row);
- });
- var index = 14;
- var len = index-$scope.Subject[0].length;
- //console.log(len);
- for(var j=0;j<=len;j++){
- if(no <=9){
- no = no.toString();
- doc.text(20,row+5,no);
- }else{
- no = no.toString();
- doc.text(19,row+5,no);
- }
- // doc.text(75,row+5,"--");
- // doc.text(120,row+5,"--");
- row = row+6;
+ // });
+ // var index = 14;
+ // var len = index-$scope.Subject[0].length;
+ // //console.log(len);
+ // for(var j=0;j<=len;j++){
+ // if(no <=9){
+ // no = no.toString();
+ // doc.text(20,row+5,no);
+ // }else{
+ // no = no.toString();
+ // doc.text(19,row+5,no);
+ // }
+ // // doc.text(75,row+5,"--");
+ // // doc.text(120,row+5,"--");
+ // row = row+6;
- no = parseInt(no)+1;
- doc.line(10,row,200,row);
- }
- doc.line(10,240,200,240);
- doc.text(15,250,"Fees Details: Cash / Cheque / DD");
- doc.text(15,260,"DD No / Cheque No ....................... Dated ............... Bank ....................");
- doc.text(15,270,"Amount ...................");
- doc.text(150,280,"Signature of Candidate");
+ // no = parseInt(no)+1;
+ // doc.line(10,row,200,row);
+ // }
+ // doc.line(10,240,200,240);
+ // doc.text(15,250,"Fees Details: Cash / Cheque / DD");
+ // doc.text(15,260,"DD No / Cheque No ....................... Dated ............... Bank ....................");
+ // doc.text(15,270,"Amount ...................");
+ // doc.text(150,280,"Signature of Candidate");
- doc.save($scope.Course.Firstname +'_'+ $scope.Course.Lastname+'_'+$scope.sem+'.pdf');
+ // doc.save($scope.Course.Firstname +'_'+ $scope.Course.Lastname+'_'+$scope.sem+'.pdf');
}
diff --git a/Apollo/assets/views/reregistration/reregistrationformpdf.html b/Apollo/assets/views/reregistration/reregistrationformpdf.html
index 2b4692c5..1bf0516f 100755
--- a/Apollo/assets/views/reregistration/reregistrationformpdf.html
+++ b/Apollo/assets/views/reregistration/reregistrationformpdf.html
@@ -1,8 +1,9 @@
-