Hallticket Issues Fixed 1185,1183

Apollo/assets/i18n/en.json

@@ -163,7 +163,7 @@
       "reregistration":{
         "MAIN":"RE REGISTRATION",
         "REREGISTRATIONFORM":"RE REGISTRATION FORM",
-        "BATCHMOMENT":"BATCH MOMENT"
+        "BATCHMOVEMENT":"PROMOTE BATCH"
       }  
     }
   },

Apollo/assets/js/config.constant.js

@@ -181,7 +181,7 @@ app.constant('JS_REQUIRES', {
         // Re - reg for hall ticket
         'reregistrationformCtrl':'assets/js/controllers/reregistrationformCtrl.js',
          // Batch moment for hall ticket
-         'BatchmomentCtrl':'assets/js/controllers/Batchmoment.js',
+         'BatchmomentCtrl':'assets/js/controllers/BatchmomentCtrl.js',
 
         //*** Filters
         'htmlToPlaintext': 'assets/js/filters/htmlToPlaintext.js', 

Apollo/assets/js/config.router.js

@@ -682,13 +682,13 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                     label: 'Re Registration Form'
                 } 
 
-            }).state('app.reregistration.batchmoment',{
-                url:'/batchmoment',
-                templateUrl:"assets/views/reregistration/batchmoment.html",
-                title:'Re Registration Form',
+            }).state('app.reregistration.batchmovement',{
+                url:'/promotebatch',
+                templateUrl:"assets/views/reregistration/promotebatch.html",
+                title:'Promote Batch',
                 resolve: loadSequence('ladda', 'angular-ladda', 'BatchmomentCtrl','ngTable','ui.select','spin', 'ui.mask'),
                 ncyBreadcrumb: {
-                    label: 'Re Registration Form'
+                    label: 'Promote Batch'
                 }
              });
 

Apollo/assets/js/controllers/generateHallTicketCtrl.js

