diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index 9d10fa52..4edb09a2 100755 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -217,17 +217,31 @@ class Hallticket_model extends CI_Model return 1; } else + { + //////////////////// + // $this->db->distinct(); + // $this->db->select('SubjectID,SubjectCode,SubjectName'); + // $this->db->from('T_SubjectMaster'); + // // //$this->db->join('T_SubjectMaster','T_CourseSubject_Details.SubjectID=T_SubjectMaster.SubjectID'); + // $this->db->where('T_SubjectMaster.IsActive','1'); + // // // $this->db->where('T_CourseSubject_Details.UniversityID',$universityID); + // $this->db->where_in('T_SubjectMaster.BranchCode',$branchId); + // $result = $this->db->get(); + // //echo $this->db->last_query(); + //return $result->result(); + ///////////////////////// + foreach($courseIDS as $c) { $this->db->distinct(); - $this->db->select('SubjectID,SubjectCode,SubjectName'); - $this->db->from('T_SubjectMaster'); - //$this->db->join('T_SubjectMaster','T_CourseSubject_Details.SubjectID=T_SubjectMaster.SubjectID'); - $this->db->where('T_SubjectMaster.IsActive','1'); - // $this->db->where('T_CourseSubject_Details.UniversityID',$universityID); - $this->db->where_in('T_SubjectMaster.BranchCode',$branchId); + $this->db->select('SM.SubjectID,SM.SubjectCode,SM.SubjectName'); + $this->db->from('T_SubjectMaster SM'); + $this->db->join('T_SemSubMap_Child SC','SC.SubjectID = SM.SubjectID'); + $this->db->join('T_SemSubMap_Master SMM','SMM.mapID = SC.mapID'); + $this->db->where('SMM.UniversityID',$universityID); + $this->db->where('SMM.CourseID',$c); $result = $this->db->get(); - //echo $this->db->last_query(); - return $result->result(); + return $result->result(); + } } } diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js index 56cc608f..9098144b 100755 --- a/Apollo/assets/js/controllers/dashboardCtrl.js +++ b/Apollo/assets/js/controllers/dashboardCtrl.js @@ -353,7 +353,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" $scope.open = function (studentDetails) { - // get student view details var getcourse = { method: 'POST', diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 99e94d3b..2ef1749e 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -2387,7 +2387,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" // $scope.items = ['item1', 'item2', 'item3']; - $scope.openStudentView = function (studentDetails) { + $scope.open = function (studentDetails) { // get student view details @@ -2515,7 +2515,7 @@ $scope.reregisterPDF = function(student){ // console.log(subkey); // $scope.subjectDetails.push(subjectdata); // }); - $scope.open(coursefiltered,response.data.SubjectDetails,student); + $scope.openReregistration(coursefiltered,response.data.SubjectDetails,student); //}); } @@ -2530,7 +2530,7 @@ $scope.reregisterPDF = function(student){ } -$scope.open = function(coursefiltered,Subjects,sem){ +$scope.openReregistration = function(coursefiltered,Subjects,sem){ // console.log(PDFdata); //$rootScope.Student = PDFdata; diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index c477ebcf..7772f1a0 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -483,19 +483,19 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location var uni_add_position = 0; - if($scope.length_of_universityNamePDF >= 20 ){ + // if($scope.length_of_universityNamePDF >= 20 ){ - uni_add_position = 110;console.log(uni_add_position); - } - else{ - uni_add_position = 10;console.log(uni_add_position); - } - doc.setFontSize(10); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF); + // uni_add_position = 110;console.log(uni_add_position); + // } + // else{ + // uni_add_position = 10;console.log(uni_add_position); + // } + doc.setFontSize(14); + doc.text(140,45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); + doc.text(140,65,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF); + doc.text(140,85,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -714,19 +714,19 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location var uni_add_position = 0; - if($scope.length_of_universityNamePDF >= 20 ){ + // if($scope.length_of_universityNamePDF >= 20 ){ - uni_add_position = 110;console.log(uni_add_position); - } - else{ - uni_add_position = 10;console.log(uni_add_position); - } - doc.setFontSize(10); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF); + // uni_add_position = 110;console.log(uni_add_position); + // } + // else{ + // uni_add_position = 10;console.log(uni_add_position); + // } + doc.setFontSize(14); + doc.text(140,45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); + doc.text(140,65,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF); + doc.text(140,85,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -899,19 +899,19 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location var uni_add_position = 0; - if($scope.length_of_universityNamePDF >= 20 ){ + // if($scope.length_of_universityNamePDF >= 20 ){ - uni_add_position = 110;console.log(uni_add_position); - } - else{ - uni_add_position = 10;console.log(uni_add_position); - } - doc.setFontSize(10); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF); + // uni_add_position = 110;console.log(uni_add_position); + // } + // else{ + // uni_add_position = 10;console.log(uni_add_position); + // } + doc.setFontSize(14); + doc.text(140,45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); + doc.text(140,65,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF); + doc.text(140,85,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html index 6e35d5ad..81f47706 100755 --- a/Apollo/assets/views/dashboard.html +++ b/Apollo/assets/views/dashboard.html @@ -17,7 +17,7 @@
-
+
@@ -36,7 +36,7 @@ view more
- +
@@ -72,7 +72,7 @@ view more -
+
@@ -113,7 +113,7 @@ view more -
+
@@ -153,7 +153,7 @@ view more -
+
@@ -196,7 +196,7 @@ view more -
+
@@ -235,7 +235,7 @@ view more -
+
diff --git a/Apollo/assets/views/reregistration/reregistrationformpdf.html b/Apollo/assets/views/reregistration/reregistrationformpdf.html index 7068ef50..8d24dac2 100755 --- a/Apollo/assets/views/reregistration/reregistrationformpdf.html +++ b/Apollo/assets/views/reregistration/reregistrationformpdf.html @@ -9,7 +9,7 @@ diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html index 31c99c09..416f8ab2 100755 --- a/Apollo/assets/views/status-update/fees_status.html +++ b/Apollo/assets/views/status-update/fees_status.html @@ -126,9 +126,9 @@ - + - + diff --git a/Apollo/images/student/Dri_XiHb16emyWwY.jpeg b/Apollo/images/student/Dri_XiHb16emyWwY.jpeg new file mode 100644 index 00000000..7fb22b9a Binary files /dev/null and b/Apollo/images/student/Dri_XiHb16emyWwY.jpeg differ diff --git a/Apollo/images/university/sample.jpeg b/Apollo/images/university/Dri_S3fkhY1VmHa6.jpeg similarity index 100% rename from Apollo/images/university/sample.jpeg rename to Apollo/images/university/Dri_S3fkhY1VmHa6.jpeg

{{Course.UniversityName}}

-

{{Course.Address}}

+

{{Course.Address}}
{{user.Firstname}}{{user.Firstname}} {{user.Lastname}}{{user.MobileNumber}}{{user.MobileNumber}} {{user.UniversityName}} {{user.CourseName}}