From 35f3e52f800954c94ccd544b0a994edf7249053d Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 24 Aug 2018 16:21:37 +0530 Subject: [PATCH 1/5] edit course master changes for duplication validations --- Apollo/assets/js/controllers/dashboardCtrl.js | 1 - Apollo/assets/js/controllers/feesStatusCtrl.js | 6 +++--- Apollo/assets/views/dashboard.html | 14 +++++++------- Apollo/assets/views/status-update/fees_status.html | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) 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/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/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 @@ - + - + From 88c8e47d5197a868fada2063645c041c46981617 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Fri, 24 Aug 2018 18:26:08 +0530 Subject: [PATCH 2/5] batchshedule change --- .../application/models/Hallticket_model.php | 30 ++++++--- .../js/controllers/generateHallTicketCtrl.js | 58 +++++++++--------- .../reregistration/reregistrationformpdf.html | 2 +- Apollo/images/student/Dri_XiHb16emyWwY.jpeg | Bin 0 -> 3209 bytes .../{sample.jpeg => Dri_S3fkhY1VmHa6.jpeg} | Bin 5 files changed, 52 insertions(+), 38 deletions(-) create mode 100644 Apollo/images/student/Dri_XiHb16emyWwY.jpeg rename Apollo/images/university/{sample.jpeg => Dri_S3fkhY1VmHa6.jpeg} (100%) 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/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index c477ebcf..a361a8f1 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -482,20 +482,20 @@ 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 ){ + //var uni_add_position = 0; + // 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); - } + // 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); + doc.text(45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); + doc.text(55,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF); + doc.text(93,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -713,20 +713,20 @@ 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 ){ + // var uni_add_position = 0; + // 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); - } + // 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); + doc.text(45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); + doc.text(55,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF); + doc.text(93,$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); - } + // 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); + doc.text(45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); + doc.text(55,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF); + doc.text(93,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); 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/images/student/Dri_XiHb16emyWwY.jpeg b/Apollo/images/student/Dri_XiHb16emyWwY.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..7fb22b9a1f841ecfb5ca5082b15be8a41acefa4d GIT binary patch literal 3209 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 PF-%7CT{tWNI-vd?#qiK+ literal 0 HcmV?d00001 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 From 1b505c0a6bb98f08b538318f52f6fd059b78e088 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Fri, 24 Aug 2018 19:31:56 +0530 Subject: [PATCH 3/5] pdf changes (hallticket) --- .../js/controllers/generateHallTicketCtrl.js | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index a361a8f1..eaacb579 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -482,7 +482,7 @@ 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; + var uni_add_position = 0; // if($scope.length_of_universityNamePDF >= 20 ){ // uni_add_position = 110;console.log(uni_add_position); @@ -491,11 +491,11 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun // uni_add_position = 10;console.log(uni_add_position); // } doc.setFontSize(10); - doc.text(45,$scope.universityNamePDF); + doc.text(150,45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(55,$scope.universityAddressPDF); + doc.text(150,55,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(93,$scope.universityEmailPDF); + doc.text(150,65,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -713,7 +713,7 @@ 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; + var uni_add_position = 0; // if($scope.length_of_universityNamePDF >= 20 ){ // uni_add_position = 110;console.log(uni_add_position); @@ -722,11 +722,11 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun // uni_add_position = 10;console.log(uni_add_position); // } doc.setFontSize(10); - doc.text(45,$scope.universityNamePDF); + doc.text(150,45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(55,$scope.universityAddressPDF); + doc.text(150,55,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(93,$scope.universityEmailPDF); + doc.text(150,65,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -907,11 +907,11 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun // uni_add_position = 10;console.log(uni_add_position); // } doc.setFontSize(10); - doc.text(45,$scope.universityNamePDF); + doc.text(150,45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(55,$scope.universityAddressPDF); + doc.text(150,55,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(93,$scope.universityEmailPDF); + doc.text(150,65,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); From e3283bb1e94fecc23295e558ea488cd400929d89 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Fri, 24 Aug 2018 19:39:06 +0530 Subject: [PATCH 4/5] latest changes --- .../js/controllers/generateHallTicketCtrl.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index eaacb579..cd86283c 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -490,12 +490,12 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun // else{ // uni_add_position = 10;console.log(uni_add_position); // } - doc.setFontSize(10); + doc.setFontSize(12); doc.text(150,45,$scope.universityNamePDF); + doc.setFontSize(10); + doc.text(150,65,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(150,55,$scope.universityAddressPDF); - doc.setFontSize(8); - doc.text(150,65,$scope.universityEmailPDF); + doc.text(150,85,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -721,12 +721,12 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun // else{ // uni_add_position = 10;console.log(uni_add_position); // } - doc.setFontSize(10); + doc.setFontSize(12); doc.text(150,45,$scope.universityNamePDF); + doc.setFontSize(10); + doc.text(150,65,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(150,55,$scope.universityAddressPDF); - doc.setFontSize(8); - doc.text(150,65,$scope.universityEmailPDF); + doc.text(150,85,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -906,12 +906,12 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun // else{ // uni_add_position = 10;console.log(uni_add_position); // } - doc.setFontSize(10); + doc.setFontSize(12); doc.text(150,45,$scope.universityNamePDF); + doc.setFontSize(10); + doc.text(150,65,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(150,55,$scope.universityAddressPDF); - doc.setFontSize(8); - doc.text(150,65,$scope.universityEmailPDF); + doc.text(150,85,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); From 9258664b4b5c87b86c47b681df1dd95700cd5c6b Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Fri, 24 Aug 2018 20:02:36 +0530 Subject: [PATCH 5/5] hallticket changes --- .../js/controllers/generateHallTicketCtrl.js | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index cd86283c..7772f1a0 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -490,12 +490,12 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun // else{ // uni_add_position = 10;console.log(uni_add_position); // } - doc.setFontSize(12); - doc.text(150,45,$scope.universityNamePDF); - doc.setFontSize(10); - doc.text(150,65,$scope.universityAddressPDF); + doc.setFontSize(14); + doc.text(140,45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(150,85,$scope.universityEmailPDF); + doc.text(140,65,$scope.universityAddressPDF); + doc.setFontSize(8); + doc.text(140,85,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -721,12 +721,12 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun // else{ // uni_add_position = 10;console.log(uni_add_position); // } - doc.setFontSize(12); - doc.text(150,45,$scope.universityNamePDF); - doc.setFontSize(10); - doc.text(150,65,$scope.universityAddressPDF); + doc.setFontSize(14); + doc.text(140,45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(150,85,$scope.universityEmailPDF); + doc.text(140,65,$scope.universityAddressPDF); + doc.setFontSize(8); + doc.text(140,85,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -906,12 +906,12 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun // else{ // uni_add_position = 10;console.log(uni_add_position); // } - doc.setFontSize(12); - doc.text(150,45,$scope.universityNamePDF); - doc.setFontSize(10); - doc.text(150,65,$scope.universityAddressPDF); + doc.setFontSize(14); + doc.text(140,45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(150,85,$scope.universityEmailPDF); + doc.text(140,65,$scope.universityAddressPDF); + doc.setFontSize(8); + doc.text(140,85,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60);
{{user.Firstname}}{{user.Firstname}} {{user.Lastname}}{{user.MobileNumber}}{{user.MobileNumber}} {{user.UniversityName}} {{user.CourseName}}

{{Course.UniversityName}}

-

{{Course.Address}}

+

{{Course.Address}}