Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Apollo/api/application/models/Hallticket_model.php

@@ -217,19 +217,33 @@ 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->select('SM.SubjectID,SM.SubjectCode,SM.SubjectName');
-		$this->db->from('T_SubjectMaster');
+		$this->db->from('T_SubjectMaster SM');
-		//$this->db->join('T_SubjectMaster','T_CourseSubject_Details.SubjectID=T_SubjectMaster.SubjectID');
+		$this->db->join('T_SemSubMap_Child SC','SC.SubjectID = SM.SubjectID');
-		$this->db->where('T_SubjectMaster.IsActive','1');
+		$this->db->join('T_SemSubMap_Master SMM','SMM.mapID =  SC.mapID');
-	//	$this->db->where('T_CourseSubject_Details.UniversityID',$universityID);
+		$this->db->where('SMM.UniversityID',$universityID);
-		$this->db->where_in('T_SubjectMaster.BranchCode',$branchId);
+		$this->db->where('SMM.CourseID',$c);
 		$result = $this->db->get();
-		//echo $this->db->last_query();
         return $result->result();
 		}
 		}
+	}
 	
 	/*
      * get subject details

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',

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;

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);
+				// 	uni_add_position = 110;console.log(uni_add_position);
-					}
+				// 	}
-					else{
+				// 	else{
-						uni_add_position = 10;console.log(uni_add_position);
+				// 		uni_add_position = 10;console.log(uni_add_position);
-						}
+				// 		}
-				doc.setFontSize(10);
+				doc.setFontSize(14);
-				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
+				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);
+				// 	uni_add_position = 110;console.log(uni_add_position);
-					}
+				// 	}
-					else{
+				// 	else{
-						uni_add_position = 10;console.log(uni_add_position);
+				// 		uni_add_position = 10;console.log(uni_add_position);
-						}
+				// 		}
-				doc.setFontSize(10);
+				doc.setFontSize(14);
-				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
+				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);
+				// 	uni_add_position = 110;console.log(uni_add_position);
-					}
+				// 	}
-					else{
+				// 	else{
-						uni_add_position = 10;console.log(uni_add_position);
+				// 		uni_add_position = 10;console.log(uni_add_position);
-						}
+				// 		}
-				doc.setFontSize(10);
+				doc.setFontSize(14);
-				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
+				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);

Apollo/assets/views/dashboard.html

@@ -17,7 +17,7 @@
 <div ng-controller="dashboardCtrl">
 	<div class="container-fluid container-fullw padding-bottom-10">
 		<div class="row" data-ng-init="initCallTracking()">
-			<div class="col-sm-12">
+			<div class="col-sm-12" ng-controller="studentModalDemoCtrl">
 				<div class="panel panel-white no-radius">
 
 					<div class="panel-body no-padding">
@@ -36,7 +36,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover no-margin" ng-if="emptyDataToday==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover no-margin" ng-if="emptyDataToday==false">
 										<thead>
 										<tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
 										<tr>
@@ -72,7 +72,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover no-margin" ng-if="emptyDataToday==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover no-margin" ng-if="emptyDataToday==false">
 										<thead>
 										<tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
 										<tr>
@@ -113,7 +113,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover" ng-if="emptyDataPending==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover" ng-if="emptyDataPending==false">
 										<thead>
 										<!-- <tr> -->
 										<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
@@ -153,7 +153,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover" ng-if="emptyDataPending==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover" ng-if="emptyDataPending==false">
 										<thead>
 										<!-- <tr> -->
 										<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
@@ -196,7 +196,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover" ng-if="emptyDataLead==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover" ng-if="emptyDataLead==false">
 										<thead>
 										<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
 										<tr>
@@ -235,7 +235,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover" ng-if="emptyDataLead==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover" ng-if="emptyDataLead==false">
 										<thead>
 										<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
 										<tr>

Apollo/assets/views/reregistration/reregistrationformpdf.html

@@ -9,7 +9,7 @@
         <td style="width:154px;text-align: left;border-right-style: hidden;border-bottom-style: hidden;"><img src="images/{{Course.ProfilePicPath || university/No_Image.png}}" id="logo" style="width: 40%;"></td>
         <td style="border-bottom-style: hidden;" colspan="2">
         <h3 style="color:blue; text-align:center;margin-left:-20%;"><strong>{{Course.UniversityName}}</strong></h3>
-        <p style="color:blue; margin-top: 2px;text-align:center;margin-left:-30%;">{{Course.Address}}</p>
+        <p style="color:blue; margin-top: 2px;text-align:center;margin-left:-22%;">{{Course.Address}}</p>
         </td>
         </tr>
         <tr>

Apollo/assets/views/status-update/fees_status.html

@@ -126,9 +126,9 @@
             </thead>
             <tbody dir-paginate="user in studentInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
             <tr>
-                <td><a tooltip="View Student" class="text-dark" ng-click="openStudentView(user);">{{user.Firstname}}</a></td>
+                <td><a tooltip="View Student" class="text-dark" ng-click="open(user);">{{user.Firstname}}</a></td>
                 <td>{{user.Lastname}}</td>
-                <td><a tooltip="View Student" class="text-dark" ng-click="openStudentView(user);">{{user.MobileNumber}}</a></td>
+                <td><a tooltip="View Student" class="text-dark" ng-click="open(user);">{{user.MobileNumber}}</a></td>
                 <td>{{user.UniversityName}}</td>
                 <td>{{user.CourseName}}</td>
               <!--  <td>{{user.SessionName}}</td>-->