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

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

Browse Source
This commit is contained in:
gayathri1990 2018-08-23 19:12:40 +05:30
commit 1e2f591f67
24 changed files with 401 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=cfd.syear
}
public function certificate_status($bat=null,$br=null,$u=null,$from=null,$to=null){
$sql = "select sms.sid,sms.cid,sms.status,sms.adate,sms.acmts,sms.ctype,sms.certname,((sfs.cf + sfs.stf + sfs.others) - sfb.bamount) as balance,sfb.bamount,sfp.BillDate as initialPaid,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(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,cm.uid as univID
$sql = "select sms.sid,sms.cid,sms.status,sms.adate,sms.acmts,sms.ctype,sms.certname,((sfs.cf + sfs.stf + sfs.others) - sfb.bamount) as balance,sfs.cf , sfs.stf , sfs.others,sfb.bamount,sfp.BillDate as initialPaid,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(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,cm.uid as univID
from
(SELECT app.ID,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,AppDate as adate,app.Comments as acmts,CertificationType as ctype,CertificateName as certname
FROM T_ApplicationStatus as app
@ -179,17 +179,18 @@ from
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
FROM T_Students_Fees_Status
group by sid,fid)
group by sid,cid)
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
(SELECT sfp.StudentID as sid,sfp.FeesId as fid,sfs.CourseID as cid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails sfp
left join T_Students_Fees_Status sfs on sfs.FeesId=sfp.FeesId
where IsActive = 1
group by fid,sid)
as sfb on sfb.fid=sfs.fid and sfb.sid=sfs.sid
group by sid,cid)
as sfb on sfb.sid=sms.sid
left join
(select ID,StudentId,FeesID,BillDate from T_Students_Fees_PaidDetails where ID in
(select min(ID) from T_Students_Fees_PaidDetails group by FeesID)
group by FeesID) as sfp on sfp.FeesID=sfs.fid
group by FeesID) as sfp on sfp.FeesID=sfb.fid
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
@ -218,12 +219,12 @@ left join
$fromd= date("Y-m-d",strtotime($from));
$tod=date("Y-m-d",strtotime($to));
$sql.="and STR_TO_DATE(ams.adate,'%d-%m-%Y') >= '".$fromd."'
and STR_TO_DATE(ams.adate,'%d-%m-%Y') <= '".$tod."'";
$sql.="and STR_TO_DATE(sms.adate,'%d-%m-%Y') >= '".$fromd."'
and STR_TO_DATE(sms.adate,'%d-%m-%Y') <= '".$tod."'";
}
$sql.=" group by sms.sid,sms.cid,ctype,univID";
// echo $sql;
$leadDet=$this->db->query($sql);
$cert_statusDetails = $leadDet->result();
if (count($cert_statusDetails) > 0) {
@ -239,36 +240,41 @@ left join
}
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.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 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
$sql = "select sms.ID,sms.sid,sms.cid,sms.fid,sms.sem as Sem_year,sms.certname as Certificate_name,sms.ctype,
sms.issuedate,sms.istatus,
sms.rcvedate,sms.rstatus,sms.acmts,((sfs.cf + sfs.stf + sfs.others) - ifnull(sfb.bamount,0)) as Balance_fee,sfs.cf , sfs.stf , sfs.others,sfb.bamount,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,cm.course as course_name,cm.uname as University,mdate
from
(select c.ID,c.StudentID as sid,sfs.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,Sem as sem,c.CertificationType as certname,c.CertificationType as ctype,CDate as mdate,
max(if(ListName = 'ISSUED TO STUDENT', CDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus,
max(if(ListName = 'RECEIVED', CDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,c.Comments as acmts
from T_CertificationStatus c
left join T_Students_Fees_Status sfs on sfs.FeesType=c.CourseID and sfs.StudentID=c.StudentID
left join T_PickListDetails list on list.ListCode=c.ListCode
where CDate is not null and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' )
group by sid,cid,sem,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
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
select a.ID,a.StudentID as sid,a.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,'-' as sem,cm.CertificateName as certname,a.CertificationType as ctype,AppDate as mdate,
max(if(ListName = 'ISSUED TO STUDENT', AppDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus,
max(if(ListName = 'RECEIVED', AppDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,a.Comments as acmts
from T_ApplicationStatus a
left join
T_Students_Fees_Status sfs on sfs.StudentID=a.StudentID and sfs.CourseID=a.CourseID
left join T_CertificationMaster cm on cm.CertificationID=a.CertificationType
left join T_PickListDetails list on list.ListCode=a.ListCode
where AppDate is not null and a.ID in (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,CertificationType)
group by sid,cid,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
FROM T_Students_Fees_Status
group by sid,fid,cid,batch)
group by sid,cid)
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
(SELECT sfp.StudentID as sid,sfp.FeesId as fid,sfs.FeesType as ftype,sfs.CourseID as cid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails sfp
left join T_Students_Fees_Status sfs on sfs.FeesId=sfp.FeesId
where IsActive = 1
group by sid,fid,billno)
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.ccid=sms.cid
left join
group by sid,cid)
as sfb on sfb.sid=sms.sid and sfb.fid=sms.fid and (sfb.ftype=sms.cid or sfb.cid=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
@ -277,8 +283,10 @@ left join
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 and scd.cid=sms.cid
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 sms.branch = '".$br."'
";
if ($bat!= ''){
@ -295,13 +303,13 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
$fromd= date("Y-m-d",strtotime($from));
$tod=date("Y-m-d",strtotime($to));
$sql.="and STR_TO_DATE(sfp.bdate,'%d-%m-%Y') >= '".$fromd."'
and STR_TO_DATE(sfp.bdate,'%d-%m-%Y') <= '".$tod."'";
$sql.="and STR_TO_DATE(sms.mdate,'%d-%m-%Y') >= '".$fromd."'
and STR_TO_DATE(sms.mdate,'%d-%m-%Y') <= '".$tod."'";
}
$sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem_year,Certificate_name";
//echo $sql;
$leadDet=$this->db->query($sql);
$mcert_statusDetails = $leadDet->result();
@ -916,46 +924,42 @@ $query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$from
//echo $det['university'];die() ;
$this->db->select('T_Student_CourseDetails.UniversityID,UniversityName,
SUM(IF(ModeOfPayment ="CASH", BillAmount, 0)) AS Cash,
SUM(IF(ModeOfPayment ="CHEQUE",BillAmount, 0)) AS Cheque,
SUM(IF(ModeOfPayment ="REFERRAL", BillAmount, 0)) AS Referal,
SUM(IF(ModeOfPayment ="ONLINE TRANSACTION",BillAmount, 0)) AS Onlinec,
SUM(IF(ModeOfPayment ="WAIVER",BillAmount, 0)) AS WAIVER,
SUM(IF(ModeOfPayment ="Credit/Debit Card",BillAmount, 0)) AS Card,
SUM(T_Students_Fees_PaidDetails.BillAmount) AS Total');
$this->db->from('T_Students_Fees_PaidDetails');
$this->db->join('T_Student_CourseDetails','T_Student_CourseDetails.StudentID=T_Students_Fees_PaidDetails.StudentID');
$this->db->join('T_UniversityMaster','T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID');
$this->db->select('d.UniversityID,UniversityName,
sum(IF(ModeOfPayment ="CASH", BillAmount, 0)) AS Cash,
sum(IF(ModeOfPayment ="CHEQUE", BillAmount, 0)) AS Cheque,
sum(IF(ModeOfPayment ="REFERRAL", BillAmount, 0)) AS Referal,
sum(IF(ModeOfPayment ="ONLINE TRANSACTION", BillAmount, 0)) AS Onlinec,
sum(IF(ModeOfPayment ="WAIVER",BillAmount, 0)) AS WAIVER,
sum(IF(ModeOfPayment ="Credit/Debit Card",BillAmount, 0)) AS Card,
sum(a.BillAmount) AS Total,a.CreatedOn');
$this->db->from('T_Students_Fees_PaidDetails a');
$this->db->join('T_Students_Fees_Status b','b.FeesId = a.FeesID','left');
$this->db->join('T_CourseMaster c','c.CourseID = b.CourseID','left');
$this->db->join('T_UniversityMaster d','d.UniversityID=c.UniversityID','left');
// $this->db->where('T_Students_Fees_PaidDetails.CreatedOn BETWEEN "'.date('Y-m-d', strtotime($start_date)). '" and "'. date('Y-m-d', strtotime($end_date)).'"');
$this->db->where("date_format(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')>=",date('Y-m-d', strtotime($start_date)));
$this->db->where("date_format(a.CreatedOn,'%Y-%m-%d')>=",date('Y-m-d', strtotime($start_date)));
$this->db->where("date_format(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')<=",date('Y-m-d', strtotime($end_date)));
$this->db->where("date_format(a.CreatedOn,'%Y-%m-%d')<=",date('Y-m-d', strtotime($end_date)));
// $this->db->where(' BillDate <= str_to_date("'.$end_date.'",%d-%m-%Y)');
$this->db->where('T_Students_Fees_PaidDetails.IsActive','1');
$this->db->where('a.IsActive','1');
if($det['university']!='')
{
$this->db->where('T_Student_CourseDetails.UniversityID',$det['university']);
$this->db->where('d.UniversityID',$det['university']);
}
$this->db->group_by('UniversityID');
$feeDetails = $this->db->get()->result();
// print_r( $this->db->last_query());
// die();
// print_r($feeDetails);
if($feeDetails)
{

2
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -224,7 +224,7 @@ class StatusUpdation_model extends CI_Model {
$results['preStatusDetails'] = false;
$results['message'] = 'No record found';
}
} else if ($reqDetailsFor == 'CERTIFICATE_STATUS') {
} else if ($reqDetailsFor == 'APPICATION_STATUS') {
$searchFor = 'A001';
$searchTableFor = APPLICATION_STATUS;
$this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName');

18
Apollo/assets/js/controllers/daybooksuperadminCtrl.js
View File

@ -221,7 +221,7 @@ var rows1 = '';
value['VoucherBillNumber'] = element.VoucherNumber || '-';
value['PaidReceivedToFrom'] = element.PaidTo || '-';
value['Sem'] = element.FeePaymentDetails || '-';
value['Course'] = element.CourseName || '-';
// value['Course'] = element.CourseName || '-';
// value['University'] = element.UniversityName || '-';
// value['Type'] = element.TypeName || '-';
// value['ReceiptNo'] = element.ReceiptNo || '-';
@ -271,7 +271,7 @@ var headers = {
col_3:{ text: 'Voucher Number Bill Number', style: 'tableHeader', alignment: 'center' },
col_4:{ text: 'Paid To Received From', style: 'tableHeader', alignment: 'center' },
col_5:{ text: 'Sem', style: 'tableHeader', alignment: 'center'},
col_6:{ text: 'Course', style: 'tableHeader', alignment: 'center'},
// col_6:{ text: 'Course', style: 'tableHeader', alignment: 'center'},
// col_7:{ text: 'University', style: 'tableHeader', alignment: 'center'},
// col_8:{ text: 'Type', style: 'tableHeader', alignment: 'center'},
// col_9:{ text: 'Receipt No', style: 'tableHeader', alignment: 'center'},
@ -291,7 +291,7 @@ for (var key in headers){
row.push( header.col_3 );
row.push( header.col_4 );
row.push( header.col_5 );
row.push( header.col_6 );
// row.push( header.col_6 );
// row.push( header.col_7 );
// row.push( header.col_8 );
// row.push( header.col_9 );
@ -313,7 +313,7 @@ for (var key in rows1)
row.push( data.VoucherBillNumber.toString() );
row.push( data.PaidReceivedToFrom.toString() );
row.push( data.Sem.toString() );
row.push( data.Course.toString() );
// row.push( data.Course.toString() );
// row.push( data.University.toString() );
// row.push( data.Type.toString() );
// row.push( data.ReceiptNo.toString() );
@ -327,15 +327,15 @@ for (var key in rows1)
var docDefinition = {
pageMargins: [40,155,40,55],
pageMargins: [40,165,40,55],
pageOrientation: 'landscape',
header: function() {
return {
margin: 40,
margin: 2,
columns: [
{
},
{ text:['Resumen disciplinario'],
{ text:['DAYBOOK DETAILS'],
alignment: 'left',bold:true,margin:[-405,80,0,0],fontSize: 24}
]
}
@ -357,7 +357,7 @@ var docDefinition = {
// [ 'Value 1', 'Value 2', 'Value 3', 'Value 4' ],
// [ { text: 'Bold value', bold: true }, 'Val 2', 'Val 3', 'Val 4' ]
// ]
widths: [ '*', '*', '*', '*', '*' ],
widths: [ '40', 'auto', 'auto', 'auto', 'auto'],
headerRows: 2,
// keepWithHeaderRows: 1,
body: body
@ -387,7 +387,7 @@ var docDefinition = {
}
};
alert(JSON.stringify(rows1));
// alert(JSON.stringify(rows1));
// pdfMake.createPdf(docDefinition).download();
pdfMake.createPdf(docDefinition).print();
}

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

@ -299,7 +299,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
//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;
comments [stuid] ="Call Tracking For Report Answer Booklet Details - BalanceFee:"+selectedStudents[stuid].balance + " - IssuedToStudentDate:" +selectedStudents[stuid].issuedate;
}
if(isNaN(myModel.date)){

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

@ -297,6 +297,10 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Application Details :"+selectedStudents[stuid].Course_name + " - Status:" +selectedStudents[stuid].StatusName;
}
//console.log(selectedStudents);
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
@ -354,7 +358,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
comments:"Call Tracking For Report Application Details ",
comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

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

@ -349,6 +349,10 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
$scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Balence Fee:"+selectedStudents[stuid].balance + " - RegistrationDate:" +selectedStudents[stuid].regdate;
}
//console.log(selectedStudents);
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
@ -406,7 +410,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
comments:"Call Tracking For Report ExamFees Details ",
comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

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

@ -98,7 +98,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
});
// disable submit
$scope.$watchCollection('filters.from_date', function (newValue,oldValue) {
$scope.$watchCollection('univModel.from_date', function (newValue,oldValue) {
if(newValue==undefined || newValue=='' || newValue==null){
$scope.disableSubmit=true;
}
@ -110,7 +110,11 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
});
$scope.onSubmit = function () {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
if($scope.univModel.university !== null && $scope.univModel.university !== '' ){
$scope.filterUniv = angular.fromJson($scope.univModel.university);
}else {
$scope.filterUniv = '';
}
//alert($scope.batch.name);
$scope.cert_data = '';
$scope.message = '';

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

@ -294,6 +294,10 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Document Pending:"+selectedStudents[stuid].Course_name + " - Followupdate:" +selectedStudents[stuid].Followupdate;
}
//console.log(selectedStudents);
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;

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

@ -308,6 +308,10 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
$scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Exam Writing Fees Details:"+selectedStudents[stuid].Course_name + " - ExamWritingFee:" +selectedStudents[stuid].ExamWritingFee;
}
//console.log(selectedStudents);
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
@ -365,7 +369,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
comments:"Call Tracking For Report Exam Writing Fees Details ",
comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

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

@ -47,6 +47,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
"to_date": "",
};
$scope.filters = function () {
var filterlist = {
@ -99,7 +100,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
});
// disable submit
$scope.$watchCollection('filters.from_date', function (newValue,oldValue) {
$scope.$watchCollection('univModel.from_date', function (newValue,oldValue) {
if(newValue==undefined || newValue=='' || newValue==null){
$scope.disableSubmit=true;
}
@ -110,8 +111,21 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
});
$scope.onSubmit = function () {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
//alert($scope.batch.name);
//alert($scope.univModel.from_date);
// if(angular.isString($scope.univModel.university) && $scope.univModel.university !== null){
// $scope.filterUniv = angular.fromJson($scope.univModel.university);
// }
// else{
// $scope.filterUniv ='';
// }
//alert($scope.univModel.university);
if($scope.univModel.university !== null && $scope.univModel.university !== '' ){
$scope.filterUniv = angular.fromJson($scope.univModel.university);
}else {
$scope.filterUniv = '';
}
$scope.mark_cert_data = '';
$scope.message = '';
var response_data = {
@ -161,7 +175,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Document_fee_paid_date as DocumentFeePaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Balance_fee AS NUMBER) as BalanceFee,Markcard_status as MarkcardStatus,Markcard_date as MarkcardDate,Markcard_comments as MarkcardComments,Certificate_name as CertificateName,Certificate_status as CertificateStatus,Certificate_date as CertificateDate,Certificate_comments as CertificateComments INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]);
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,course_name as CourseName,Sem_year as SemYear,Certificate_name as CertificateName,rstatus as ReceivedStatus,rcvedate as ReceivedDate,istatus as IssuedStatus,issuedate as IssuedDate,acmts as CertificateIssuedComments,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]);
};
/**
* Auto Call Tracking Sriram

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

@ -292,6 +292,10 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
$scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report MarkCard Details:"+selectedStudents[stuid].Balance_Fee + " - ApplicationDate:" +selectedStudents[stuid].appdate;
}
//console.log(selectedStudents);
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
@ -349,7 +353,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
comments:"Call Tracking For Report MarkCard Details ",
comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

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

@ -295,6 +295,10 @@ $scope.exportExcel= function () {
$scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Study Material Status Report:"+selectedStudents[stuid].Balance_fee + " - Date:" +selectedStudents[stuid].Date;
}
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
@ -351,7 +355,7 @@ $scope.exportExcel= function () {
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
comments:"Call Tracking For Study Material Status Report ",
comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

164
Apollo/assets/views/courseDetails.html
View File

@ -13,9 +13,9 @@
<div class="row">
<div class="col-sm-8">
<h1 class="mainTitle" translate="Course ">{{ mainTitle }}</h1>
<span class="mainDescription">Add/View Course Details. </span>
</div>
<div ncy-breadcrumb></div>
</div>
@ -340,83 +340,8 @@
<div class="row">
<div class="col-md-12">
<fieldset>
<legend>{{myModelSemYear.FeesName}}</legend>
<div class="panel-body" >
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.sem_year.$dirty && Form.sem_year.$invalid}">
<label>
Sem/Year
</label>
<input type="text" placeholder="Enter Sem/year"
tabindex="9" class="form-control" name="sem_year"
ng-model="myModelSemYear.programName" ng-disabled="myModelLateral.FeesAmount!='' || myModelRegular.FeesAmount!=''" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
<!--<span class="error text-small block"
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.required">Sem/Year is required</span>-->
<span class="error text-small block"
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.pattern">Invalid Sem/Year name </span>
</div>
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.feesAmount.$dirty && Form.feesAmount.$invalid}">
<label>
Fees
</label>
<input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="10" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
ng-model="myModelSemYear.FeesAmount" ng-disabled="myModelLateral.FeesAmount!='' || myModelRegular.FeesAmount!=''" ng-pattern="/^[0-9]*$/"/>
<!--<span class="error text-small block"
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
ng-hide="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Fees amount is required</span>-->
<span class="error text-small block"
ng-if="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Enter a valid amount</span>
</div>
<div class="col-md-12">
<div class="pull-right">
<input type="button" class="btn btn-sm btn-info" title="Click to add one more fees items" value="Add More" ng-disabled="myModelLateral.FeesAmount!='' || myModelRegular.FeesAmount!=''" ng-click="addMoreFeesItems(myModelSemYear,Form);"/>
</div>
</div>
<div class="row" ng-repeat="n in addMoreItems">
<div class="col-md-6 form-group" ng-class="{'has-error':n.programName==undefined, 'has-success':n.programName!=undefined}">
<label>
</label>
<input type="text" placeholder="Enter Sem/year"
class="form-control" name="sem_year{{$index}}"
ng-model="n.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required/>
<span class="error text-small block" ng-if="n.programName==undefined">Enter a valid name</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':n.FeesAmount==undefined, 'has-success':n.FeesAmount!=undefined}">
<label>
</label>
<input type="text" placeholder="Enter Fees Amount"
autofocus class="form-control" name="feesAmount{{$index}}" id="feesAmount{{$index}}" ng-maxlength="8"
ng-model="n.FeesAmount" ng-pattern="/^[0-9]*$/" required/>
<span class="error text-small block" ng-if="n.FeesAmount==undefined">Enter a valid amount</span>
</div>
</div>
</div>
</div>
</fieldset>
</div>
</div>
</div>
<div class="col-md-6">
<fieldset>
<div class="row">
<div class="col-md-6 form-group"
@ -492,9 +417,90 @@
</div>
</div>
</fieldset>
</div>
</div>
</div>
<div class="col-md-6">
<div class="col-md-12">
<fieldset>
<legend>{{myModelSemYear.FeesName}}</legend>
<div class="panel-body" >
<!--<div class="panel-scroll height-400" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">-->
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.sem_year.$dirty && Form.sem_year.$invalid}">
<label>
Sem/Year
</label>
<input type="text" placeholder="Enter Sem/year"
tabindex="9" class="form-control" name="sem_year"
ng-model="myModelSemYear.programName" ng-disabled="myModelLateral.FeesAmount!='' || myModelRegular.FeesAmount!=''" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
<!--<span class="error text-small block"
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.required">Sem/Year is required</span>-->
<span class="error text-small block"
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.pattern">Invalid Sem/Year name </span>
</div>
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.feesAmount.$dirty && Form.feesAmount.$invalid}">
<label>
Fees
</label>
<input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="10" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
ng-model="myModelSemYear.FeesAmount" ng-disabled="myModelLateral.FeesAmount!='' || myModelRegular.FeesAmount!=''" ng-pattern="/^[0-9]*$/"/>
<!--<span class="error text-small block"
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
ng-hide="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Fees amount is required</span>-->
<span class="error text-small block"
ng-if="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Enter a valid amount</span>
</div>
<div class="col-md-12">
<div class="pull-right">
<input type="button" class="btn btn-sm btn-info" title="Click to add one more fees items" value="Add More" ng-disabled="myModelLateral.FeesAmount!='' || myModelRegular.FeesAmount!=''" ng-click="addMoreFeesItems(myModelSemYear,Form);"/>
</div>
</div>
<div class="row" ng-repeat="n in addMoreItems">
<div class="col-md-6 form-group" ng-class="{'has-error':n.programName==undefined, 'has-success':n.programName!=undefined}">
<label>
</label>
<input type="text" placeholder="Enter Sem/year"
class="form-control" name="sem_year{{$index}}"
ng-model="n.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required/>
<span class="error text-small block" ng-if="n.programName==undefined">Enter a valid name</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':n.FeesAmount==undefined, 'has-success':n.FeesAmount!=undefined}">
<label>
</label>
<input type="text" placeholder="Enter Fees Amount"
autofocus class="form-control" name="feesAmount{{$index}}" id="feesAmount{{$index}}" ng-maxlength="8"
ng-model="n.FeesAmount" ng-pattern="/^[0-9]*$/" required/>
<span class="error text-small block" ng-if="n.FeesAmount==undefined">Enter a valid amount</span>
</div>
</div>
<!--</div>-->
</div>
</fieldset>
</div>
</div>
</div>

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

@ -123,7 +123,7 @@
<table class="table table-bordered" export-table>
<thead>
<tr>
<th ng-click="sort('Date')" style="width: 20%">Date
<th ng-click="sort('Date')" style="width: 20%;padding-right:5%">Date
</th>
<th ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense

2
Apollo/assets/views/daybook/daybookadmin.html
View File

@ -123,7 +123,7 @@
<table class="table table-bordered export-table">
<thead>
<tr>
<th ng-click="sort('Date')" style="width: 20%">Date
<th ng-click="sort('Date')" style="width: 20%;padding-right:5%">Date
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense

18
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -15,7 +15,6 @@
<div>
<tabset class="tabbable">
<tab heading="View" id="viewDayBook">
<!--<button ng-click="generatePFD()">generatePFD</button>-->
<div class="container-fluid container-fullw">
<div class="row">
<div class="col-md-12">
@ -83,6 +82,20 @@
</style>
<div class="row">
<!--<button ng-click="exportData()">export</button>-->
<div class="pull-right" ng-if="data">
<button ng-click="exportData()" class="btn btn-sm btn-default">
Export As Excel
</button>
<!--<button ng-click="generatePFD()" class="btn btn-sm btn-default">
Export As PDF
</button>-->
</div>
</div>
<div class="row">
<div class="pull-right">
@ -105,11 +118,10 @@
</style>
<button ng-click="exportData()">export</button>
<table class="table table-bordered export-table">
<thead>
<tr>
<th ng-click="sort('Date')" style="width: 20%">Date
<th ng-click="sort('Date')" style="width: 20%;padding-right:5%">Date
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th class="th" ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense

281
Apollo/assets/views/editCourseDetails.html
View File

@ -203,78 +203,87 @@
<div class="col-md-12">
<fieldset>
<legend >{{myModelSemYear1.FeesName}}</legend>
<div class="row">
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.provFess.$dirty && Form.provFess.$invalid}">
<label>
Prov Cert Fees
</label>
<div class="panel-body" >
<input type="text" placeholder="Enter Prov Cert Fees"
autofocus tabindex="11" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
ng-model="p.PC" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.provFess.$error.maxlength || Form.provFess.$error.pattern">Enter a valid amount</span>
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div class="row">
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.sem_year.$dirty && Form.sem_year.$invalid}">
<label>
Sem/Year
</label>
<input type="text" placeholder="Enter Sem/year"
tabindex="9" class="form-control" name="sem_year"
ng-model="myModelSemYear1.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
<!--<span class="error text-small block"
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.required">Sem/Year is required</span>-->
<span class="error text-small block"
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.pattern">Invalid Sem/Year name </span>
</div>
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.feesAmount.$dirty && Form.feesAmount.$invalid}">
<label>
Fees
</label>
<input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="10" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
ng-model="myModelSemYear1.FeesAmount" ng-pattern="/^[0-9]*$/"/>
<!--<span class="error text-small block"
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
ng-hide="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Fees amount is required</span>-->
<span class="error text-small block"
ng-if="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Enter a valid amount</span>
</div>
<div class="col-md-12">
<div class="pull-right">
<input type="button" class="btn btn-sm btn-info" title="Click to add one more fees items" value="Add More" ng-click="updateMoreFeesItems(myModelSemYear1,Form);"/>
</div>
</div>
</div>
<div class="row" ng-repeat="n in updateMoreItems">
<div class="col-md-6 form-group" ng-class="{'has-error':n.programName==undefined, 'has-success':n.programName!=undefined}">
<label>
</label>
<input type="text" placeholder="Enter Sem/year"
class="form-control" name="sem_year{{$index}}"
ng-model="n.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required/>
<span class="error text-small block" ng-if="n.programName==undefined">Enter a valid name</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':n.FeesAmount==undefined, 'has-success':n.FeesAmount!=undefined}">
<label>
</label>
<input type="text" placeholder="Enter Fees Amount"
autofocus class="form-control" name="feesAmount{{$index}}" id="feesAmount{{$index}}" ng-maxlength="8"
ng-model="n.FeesAmount" ng-pattern="/^[0-9]*$/" required/>
<span class="error text-small block" ng-if="n.FeesAmount==undefined">Enter a valid amount</span>
</div>
</div>
</div>
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.transferAmount.$dirty && Form.transferAmount.$invalid}">
<label>
Transfer Cert Fees
</label>
<input type="text" placeholder="Enter transfer Cert Fees"
autofocus tabindex="12" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
ng-model="p.TC" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.transferAmount.$error.maxlength || Form.transferAmount.$error.pattern">Enter a valid amount</span>
</div>
</div>
<div class="row">
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.degreeAmount.$dirty && Form.degreeAmount.$invalid}">
<label>
Degree Cert Fees
</label>
<input type="text" placeholder="Enter Degree Cert Fees"
autofocus tabindex="13" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
ng-model="p.DC" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.degreeAmount.$error.maxlength || Form.degreeAmount.$error.pattern">Enter a valid amount</span>
</div>
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.migrationAmount.$dirty && Form.migrationAmount.$invalid}">
<label>
Migration Cert Fees
</label>
<input type="text" placeholder="Enter Migration Cert Fees"
autofocus tabindex="14" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
ng-model="p.MC" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.migrationAmount.$error.maxlength || Form.migrationAmount.$error.pattern">Enter a valid amount</span>
</div>
</div>
<div class="row">
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.otherAmount.$dirty && Form.otherAmount.$invalid}">
<label>
Other Fees
</label>
<input type="text" placeholder="Enter Other Fees"
autofocus tabindex="15" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
ng-model="p.OtherFees" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
</div>
</div>
</fieldset>
</div>
@ -283,89 +292,81 @@
</div>
<div class="col-md-6">
<fieldset>
<div class="row">
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.provFess.$dirty && Form.provFess.$invalid}">
<label>
Prov Cert Fees
</label>
<input type="text" placeholder="Enter Prov Cert Fees"
autofocus tabindex="11" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
ng-model="p.PC" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.provFess.$error.maxlength || Form.provFess.$error.pattern">Enter a valid amount</span>
<fieldset>
<legend >{{myModelSemYear1.FeesName}}</legend>
<div class="panel-body" >
<!--<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">-->
<div class="row">
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.sem_year.$dirty && Form.sem_year.$invalid}">
<label>
Sem/Year
</label>
<input type="text" placeholder="Enter Sem/year"
tabindex="9" class="form-control" name="sem_year"
ng-model="myModelSemYear1.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
<!--<span class="error text-small block"
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.required">Sem/Year is required</span>-->
<span class="error text-small block"
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.pattern">Invalid Sem/Year name </span>
</div>
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.feesAmount.$dirty && Form.feesAmount.$invalid}">
<label>
Fees
</label>
<input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="10" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
ng-model="myModelSemYear1.FeesAmount" ng-pattern="/^[0-9]*$/"/>
<!--<span class="error text-small block"
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
ng-hide="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Fees amount is required</span>-->
<span class="error text-small block"
ng-if="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Enter a valid amount</span>
</div>
<div class="col-md-12">
<div class="pull-right">
<input type="button" class="btn btn-sm btn-info" title="Click to add one more fees items" value="Add More" ng-click="updateMoreFeesItems(myModelSemYear1,Form);"/>
</div>
</div>
</div>
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.transferAmount.$dirty && Form.transferAmount.$invalid}">
<label>
Transfer Cert Fees
</label>
<div class="row" ng-repeat="n in updateMoreItems">
<div class="col-md-6 form-group" ng-class="{'has-error':n.programName==undefined, 'has-success':n.programName!=undefined}">
<label>
<input type="text" placeholder="Enter transfer Cert Fees"
autofocus tabindex="12" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
ng-model="p.TC" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.transferAmount.$error.maxlength || Form.transferAmount.$error.pattern">Enter a valid amount</span>
</label>
<input type="text" placeholder="Enter Sem/year"
class="form-control" name="sem_year{{$index}}"
ng-model="n.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required/>
<span class="error text-small block" ng-if="n.programName==undefined">Enter a valid name</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':n.FeesAmount==undefined, 'has-success':n.FeesAmount!=undefined}">
<label>
</label>
<input type="text" placeholder="Enter Fees Amount"
autofocus class="form-control" name="feesAmount{{$index}}" id="feesAmount{{$index}}" ng-maxlength="8"
ng-model="n.FeesAmount" ng-pattern="/^[0-9]*$/" required/>
<span class="error text-small block" ng-if="n.FeesAmount==undefined">Enter a valid amount</span>
</div>
</div>
</div>
<!--</div>-->
<div class="row">
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.degreeAmount.$dirty && Form.degreeAmount.$invalid}">
<label>
Degree Cert Fees
</label>
<input type="text" placeholder="Enter Degree Cert Fees"
autofocus tabindex="13" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
ng-model="p.DC" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.degreeAmount.$error.maxlength || Form.degreeAmount.$error.pattern">Enter a valid amount</span>
</div>
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.migrationAmount.$dirty && Form.migrationAmount.$invalid}">
<label>
Migration Cert Fees
</label>
<input type="text" placeholder="Enter Migration Cert Fees"
autofocus tabindex="14" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
ng-model="p.MC" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.migrationAmount.$error.maxlength || Form.migrationAmount.$error.pattern">Enter a valid amount</span>
</div>
</div>
<div class="row">
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.otherAmount.$dirty && Form.otherAmount.$invalid}">
<label>
Other Fees
</label>
<input type="text" placeholder="Enter Other Fees"
autofocus tabindex="15" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
ng-model="p.OtherFees" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
</div>
</div>
</fieldset>
</div>
</fieldset>
</div>
</div>

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

@ -112,7 +112,7 @@
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="university" ng-model="myModel.myUnivSearch"
ng-click="getEmployeeList()">
<option value="" disabled selected>Select University</option>
<option value="" selected>Select University</option>
<option ng-repeat="item in universitySearchData" value="{{item.UniversityID}}">{{item.UniversityName}}</option>

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

@ -355,7 +355,7 @@
<i class="ti-write"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.master.HALLTICKET"> GENERATE HALLTICKET </span>
<span class="title" translate="sidebar.nav.master.HALLTICKET"> GENERATE HALLTICKET </span><i class="icon-arrow"></i>
</div>
</div>
</a>
@ -391,7 +391,7 @@
<i class="ti-rocket"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span>
<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span><i class="icon-arrow"></i>
</div>
</div>
</a>
@ -856,7 +856,7 @@
<i class="ti-rocket"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span>
<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span><i class="icon-arrow"></i>
</div>
</div>
</a>
@ -1228,7 +1228,7 @@
<i class="ti-rocket"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span>
<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span><i class="icon-arrow"></i>
</div>
</div>
</a>

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

@ -70,7 +70,7 @@ td,th {
<label>
From Date
</label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date"
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.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" />
@ -83,7 +83,7 @@ td,th {
<label>
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"
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.to_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
show-button-bar="true" />
@ -156,18 +156,18 @@ 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.initialPaid}}</td>
<td>{{p.Enrollment_id}}</td>
<td>{{p.initialPaid || "-"}}</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}}</td>
<td style="text-align:right;">{{p.balance || "0"}}</td>
<td>{{p.certname}}</td>
<td>{{p.status}}</td>
<td>{{p.adate}}</td>
<td>{{p.adate || "-"}}</td>
</tr>
</tbody>

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

@ -70,7 +70,7 @@ td,th {
<label>
From Date
</label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date"
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.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" />
@ -83,7 +83,7 @@ td,th {
<label>
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"
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.to_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
show-button-bar="true" />
@ -142,17 +142,17 @@ td,th {
<th>SL.No</th>
<th>Student Name</th>
<th>Father Name</th>
<th>Phone No</th>
<th>University</th>
<th>Course</th>
<th>Sem/Year</th>
<th>Phone No</th>
<th>University</th>
<th>Balance Fee</th>
<th>Certificates Name</th>
<th>Certificates Name</th>
<th>Received Status</th>
<th>Received Date</th>
<th>Issued Status</th>
<th>Issued Date</th>
<th>Certificate Issued Comments</th>
<th>Balance Fee</th>
</tr>
</thead>
@ -162,17 +162,17 @@ td,th {
<td>{{p.SL_NO}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
<td>{{p.Father_name}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<td>{{p.University}}</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 style="text-align:right;">{{p.Balance_fee}}</td>
<td>{{p.Certificate_name}}</td>
<td>{{p.Certificate_name}}</td>
<td>{{p.rstatus}}</td>
<td>{{p.rdate}}</td>
<td>{{p.rcvedate}}</td>
<td>{{p.istatus}}</td>
<td>{{p.idate}}</td>
<td>{{p.cmnts}}</td>
<td>{{p.issuedate}}</td>
<td>{{p.acmts}}</td>
<td style="text-align:right;">{{p.Balance_fee}}</td>
</tr>

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

@ -140,7 +140,7 @@
<td>{{p.staffname}}</td>
<td>{{p.Waiver_bill}}</td>
<td style="text-align:right;">{{p.Waiver_amount}}</td>
<td>{{p.Referal_bill}}</td>
<td style="text-align:center;">{{p.Referal_bill}}</td>
<td style="text-align:right;">{{p.Referal_amount}}</td>
<td>{{p.Comments}}</td>

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

@ -395,7 +395,7 @@
</tab>
<tab heading="Document Details" id="document">
<tab heading="Certificate Details" id="document">
<div class="panel-scroll ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
<div ng-if="course.certificateDetails==false">
<!--<center>
@ -406,7 +406,7 @@
<thead>
<tr>
<!-- <th>Type</th>-->
<th>Document Name</th>
<th>Certificate Name</th>
<th>Status</th>
<th>Date</th>
<th>Comments</th>

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

@ -455,7 +455,7 @@
</tab>
<tab heading="Document Details" id="document">
<tab heading="Certificate Details" id="document">
<div class="panel-scroll ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
<div ng-if="course.certificateDetails==false">
<!--<center>
@ -466,7 +466,7 @@
<thead>
<tr>
<!-- <th>Type</th>-->
<th>Document Name</th>
<th>Certificate Name</th>
<th>Status</th>
<th>Date</th>
<th>Comments</th>