HALLTICKET SEMMAPPING BATCHSCHDEULE PROMOTEBATCH EXAMATTENDANCE PROD ISSUES FIXED
This commit is contained in:
velz
parent
95bbdc4c3b
commit
f0aeb0cbfe
@ -427,6 +427,8 @@ class HallTickets_Controller extends REST_Controller {
|
||||
$center = $this->post('center');
|
||||
//print_r($center);die();
|
||||
$res = $this->Hallticket_model->getStudentListForHallTicketmodel($UID,$courseID,$batch,$requestedBy,$branchId,$center);
|
||||
// echo "CON";
|
||||
// print_r($res);die();
|
||||
if(count($res) > 0)
|
||||
{
|
||||
$data['status'] = REST_Controller::HTTP_OK;
|
||||
|
||||
@ -697,7 +697,7 @@ class Hallticket_model extends CI_Model
|
||||
$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,T_Hallticket_Master.HallTicket_ID,T_Hallticket_Student_Details.HallTicket_ID as isFlag');
|
||||
$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_Student_CourseDetails','T_StudentDetails.StudentID = T_Student_CourseDetails.StudentID');
|
||||
$this->db->join('T_Student_CourseDetails','T_StudentDetails.StudentID = T_Student_CourseDetails.StudentID and T_Students_Fees_Status.CourseID = T_Student_CourseDetails.CourseID');
|
||||
$this->db->join('T_Hallticket_Master','T_Students_Fees_Status.CourseID = T_Hallticket_Master.CourseID and T_Students_Fees_Status.BatchCode = T_Hallticket_Master.BatchCode and T_Students_Fees_Status.BranchCode = T_Hallticket_Master.BranchCode and T_Hallticket_Master.CenterID='.$center['CenterID'],'left');
|
||||
$this->db->join('T_Hallticket_Student_Details','T_Hallticket_Master.HallTicket_ID = T_Hallticket_Student_Details.HallTicket_ID and T_Students_Fees_Status.StudentID = T_Hallticket_Student_Details.StudentID','left');
|
||||
$this->db->where('T_Students_Fees_Status.BatchCode',$batch);
|
||||
@ -706,7 +706,7 @@ class Hallticket_model extends CI_Model
|
||||
|
||||
$res = $this->db->get();
|
||||
$data = $res->result();
|
||||
//print_r($data);die();
|
||||
|
||||
$result_array = array();
|
||||
if(count($data) > 0)
|
||||
{
|
||||
|
||||
@ -14,6 +14,7 @@ app.controller('BatchmomentCtrl', ["$scope","$rootScope","toaster", "$filter", "
|
||||
$scope.isTblShow = false;
|
||||
$scope.isLoader = false;
|
||||
$scope.isLoaderShow = false;
|
||||
$scope.isSubLoaderShow = false;
|
||||
$scope.isLoaderTxt = "Loading...";
|
||||
$scope.isShowNxtBatch = false;
|
||||
$scope.getStudentButtonTxt = 'GET STUDENTS';
|
||||
@ -71,6 +72,7 @@ $scope.promoteButtonStatus = false;
|
||||
$scope.getStudentButtonTxt = 'PLEASE WAIT';
|
||||
$scope.selectedStudentsID = [];
|
||||
$scope.isLoaderShow = true;
|
||||
$scope.isSubLoaderShow = false;
|
||||
$scope.myModel.all = false;
|
||||
$scope.isTblShow = false;
|
||||
var university = $scope.myModel.universityName;
|
||||
@ -101,16 +103,18 @@ $scope.promoteButtonStatus = false;
|
||||
{
|
||||
$scope.studentInfo="";
|
||||
$scope.isLoaderShow = true;
|
||||
$scope.isSubLoaderShow = true;
|
||||
$scope.isTblShow = false;
|
||||
$scope.isLoaderTxt = "No Records Found/ No Next Batch available";
|
||||
$scope.isLoaderTxt = "No Records Found";
|
||||
$scope.isShowNxtBatch = false;
|
||||
$scope.nextBatchDetails = "";
|
||||
$scope.getStudentButtonTxt = 'GET STUDENTS';
|
||||
}
|
||||
},function(error){
|
||||
$scope.isLoaderShow = true;
|
||||
$scope.isSubLoaderShow = true;
|
||||
$scope.isTblShow = false;
|
||||
$scope.isLoaderTxt = "No Records Found/ No Next Batch available";
|
||||
$scope.isLoaderTxt = "No Records Found";
|
||||
$scope.isShowNxtBatch = false;
|
||||
$scope.nextBatchDetails = "";
|
||||
$scope.getStudentButtonTxt = 'GET STUDENTS';
|
||||
|
||||
@ -143,11 +143,12 @@ $scope.isLoaderTxt = "Loading...";
|
||||
$scope.studentInfoPM = [];
|
||||
angular.forEach($scope.studentInfo,function(value,key){
|
||||
|
||||
var dateType = $filter('date')(new Date(value.FromTime),'a');
|
||||
if(dateType == "AM")
|
||||
//var dateType = $filter('date')(new Date(value.FromTime),'a');
|
||||
var dateType = value.FromTime.substr(-2);
|
||||
if(dateType == "AM" || dateType == "am")
|
||||
{
|
||||
$scope.studentInfoAM.push(value);
|
||||
}else if(dateType == "PM")
|
||||
}else if(dateType == "PM" || dateType == "pm")
|
||||
{
|
||||
$scope.studentInfoPM.push(value);
|
||||
}
|
||||
@ -269,17 +270,17 @@ $scope.isLoaderTxt = "Loading...";
|
||||
var headerAM = function(data) {
|
||||
|
||||
var heading = $rootScope.pdfuname+' '+$rootScope.pdfbatch+' Examination'+' '+'Center'+' '+$rootScope.pdfcenter['CenterName']+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session';
|
||||
doc1.setFontSize(12);
|
||||
doc1.setFontSize(9);
|
||||
doc1.setFontStyle('bold');
|
||||
doc1.text(120,30,heading);
|
||||
doc1.text(50,30,heading);
|
||||
};
|
||||
|
||||
var headerPM = function(data) {
|
||||
|
||||
var heading = $rootScope.pdfuname+' '+$rootScope.pdfbatch+' Examination'+' '+'Center'+' '+$rootScope.pdfcenter['CenterName']+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session';
|
||||
doc2.setFontSize(12);
|
||||
doc2.setFontSize(9);
|
||||
doc2.setFontStyle('bold');
|
||||
doc2.text(120,30,heading);
|
||||
doc2.text(50,30,heading);
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -460,20 +460,21 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
|
||||
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.setFontSize(16);
|
||||
doc.text(150,50,$scope.universityNamePDF);
|
||||
doc.setFontSize(8);
|
||||
doc.text(160,65,$scope.universityAddressPDF);
|
||||
doc.setFontSize(10);
|
||||
doc.setFontSize(8);
|
||||
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.setFontSize(8);
|
||||
doc.setFontType("bold");
|
||||
doc.text(80,115,examName);
|
||||
doc.text(50,115,examName);
|
||||
|
||||
doc.setFontSize(10);
|
||||
doc.setFontType("normal");
|
||||
doc.text(50,140,rollNo);
|
||||
doc.text(230,140,stuName);
|
||||
@ -683,20 +684,21 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
|
||||
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.setFontSize(16);
|
||||
doc.text(150,50,$scope.universityNamePDF);
|
||||
doc.setFontSize(8);
|
||||
doc.text(160,65,$scope.universityAddressPDF);
|
||||
doc.setFontSize(10);
|
||||
doc.setFontSize(8);
|
||||
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.setFontSize(8);
|
||||
doc.setFontType("bold");
|
||||
doc.text(80,115,examName);
|
||||
doc.text(50,115,examName);
|
||||
|
||||
doc.setFontSize(10);
|
||||
doc.setFontType("normal");
|
||||
doc.text(50,140,rollNo);
|
||||
doc.text(230,140,stuName);
|
||||
@ -757,7 +759,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
|
||||
|
||||
|
||||
else if(hallticket_type == 'SEM' ){
|
||||
console.log('SEM');
|
||||
console.log('SEM*********df;lsjfo');
|
||||
var semlength = value.FeeDetails.length;
|
||||
|
||||
var i = 0;
|
||||
@ -859,21 +861,22 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
|
||||
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.setFontSize(17);
|
||||
doc.text(150,50,$scope.universityNamePDF);
|
||||
doc.setFontSize(8);
|
||||
doc.text(160,65,$scope.universityAddressPDF);
|
||||
doc.setFontSize(10);
|
||||
doc.setFontSize(8);
|
||||
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.setFontSize(8);
|
||||
doc.setFontType("bold");
|
||||
doc.text(80,115,examName);
|
||||
doc.text(50,115,examName);
|
||||
|
||||
doc.setFontType("normal");
|
||||
doc.setFontSize(10);
|
||||
doc.text(50,140,rollNo);
|
||||
doc.text(230,140,stuName);
|
||||
doc.text(50,155,centerName);
|
||||
|
||||
@ -334,7 +334,39 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
|
||||
|
||||
angular.forEach(subjectsDetails,function (value) {
|
||||
if((value.ScheduleDate!='' && value.ScheduleDate!=undefined) && (value.ScheduleStartTime!='' && value.ScheduleStartTime!=undefined) && (value.ScheduleEndTime!='' && value.ScheduleEndTime!=undefined)){
|
||||
|
||||
|
||||
// var timeToaddAM = "05:30:00";
|
||||
// var timeToaddPM = "15:30:00";
|
||||
// var tempDate = $filter('date')(value.ScheduleDate, 'yyyy-MM-dd');
|
||||
// var ScheduleStartTime = value.ScheduleStartTime;
|
||||
// var STARTAMPM = ScheduleStartTime.substr(-2);
|
||||
// var ScheduleStartTime = ScheduleStartTime.substr(0,5)+":00";
|
||||
// console.log('ScheduleStartTime'+ScheduleStartTime);
|
||||
// var timeToAddArr = "";
|
||||
// if(STARTAMPM == 'AM' || STARTAMPM == 'am')
|
||||
// {
|
||||
// timeToAddArr = timeToaddAM.split(":");
|
||||
// }else { timeToAddArr = timeToaddPM.split(":"); }
|
||||
// var ms = (60 * 60 * parseInt(timeToAddArr[0]) + 60 * (parseInt(timeToAddArr[1])) ) * 1000;
|
||||
// var newStartTime =new Date('1970-01-01T' + ScheduleStartTime ).getTime() + ms
|
||||
// var finalStartTime = new Date(newStartTime).toLocaleString('en-GB').slice(12 ,20);
|
||||
// finalStartTime = tempDate+'T'+finalStartTime+':000Z';
|
||||
// console.log(finalStartTime);
|
||||
|
||||
// var ScheduleEndTime = value.ScheduleEndTime;
|
||||
// var ENDAMPM = ScheduleEndTime.substr(-2);
|
||||
// var ScheduleEndTime = ScheduleEndTime.substr(0,5)+":00";
|
||||
// console.log('ScheduleEndTime'+ScheduleEndTime);
|
||||
// var timeToAddArr2 = '';
|
||||
// if(ENDAMPM == 'AM' || ENDAMPM == 'am')
|
||||
// {
|
||||
// timeToAddArr2 = timeToaddAM.split(":");
|
||||
// }else { timeToAddArr2 = timeToaddPM.split(":"); }
|
||||
// var ms2 = (60 * 60 * parseInt(timeToAddArr2[0]) + 60 * (parseInt(timeToAddArr2[1])) ) * 1000;
|
||||
// var newEndTime =new Date('1970-01-01T' + ScheduleEndTime ).getTime() + ms2
|
||||
// var finalEndTime = new Date(newEndTime).toLocaleString('en-GB').slice(12 ,20);
|
||||
// finalEndTime = tempDate+'T'+finalEndTime+':000Z';
|
||||
// console.log(finalEndTime);
|
||||
$scope.scheduledDetails.push({
|
||||
"universityID":myModel.universityName.universityID,
|
||||
//"courseID":courseDetails.list[0],
|
||||
@ -347,6 +379,8 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
|
||||
|
||||
}
|
||||
});
|
||||
//return false;
|
||||
|
||||
var saveAllInfo = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'saveBatchSchedule/',
|
||||
@ -370,12 +404,14 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
|
||||
//console.log(status);
|
||||
if (response.data.status==200)
|
||||
{
|
||||
swal(" ", "Saved successfully,", "success");
|
||||
$scope.init();
|
||||
swal(" Saved successfully", "", "success");
|
||||
//$scope.init();
|
||||
$state.go($state.current, {}, {reload: true});
|
||||
}
|
||||
},function(error){
|
||||
|
||||
swal('Some Thing Went Wrong!','Try Later','error')
|
||||
swal('Some Thing Went Wrong!','Try Later','error');
|
||||
$state.go($state.current, {}, {reload: true});
|
||||
|
||||
});
|
||||
|
||||
@ -424,11 +460,12 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
|
||||
swal("", "Saved Successfully.", "success");
|
||||
//$scope.editId = -1;
|
||||
// $scope.init();
|
||||
|
||||
$state.go($state.current, {}, {reload: true});
|
||||
|
||||
} else {
|
||||
$scope.ldloading[loading.replace('-', '_')] = false;
|
||||
swal("", response.data.message,"error");
|
||||
$state.go($state.current, {}, {reload: true});
|
||||
}
|
||||
});
|
||||
};
|
||||
@ -570,5 +607,29 @@ $scope.batchschedule={
|
||||
|
||||
},
|
||||
};
|
||||
|
||||
$scope.validateTime = function(time,ide){
|
||||
//alert(time);
|
||||
var tempTime = time;
|
||||
var tempID = ide.target.attributes.id.value;
|
||||
///console.log(tempID);
|
||||
var arrayTime = time.split(":");
|
||||
////console.log(!isNaN(arrayTime[0]));
|
||||
//console.log(!isNaN(arrayTime[1].substr(0,2)));
|
||||
//console.log(isNaN(arrayTime[1].substr(-2)));
|
||||
//return false;
|
||||
|
||||
if(time.length != 7 || isNaN(arrayTime[0]) || isNaN(arrayTime[1].substr(0,2)) || !isNaN(arrayTime[1].substr(-2))){
|
||||
swal('Wrong Time Format...!',' Enter as "09:00AM" ','error');
|
||||
document.getElementById(tempID).value = "";
|
||||
window.setTimeout(function ()
|
||||
{
|
||||
document.getElementById(tempID).focus();
|
||||
}, 0);
|
||||
//return false;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}]);
|
||||
@ -206,23 +206,26 @@
|
||||
<div class="col-md-3 form-group">
|
||||
<label class="text-blue"> <!--<b>Date</b>-->
|
||||
</label>
|
||||
<input type="text" tabindex="5" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.ScheduleDate"
|
||||
<input type="text" tabindex="4" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.ScheduleDate"
|
||||
is-open="startOpen" ng-init="startOpen = false" name="scheduleDate{{$index+1}}" id="scheduleDate{{$index+1}}" datepicker-options="dateOptions"
|
||||
placeholder="Select Date" close-text="Close"
|
||||
show-button-bar="true"/>
|
||||
</div>
|
||||
<div class="col-md-3" style="margin-top: -16px;">
|
||||
<div class="col-md-3" style="margin-top: 17px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>Start Time</b>
|
||||
</label>-->
|
||||
<timepicker class="control-label"
|
||||
ng-model="p.ScheduleStartTime"
|
||||
hour-step="hstep"
|
||||
minute-step="hstep"
|
||||
show-meridian="ismeridian"></timepicker>
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="p.ScheduleStartTime" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
<input type="text" placeholder="09:00AM"
|
||||
class="form-control" name="scheduleFromTime{{$index}}" id="scheduleFromTime{{$index}}" tabindex="4"
|
||||
ng-model="p.ScheduleStartTime" ng-pattern="" size="10" ng-blur="validateTime(p.ScheduleStartTime,$event);">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" style="margin-top: -16px;">
|
||||
<div class="col-md-3" style="margin-top: 17px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>End Time</b>
|
||||
</label>-->
|
||||
@ -232,12 +235,16 @@
|
||||
minute-step="hstep"
|
||||
show-meridian="ismeridian"></timepicker>-->
|
||||
|
||||
<timepicker class="control-label"
|
||||
ng-model="p.ScheduleEndTime"
|
||||
ng-change="changed()"
|
||||
hour-step="hstep"
|
||||
minute-step="hstep"
|
||||
show-meridian="ismeridian"></timepicker>
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="p.ScheduleEndTime" -->
|
||||
<!-- ng-change="changed()" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
|
||||
<input type="text" placeholder="10:00PM"
|
||||
class="form-control" name="scheduleEndTime{{$index}}" id="scheduleEndTime{{$index}}" tabindex="4"
|
||||
ng-model="p.ScheduleEndTime" ng-pattern="" size="10" ng-blur="validateTime(p.ScheduleEndTime,$event);">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -255,7 +262,7 @@
|
||||
<div class="pull-right">
|
||||
<br>
|
||||
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="3" class="btn btn-wide btn-primary" data-style="zoom-in" ng-disabled="saveButtonDisabled" ng-click="saveAll(myModel,selectedCourseNameC,subjects);">{{saveButtonTxt}}</button>
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="" class="btn btn-wide btn-primary" data-style="zoom-in" ng-disabled="saveButtonDisabled" ng-click="saveAll(myModel,selectedCourseNameC,subjects);">{{saveButtonTxt}}</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -49,6 +49,7 @@
|
||||
class="symbol required"></span>
|
||||
</label>-->
|
||||
<input type="text"
|
||||
tabindex="1"
|
||||
class="form-control "
|
||||
ng-click="startOpen = !startOpen"
|
||||
datepicker-popup="dd-MM-yyyy"
|
||||
@ -75,15 +76,18 @@
|
||||
Shedule Starting Time <span class="symbol required"></span>
|
||||
</label>-->
|
||||
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div style="margin-top: 35px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>Start Time</b>
|
||||
</label>-->
|
||||
<timepicker class="control-label"
|
||||
ng-model="s.FromTime"
|
||||
hour-step="hstep"
|
||||
minute-step="hstep"
|
||||
show-meridian="ismeridian"></timepicker>
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="s.FromTime" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
<input type="text" placeholder="09:00AM"
|
||||
class="form-control" name="scheduleFromTime{{$index}}" id="scheduleFromTime{{$index}}" tabindex="1"
|
||||
ng-model="s.FromTime" ng-pattern="" size="10" ng-blur="validateTime(s.FromTime,$event);">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -92,21 +96,25 @@
|
||||
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 form-group" style="margin-top: -34px;"
|
||||
<div style="margin-top: -34px;"
|
||||
ng-class="{'has-error':Form.ToTime.$dirty && Form.ToTime.$invalid, 'has-success':Form.batchcode.$valid}">
|
||||
<!--<label>
|
||||
Shedule Ending Time <span class="symbol required"></span>
|
||||
</label>-->
|
||||
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-3" style="margin-top: 0px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>Start Time</b>
|
||||
</label>-->
|
||||
<timepicker class="control-label"
|
||||
ng-model="s.ToTime"
|
||||
hour-step="hstep"
|
||||
minute-step="hstep"
|
||||
show-meridian="ismeridian"></timepicker>
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="s.ToTime" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
<input type="text" placeholder="09:00AM"
|
||||
class="form-control" name="scheduleEndTime{{$index}}" id="scheduleEndTime{{$index}}" tabindex="1"
|
||||
ng-model="s.ToTime" ng-pattern="" size="10" ng-blur="validateTime(s.ToTime,$event);">
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -126,11 +134,11 @@
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="submit" ladda="ldloading.zoom_in" tabindex="9" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateShedule(unsheduledetails);">
|
||||
<button type="submit" ladda="ldloading.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateShedule(unsheduledetails);">
|
||||
Save
|
||||
</button>
|
||||
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="10" value="Cancel"
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="3" value="Cancel"
|
||||
ng-click="cancel();">
|
||||
|
||||
</input>
|
||||
|
||||
@ -62,7 +62,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="sub in subjects">
|
||||
<td>0{{sub.SemesterID}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime | date :"hh:mm a"}} - {{sub.ToTime | date :"hh:mm: a"}}</td><td > </td>
|
||||
<td>0{{sub.SemesterID}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime }}</td><td > </td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
<!-- END OF SEMESTER TYPE STUDENTS-->
|
||||
<!-- FOR YEAR TYPE STUDENTS-->
|
||||
|
||||
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[0]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
|
||||
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[0]" ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
|
||||
<thead>
|
||||
|
||||
<tr>
|
||||
@ -80,7 +80,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="sub in sem">
|
||||
<td ng-if="$parent.$index == 0">0{{sub.SemesterID}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-1}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime | date :"hh:mm: a"}} - {{sub.ToTime | date :"hh:mm: a"}}</td><td > </td>
|
||||
<td ng-if="$parent.$index == 0">0{{sub.SemesterID}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-1}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime}}</td><td > </td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -97,7 +97,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="sub in sem">
|
||||
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-1}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-2}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime | date :"hh:mm: a"}} - {{sub.ToTime | date :"hh:mm: a"}}</td><td > </td>
|
||||
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-1}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-2}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime }} - {{sub.ToTime }}</td><td > </td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -114,7 +114,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="sub in sem">
|
||||
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-2}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-3}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime | date :"hh:mm: a"}} - {{sub.ToTime | date :"hh:mm: a"}}</td><td > </td>
|
||||
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-2}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-3}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime | date :"hh:mm: a"}}</td><td > </td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -131,7 +131,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="sub in sem">
|
||||
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-3}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-4}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime | date :"hh:mm: a"}} - {{sub.ToTime | date :"hh:mm: a"}}</td><td > </td>
|
||||
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-3}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-4}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime }} - {{sub.ToTime}}</td><td > </td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -151,7 +151,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="sub in subjects">
|
||||
<td>0{{sub.SemesterID}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime | date :"hh:mm: a"}} - {{sub.ToTime | date :"hh:mm: a"}}</td><td > </td>
|
||||
<td>0{{sub.SemesterID}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime }}</td><td > </td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
|
||||
@ -61,6 +61,13 @@
|
||||
<span class="title" translate="sidebar.nav.master.COURSE"> COURSE DETAILS </span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.hallTicket.semCourseMap" ng-click="checkSuperAdmin()">
|
||||
<span class="title" translate="sidebar.nav.hallTicket.COURSESEMESTERMAPPING">COURSE SEMESTER MAPPING</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.master.branch" ng-click="checkSuperAdmin()">
|
||||
<span class="title" translate="sidebar.nav.master.BRANCH"> BRANCH DETAILS </span>
|
||||
@ -342,11 +349,11 @@
|
||||
</a>
|
||||
|
||||
<ul class="sub-menu">
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.hallTicket.semCourseMap" ng-click="checkSuperAdmin()">
|
||||
<span class="title" translate="sidebar.nav.hallTicket.COURSESEMESTERMAPPING">COURSE SEMESTER MAPPING</span>
|
||||
</a>
|
||||
</li>
|
||||
<!-- <li ui-sref-active="active"> -->
|
||||
<!-- <a ui-sref="app.hallTicket.semCourseMap" ng-click="checkSuperAdmin()"> -->
|
||||
<!-- <span class="title" translate="sidebar.nav.hallTicket.COURSESEMESTERMAPPING">COURSE SEMESTER MAPPING</span> -->
|
||||
<!-- </a> -->
|
||||
<!-- </li> -->
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkSuperAdmin()">
|
||||
<span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span>
|
||||
@ -538,7 +545,11 @@
|
||||
<span class="title" translate="sidebar.nav.master.COURSE"> COURSE DETAILS </span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.hallTicket.semCourseMap" ng-click="checkAdmin()">
|
||||
<span class="title" translate="sidebar.nav.hallTicket.COURSESEMESTERMAPPING">COURSE SEMESTER MAPPING</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<!--<li ui-sref-active="active">
|
||||
<a ui-sref="app.master.branch">
|
||||
@ -770,11 +781,11 @@
|
||||
</a>
|
||||
|
||||
<ul class="sub-menu">
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.hallTicket.semCourseMap" ng-click="checkAdmin()">
|
||||
<span class="title" translate="sidebar.nav.hallTicket.COURSESEMESTERMAPPING">COURSE SEMESTER MAPPING</span>
|
||||
</a>
|
||||
</li>
|
||||
<!-- <li ui-sref-active="active"> -->
|
||||
<!-- <a ui-sref="app.hallTicket.semCourseMap" ng-click="checkAdmin()"> -->
|
||||
<!-- <span class="title" translate="sidebar.nav.hallTicket.COURSESEMESTERMAPPING">COURSE SEMESTER MAPPING</span> -->
|
||||
<!-- </a> -->
|
||||
<!-- </li> -->
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkSuperAdmin()">
|
||||
<span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span>
|
||||
@ -1111,11 +1122,11 @@
|
||||
</a>
|
||||
|
||||
<ul class="sub-menu">
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.hallTicket.semCourseMap" ng-click="checkStaff()">
|
||||
<span class="title" translate="sidebar.nav.hallTicket.COURSESEMESTERMAPPING">COURSE SEMESTER MAPPING</span>
|
||||
</a>
|
||||
</li>
|
||||
<!-- <li ui-sref-active="active"> -->
|
||||
<!-- <a ui-sref="app.hallTicket.semCourseMap" ng-click="checkStaff()"> -->
|
||||
<!-- <span class="title" translate="sidebar.nav.hallTicket.COURSESEMESTERMAPPING">COURSE SEMESTER MAPPING</span> -->
|
||||
<!-- </a> -->
|
||||
<!-- </li> -->
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkSuperAdmin()">
|
||||
<span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span>
|
||||
|
||||
@ -97,6 +97,15 @@
|
||||
<div class="row">
|
||||
<div class="col-md-12" ng-if="isLoaderShow">
|
||||
<center> <h1>{{isLoaderTxt}}</h1> </center>
|
||||
<div ng-if="isSubLoaderShow">
|
||||
<h4>
|
||||
It may caused by one of the following reasons</h4>
|
||||
<ul>
|
||||
<li>No Next Batch Available for Selected University</li>
|
||||
<li>No Next Sessions Available for Courses under selected University</li>
|
||||
<li>No Next Semesters Available for Courses under selected University</li>
|
||||
</ul>
|
||||
<div/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user