diff --git a/Apollo/api/application/controllers/Report.php b/Apollo/api/application/controllers/Report.php
index 10ffdf1b..e61fc126 100755
--- a/Apollo/api/application/controllers/Report.php
+++ b/Apollo/api/application/controllers/Report.php
@@ -383,10 +383,8 @@ class Report extends REST_Controller {
}
-
-
-
-
+
+
public function getAllUniversity_post()
{
@@ -443,8 +441,6 @@ class Report extends REST_Controller {
}
-
-
diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 532b02e6..0461f0fb 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -34,7 +34,7 @@ order by CourseID) 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,AlternateNumber,PresentAddress as address FROM T_StudentDetails where IsActive = 1) 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
+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 sms.branch = '".$br."'
";
@@ -433,26 +433,24 @@ group by sid
}
public function app_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,ifnull(sfp.bdate,'-') as Admission_date,
- ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,sms.adate as appdate
+ $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(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,ifnull(sfp.bdate,'-') as Admission_date,
+ sms.adate as appdate,ifnull(reg.formtype,'-') as formtype,sfs.batch as batch
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
+ (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,app.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 CertificateName like 'APPLICATION%' and list.ListName != 'SENT TO UNIVERSITY' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode)
-group by sid,cid,lcode,branch) 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)
- as sfs on sfs.sid=sms.sid and sms.cid=sfs.cid
+where CertificateName like 'APPLICATION%' and list.ListName != 'SENT TO UNIVERSITY' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType,ListCode)
+group by sid,cid,lcode,branch,ctype) as sms
+left join
+(select StudentID as sid,CourseID as cid,BatchCode as batch,FeesID as fid from T_Students_Fees_Status) as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid
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)
group by sid,fid,billno)
- as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
+ as sfp on sfp.sid=sfs.sid and sfs.fid=sfp.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=sfs.cid and cfd.cid=sfs.ftype
+ (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
@@ -463,6 +461,9 @@ left join
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
+left join
+(Select StudentID as sid,CourseID as cid,BatchCode as bcode,FeeType as ftype,BranchCode as branch,RegistrationType as formtype from T_Registration_Details) as reg on reg.sid=sms.sid and reg.cid=sms.cid
+
where std.active = 1 and sms.branch = '".$br."'
";
@@ -476,7 +477,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,Branch_code,Sem_year";
@@ -618,26 +619,23 @@ left join
}
public function examfee($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(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfs.cid,'-') as Course_id,ifnull(sms.cmts,'-') as Comments,ifnull(sms.stf,'-') as Amount,ifnull(sms.branch,'-') as Branch_code,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(cfd.syear,'-') as Sem_year,ifnull(sms.batch,'-') as Batch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.cid,'-') as Course_id,ifnull(sms.cmts,'-') as Comments,ifnull(sms.stf,'-') as Amount,ifnull(sms.branch,'-') as Branch_code,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
from
(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,Comments as cmts,BranchCode as branch FROM T_Students_Fees_Status
where STFOrWR != ''
-group by sid,batch,cid) as sms
-left join
- (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype FROM T_Students_Fees_Status
- group by sid,cid,batch) as sfs on sfs.sid=sms.sid and sfs.fid=sms.fid
+group by sid,fid,batch,cid) as sms
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=sfs.cid
+ (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
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=scd.cid and cfd.cid=sfs.ftype
+ (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 and cfd.cid=sms.ftype
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
where std.active = 1 and sms.branch = '".$br."'
@@ -646,7 +644,7 @@ left join
if ($bat!= ''){
- $sql.=" and sfs.batch = '".$bat."'";
+ $sql.=" and sms.batch = '".$bat."'";
}
if ($u!= ''){
@@ -837,10 +835,7 @@ from T_Lead_Tracking_Followup as ltf
$batchDetails = $this->db->get(BATCH);
return $batchDetails->result();
}
-
-
-
- public function GetAllUniversity($branchId)
+ public function GetAllUniversity($branchId)
{
$this->db->select('UniversityID,UniversityName');
$this->db->from('T_UniversityMaster');
@@ -886,7 +881,7 @@ left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_
left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode
WHERE T_Registration_Details.RegistrationType = ? and str_to_date(DOJ,?)>=? and str_to_date(DOJ,?)<=? and T_Registration_Details.RegistrationMode=?';
-$query = $this->db->query($subQuery,array(NewReg,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1'));
+$query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1'));
$searchDetails =$query->result();
diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json
index 142041a4..43b1900a 100755
--- a/Apollo/assets/i18n/en.json
+++ b/Apollo/assets/i18n/en.json
@@ -83,16 +83,16 @@
"studmatstatus": "STUDY MATERIAL STATUS ",
"mstatus": "MARK CARD STATUS ",
"certificate_status": "CERTIFICATE STATUS ",
- "certificate_mark_status": "MARKCARD/CERTIFICATE ISSUED STATUS ",
+ "certificate_mark_status": "MARKS CARD/ CERTIFICATES - RECEIVED/ ISSUED STATUS REPORT",
"expense": "EXPENSE REPORT ",
"answer_booklets": "ANSWER BOOKLETS STATUS REPORT ",
- "app_pending": "APPLICATION PENDING STUDENT LIST REPORT",
+ "app_pending": "NEW & RE-REG FORM STATUS REPORT",
"doc_pending": "STUDENT DOCUMENTS PENDING REPORT",
"wav_ref": "WAIVER AND REFERAL REPORT",
"examfee": "EXAM WRITING FEE REPORT",
"balfee": "FEE BALANCE REPORT",
"lead": "LEAD TRACKING REPORT",
- "newreg":"NEW REG REPORT"
+ "newreg":"NEW REG REPORT"
},
"student": {
diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
index 626616b6..4a860046 100755
--- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
@@ -150,7 +150,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.exportData = function () {
- alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,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,Status as ApplicationPendingStatus INTO XLS("Application_pending_student_list.xls",?) FROM ?',[mystyle,$scope.app_pending_data]);
+ alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as InititalPaymentDate,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,Status as ApplicationPendingStatus,formtype as FormType,appdate as Date INTO XLS("Application_pending_student_list.xls",?) FROM ?',[mystyle,$scope.app_pending_data]);
};
diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js
index 28a22b1f..54d58da3 100755
--- a/Apollo/assets/js/controllers/report_balfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js
@@ -173,10 +173,10 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
}
//Export to excel
var mystyle = {
- sheetid: 'BALANCE FEE STATUS REPORT',
+ sheetid: 'FEE BALANCE REPORT',
headers: true,
caption: {
- title:'BALANCE FEE STATUS REPORT',
+ title:'FEE BALANCE REPORT',
width: '300px',
style:'font-size:50px;'
},
diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
index a82e9624..605ba51f 100755
--- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
@@ -150,7 +150,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.exportData = function () {
- alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,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,adate as DocumentAppliedDate,certname as DocumentName,Status as DocumentPendingStatus INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]);
+ alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,fdate as Followupdate,certname as DocumentName INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]);
};
/*modal controller
* */
diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
index 0c588387..7792ce41 100755
--- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
@@ -150,7 +150,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
$scope.exportData = function () {
- alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Roll_NO as RollNO,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,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]);
+ alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Roll_NO as RollNO,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,appdate as ApplicationSentDate,ansdate as AnswerBookletSentDate,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]);
};
/*modal controller
* */
diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
index ab3ec6ac..9c169537 100755
--- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
+++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
@@ -142,7 +142,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
$scope.exportData = function () {
- alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,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,Status as StudyMaterial_Status,CAST(Balance_fee AS NUMBER) as BalanceFee,Date INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]);
+ alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,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,Status as StudyMaterial_Status,Date,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]);
};
diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html
index eca1e330..efed3b3f 100755
--- a/Apollo/assets/views/report_answer_booklets.html
+++ b/Apollo/assets/views/report_answer_booklets.html
@@ -119,7 +119,7 @@ td,th {