diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php index f8df5be8..2e630305 100755 --- a/Apollo/api/application/config/database.php +++ b/Apollo/api/application/config/database.php @@ -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, diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 05e314d7..a17e6779 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -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'; diff --git a/Apollo/api/application/controllers/Reregister_Controller.php b/Apollo/api/application/controllers/Reregister_Controller.php index 89eac9e0..8c5c9091 100644 --- a/Apollo/api/application/controllers/Reregister_Controller.php +++ b/Apollo/api/application/controllers/Reregister_Controller.php @@ -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); + } + } diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 5fbfe46b..9188c1f1 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -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']); diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index ab0f3740..5946a068 100755 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -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'); diff --git a/Apollo/api/application/models/Reregister_model.php b/Apollo/api/application/models/Reregister_model.php index cba1a571..1af927dc 100644 --- a/Apollo/api/application/models/Reregister_model.php +++ b/Apollo/api/application/models/Reregister_model.php @@ -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; + + } } \ No newline at end of file diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 01b65713..a3e59507 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -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'); diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 5b672ee0..57d37362 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -163,7 +163,7 @@ "reregistration":{ "MAIN":"RE REGISTRATION", "REREGISTRATIONFORM":"RE REGISTRATION FORM", - "BATCHMOMENT":"BATCH MOMENT" + "BATCHMOVEMENT":"PROMOTE BATCH" } } }, diff --git a/Apollo/assets/js/BatchmomentCtrl.js b/Apollo/assets/js/BatchmomentCtrl.js deleted file mode 100644 index 31e6d86a..00000000 --- a/Apollo/assets/js/BatchmomentCtrl.js +++ /dev/null @@ -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":"" - }; - - - -}]); \ No newline at end of file diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 13a08b54..aa1b619e 100755 --- a/Apollo/assets/js/config.constant.js +++ b/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', diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 9d4a5582..fc9fff63 100755 --- a/Apollo/assets/js/config.router.js +++ b/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' } }); diff --git a/Apollo/assets/js/controllers/BatchmomentCtrl.js b/Apollo/assets/js/controllers/BatchmomentCtrl.js new file mode 100644 index 00000000..54f27adc --- /dev/null +++ b/Apollo/assets/js/controllers/BatchmomentCtrl.js @@ -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;i0 && 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)SEMESTER --> - sem/yearSubject CodeSubject NameDateTimeInvigi.sign + Sem/YearPaper CodeSubject NameDateTimeInvigi.sign @@ -75,7 +75,7 @@ - sem/yearSubject CodeSubject NameDateTimeInvigi.sign + Sem/YearPaper CodeSubject NameDateTimeInvigi.sign @@ -92,7 +92,7 @@ - sem/yearSubject CodeSubject NameDateTimeInvigi.sign + Sem/YearPaper CodeSubject NameDateTimeInvigi.sign @@ -109,7 +109,7 @@ - sem/yearSubject CodeSubject NameDateTimeInvigi.sign + Sem/YearPaper CodeSubject NameDateTimeInvigi.sign @@ -126,7 +126,7 @@ - sem/yearSubject CodeSubject NameDateTimeInvigi.sign + Sem/YearPaper CodeSubject NameDateTimeInvigi.sign @@ -146,7 +146,7 @@ - sem/yearSubject CodeSubject NameDateTimeInvigi.sign + Sem/YearPaper CodeSubject NameDateTimeInvigi.sign diff --git a/Apollo/assets/views/hallticket/semcoursemap.html b/Apollo/assets/views/hallticket/semcoursemap.html index 3278290d..5a865799 100755 --- a/Apollo/assets/views/hallticket/semcoursemap.html +++ b/Apollo/assets/views/hallticket/semcoursemap.html @@ -84,7 +84,7 @@ {{p.CourseName}}({{p.CourseCode}}) + ng-click="setEditId(p.UniversityID,p.CourseID,p.ProgramType,p.FeesType,p.Sem_Year);"> @@ -104,12 +104,12 @@
- +
@@ -125,7 +125,7 @@
-
+
@@ -146,12 +146,12 @@
- +
@@ -172,7 +172,7 @@ -
+
@@ -193,12 +193,12 @@
- +
@@ -214,7 +214,7 @@
-
+
@@ -235,12 +235,12 @@
- +
@@ -256,7 +256,7 @@
-
+
@@ -327,17 +327,17 @@ - + {{$item.CourseName}} + repeat="x as x in selectedUniversityCourseName | filter:$select.search"> {{x.CourseName}} - + 
{{selectedCourseNameC.list | json}}
@@ -357,12 +357,12 @@
- +
@@ -378,7 +378,7 @@
-
+
@@ -400,12 +400,12 @@
- +
@@ -426,7 +426,7 @@ -
+
@@ -448,12 +448,12 @@
- +
@@ -469,7 +469,7 @@
-
+
@@ -491,12 +491,12 @@
- +
@@ -512,7 +512,7 @@
-
+
diff --git a/Apollo/assets/views/login_login.html b/Apollo/assets/views/login_login.html index 2738434e..473758e6 100755 --- a/Apollo/assets/views/login_login.html +++ b/Apollo/assets/views/login_login.html @@ -614,7 +614,7 @@ ng-minlength="6" required/>
- © 2018 VENBA INFORMATION TECHNOLOGY. All rights reserved + © 2018 Apollo Distance Education Center. All rights reserved
diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 88ab98ac..c55de2c9 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -341,14 +341,15 @@ +
  • - +
    - RE REGISTRATION + REREGISTRATION
    @@ -356,20 +357,18 @@ -
    • +
  • diff --git a/Apollo/assets/views/reregistration/batchmoment.html b/Apollo/assets/views/reregistration/batchmoment.html deleted file mode 100644 index 348bd776..00000000 --- a/Apollo/assets/views/reregistration/batchmoment.html +++ /dev/null @@ -1,49 +0,0 @@ - - -
    -
    -
    - -

    {{ mainTitle }}

    - - BATCH MOMENT - -
    -
    -
    -
    - - - -
    -
    - - - - - - - - - diff --git a/Apollo/assets/views/reregistration/promotebatch.html b/Apollo/assets/views/reregistration/promotebatch.html new file mode 100644 index 00000000..92e4f39e --- /dev/null +++ b/Apollo/assets/views/reregistration/promotebatch.html @@ -0,0 +1,154 @@ + + +
    +
    +
    + +

    {{ mainTitle }}

    + + Promote Students From One Batch To Next Batch + +
    +
    +
    +
    + + + +
    + +
    + Search +
    + +
    + + + + +
    + + + + + + + + + + + + + +
    + + + + +
    + +
    + +
    + +
    + + +
    +
    +
    +

    {{isLoaderTxt}}

    +
    +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Student Name + + Mobile No + + EmailID + +
    {{p.Firstname}}{{p.Lastname}}{{p.MobileNumber}}{{p.EmailID}}
    + + + +
    +
    +
    + + + + +
    +
    + + + + + + + + + diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html index 3a0e3bf9..44b53fbd 100755 --- a/Apollo/assets/views/status-update/fees_status.html +++ b/Apollo/assets/views/status-update/fees_status.html @@ -53,11 +53,12 @@ Enter a valid mobile number +
    + ng-model="setModel.feesType.ActualFees" ng-pattern="/^[0-9]*$/" ng-disabled="userType=='R002'" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" required/> Fees amount is required diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index 14cd95c1..a84ecbec 100755 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -265,7 +265,7 @@ {{fees.FeesName}} - {{fees.BatchName}} ({{fees.BatchDate}}) + {{fees.BatchName}} ({{fees.BatchCode}}) {{fees.SessionName}}/{{fees.ToSessionName}} {{fees.SessionName}} diff --git a/Apollo/assets/views/student/studentView.html b/Apollo/assets/views/student/studentView.html index 61123a3f..abf78e90 100755 --- a/Apollo/assets/views/student/studentView.html +++ b/Apollo/assets/views/student/studentView.html @@ -283,7 +283,7 @@ {{fees.FeesName}} - {{fees.BatchName}} ({{fees.BatchDate}}) + {{fees.BatchName}} ({{fees.BatchCode}}) {{fees.SessionName}}/{{fees.ToSessionName}} {{fees.SessionName}} diff --git a/Apollo/images/university/Dri_0Litx9Mo8TkS.jpeg b/Apollo/images/university/Dri_0Litx9Mo8TkS.jpeg new file mode 100644 index 00000000..62d2480c Binary files /dev/null and b/Apollo/images/university/Dri_0Litx9Mo8TkS.jpeg differ diff --git a/Apollo/images/university/Dri_RWnpeVXBKMuD.jpeg b/Apollo/images/university/Dri_RWnpeVXBKMuD.jpeg new file mode 100644 index 00000000..6b802bae Binary files /dev/null and b/Apollo/images/university/Dri_RWnpeVXBKMuD.jpeg differ diff --git a/Apollo/images/university/Dri_xjR7i1TZw2Ln.jpeg b/Apollo/images/university/Dri_xjR7i1TZw2Ln.jpeg new file mode 100644 index 00000000..6b802bae Binary files /dev/null and b/Apollo/images/university/Dri_xjR7i1TZw2Ln.jpeg differ