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

report issues

Browse Source
This commit is contained in:
gandhimathi 2018-08-20 10:17:45 +05:30
parent 5cc08d3a32
commit ee47ec8fbd
26 changed files with 334 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Apollo/api/application/controllers/Call_Tracking_Controller.php
View File

@ -415,13 +415,14 @@ class Call_Tracking_Controller extends REST_Controller {
*/
public function autoAddlead_post(){
$student = $this->post('student');
//print_r($student);die;
$comments = $this->post('comments');
//print_r($comments);die;
if(!empty($student)){
$now = new DateTime();
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
//store lead details
$Student_Id = '';
foreach($student as $student){
foreach($student as $index =>$student){
$lead_details['LeadName'] = $student['Student_name'];
@ -444,11 +445,12 @@ class Call_Tracking_Controller extends REST_Controller {
$tracking_details['CreatedBranch'] = $this->post('branchId');
//store tracking followup details
$tracking_followup_details['FollowupOn'] = $this->post('date');
$tracking_followup_details['FollowupComments'] = $this->post('comments');
$tracking_followup_details['FollowupComments'] = $comments[$index];
$tracking_followup_details['StatusName'] = $this->post('status');
$tracking_followup_details['AssignedStaff'] = $this->post('assignedTo');
//print_r(array($lead_details,$tracking_details,$tracking_followup_details));
$leadDetails['leadDetails'] = $this->Calltracking_model->getaddautocall($lead_details,$tracking_details,$tracking_followup_details,$CreatedBy);// Check if the users data store contains users (in case the database result returns NULL)

68
Apollo/api/application/models/Reports_model.php
View File

@ -250,49 +250,46 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
}
public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.idate,'-') as idate,ifnull(sms.istatus,'-') as istatus,ifnull(sms.rdate,'-') as rdate,ifnull(sms.rstatus,'-') as rstatus,ifnull(sms.acmts,'-') as cmnts,sms.certname as Certificate_name
from
(SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,
CertificationType as ctype,CDate as mdate,Sem as sem,Comments as mcmts
FROM T_CertificationStatus
WHERE ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem)
group by sid,sem,cid,lcode,branch) as sms
left join
(SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname
(SELECT c.ID as id,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName as status,c.CertificationType as ctype,c.CDate as adate,c.Comments as acmts,c.CertificationType as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',c.CDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',c.CDate,'-') as rdate
FROM T_CertificationStatus c
left join T_PickListDetails p on p.ListCode=c.ListCode
left join T_CertificationMaster cm on cm.CertificationID=c.CertificationType
WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem,CertificationType)
and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED')
group by sid,sem,cid,branch,ctype
union
SELECT app.ID as id,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,app.CertificationType as ctype,app.AppDate as adate,app.Comments as acmts,cm.CertificateName as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',app.AppDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',app.AppDate,'-') as rdate
FROM T_ApplicationStatus as app
left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
where CertificationType != 'CERT024' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode)
group by sid,cid,lcode,branch)
as ams on ams.branch=sms.branch and ams.sid=sms.sid
left join T_PickListDetails p on p.ListCode=app.ListCode
where CertificateName not like 'APPLICATION%' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType) and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED')
group by sid,cid,lcode,branch,ctype) as sms
left join
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype, sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others
FROM T_Students_Fees_Status
group by sid,fid,cid,batch)
as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype
as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid
left join
(SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails
where IsActive = 1
group by sid,fid,billno)
as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
as sfp on sfp.sid=sms.sid and sfp.fid=sfs.fid
left join
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.cid=sms.cid
left join
(SELECT ListCode as lcode,ListName as status FROM T_PickListDetails)
as list on list.lcode=sms.lcode
left join
(SELECT ListCode as lcode,ListName as astatus FROM T_PickListDetails)
as alist on alist.lcode=ams.lcode
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sms.cid
left join
(SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course,
UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm
left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID
group by cid
order by CourseID)
as cm on cm.cid=cfd.ccid
as cm on cm.cid=sms.cid
left join
(SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
where std.active = 1 and sms.branch = '".$br."'
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid
where std.active = 1 and sms.branch = '".$br."'
";
if ($bat!= ''){
@ -314,7 +311,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
}
$sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year";
$sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem_year,Certificate_name";
$leadDet=$this->db->query($sql);
@ -498,19 +495,16 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
}
public function doc_pending($bat=null,$br=null,$u=null){
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.adate,
ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.follow_date as fdate
from
(SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,list.ListName as status,app.ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app
left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
left join T_PickListDetails list on list.ListCode=app.ListCode
where list.ListName = 'PENDING' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode)
group by sid,cid,lcode,branch) as sms
(select StudentID as sid,Details as certname,DocumentDate as follow_date,StatusName as status
from T_Student_DocumentTrack_Details
where StatusName not like 'CLOSED') as sms
left join
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype, sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,BranchCode as branch
FROM T_Students_Fees_Status
group by sid,fid,cid,batch)
as sfs on sfs.sid=sms.sid and sms.cid=sfs.cid
as sfs on sfs.sid=sms.sid
left join
(SELECT ID,StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails
WHERE IsActive = 1 and ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails group by StudentID,FeesID)
@ -527,8 +521,8 @@ left join
as cm on cm.cid=cfd.ccid
left join
(SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch
where std.active = 1 and sms.branch = '".$br."'
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
where std.active = 1 and sfs.branch = '".$br."'
";
@ -542,7 +536,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
$sql.=" and cm.uid = '".$u."'";
}
$sql.="group by Student_id,Course_id,Batch_code,Branch_code,Sem_year ";
$sql.="group by Student_id,Course_id,Batch_code,Branch_code";

30
Apollo/assets/js/controllers/report_ans_bookletCtrl.js
View File

@ -82,8 +82,24 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
}
});
}
$scope.onSubmit = function () {
$scope.show = false;
$scope.onSubmit = function (form) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
$scope.show = true;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$batch;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[batch=' + firstError + ']').focus();
}else {
//alert($scope.batch.name);
$scope.ans_book_data = '';
$scope.message = '';
@ -115,6 +131,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
});
}
}
var mystyle = {
sheetid: 'ANSWER BOOKLET STATUS REPORT',
headers: true,
@ -405,7 +422,12 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
$scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) {
//console.log(selectedStudents);
//console.log(selectedStudents);return false;
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Answer Booklet Details - BalanceFee:"+selectedStudents[stuid].balance + " - IssuedDate:" +selectedStudents[stuid].issuedate;
}
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
@ -462,7 +484,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
comments:"Call Tracking For Report Answer Booklet Details ",
comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

21
Apollo/assets/js/controllers/report_app_pendingCtrl.js
View File

@ -82,8 +82,24 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
}
});
}
$scope.onSubmit = function () {
$scope.show = false;
$scope.onSubmit = function (form) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
$scope.show = true;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$batch;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[batch=' + firstError + ']').focus();
}else {
//alert($scope.batch.name);
$scope.app_pending_data = '';
$scope.message = '';
@ -115,6 +131,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
});
}
}
var mystyle = {
sheetid: 'APPLICAITON PENDING STUDENT LIST REPORT',
headers: true,

22
Apollo/assets/js/controllers/report_balfeeCtrl.js
View File

@ -91,8 +91,24 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
});
}
// response data
$scope.onSubmit = function () {
$scope.show = false;
$scope.onSubmit = function (form) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
$scope.show = true;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$batch;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[batch=' + firstError + ']').focus();
}else {
$scope.balfee_data = '';
$scope.message = '';
var response_data = {
@ -154,7 +170,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
}
}
//Export to excel
var mystyle = {
sheetid: 'BALANCE FEE STATUS REPORT',

6
Apollo/assets/js/controllers/report_certificateCtrl.js
View File

@ -408,6 +408,10 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
$scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) {
//console.log(selectedStudents);
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Certificate Status - DocumentName:"+selectedStudents[stuid].Certificate_name + " - Status:" +selectedStudents[stuid].Certificate_status + " - Date:" +selectedStudents[stuid].Certificate_date;
}
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
@ -464,7 +468,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
comments:"Call Tracking For Report Certificate Details ",
comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

23
Apollo/assets/js/controllers/report_doc_pendingCtrl.js
View File

@ -82,8 +82,25 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
}
});
}
$scope.onSubmit = function () {
$scope.show = false;
$scope.onSubmit = function (form) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
$scope.show = true;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$batch;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[batch=' + firstError + ']').focus();
}else {
//alert($scope.batch.name);
$scope.doc_pending_data = '';
$scope.message = '';
@ -113,7 +130,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
}
});
}
}
var mystyle = {
sheetid: 'DOCUMENT PENDING STUDENT LIST REPORT',

21
Apollo/assets/js/controllers/report_examfeeCtrl.js
View File

@ -83,7 +83,24 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
});
}
$scope.onSubmit = function () {
$scope.show = false;
$scope.onSubmit = function (form) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
$scope.show = true;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$batch;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[batch=' + firstError + ']').focus();
}else {
//alert($scope.batch.name);
$scope.examfee_data = '';
$scope.message = '';
@ -120,7 +137,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
totalf += parseFloat(item.Amount);
}
return totalf; }
}
}
var mystyle = {
sheetid: 'EXAM WRITING FEE REPORT',

21
Apollo/assets/js/controllers/report_expenseCtrl.js
View File

@ -63,7 +63,25 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
});
}
$scope.onSubmit = function () {
$scope.show = false;
$scope.onSubmit = function (form) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
$scope.show = true;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$addDate;
firstError = form[field].$toDate;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[toDate=' + firstError + ']').focus();
}else {
//alert($scope.batch.name);
$scope.expense_data = '';
$scope.message = '';
@ -95,6 +113,7 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
});
}
}
var mystyle = {
sheetid: 'EXPENSE REPORT',

21
Apollo/assets/js/controllers/report_leadCtrl.js
View File

@ -101,7 +101,25 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A
});
}
$scope.onSubmit = function () {
$scope.show = false;
$scope.onSubmit = function (form) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
$scope.show = true;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$addDate;
firstError = form[field].$toDate;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[toDate=' + firstError + ']').focus();
}else {
//alert($scope.batch.name);
$scope.lead_data = '';
$scope.message = '';
@ -132,6 +150,7 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A
});
}
}
var mystyle = {
sheetid: 'Lead REPORT',
headers: true,

6
Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
View File

@ -407,6 +407,10 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
$scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) {
//console.log(selectedStudents);
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Certificate Status - SemYear:"+selectedStudents[stuid].Sem_year + " - Balance:" +selectedStudents[stuid].Balance_fee + " - CertificateName:" +selectedStudents[stuid].Certificate_name + " - ReceivedStatus:" +selectedStudents[stuid].rstatus + " - ReceivedDate:" +selectedStudents[stuid].rdate;
}
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
@ -463,7 +467,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
comments:"Call Tracking For Report MarkCard-Certificate Details ",
comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

20
Apollo/assets/js/controllers/report_markcard_statusCtrl.js
View File