@@ -255,7 +255,7 @@ $scope.isLoaderTxt = "Loading...";
             if (response.data.status==200 && response.data.hallTicketStatus) {
                
 				$scope.pdfModel.universityDetails = response.data.hallTicketData.UniversityDetails;
-				
+				$scope.pdfModel.studentDetails = response.data.hallTicketData.studentDetails;
 				
 				$scope.pdfModel.batchDetails = $scope.selectedBatchName;
 				$scope.pdfModel.courseDetails = $scope.selectedCourseName;
@@ -316,7 +316,7 @@ $scope.isLoaderTxt = "Loading...";
 // Controller for Hallticket Modal PDF
 app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", function ($scope, $modalInstance, pdfitems) {
 
-  
+	console.log('child');
 	$scope.localPdfUniverityDetails = pdfitems.universityDetails;
 	$scope.universityNamePDF = $scope.localPdfUniverityDetails[0].UniversityName;
 	$scope.universityAddressPDF = $scope.localPdfUniverityDetails[0].Address;
@@ -392,8 +392,8 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 			
 			  doc.autoTableSetDefaults({
 				  styles: {cellPadding: 3.0, fontSize: 10},
-					headerStyles: {fillColor: [245, 245, 240], textColor: 0},
-					 
+					headerStyles: {fillColor: [245, 245, 240], textColor: 0}
+					 	  });
 						
 				
 			  var firstTableID = tableid+i;
@@ -444,23 +444,23 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 				doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
 				
 				doc.setFontSize(22);
-				doc.text(200,50,$scope.universityNamePDF);
+				doc.text(160,50,$scope.universityNamePDF);
 				doc.setFontSize(10);
-				doc.text(200,65,$scope.universityAddressPDF);
+				doc.text(160,65,$scope.universityAddressPDF);
 				doc.setFontSize(10);
-				doc.text(200,80,$scope.universityEmailPDF);
+				doc.text(160,88,$scope.universityEmailPDF);
 				
 				doc.rect(45, 100, 400, 60);
 				doc.rect(445, 100, 100, 60);
 				doc.line(45, 125, 445, 125);
 				doc.setFontSize(10);
 				doc.setFontType("bold");
-				doc.text(110,115,examName);
+				doc.text(80,115,examName);
 				
 				doc.setFontType("normal");
-				doc.text(70,140,rollNo);
-				doc.text(280,140,stuName);
-				doc.text(70,155,centerName);
+				doc.text(50,140,rollNo);
+				doc.text(230,140,stuName);
+				doc.text(50,155,centerName);
 				
 				//footer content
 				var footerNote1  ="Note :    1. Without Identification Card Candidates shallnot Allowed to write for examination.";
@@ -481,7 +481,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 			 
 			
               var autoTableEndPosYvalue = 0;
-			  sem1 = "";
+			  
 			  if(sem1 == "")
 			  {
 				  autoTableEndPosYvalue = 200;
@@ -670,23 +670,23 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 				doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
 				
 				doc.setFontSize(22);
-				doc.text(200,50,$scope.universityNamePDF);
+				doc.text(160,50,$scope.universityNamePDF);
 				doc.setFontSize(10);
-				doc.text(200,65,$scope.universityAddressPDF);
+				doc.text(160,65,$scope.universityAddressPDF);
 				doc.setFontSize(10);
-				doc.text(200,80,$scope.universityEmailPDF);
+				doc.text(160,88,$scope.universityEmailPDF);
 				
 				doc.rect(45, 100, 400, 60);
 				doc.rect(445, 100, 100, 60);
 				doc.line(45, 125, 445, 125);
 				doc.setFontSize(10);
 				doc.setFontType("bold");
-				doc.text(110,115,examName);
+				doc.text(80,115,examName);
 				
 				doc.setFontType("normal");
-				doc.text(70,140,rollNo);
-				doc.text(280,140,stuName);
-				doc.text(70,155,centerName);
+				doc.text(50,140,rollNo);
+				doc.text(230,140,stuName);
+				doc.text(50,155,centerName);
 				
 				//footer content
 				var footerNote1  ="Note :    1. Without Identification Card Candidates shallnot Allowed to write for examination.";
@@ -724,7 +724,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 				doc.autoTable(sem2.columns, sem2.data, options);
 				
 			  }
-			  /
+			  
 			  
 			  if(sem2 != "" || sem1 != "")
 			  {

Apollo/assets/views/hallticket/hallTicketPDF.html

@@ -57,7 +57,7 @@
 					<!-- <th colspan="6">SEMESTER</th> -->
 				<!-- </tr> -->
 				<tr>
-					<th width="5%">sem/year</th><th width="10%">Subject Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
+					<th width="5%">sem/year</th><th width="10%">Paper Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -75,7 +75,7 @@
 			<thead>
 				
 				<tr>
-					<th width="5%">sem/year</th><th width="10%">Subject Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
+					<th width="5%">sem/year</th><th width="10%">Paper Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -92,7 +92,7 @@
 			<thead>
 				
 				<tr>
-					<th width="5%">sem/year</th><th width="10%">Subject Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
+					<th width="5%">sem/year</th><th width="10%">Paper Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -109,7 +109,7 @@
 			<thead>
 				
 				<tr>
-					<th width="5%">sem/year</th><th width="10%">Subject Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
+					<th width="5%">sem/year</th><th width="10%">Paper Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -126,7 +126,7 @@
 			<thead>
 				
 				<tr>
-					<th width="5%">sem/year</th><th width="10%">Subject Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
+					<th width="5%">sem/year</th><th width="10%">Paper Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -146,7 +146,7 @@
 			<thead>
 				
 				<tr>
-					<th width="5%">sem/year</th><th width="10%">Subject Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
+					<th width="5%">sem/year</th><th width="10%">Paper Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
 				</tr>
 				</thead>
 				<tbody>

Apollo/assets/views/partials/nav.html

@@ -341,6 +341,7 @@
 			</li>
 		</ul>
 	</li>
+	
 	<li ng-class="{'active open':$state.includes('app.reregistration')}">
 			<a href="javascript:void(0)">
 			<div class="item-content">
@@ -348,7 +349,7 @@
 					<i class="ti-write"></i>
 				</div>
 				<div class="item-inner">
-					<span class="title" translate="sidebar.nav.master.REREGISTRATION"> RE REGISTRATION </span>
+					<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span>
 				</div>
 			</div>
 		</a>
@@ -356,20 +357,18 @@
 		<ul class="sub-menu">
 			<li ui-sref-active="active">
 				<a ui-sref="app.reregistration.reregistrationform" ng-click="checkSuperAdmin()">
-					<span class="title" translate="sidebar.nav.reregistration.REREGISTRATIONFORM">RE REGISTRATION FORM</span>
+					<span class="title" translate="sidebar.nav.reregistration.REREGISTRATIONFORM">REREGISTRATIONFORM</span>
+				</a>
+			</li>
+			<li ui-sref-active="active">
+				<a ui-sref="app.reregistration.batchmovement" ng-click="checkSuperAdmin()">
+					<span class="title" translate="sidebar.nav.reregistration.BATCHMOVEMENT">BATCHMOVEMENT</span>
 				</a>
 			</li>
 			
 		</ul>
-		<ul class="sub-menu">
-				<li ui-sref-active="active">
-					<a ui-sref="app.reregistration.batchmoment" ng-click="checkSuperAdmin()">
-						<span class="title" translate="sidebar.nav.reregistration.BATCHMOMENT">RE REGISTRATION FORM</span>
-					</a>
-				</li>
-				
-			</ul>
 	</li>
+	
 	<li ng-class="{'active open':$state.includes('app.reports')}">
 		<a href="javascript:void(0)">
 			<div class="item-content">

Apollo/assets/views/reregistration/batchmoment.html

@@ -1,49 +0,0 @@
-<style>
-    b.fa {
-        display: inline-block;
-        border-radius: 60px;
-        box-shadow: 0px 0px 2px #FF6600;
-        padding: 0.5em 0.6em;
-
-
-    }
-    b.fa1 {
-        display: inline-block;
-        border-radius: 60px;
-        box-shadow: 0px 0px 2px green;
-        padding: 0.5em 0.6em;
-
-
-    }
-    a {
-        color: #007AFF;
-    }
-
-</style>
-<!-- start: PAGE TITLE -->
-<section id="page-title">
-    <div class="row">
-        <div class="col-sm-8">
-
-            <h1 class="mainTitle" translate="BATCH MOMENT">{{ mainTitle }}</h1>
-
-            <span class="mainDescription">BATCH MOMENT </span>
-
-        </div>
-        <div ncy-breadcrumb></div>
-    </div>
-</section>
-<!-- end: PAGE TITLE -->
-<!-- start: LIST GROUP -->
- 
-<div class="container-fluid container-fullw bg-white" ng-controller="BatchmomentCtrl" data-ng-init="init()">
-	    </div>
-		
-
- 
-<!-- end: LIST GROUP -->
-
-
-
-
-

Apollo/assets/views/reregistration/promotebatch.html

@@ -0,0 +1,154 @@
+<style>
+    b.fa {
+        display: inline-block;
+        border-radius: 60px;
+        box-shadow: 0px 0px 2px #FF6600;
+        padding: 0.5em 0.6em;
+
+
+    }
+    b.fa1 {
+        display: inline-block;
+        border-radius: 60px;
+        box-shadow: 0px 0px 2px green;
+        padding: 0.5em 0.6em;
+
+
+    }
+    a {
+        color: #007AFF;
+    }
+
+</style>
+<!-- start: PAGE TITLE -->
+<section id="page-title">
+    <div class="row">
+        <div class="col-sm-8">
+
+            <h1 class="mainTitle" translate="PROMOTE BATCH">{{ mainTitle }}</h1>
+
+            <span class="mainDescription">Promote Students From One Batch To Next Batch</span>
+
+        </div>
+        <div ncy-breadcrumb></div>
+    </div>
+</section>
+<!-- end: PAGE TITLE -->
+<!-- start: LIST GROUP -->
+ 
+<div class="container-fluid container-fullw bg-white" ng-controller="BatchmomentCtrl" data-ng-init="init()">
+
+<fieldset>
+                <legend>Search</legend>
+                <div class="col-md-12 ">
+                    
+                    <div class="col-md-3 form-group">
+                        <label>
+                            University
+                        </label>
+                        <select  class="form-control" name="university" tabindex="1" id="university" 
+                                ng-model="myModel.universityName"
+                                ng-options="i.universityName for i in university" ng-change="">
+                            <option value=""> Select University</option>
+                        </select>
+						 <!-- <pre>{{myModel.universityName | json}}</pre>-->
+
+                    </div>
+                    <!-- <div class="col-md-3 form-group"> -->
+                        <!-- <label> -->
+                            <!-- Course -->
+                        <!-- </label> -->
+                        <!-- <select ui-select2 class="form-control" name="course" tabindex="4" id="course" -->
+                                <!-- ng-model="myModel.courseName" ng-change="captureCourseName();"> -->
+                            <!-- <option value=""> Select Course</option> -->
+							<!-- <option ng-repeat="courseDetails in myModel.universityName.courseDetails"  value="{{courseDetails.CourseID}}"><span ng-show="courseDetails.CourseCode != ''"><strong>{{courseDetails.CourseName}}</strong></span></option> -->
+                        <!-- </select> -->
+						
+						<!-- <!-- <pre>{{myModel.courseName|json}}</pre> --> -->
+                    <!-- </div> -->
+					
+							<div class="col-md-2 form-group">
+							
+							 <label>
+                           Batch Name
+								</label>
+								<select ui-select2 class="form-control" name="batch" tabindex="4" id="batch"
+										ng-model="myModel.batchName" ng-change="captureBatchName()"
+										>
+									<option value=""> Select Batch</option>
+									<option ng-repeat="batchDetails in myModel.universityName.batchDetails"  value="{{batchDetails.BatchCode}}"><span ng-show="batchDetails.BatchCode != ''"><strong>{{batchDetails.BatchName}}</strong></span></option>
+								</select>
+						<!-- <pre>{{myModel.batchName | json}}</pre> -->
+							</div>
+							
+							<div class="col-md-2 form-group">
+						
+						<br>                   
+                                             <button type="button" ladda="ldloading1.zoom_in" tabindex="5" class="btn btn-wide btn-info" data-style="zoom-in" ng-click="getStudentDetails(Form,myModel);">GET STUDENTS</button>
+						</div>
+					
+
+                </div>
+				   <div class="row">
+				<div class="col-md-12" ng-if="isLoaderShow">
+					<center> <h1>{{isLoaderTxt}}</h1> </center>
+				</div>
+			</div>
+			
+			<div class="row">
+			<div class="col-md-12" ng-if="isTblShow">
+			<div class="table-responsive">
+                                <table class="table table-hover">
+                                    <thead>
+                                        <tr>
+										<th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);" class="form-control"></th>
+                                            <th ng-click="sort('Firstname')">Student Name
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
+                                            <!-- <th ng-click="sort('UniversityShortName')">University Short Name -->
+                                                <!-- <span class="glyphicon sort-icon" ng-show="sortKey=='UniversityShortName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> -->
+                                            <!-- </th> -->
+                                            <th ng-click="sort('MobileNumber')">Mobile No
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
+                                            <th ng-click="sort('EmailID')">EmailID
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
+											<!-- <th>Status</th> -->
+                                            <!-- <th style="text-align: center;"> Action -->
+                                            <!-- </th> -->
+                                        </tr>
+                                    </thead>
+                                    <tbody dir-paginate="p in studentInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
+                                        <tr>
+										<td><input type="checkbox" ng-checked="myModel.all" id="{{p.StudentID}}" name="{{p.StudentID}}" class="form-control" ng-click="isClick($event);"></td>
+										<td>{{p.Firstname}}{{p.Lastname}}</td>
+                                            <!-- <td>{{p.UniversityShortName}}</td> -->
+                                            <td>{{p.MobileNumber}}</td>
+                                            <td>{{p.EmailID}}</td>
+											
+										</tr>
+										</tbody>
+
+                                </table>
+                                <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                                </dir-pagination-controls>
+
+                            </div>
+						</div>
+					</div>
+			
+			
+					
+
+            </fieldset>
+	    </div>
+		
+
+ 
+<!-- end: LIST GROUP -->
+
+
+
+
+