Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dineshkumarkannan 2018-06-18 12:06:37 +05:30
commit a22e36affe
29 changed files with 908 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Apollo/api/application/config/database.php
View File

@ -76,9 +76,12 @@ $query_builder = TRUE;
$db['default'] = array(
'dsn' => '',
'hostname' => 'apollodec.com',
'username' => 'apollod4_DEV',
'password' => 'apollo1234',
'database' => 'apollod4_ApolloDECDev',
'username' => 'apollod4_SIT',
'password' => 'apollosit1234',
'database' => 'apollod4_ApolloDECNEWSIT',
// 'username' => 'apollod4_DEV',
// 'password' => 'apollo1234',
// 'database' => 'apollod4_ApolloDECDev',
'dbdriver' => 'mysqli',
'dbprefix' => '',
'pconnect' => FALSE,

4
Apollo/api/application/config/routes.php
View File

@ -269,6 +269,10 @@ $route['getSheduleDetails'] = 'HallTickets_Controller/getSheduleDetails';
$route['getUniversityCourseId'] = 'HallTickets_Controller/getUniversityCourseId';
$route['saveBatchSchedule'] = 'HallTickets_Controller/SaveAllBatchSchedule';
///PROMOTE BATCH AND RE REG
$route['getUniversityBatchDetails'] = 'Reregister_Controller/getUniversityBatchDetails';
$route['getStudentListForPromoteBatch'] = 'Reregister_Controller/getStudentListForPromoteBatch';
//Reports
$route['report_status'] = 'Report/status';
$route['report_filters'] = 'Report/filters';

42
Apollo/api/application/controllers/Reregister_Controller.php
View File

@ -28,7 +28,49 @@ class Reregister_Controller extends REST_Controller {
}
// For Get University and Batch Details for PROMOTE BATCH MODULE
public function getUniversityBatchDetails_post()
{
$branchId = $this->post('branchId');
$getUnivBatchDetails = $this->Reregister_model->getUniversityBatchDetails($branchId);
if ($getUnivBatchDetails)
{
$getUnivBatchDetails['status'] = REST_Controller::HTTP_OK;
$this->response($getUnivBatchDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else
{
// Set the response and exit
$this->response([
'message' => 'No records found!',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
//Get student list for promote Batch Listing Screen
public function getStudentListForPromoteBatch_post()
{
$UID = $this->post('university');
$batch = $this->post('batch');
$branchId = $this->post('branchId');
$res = $this->Reregister_model->getStudentListForPromoteBatchmodal($UID,$batch,$branchId);
if(count($res) > 0)
{
$data['status'] = REST_Controller::HTTP_OK;
$data['studentStatus'] = true;
$data['studentDetails'] = $res;
$this->response($data, REST_Controller::HTTP_OK);
}
else
{
$this->response([
'message' => 'Something Went Wrong!',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND);
}
}

3
Apollo/api/application/models/Fees_status_model.php
View File

@ -34,7 +34,8 @@ class Fees_status_model extends CI_Model
$this->db->where('ST.MobileNumber',$search['MobileNumber']);
}
if($search['Firstname']!=''){
$this->db->like('ST.Firstname',$search['Firstname'],'after');
// $this->db->like('ST.Firstname','%'.$search['Firstname'].'%');
$this->db->like('ST.Firstname',$search['Firstname'],'both');
}
if($search['UniversityID']!=''){
$this->db->where('STC.UniversityID',$search['UniversityID']);

25
Apollo/api/application/models/Hallticket_model.php
View File

@ -169,13 +169,15 @@ class Hallticket_model extends CI_Model
* */
public function getCourseDetails($universityID=null,$branchId)
{
$this->db->select('CourseID,CONCAT(CourseName, "(",CourseCode,")") AS CourseName');
$this->db->select('T_CourseMaster.CourseID,CONCAT(T_CourseMaster.CourseName, "(",T_CourseMaster.CourseCode,")") AS CourseName,T_Course_Fees_Details.ProgramType,T_Course_Fees_Details.FeesType,T_Course_Fees_Details.Sem_Year');
$this->db->join('T_Course_Fees_Details','T_CourseMaster.CourseID = T_Course_Fees_Details.CourseID');
$this->db->where('UniversityID',$universityID);
$this->db->where('BranchCode',$branchId);
$this->db->where('IsActive','1');
$this->db->group_by('CourseName');
$this->db->order_by('CourseID','ASC');
$courseDetails = $this->db->get(COURSE);
$courseDetails = $this->db->get('T_CourseMaster');
return $courseDetails->result();
}
@ -224,6 +226,15 @@ class Hallticket_model extends CI_Model
* */
public function saveAllSemesterSubjectMappingmodel($UID,$courseIDS,$requestedBy,$branchId,$semArray)
{
// echo "from MODEL";
// print_r($courseIDS);die();
$tempCourseArray = array();
foreach($courseIDS as $c)
{
$tempCourseArray[] = $c['CourseID'];
}
$sem1 = 0;$sem2=0;$sem3=0;$sem4=0;$sem5=0;$sem6=0;$sem7=0;$sem8 = 0;
foreach($semArray as $key => $s)
{
@ -262,7 +273,7 @@ class Hallticket_model extends CI_Model
$this->db->from('T_SemSubMap_Master');
$this->db->where('BranchCode',$branchId);
$this->db->where('UniversityID',$UID);
$this->db->where_in('CourseID',$courseIDS);
$this->db->where_in('CourseID',$tempCourseArray);
$isExist = $this->db->get();
$isExist = $isExist->result();
$result_array = array('insert'=>'','exist'=>'');
@ -274,7 +285,7 @@ class Hallticket_model extends CI_Model
$ids = array();
foreach($courseIDS as $course)
foreach($tempCourseArray as $course)
{
for($i=1;$i<=8;$i++)
{
@ -431,10 +442,11 @@ class Hallticket_model extends CI_Model
* */
public function getAllSemesterSubjectsmodel($branchId)
{
$this->db->select('T_SemSubMap_Master.UniversityID,T_UniversityMaster.UniversityName,T_CourseMaster.CourseID,T_CourseMaster.CourseCode,T_CourseMaster.CourseName');
$this->db->select('T_SemSubMap_Master.UniversityID,T_UniversityMaster.UniversityName,T_CourseMaster.CourseID,T_CourseMaster.CourseCode,T_CourseMaster.CourseName,T_Course_Fees_Details.ProgramType,T_Course_Fees_Details.FeesType,T_Course_Fees_Details.Sem_Year');
$this->db->from('T_SemSubMap_Master');
$this->db->join('T_UniversityMaster','T_SemSubMap_Master.UniversityID=T_UniversityMaster.UniversityID and T_SemSubMap_Master.BranchCode=T_UniversityMaster.BranchCode') ;
$this->db->join('T_CourseMaster','T_SemSubMap_Master.CourseID=T_CourseMaster.CourseID and T_SemSubMap_Master.BranchCode=T_CourseMaster.BranchCode');
$this->db->join('T_Course_Fees_Details','T_SemSubMap_Master.CourseID=T_Course_Fees_Details.CourseID and T_CourseMaster.CourseID=T_Course_Fees_Details.CourseID');
$this->db->group_by('T_SemSubMap_Master.UniversityID,T_SemSubMap_Master.CourseID');
$res = $this->db->get();
return $res->result();
@ -479,6 +491,8 @@ class Hallticket_model extends CI_Model
* */
public function updateAllSemesterSubjectMappingmodel($UID,$courseIDS,$requestedBy,$branchId,$semArray)
{
//echo $courseIDS;die();
$sem1 = 0;$sem2=0;$sem3=0;$sem4=0;$sem5=0;$sem6=0;$sem7=0;$sem8 = 0;
foreach($semArray as $key => $s)
{
@ -678,6 +692,7 @@ class Hallticket_model extends CI_Model
public function getStudentListForHallTicketmodel($UID,$courseID,$batch,$requestedBy,$branchId)
{
$this->db->distinct();
$this->db->select('T_StudentDetails.StudentID,T_StudentDetails.MobileNumber,T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_StudentDetails.EmailID,T_StudentDetails.ProfilePicPath,T_Student_CourseDetails.EnrollmentID');
$this->db->from('T_Students_Fees_Status');
$this->db->join('T_StudentDetails','T_Students_Fees_Status.StudentID=T_StudentDetails.StudentID and T_StudentDetails.IsActive = 1');

89
Apollo/api/application/models/Reregister_model.php
View File

@ -12,5 +12,94 @@ class Reregister_model extends CI_Model
{
public function getUniversityBatchDetails($branchId)
{
$this->db->select('UniversityID,UniversityName');
$this->db->where('IsActive','1');
$this->db->where('BranchCode',$branchId);
$this->db->order_by('UniversityID','ASC');
$unviversityDetails = $this->db->get(UNIVERSITY);
if($unviversityDetails->result()){
$result_university = array();
$result_university['universityStatus'] = true;
foreach ($unviversityDetails->result() as $row)
{
$university_array['universityID'] = $row->UniversityID;
$university_array['universityName'] = $row->UniversityName;
//$university_array['courseDetails']= $this->getCourseDetails($row->UniversityID,$branchId);
$university_array['batchDetails']= $this->getBatchDetails($row->UniversityID,$branchId);
$result_array[]=$university_array;
}
$result_university['univerSityDetails']= $result_array;
//$result_university['centerDetails'] = $this->getCenterDetails($branchId);
}
else {
$result_university['universityStatus'] = false;
$result_university['message'] = "No records found!";
$result_university['universityID'] = "";
$result_university['universityName'] = "";
$result_university['courseDetails']= "";
}
return $result_university;
}
public function getBatchDetails($UniversityID,$branchId)
{
$this->db->select("BatchID,BatchCode,BatchName,str_to_date( BatchDate,'%d-%m-%Y') as BD");
$this->db->from('T_BatchMaster');
$this->db->where('UniversityID',$UniversityID);
$this->db->where('IsActive',1);
$this->db->where('BranchCode',$branchId);
$this->db->order_by("BD","DESC");
$res = $this->db->get();
return $res->result();
}
public function getStudentListForPromoteBatchmodal($UID,$batch,$branchId)
{
$this->db->select('T_StudentDetails.StudentID,T_StudentDetails.MobileNumber,T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_StudentDetails.EmailID');
$this->db->from('T_Students_Fees_Status');
$this->db->join('T_StudentDetails','T_Students_Fees_Status.StudentID=T_StudentDetails.StudentID and T_StudentDetails.IsActive = 1');
$this->db->join('T_Course_Fees_Details','T_Students_Fees_Status.CourseID = T_Course_Fees_Details.CourseID and T_Students_Fees_Status.FeesType = T_Course_Fees_Details.ID and T_Course_Fees_Details.ProgramType = "Y001" and T_Course_Fees_Details.FeesType = "F002" and T_StudentDetails.IsActive = 1' );
$this->db->where('T_Students_Fees_Status.BatchCode',$batch);
$this->db->where('T_Students_Fees_Status.BranchCode',$branchId);
$res = $this->db->get();
$data = $res->result();
return $data;
// $result_array = array();
// if(count($data) > 0)
// {
// $result_array = array();
// $prestu = "";
// foreach($data as $r)
// {
// if($prestu != $r->StudentID)
// {
// $studetdetails['StudentID'] = $r->StudentID;
// $studetdetails['MobileNumber'] = $r->MobileNumber;
// $studetdetails['Firstname'] = $r->Firstname;
// $studetdetails['Lastname'] = $r->Lastname;
// $studetdetails['EmailID'] = $r->EmailID;
// $studetdetails['ProfilePicPath'] = $r->ProfilePicPath;
// $studetdetails['EnrollmentID'] = $r->EnrollmentID;
// $studetdetails['FeeDetails'] = $this->getFeeSemesterDetails($r->StudentID,$batch,$branchId,$courseID);
// $result_array[] = $studetdetails;
// $prestu = $r->StudentID;
// }
// }
// }
// return $result_array;
}
}

4
Apollo/api/application/models/Studentview_model.php
View File

@ -198,7 +198,7 @@ class Studentview_model extends CI_Model
$serachArray=[WAIVER,REFERRAL];
$this->db->distinct();
$this->db->select('SFS.FeesID,SFS.FeesType,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,CF.Sem_Year,CF.FeesType as CourseFeesType,SM.SessionName,SM1.SessionName as ToSessionName,CF.ProgramType,BA.BatchName,BA.BatchDate');
$this->db->select('SFS.FeesID,SFS.FeesType,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,CF.Sem_Year,CF.FeesType as CourseFeesType,SM.SessionName,SM1.SessionName as ToSessionName,CF.ProgramType,BA.BatchName,BA.BatchDate,BA.BatchCode');
$this->db->from(STUDENTS_FEES_STATUS.' as SFS');
$this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = SFS.SessionName');
$this->db->join(SESSIONMASTER.' as SM1', 'SM1.SessionID = SFS.ToSessionName','left');
@ -264,6 +264,7 @@ class Studentview_model extends CI_Model
$storePaidDetails['StudentPaidAmount']=$studentPaidAmount[0]->StudentPaidAmount;
$storePaidDetails['BatchName'] = $feeRow->BatchName;
$storePaidDetails['BatchDate'] = $feeRow->BatchDate;
$storePaidDetails['BatchCode'] = $feeRow->BatchCode;
// for get paid bill details
// for get paid bill details
@ -371,6 +372,7 @@ class Studentview_model extends CI_Model
$storePaidDetails['StudentPaidAmount']=$studentPaidAmount[0]->StudentPaidAmount;
$storePaidDetails['BatchName'] = "Not Applicable";
$storePaidDetails['BatchDate'] = "";
$storePaidDetails['BatchCode'] = "";
// for get paid bill details
$this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo,BR.BranchName,BR.Address,BR.LogoPath,STF.Firstname as ReceivedBy');

2
Apollo/assets/i18n/en.json
View File

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

15
Apollo/assets/js/BatchmomentCtrl.js
View File

@ -1,15 +0,0 @@
'use strict';
/**
* controllers for ng-table
* Simple table with sorting and filtering on AngularJS
*/
app.controller('BatchmomentCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state","$modal","$log", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,$modal,$log) {
$scope.myModel = {
"universityName":"",
"courseName":"",
"batchName":""
};
}]);

2
Apollo/assets/js/config.constant.js
View File

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

10
Apollo/assets/js/config.router.js
View File

@ -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'
}
});

174
Apollo/assets/js/controllers/BatchmomentCtrl.js Normal file
View File

@ -0,0 +1,174 @@
'use strict';
/**
* This Controller for Promote Students Funcitonality.
* Simple table with sorting and filtering on AngularJS
*/
app.controller('BatchmomentCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state","$modal","$log", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,$modal,$log) {
$scope.myModel = {
"universityName":"",
"batchName":"",
"batchID":""
};
$scope.isTblShow = false;
$scope.isLoader = false;
$scope.isLoaderShow = false;
$scope.isLoaderTxt = "Loading...";
/*
* init function
* created by velz
* */
$scope.init = function () {
var getUniv = {
method: 'POST',
url: apiPoint.url + 'getUniversityBatchDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
branchId:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(getUniv).then(function (response) {
if (response.data.status==200 && response.data.universityStatus) {
$scope.university = response.data.univerSityDetails;
} else {
swal('University Not Found','','error');
$scope.university = "";
}
});
}
$scope.getStudentDetails = function () {
if($scope.myModel.universityName == null || $scope.myModel.universityName == '' || $scope.myModel.universityName == undefined){
swal('Select University','','warning');
return false;
}
if($scope.myModel.batchName == null || $scope.myModel.batchName == '' || $scope.myModel.batchName == undefined){
swal('Select Batch','','warning');
return false;
}
$scope.selectedStudentsID = [];
$scope.isLoaderShow = true;
$scope.myModel.all = false;
$scope.isTblShow = false;
var university = $scope.myModel.universityName;
var batch = $scope.myModel.batchName;
var getStudents = {
method: 'POST',
url: apiPoint.url + 'getStudentListForPromoteBatch/',
headers: {
'Content-Type': 'application/json'
},
data: {
university: university,
batch:batch,
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
}
};
$http(getStudents).then(function (response) {
if (response.data.status == 200 && response.data.studentStatus) {
$scope.studentInfo = response.data.studentDetails;
$scope.isLoaderShow = false;
$scope.isTblShow = true;
}
else
{
$scope.studentInfo="";
$scope.isLoaderShow = true;
$scope.isTblShow = false;
$scope.isLoaderTxt = "No Records Found";
}
},function(error){
$scope.isLoaderShow = true;
$scope.isTblShow = false;
$scope.isLoaderTxt = "No Records Found";
});
}
$scope.selectedStudentsID = [];
$scope.isClick = function(e)
{
var ide = e.target;
var val = (ide.checked ? true : false);
var sid = e.target.id;
angular.forEach($scope.studentInfo,function(value,key){
if(sid == value.StudentID)
{
sid = value;
}
});
var pos = $scope.selectedStudentsID.indexOf(sid);
if(val)
{
if( pos == -1)
{
$scope.selectedStudentsID.push(sid);
}
}
else
{
$scope.selectedStudentsID.splice(pos,1);
}
}
$scope.isCheckAll = function(e)
{
var val = (e.target.checked ? true : false);
if(val)
{
var len = $scope.studentInfo.length;
var i = 0;
for(i=0;i<len;i++)
{
if($scope.selectedStudentsID.indexOf($scope.studentInfo[i]) === -1)
{
$scope.selectedStudentsID.push($scope.studentInfo[i]);
}
}
}
else
{
$scope.selectedStudentsID = [];
}
}
}]);

28
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -1876,26 +1876,18 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
* created by kms
* */
$scope.calculateDueAmount = function (beforeTot,afterTot) {
if(parseInt(beforeTot)<parseInt(afterTot)){
$scope.finalTotAmt=parseInt(afterTot)-parseInt(beforeTot);
$scope.getInsTotAmt=0;
for(var i=0;i<$rootScope.updateMoreItems.length-1;i++){
$scope.getInsTotAmt=parseInt($scope.getInsTotAmt) + parseInt($rootScope.updateMoreItems[i].Amount);
}
if(parseInt(afterTot)>0 && parseInt(afterTot)>parseInt($scope.getInsTotAmt)){
$scope.finalTotAmt=parseInt(afterTot)-parseInt($scope.getInsTotAmt);
$rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount = parseInt($scope.finalTotAmt);
}
else{
$scope.finalTotAmt=parseInt(afterTot)-parseInt(beforeTot);
}
if($rootScope.updateMoreItems.length>0){
if(parseInt($scope.finalTotAmt)>0){
$rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount = parseInt($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount) + parseInt($scope.finalTotAmt);
}
else{
if(parseInt($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount)<parseInt($scope.finalTotAmt)){
$rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount=0;
}
else{
$rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount=parseInt($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount) + parseInt($scope.finalTotAmt);
}
}
$scope.finalTotAmt=0;
$rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount = parseInt($scope.finalTotAmt);
}

301
Apollo/assets/js/controllers/generateHallTicketCtrl.js
View File

@ -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;
@ -339,8 +339,8 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
if(value.StudentID)
{
if(hallticket_type == 'SEM' || hallticket_type == 'REG' || hallticket_type == 'LAT'){
if(hallticket_type == 'REG' || hallticket_type == 'LAT'){
console.log('REGLAT');
var semlength = value.FeeDetails.length;
if(hallticket_type == 'REG' || hallticket_type == 'LAT')
{
@ -391,9 +391,9 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
var tableid = value.StudentID;
doc.autoTableSetDefaults({
styles: {cellPadding: 3.0, fontSize: 10},
headerStyles: {fillColor: [245, 245, 240], textColor: 0},
styles: {cellPadding: 3.0, fontSize: 8},
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,14 +481,14 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
var autoTableEndPosYvalue = 0;
sem1 = "";
if(sem1 == "")
{
autoTableEndPosYvalue = 200;
}
else
{
autoTableEndPosYvalue = 350;
autoTableEndPosYvalue = 300;
}
var options2 = {
@ -540,7 +540,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
else if(hallticket_type == 'YEAR')
{
console.log('YEAR');
var semlength = value.FeeDetails.length;
var i = 0;
for(i = 0; i <= semlength;i++)
@ -583,45 +583,45 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
var sem1 = "";
var sem2 = "";
// var sem2 = "";
var tableid = value.StudentID;
doc.autoTableSetDefaults({
styles: {cellPadding: 3.0, fontSize: 10},
styles: {cellPadding: 3.0, fontSize: 8},
headerStyles: {fillColor: [245, 245, 240], textColor: 0},
});
var firstTableID = "0";
var SecTableID = "1";
//var SecTableID = "1";
switch(i)
{
case 0:
var firstTableID = tableid+'year10';
var SecTableID = tableid+'year11';
//var SecTableID = tableid+'year11';
semName = 'YEAR1';
break;
case 1:
var firstTableID = tableid+'year20';
var SecTableID = tableid+'year21';
//var SecTableID = tableid+'year21';
semName = 'YEAR2';
break;
case 2:
var firstTableID = tableid+'year30';
var SecTableID = tableid+'year31';
//var SecTableID = tableid+'year31';
semName = 'YEAR3';
break;
case 4:
var firstTableID = tableid+'year40';
var SecTableID = tableid+'year41';
//var SecTableID = tableid+'year41';
semName = 'YEAR4';
break;
@ -637,17 +637,14 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
}
if(document.getElementById(SecTableID))
{
// if(document.getElementById(SecTableID))
// {
var sem2 = doc.autoTableHtmlToJson(document.getElementById(SecTableID));
// var sem2 = doc.autoTableHtmlToJson(document.getElementById(SecTableID));
}
// }
if(sem1 != "")
{
doc.autoTable(sem1.columns, sem1.data, {margin: {top: 170},theme:'grid'});
}
@ -670,23 +667,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.";
@ -711,22 +708,27 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
addPageContent: header,
margin: {
top: 100
top: 170
},
startY: doc.autoTableEndPosY() + 20,
//startY: doc.autoTableEndPosY() + 20,
theme :'grid'
};
if(sem2 != "")
if(sem1 != "")
{
doc.autoTable(sem2.columns, sem2.data, options);
doc.autoTable(sem1.columns, sem1.data, options);
}
// if(sem2 != "")
// {
// doc.autoTable(sem2.columns, sem2.data, options);
}
/
// }
if(sem2 != "" || sem1 != "")
if(sem1 != "")
{
doc.save(fileName);
}
@ -735,6 +737,209 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
}//End of semlength for loop
}//END OF YEAR HALL TICKET TYPE
else if(hallticket_type == 'SEM' ){
console.log('SEM');
var semlength = value.FeeDetails.length;
var i = 0;
for(i = 0; i < semlength;i++)
{
var fileName = "DEFAULT.pdf";
var margins = {
top: 70,
bottom: 40,
left: 30,
width: 550
};
var doc = new jsPDF('p', 'pt');
//convert img to base 64
var img = document.getElementById("logo")
var canvas = document.createElement("canvas");
canvas.width = 100;
canvas.height = 100;
var ctx = canvas.getContext("2d");
ctx.drawImage(img, 0, 0,100,100);
var dataURL = canvas.toDataURL("image/png");
//console.log('***'+dataURL);
//convert img to base 64
//convert img to base 64
var profile = document.getElementById("sprofile")
var canvas2 = document.createElement("canvas");
canvas2.width = 100;
canvas2.height = 100;
var ctx2 = canvas2.getContext("2d");
ctx2.drawImage(profile, 0, 0,100,100);
var profiledataURL = canvas2.toDataURL("image/png",1.0);
//convert img to base 64
var sem1 = "";
//var sem2 = "";
var tableid = value.StudentID;
doc.autoTableSetDefaults({
styles: {cellPadding: 3.0, fontSize: 8},
headerStyles: {fillColor: [245, 245, 240], textColor: 0}
});
var firstTableID = tableid+i;
// var SecTableID = (tableid+(i+1));
if(document.getElementById(firstTableID))
{
var sem1 = doc.autoTableHtmlToJson(document.getElementById(firstTableID));
}
// if(document.getElementById(SecTableID))
// {
// var sem2 = doc.autoTableHtmlToJson(document.getElementById(SecTableID));
// }
var header = function(data) {
var examName = 'ADMIT CARD : '+$scope.courseNamePDF+' EXAMINATION ' +$scope.batchNamePDF;
var rollNo = 'Reg No : '+value.EnrollmentID;
var stuName = 'Name : '+value.Firstname+' '+value.Lastname;
var centerName = 'Centre : '+$scope.centerNamePDF;
// if(hallticket_type == 'SEM' || hallticket_type == 'REG')
// {
// var semName = 'SEM'+(i+1)+'&'+(i+2);
// }
// else if(hallticket_type == 'LAT')
// {
// var semName = 'SEM'+(i+3)+'&'+(i+4);
// }
var semName = 'SEM'+(i+1);
fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf';
doc.setDrawColor(0);
doc.setFillColor(245, 245, 240);
doc.rect(150, 30, 395, 60,'FD');
doc.setFontSize(12);
doc.setTextColor(40);
doc.setFontStyle('normal');
doc.addImage(dataURL, 'jpeg', 75, 35, 50, 50);//university logo location
doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
doc.setFontSize(22);
doc.text(160,50,$scope.universityNamePDF);
doc.setFontSize(10);
doc.text(160,65,$scope.universityAddressPDF);
doc.setFontSize(10);
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(80,115,examName);
doc.setFontType("normal");
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.";
var footerNote2 ="2. For further instructions refer to the facing sheet of the Answer book before writting examination.";
var footerNote3 ="3. Carrying Mobile phone to the examination hall is strictly prohibited.";
var footerNote4 ="4. Attend the examintaion as per mentioned above.";
var footerNote_student_sign ="Signature of the Student";
var footerNote_controller_sign ="Controller of Examination";
doc.setFontSize(8);
doc.text(40,doc.internal.pageSize.height - 150,footerNote1);
doc.text(70,doc.internal.pageSize.height - 140,footerNote2);
doc.text(70,doc.internal.pageSize.height - 130,footerNote3);
doc.text(70,doc.internal.pageSize.height - 120,footerNote4);
doc.text(40,doc.internal.pageSize.height - 50,footerNote_student_sign);
doc.text(450,doc.internal.pageSize.height - 50,footerNote_controller_sign);
};
// var autoTableEndPosYvalue = 0;
// if(sem1 == "")
// {
// autoTableEndPosYvalue = 200;
// }
// else
// {
// autoTableEndPosYvalue = 300;
// }
// var options2 = {
// addPageContent: header,
// margin: {
// top: 100
// },
// startY: doc.autoTableEndPosY() + autoTableEndPosYvalue,
// theme :'grid'
// };
var options1 = {
addPageContent: header,
margin: {
top: 200
},
theme :'grid'
};
if(sem1 != "")
{
doc.autoTable(sem1.columns, sem1.data, options1);
}
// if(sem2 != "")
// {
// doc.autoTable(sem2.columns, sem2.data, options2);
// }
if(sem2 != "" || sem1 != "")
{
doc.save(fileName);
}
}//End of semlength for loop
}
}// END of studentID Check

110
Apollo/assets/js/controllers/semcoursemapCtrl.js
View File

@ -30,6 +30,16 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.semDetailsLoadingStatus = false;
$scope.semDetailsLoadingTxt = "";
$scope.label1 = "";
$scope.label2 = "";
$scope.label3 = "";
$scope.label4 = "";
$scope.viewLabel1 = "";//FOr View Page
$scope.viewLlabel2 = "";//FOr View Page
$scope.viewLlabel3 = "";//FOr View Page
$scope.viewLlabel4 = "";//FOr View Page
$scope.selectedCourseName = [];
$scope.selectedUniversityCourseName = '';
@ -125,6 +135,7 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.testFun = function(){
$scope.selectedUniversityCourseName = $scope.myModel.universityName.courseDetails;
//console.log($scope.selectedUniversityCourseName);
if($scope.selectedUniversityCourseName.length == 0){ swal('No Courses Available','','info'); }
$scope.selectedCourseNameC = {
list: $scope.selectedCourseName,
@ -158,7 +169,8 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
}
else
{
//console.log(UID+'-'+COURSES.list);
//alert($scope.prevoiusSelectedCouseType);
if(UID == undefined || UID == '')
{
@ -170,8 +182,24 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
swal("Select Course");
return false;
}
//console.log(JSON.parse(localStorage.getItem('localObj')));
//return false;
if($scope.prevoiusSelectedCouseType.toUpperCase() == 'EAR')
{
$scope.label1 = "Year 1";
$scope.label2 = "Year 2";
$scope.label3 = "Year 3";
$scope.label4 = "Year 4";
$scope.courseMode = 1;
}
else
{
$scope.label1 = "Semester 1";
$scope.label2 = "Semester 3";
$scope.label3 = "Semester 5";
$scope.label4 = "Semester 7";
$scope.courseMode = 0;
}
$scope.semDropDownShowLoading = false;
$scope.semDropDownShow = false;
$scope.semDropDownShowLoading = true;
@ -285,6 +313,8 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.saveAll = function()
{
//swal('SAVEALL',$scope.myModel.universityName.universityID,'warning');
var universityID = $scope.myModel.universityName.universityID;
var courseIDs = $scope.selectedCourseNameC.list;
var sem1 = $scope.selectedSubjetcsSem1C.list;
@ -296,16 +326,7 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
var sem7 = $scope.selectedSubjetcsSem7C.list;
var sem8 = $scope.selectedSubjetcsSem8C.list;
// console.log(universityID+'-'+courseIDs);
// console.log(courseIDs);
// console.log(sem1);
// console.log(sem2);
// console.log(sem3);
// console.log(sem4);
// console.log(sem5);
// console.log(sem6);
// console.log(sem7);
// console.log(sem8);
var semestersArray = [];
for(var i = 1; i<= 8 ;i++)
{
@ -428,9 +449,35 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
}
$scope.setEditId = function (uid,cid)
$scope.setEditId = function (uid,cid,PT,FT,SY)
{
//alert(uid+'-'+cid);
//alert(uid+'-'+cid+'-'+PT+'-'+FT+'-'+SY);
var courseModewithoutnum = "";
if(PT == 'Y001' && FT == 'F002')
{
var courseMode = (SY.toUpperCase()).substr(-4);
courseModewithoutnum = courseMode.substr(0,3);
//alert(courseModewithoutnum);
if((courseModewithoutnum.toUpperCase()) == 'EAR')
{
$scope.viewLabel1 = 'Year 1';
$scope.viewLabel2 = 'Year 2';
$scope.viewLabel3 = 'Year 3';
$scope.viewLabel4 = 'Year 4';
$scope.viewPageCourseMode = 1;
}
else
{
$scope.viewLabel1 = 'Semester 1';
$scope.viewLabel2 = 'Semester 3';
$scope.viewLabel3 = 'Semester 5';
$scope.viewLabel4 = 'Semester 7';
$scope.viewPageCourseMode = 0;
}
}
$scope.editUniversityId = uid;
$scope.editCourseId = cid;
$scope.getIndividualCourseSemMappingDetails(uid,cid);
@ -583,10 +630,10 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
}
};
$http(updateAllInfo).then(function(response) {
console.log(response);
if(response.data.status == 200 && response.data.txtStatus)
{
//console.log(response);
$scope.updateButtonTxt = "SAVED";
swal('Saved!','Good Job','success')
$state.go($state.current, {}, {reload: true});
@ -599,5 +646,34 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
}
$scope.prevoiusSelectedCouseType = "";
$scope.checkCourseMode = function(item)
{
if(item['ProgramType'] == "Y001" && item['FeesType'] == "F002")
{
var tempString = item['Sem_Year'];
var courseMode = (tempString.toUpperCase()).substr(-4);
var courseModewithoutnum = courseMode.substr(0,3);
if($scope.prevoiusSelectedCouseType != "" && $scope.prevoiusSelectedCouseType != courseModewithoutnum)
{
swal('Semester and Year Mode Combination Not Accepted','Please Select Either Year Mode OR Semester Mode Courses','info');
$scope.selectedCourseNameC.list = "";
$scope.prevoiusSelectedCouseType = "";
$scope.semDropDownShow = false;
return false;
}
$scope.prevoiusSelectedCouseType = courseModewithoutnum;
}
}
}]);

2
Apollo/assets/js/main.js
View File

@ -14,7 +14,7 @@ function ($rootScope, $state, $stateParams) {
// set below basic information
$rootScope.app = {
name: 'Apollo', // name of your project
author: 'Venba Information technology', // author's name or company name
author: 'Apollo Distance Education Center', // author's name or company name
description: 'Distance Education Center', // brief description
version: '1.0', // current version
year: ((new Date()).getFullYear()), // automatic current year (for copyright information)

12
Apollo/assets/views/hallticket/hallTicketPDF.html
View File

@ -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>

56
Apollo/assets/views/hallticket/semcoursemap.html
View File

@ -84,7 +84,7 @@
<td>{{p.CourseName}}({{p.CourseCode}})</td>
<td style="text-align: center;">
<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.UniversityID}}" value="Edit"
ng-click="setEditId(p.UniversityID,p.CourseID);">
ng-click="setEditId(p.UniversityID,p.CourseID,p.ProgramType,p.FeesType,p.Sem_Year);">
</td>
</tr>
<tr ng-show="editUniversityId === p.UniversityID && editCourseId === p.CourseID" ng-if="editUniversityId === p.UniversityID && editCourseId === p.CourseID">
@ -104,12 +104,12 @@
</div>
<div class="row" ng-if="viewPageSemDropDownShow">
<label><b>Year 1-Subjetcs</b></label>
<!-- <label><b>Year 1-Subjetcs</b></label> -->
<div class="col-md-12">
<div class="col-md-6 form-group">
<label>
<b>Semester 1 </b>
<b>{{viewLabel1}}</b>
</label>
<ui-select multiple ng-model="selectedSubjetcsSem1ViewPage.list" tabindex="4" id="sem1" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem1ViewPage.list);" on-remove="itemRemove($item);">
@ -125,7 +125,7 @@
</div>
<div class="col-md-6 form-group">
<div class="col-md-6 form-group" ng-if="viewPageCourseMode == 0">
<label>
<b>Semester 2</b>
</label>
@ -146,12 +146,12 @@
</div>
<hr>
<div class="row" ng-if="viewPageSemDropDownShow">
<label><b>Year 2-Subjetcs</b></label>
<!-- <label><b>Year 2-Subjetcs</b></label> -->
<div class="col-md-12 ">
<div class="col-md-6 form-group">
<label>
<b>Semester 3</b>
<b>{{viewLabel2}}</b>
</label>
<ui-select multiple ng-model="selectedSubjetcsSem3ViewPage.list" tabindex="6" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem3ViewPage.list);" on-remove="itemRemove($item);">
@ -172,7 +172,7 @@
<div class="col-md-6 form-group">
<div class="col-md-6 form-group" ng-if="viewPageCourseMode == 0">
<label>
<b>Semester 4</b>
</label>
@ -193,12 +193,12 @@
</div>
<hr>
<div class="row" ng-if="viewPageSemDropDownShow">
<label><b>Year 3-Subjetcs</b></label>
<!-- <label><b>Year 3-Subjetcs</b></label> -->
<div class="col-md-12 ">
<div class="col-md-6 form-group">
<label>
<b>Semester 5</b>
<b>{{viewLabel3}}</b>
</label>
<ui-select multiple ng-model="selectedSubjetcsSem5ViewPage.list" tabindex="8" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem5ViewPage.list);" on-remove="itemRemove($item);">
@ -214,7 +214,7 @@
</div>
<div class="col-md-6 form-group">
<div class="col-md-6 form-group" ng-if="viewPageCourseMode == 0">
<label>
<b>Semester 6</b>
</label>
@ -235,12 +235,12 @@
</div>
<hr>
<div class="row" ng-if="viewPageSemDropDownShow">
<label><b>Year 4-Subjetcs</b></label>
<!-- <label><b>Year 4-Subjetcs</b></label> -->
<div class="col-md-12 ">
<div class="col-md-6 form-group">
<label>
<b>Semester 7</b>
<b>{{viewLabel4}}</b>
</label>
<ui-select multiple ng-model="selectedSubjetcsSem7ViewPage.list" tabindex="10" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem7ViewPage.list);" on-remove="itemRemove($item);">
@ -256,7 +256,7 @@
</div>
<div class="col-md-6 form-group">
<div class="col-md-6 form-group" ng-if="viewPageCourseMode == 0">
<label>
<b>Semester 8</b>
</label>
@ -327,17 +327,17 @@
</label>
<ui-select multiple ng-model="selectedCourseNameC.list" tabindex="2" >
<ui-select multiple ng-model="selectedCourseNameC.list" tabindex="2" on-select = "checkCourseMode($item);">
<ui-select-match placeholder="Select Courses" >
{{$item.CourseName}}
</ui-select-match>
<ui-select-choices
repeat="x.CourseID as x in selectedUniversityCourseName | filter:$select.search">
repeat="x as x in selectedUniversityCourseName | filter:$select.search">
{{x.CourseName}}
</ui-select-choices>
</ui-select>
<!-- <pre>{{selectedCourseNameC.list | json}}</pre> -->
<pre>{{selectedCourseNameC.list | json}}</pre>
</div>
<div class="col-md-3 form-group">
@ -357,12 +357,12 @@
</div>
<div class="row" ng-if="semDropDownShow">
<label><b>Year 1-Subjetcs</b></label>
<!-- <label><b>Year 1-Subjetcs</b></label> -->
<div class="col-md-12">
<div class="col-md-6">
<label>
Semester 1
{{label1}}
</label>
<ui-select multiple ng-model="selectedSubjetcsSem1C.list" tabindex="4" id="sem1" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem1C.list);">
@ -378,7 +378,7 @@
</div>
<div class="col-md-6 form-group">
<div class="col-md-6 form-group" ng-if="courseMode == 0">
<label>
Semester 2
</label>
@ -400,12 +400,12 @@
<div class="row" ng-if="semDropDownShow">
<hr>
<label><b>Year 2-Subjetcs</b></label>
<!-- <label><b>Year 2-Subjetcs</b></label> -->
<div class="col-md-12">
<div class="col-md-6 form-group">
<label>
Semester 3
{{label2}}
</label>
<ui-select multiple ng-model="selectedSubjetcsSem3C.list" tabindex="6" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem3C.list);">
@ -426,7 +426,7 @@
<div class="col-md-6 form-group">
<div class="col-md-6 form-group" ng-if="courseMode == 0">
<label>
Semester 4
</label>
@ -448,12 +448,12 @@
<div class="row" ng-if="semDropDownShow">
<hr>
<label><b>Year 3-Subjetcs</b></label>
<!-- <label><b>Year 3-Subjetcs</b></label> -->
<div class="col-md-12">
<div class="col-md-6 form-group">
<label>
Semester 5
{{label3}}
</label>
<ui-select multiple ng-model="selectedSubjetcsSem5C.list" tabindex="8" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem5C.list);">
@ -469,7 +469,7 @@
</div>
<div class="col-md-6 form-group">
<div class="col-md-6 form-group" ng-if="courseMode == 0">
<label>
Semester 6
</label>
@ -491,12 +491,12 @@
<div class="row" ng-if="semDropDownShow">
<hr>
<label><b>Year 4-Subjetcs</b></label>
<!-- <label><b>Year 4-Subjetcs</b></label> -->
<div class="col-md-12">
<div class="col-md-6 form-group">
<label>
Semester 7
{{label4}}
</label>
<ui-select multiple ng-model="selectedSubjetcsSem7C.list" tabindex="10" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem7C.list);">
@ -512,7 +512,7 @@
</div>
<div class="col-md-6 form-group">
<div class="col-md-6 form-group" ng-if="courseMode == 0">
<label>
Semester 8
</label>

2
Apollo/assets/views/login_login.html
View File

@ -614,7 +614,7 @@ ng-minlength="6" required/>
<div class="copyright">
© 2018 VENBA INFORMATION TECHNOLOGY. All rights reserved
© 2018 Apollo Distance Education Center. All rights reserved
</div>

21
Apollo/assets/views/partials/nav.html
View File

@ -341,14 +341,15 @@
</li>
</ul>
</li>
<li ng-class="{'active open':$state.includes('app.reregistration')}">
<a href="javascript:void(0)">
<div class="item-content">
<div class="item-media">
<i class="ti-write"></i>
<i class="ti-rocket"></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">

49
Apollo/assets/views/reregistration/batchmoment.html
View File

@ -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 -->

154
Apollo/assets/views/reregistration/promotebatch.html Normal file
View File

@ -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-3 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();">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 -->

3
Apollo/assets/views/status-update/fees_status.html
View File

@ -53,11 +53,12 @@
<span class="error text-small block"
ng-if="Form.mobilenumber.$error.maxlength || Form.mobilenumber.$error.minlength || Form.mobilenumber.$error.pattern">Enter a valid mobile number</span>
</div>
<div class="col-md-3 form-group">
<label>
Student Name
Student First Name
</label>
<input type="text" placeholder="Search Student Name"

2
Apollo/assets/views/status-update/setFeesForStudent.html
View File

@ -156,7 +156,7 @@
<input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="11" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="9"
ng-model="setModel.feesType.ActualFees" ng-pattern="/^[0-9]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" required/>
ng-model="setModel.feesType.ActualFees" ng-pattern="/^[0-9]*$/" ng-disabled="userType=='R002'" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" required/>
<span class="error text-small block"
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
ng-hide="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Fees amount is required</span>

2
Apollo/assets/views/student/studentDetailsModal.html
View File

@ -265,7 +265,7 @@
<span>{{fees.FeesName}}</span>
</td>
<td>
<span>{{fees.BatchName}}</span><span ng-if="fees.BatchDate!='' && fees.BatchDate!=null">&nbsp;({{fees.BatchDate}})</span>
<span>{{fees.BatchName}}</span><span ng-if="fees.BatchCode!='' && fees.BatchCode!=null">&nbsp;({{fees.BatchCode}})</span>
</td>
<td ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">{{fees.SessionName}}/{{fees.ToSessionName}}</td>
<td ng-if="course.feesDetails[0].ProgramType=='Y001'">{{fees.SessionName}}</td>

2
Apollo/assets/views/student/studentView.html
View File

@ -283,7 +283,7 @@
<span>{{fees.FeesName}}</span>
</td>
<td>
<span>{{fees.BatchName}}</span><span ng-if="fees.BatchDate!='' && fees.BatchDate!=null">&nbsp;({{fees.BatchDate}})</span>
<span>{{fees.BatchName}}</span><span ng-if="fees.BatchCode!='' && fees.BatchCode!=null">&nbsp;({{fees.BatchCode}})</span>
</td>
<td ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">{{fees.SessionName}}/{{fees.ToSessionName}}</td>
<td ng-if="course.feesDetails[0].ProgramType=='Y001'">{{fees.SessionName}}</td>

BIN
Apollo/images/university/Dri_0Litx9Mo8TkS.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
Apollo/images/university/Dri_RWnpeVXBKMuD.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
Apollo/images/university/Dri_xjR7i1TZw2Ln.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB