diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index 6f2264a1..7b0ed919 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -262,11 +262,11 @@ $scope.isLoaderTxt = "Loading..."; //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; - + //console.log($scope.pdfModel); $scope.open($scope.pdfModel); } },function(error){ swal('No Records Found','',error); }); @@ -301,7 +301,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,17 +321,18 @@ $scope.isLoaderTxt = "Loading..."; // Controller for Hallticket Modal PDF app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", function ($scope, $modalInstance, pdfitems) { - //console.log(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.batchNamePDF); + console.log($scope.courseNamePDF); //console.log($scope.universityNamePDF+'-'+$scope.localPdfUniverityDetails.UniversityName); $scope.localPdfStudentDetails = pdfitems.studentDetails; diff --git a/Apollo/assets/views/hallticket/generatehallticket.html b/Apollo/assets/views/hallticket/generatehallticket.html index df610b73..f7a525f6 100755 --- a/Apollo/assets/views/hallticket/generatehallticket.html +++ b/Apollo/assets/views/hallticket/generatehallticket.html @@ -62,7 +62,7 @@ Course + ng-model="myModel.courseName" ng-change="captureCourseName();"> Select Course {{courseDetails.CourseName}} @@ -76,7 +76,7 @@ Batch Name Select Batch {{batchDetails.BatchName}} diff --git a/Apollo/assets/views/hallticket/hallTicketPDF.html b/Apollo/assets/views/hallticket/hallTicketPDF.html index f5d47a18..7d4684c4 100755 --- a/Apollo/assets/views/hallticket/hallTicketPDF.html +++ b/Apollo/assets/views/hallticket/hallTicketPDF.html @@ -36,7 +36,7 @@ - ADMIT CARD : EXAMINATION {{courseNamePDF}} - {{batchNamePDF}} + ADMIT CARD : {{courseNamePDF}} EXAMINATION {{batchNamePDF}}