@ -83,7 +83,24 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
});
}
$scope.onSubmit = function () {
$scope.show = false;
$scope.onSubmit = function (form) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
$scope.show = true;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$batch;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[batch=' + firstError + ']').focus();
}else {
//alert($scope.batch.name);
$scope.markcard_data = '';
$scope.message = '';
@ -114,6 +131,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
});
}
}
var mystyle = {
sheetid: 'MARKCARD STATUS REPORT',
headers: true,

50
Apollo/assets/js/controllers/report_study_material_statusCtrl.js
View File

@ -72,35 +72,26 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
}
});
}
//dropdown values for batch
$scope.getBatch = function(Form,filters){
$scope.batchValue= filters.university;
var filterBatch = {
method: 'POST',
url: apiPoint.url + 'report_BatchName/',
headers: {
'Content-Type': 'application/json'
},
data: {
branch : JSON.parse(localStorage.getItem('localObj')).localBranchID,
batch : $scope.batchValue
}
};
//console.log($scope.batchValue);
$scope.batchName = "";
$http(filterBatch).then(function (response) {
if (response.data) {
$scope.batchName = response.data.batchName;
console.log($scope.batchName);
} else {
}
});
}
$scope.onSubmit = function() {
$scope.show = false;
$scope.onSubmit = function (form) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
$scope.show = true;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$batch;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[batch=' + firstError + ']').focus();
}else {
//alert($scope.batch.name);
$scope.study_mat_data = '';
$scope.message = '';
@ -130,7 +121,8 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
});
}
}
}
//Export to excel
var mystyle = {
sheetid: 'STUDY MATERIAL STATUS REPORT',

20
Apollo/assets/js/controllers/report_waiver_referalCtrl.js
View File

@ -50,7 +50,24 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
});
}
$scope.onSubmit = function () {
$scope.show = false;
$scope.onSubmit = function (form) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
$scope.show = true;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$batch;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[batch=' + firstError + ']').focus();
}else {
//alert($scope.batch.name);
$scope.waiver_referal_data = '';
$scope.message = '';
@ -95,6 +112,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
}
return totalf; }
}
}
var mystyle = {
sheetid: 'WAIVER AND REFERAL REPORT',

9
Apollo/assets/views/report_answer_booklets.html
View File

@ -13,6 +13,7 @@ td,th {
th{
text-align:center;
}
.table>tbody>tr>td { padding: 2px; }
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
@ -28,7 +29,7 @@ td,th {
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="report_ans_bookletCtrl" ng-init="filters()">
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
<form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
@ -40,18 +41,20 @@ td,th {
University
</label>
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
<option value="" selected>Select University</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
</div>
<div class="col-md-3">
<label for="form-field-select-2">
Batch
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
<option value="" selected>Select Batch</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >

9
Apollo/assets/views/report_application_pending.html
View File

@ -15,6 +15,7 @@
th{
text-align:center;
}
.table>tbody>tr>td { padding: 2px; }
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
@ -30,7 +31,7 @@
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="report_app_pendingCtrl" ng-init="filters()">
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
<form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
@ -42,18 +43,20 @@
University
</label>
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
<option value="" selected>Select University</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
</div>
<div class="col-md-3">
<label for="form-field-select-2">
Batch
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
<option value="" selected>Select Batch</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >

9
Apollo/assets/views/report_balance_fee.html
View File

@ -7,6 +7,7 @@
</div>
</section>
<style>
.table>tbody>tr>td { padding: 2px; }
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
@ -22,7 +23,7 @@
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="report_balfeeCtrl" ng-init="filters()">
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
<form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
@ -34,18 +35,20 @@
University
</label>
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
<option value="" selected>Select University</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
</div>
<div class="col-md-3">
<label for="form-field-select-2">
Batch
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
<option value="" selected>Select Batch</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >

1
Apollo/assets/views/report_certificate_status.html
View File

@ -13,6 +13,7 @@ td,th {
th{
text-align:center;
}
.table>tbody>tr>td { padding: 2px; }
/* .sort-icon {
font-size: 9px;
margin-left: 5px;

15
Apollo/assets/views/report_document_pending.html
View File

@ -13,6 +13,7 @@ td,th {
th{
text-align:center;
}
.table>tbody>tr>td { padding: 2px; }
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
@ -28,7 +29,7 @@ td,th {
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="report_doc_pendingCtrl" ng-init="filters()">
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
<form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
@ -40,20 +41,20 @@ td,th {
University
</label>
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" >
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
<option value="" selected>Select University</option>
</select>
<!--<p ng-show="Form.university.$error.required">Providing a username is mandatory.</p>-->
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
</div>
<div class="col-md-3">
<label for="form-field-select-2">
Batch
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
<option value="" selected >Select Batch</option>
</select>
<!-- <p ng-show="Form.batch.$error.required">Providing a username is mandatory.</p>-->
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >
@ -99,7 +100,7 @@ td,th {
<!-- <th>Sem/Year</th> -->
<th>Phone No</th>
<th>University</th>
<th>Document Applied Date</th>
<th>Followup Date</th>
<th>Pending Document</th>
<!-- <th>Document Status</th> -->
@ -119,7 +120,7 @@ td,th {
<!-- <td>{{p.Sem_year}}</td> -->
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<td>{{p.University}}</td>
<td>{{p.adate}}</td>
<td>{{p.fdate}}</td>
<td>{{p.certname}}</td>
<!-- <td>{{p.Status}}</td> -->

9
Apollo/assets/views/report_exam_writing_fee.html
View File

@ -13,6 +13,7 @@
th{
text-align:center;
}
.table>tbody>tr>td { padding: 2px; }
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
@ -28,7 +29,7 @@
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="report_examfeeCtrl" ng-init="filters()">
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
<form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
@ -40,18 +41,20 @@
University
</label>
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
<option value="" selected>Select University</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
</div>
<div class="col-md-3">
<label for="form-field-select-2">
Batch
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
<option value="" selected>Select Batch</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >

30
Apollo/assets/views/report_expense.html
View File

@ -7,14 +7,13 @@
</div>
</section>
<style>
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
}
th {
cursor: pointer;
} */
.table>tbody>tr>td { padding: 2px; }
.table-responsive {
width:80%;
margin-left: 101px;
}
</style>
<script type="text/javascript" src="bower_components/ng-table-excel-export/ng-table-excel-export.min.js">
@ -22,7 +21,7 @@
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="report_expenseCtrl" ng-init="filters()">
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
<form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
@ -38,7 +37,8 @@
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
show-button-bar="true" />
show-button-bar="true" required/>
<span style="color:red;" ng-if="show" ng-show="Form.addDate.$dirty && Form.addDate.$error.required">Please select FromDate.</span>
</div>
</div>
@ -49,9 +49,10 @@
To Date
</label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.to_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
is-open="startOpen" ng-init="startOpen = false" name="toDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
show-button-bar="true" />
show-button-bar="true" required/>
<span style="color:red;" ng-if="show" ng-show="Form.toDate.$dirty && Form.toDate.$error.required">Please select ToDate.</span>
</div>
</div>
@ -80,10 +81,11 @@
<div class="col-md-4">
<input class="form-control" type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
</div>
<button pdf-save-button="getpdf" pdf-name="someone.pdf" class="btn btn-success btn-o">PDF</button>
<button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
</div>
<div class="table-responsive">
<div pdf-save-content="getpdf" class="table-responsive">
<table id="datatable" class="table table-hover">
@ -102,7 +104,7 @@
<tr>
<td>{{p.SL_NO}}</td>
<td>{{p.Expense_name}}</td>
<td style ="text-align:right;">{{p.Amount}}</td>
<td style ="text-align:center;">{{p.Amount}}</td>
</tr>

11
Apollo/assets/views/report_lead.html
View File

@ -13,6 +13,7 @@ td,th {
th{
text-align:center;
}
.table>tbody>tr>td { padding: 2px; }
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
@ -28,7 +29,7 @@ td,th {
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="report_leadCtrl" ng-init="filters()">
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
<form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
@ -44,7 +45,8 @@ td,th {
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
show-button-bar="true" />
show-button-bar="true" required/>
<span style="color:red;" ng-if="show" ng-show="Form.addDate.$dirty && Form.addDate.$error.required">Please select FromDate.</span>
</div>
</div>
@ -55,9 +57,10 @@ td,th {
To Date
</label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.to_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
is-open="startOpen" ng-init="startOpen = false" name="toDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
show-button-bar="true" />
show-button-bar="true" required/>
<span style="color:red;" ng-if="show" ng-show="Form.toDate.$dirty && Form.toDate.$error.required">Please select ToDate.</span>
</div>
</div>

17
Apollo/assets/views/report_mark_certificate_status.html
View File

@ -13,6 +13,7 @@ td,th {
th{
text-align:center;
}
.table>tbody>tr>td { padding: 2px; }
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
@ -131,8 +132,6 @@ td,th {
<tr>
<th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>
<th>SL.No</th>
<th>Document Fee Paid Date</th>
<th>Enrollment ID</th>
<th>Student Name</th>
<th>Father Name</th>
<th>Course</th>
@ -153,21 +152,19 @@ td,th {
<tr>
<td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
<td>{{p.SL_NO}}</td>
<td>{{p.Document_fee_paid_date}}</td>
<td>{{p.Enrollment_id}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
<td>{{p.Father_name}}</td>
<td>{{p.course_name}}</td>
<td>{{p.Sem_year}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<td>{{p.University}}</td>
<td>{{p.Balance_fee}}</td>
<td style="text-align:right;">{{p.Balance_fee}}</td>
<td>{{p.Certificate_name}}</td>
<td>{{p.received_status}}</td>
<td>{{p.received_date}}</td>
<td>{{p.issued_status}}</td>
<td>{{p.issued_date}}</td>
<td>{{p.issued_comments}}</td>
<td>{{p.rstatus}}</td>
<td>{{p.rdate}}</td>
<td>{{p.istatus}}</td>
<td>{{p.idate}}</td>
<td>{{p.cmnts}}</td>
</tr>

9
Apollo/assets/views/report_markcardstatus.html
View File

@ -13,13 +13,14 @@
th{
text-align:center;
}
.table>tbody>tr>td { padding: 2px; }
</style>
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="report_markcard_statusCtrl" ng-init="filters()">
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
<form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
@ -31,18 +32,20 @@
University
</label>
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
<option value="" selected>Select University</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
</div>
<div class="col-md-3">
<label for="form-field-select-2">
Batch
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
<option value="" selected>Select Batch</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
</div>
<!-- <div class="col-md-3">
<label for="form-field-select-2">

9
Apollo/assets/views/report_studymaterialstatus.html
View File

@ -13,11 +13,12 @@
th{
text-align:center;
}
.table>tbody>tr>td { padding: 2px; }
</style>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="report_study_material_statusCtrl" ng-init="filters()">
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
<form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
@ -28,18 +29,20 @@
University
</label>
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
<option value="" selected>Select University</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
</div>
<div class="col-md-3">
<label for="form-field-select-2">
Batch
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
<option value="" selected>Select Batch</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
</div>
<!-- <div class="col-md-3">
<label for="form-field-select-2">

19
Apollo/assets/views/report_waiver_referal.html
View File

@ -13,6 +13,7 @@
th{
text-align:center;
}
.table>tbody>tr>td { padding: 2px; }
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
@ -26,7 +27,7 @@
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="report_waiver_referalCtrl" ng-init="filters()">
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
<form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
@ -38,18 +39,20 @@
University
</label>
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
<option value="" selected>Select University</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
</div>
<div class="col-md-3">
<label for="form-field-select-2">
Batch
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
<option value="" selected>Select Batch</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >
@ -140,14 +143,14 @@
</tbody>
<tfoot>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td>Total</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td style="text-align:right;">{{ getwaiver() }}</td>