diff --git a/Apollo/api/application/controllers/Fees_Status_Controller.php b/Apollo/api/application/controllers/Fees_Status_Controller.php index 32121959..6afbc0a6 100755 --- a/Apollo/api/application/controllers/Fees_Status_Controller.php +++ b/Apollo/api/application/controllers/Fees_Status_Controller.php @@ -145,6 +145,7 @@ class Fees_Status_Controller extends REST_Controller { $detailsChild['CreatedBy'] = $this->post('createdBy'); $detailsChild['CreatedOn'] = $now->format('Y-m-d H:i:s'); $detailsChild['UpdatedBy'] = $this->post('requestedBranch'); + $detailsChild['Installment'] = $this->post('existPaidCount'); $smsDetails['FeesName'] = $this->post('feesName'); $smsDetails['CurrentBalance'] = $this->post('currentBalance'); $updateDetails = $this->Fees_model->updateFees($detailsChild,$this->post('courseID'),$this->post('feesName'),$smsDetails);// Check if the users data store contains users (in case the database result returns NULL) diff --git a/Apollo/api/application/controllers/University_Controller.php b/Apollo/api/application/controllers/University_Controller.php index 818ce1c7..11e8e3a6 100755 --- a/Apollo/api/application/controllers/University_Controller.php +++ b/Apollo/api/application/controllers/University_Controller.php @@ -64,22 +64,44 @@ class University_Controller extends REST_Controller { //update university details public function updateUniversityDetail_post() { + + //s print_r($_FILES); + $imagename=''; + $size=''; + $imageSource=''; + + if(!empty($_FILES)) + { + $imagename = $_FILES['idProof']['name']; + $size = $_FILES['idProof']['size']; + $imageSource = $_FILES['idProof']['tmp_name']; + } + + + // echo $imagename; + // echo $size; + // echo $imageSource; + // die(); + + $reqData = $this->post('data'); + $data = json_decode($reqData, true); $req['UpdatedBy'] = $this->post('updatedBy'); $date = date('Y-m-d H:i:s'); $req['UpdatedOn'] = $date; - $req['UniversityName']= $reqData['UniversityName']; - $req['UniversityShortName']= $reqData['UniversityShortName']; - $req['MobileNumber']= $reqData['MobileNumber']; - $req['EmailID']= $reqData['EmailID']; - $req['Address']= $reqData['Address']; - $req['IsActive']= $reqData['IsActive']; + $req['UniversityName']= $data['UniversityName']; + $req['UniversityShortName']= $data['UniversityShortName']; + $req['MobileNumber']= $data['MobileNumber']; + $req['EmailID']= $data['EmailID']; + $req['Address']= $data['Address']; + $req['IsActive']= $data['IsActive']; $req['BranchCode'] = $this->post('branchCode'); - $req['ID']= $reqData['ID']; + $req['ID']= $data['ID']; - $updateFor = $reqData['UniversityID']; + $updateFor = $data['UniversityID']; - $updateUniversityDetail = $this->university_model->update_university_details($updateFor, $req);// Check if the employee exist + + $updateUniversityDetail = $this->university_model->update_university_details($updateFor, $req,$imagename,$imageSource,$size);// Check if the employee exist if ($updateUniversityDetail) { $updateUniversityDetail['status'] = REST_Controller::HTTP_OK; @@ -124,20 +146,37 @@ class University_Controller extends REST_Controller { // insert university details public function insertUniversity_post() { + + // echo "sdg"; + + $imagename = $_FILES['idProof']['name']; + $size = $_FILES['idProof']['size']; + $imageSource = $_FILES['idProof']['tmp_name']; + // echo $imagename; + // echo $size; + // echo $imageSource; + + $reqData = $this->post('data'); + $temp = json_decode($reqData, true); + + //print_r($reqData); + //die(); $req['CreatedBy'] = $this->post('createdBy'); $date = date('Y-m-d H:i:s'); $req['CreatedOn'] = $date; - $req['UniversityName']= $reqData['UniversityName']; - $req['UniversityShortName']= $reqData['UniversityShortName']; - $req['MobileNumber']= $reqData['MobileNumber']; - $req['EmailID']= $reqData['EmailID']; - $req['Address']= $reqData['Address']; - $req['IsActive']= $reqData['switchsetting']; - $req['UniversityID']= $reqData['UniversityID']; + $req['UniversityName']= $temp['UniversityName']; + $req['UniversityShortName']= $temp['UniversityShortName']; + $req['MobileNumber']= $temp['MobileNumber']; + $req['EmailID']= $temp['EmailID']; + $req['Address']= $temp['Address']; + $req['IsActive']= $temp['switchsetting']; + $req['UniversityID']= $temp['UniversityID']; $req['BranchCode']= $this->post('branchCode'); - $insertUniv = $this->university_model->insert_Univ($req);// Check if the employee exist + + + $insertUniv = $this->university_model->insert_Univ($req,$imagename,$imageSource,$size);// Check if the employee exist if ($insertUniv) { $insertUniv['status'] = REST_Controller::HTTP_OK; diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 2c447af2..34be21bd 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -1232,7 +1232,7 @@ class Fees_status_model extends CI_Model $insertArray['Date'] = $data['BillDate']; $insertArray['CreatedBy'] = $data['CreatedBy']; $insertArray['CreatedOn'] = $data['CreatedOn']; - $insertArray['Description'] = $data['InternalComments']; + $insertArray['ReceiptNoComments'] = $data['InternalComments']; $insertArray['PaidDescription'] = ""; $insertArray['Amount'] = $data['BillAmount']; $insertArray['Status'] = 'Approved'; @@ -1316,7 +1316,7 @@ class Fees_status_model extends CI_Model $this->db->join(STUDENTS_FEES_STATUS.' as SFS', 'FIN.FeesID = SFS.FeesID'); $this->db->join(STUDENTS_FEES_PAID.' as SFP', 'SFP.FeesId = FIN.FeesID','left'); $this->db->where('FIN.DueDate',$tomorrowDATE); - // $this->db->where('SFP.IsActive','1'); + $this->db->where('SFP.IsActive','1'); $getStudentDetails = $this->db->get(); if ($getStudentDetails->result()){ @@ -1346,7 +1346,7 @@ class Fees_status_model extends CI_Model $this->db->join(STUDENTS_FEES_STATUS.' as SFS', 'FIN.FeesID = SFS.FeesID'); $this->db->join(STUDENTS_FEES_PAID.' as SFP', 'SFP.FeesId = FIN.FeesID','left'); $this->db->where('FIN.DueDate',$afterFiveDays); - // $this->db->where('SFP.IsActive','1'); + $this->db->where('SFP.IsActive','1'); $getStudentDetails1 = $this->db->get(); if ($getStudentDetails1->result()){ foreach ($getStudentDetails1->result() as $row1){ @@ -1377,7 +1377,7 @@ class Fees_status_model extends CI_Model $this->db->join(STUDENTS_FEES_STATUS.' as SFS', 'FIN.FeesID = SFS.FeesID'); $this->db->join(STUDENTS_FEES_PAID.' as SFP', 'SFP.FeesId = FIN.FeesID','left'); $this->db->where('FIN.DueDate',$preDATE); - //$this->db->where('SFP.IsActive','1'); + $this->db->where('SFP.IsActive','1'); $getStudentDetails2 = $this->db->get(); if ($getStudentDetails2->result()){ foreach ($getStudentDetails2->result() as $row2){ diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 39da5836..35e35acc 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -9,7 +9,7 @@ class Reports_model extends CI_Model { public function status($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,std.father,std.phone,sms.cid as scid,sms.lcode,sms.date as sdate,cfd.syear,sms.sem as sem,sfs.batch as fbatch,cm.course,cm.uname,list.status,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sum(sfp.bamount) as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as balance + $sql = "select @s:=@s+1 SL_NO,sms.sid as Student_id,scd.eid as Enrollment_id,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,sms.cid as Course_id,sms.branch as Branch,sms.date as Date,cfd.syear as Sem_year,sms.sem as Sem,sfs.batch as Batch_Code,cm.course as Course_name,cm.uname as University,list.Status,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as Balance_fee,sfp.bdate as Initial_paid_date from (SELECT @s:= 0) AS s, (SELECT ID,StudentID as sid,CourseID as cid,ListCode as lcode,BranchCode as branch,SDate as date,Sem as sem FROM T_StudyMaterialStatus where ID in (SELECT max(ID) FROM T_StudyMaterialStatus group by StudentID,CourseID,BranchCode,Sem) group by sid,sem,cid,branch) as sms @@ -18,6 +18,7 @@ class Reports_model extends CI_Model group by sid,fid,cid,batch) as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype 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 left join (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd @@ -32,7 +33,8 @@ group by cid order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father 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 and scd.branch=sms.branch where sms.sid != 'null' "; if ($br!= ''){ @@ -50,8 +52,8 @@ order by CourseID) as cm $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by ssid,scid,fbatch,lcode,fbatch,fid,sem"; - $sql.=" order by sl"; + $sql.=" group by Student_id,Course_id,Branch,Batch_code,Sem"; + $sql.=" order by SL_NO"; $leadDet=$this->db->query($sql); $statusDetails = $leadDet->result(); if (count($statusDetails) > 0) { @@ -102,16 +104,17 @@ order by CourseID) as cm } public function markcard($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,sms.ctype,std.father,std.phone,sms.cid as scid,sms.lcode,sms.cdate as sdate,cfd.syear,sms.sem as sem,sfs.batch as fbatch,cm.course,cm.uname,list.status,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sum(sfp.bamount) as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as balance + $sql = "select @s:=@s+1 SL_NO,sms.sid as Student_id,ifnull(scd.eid,'-') as Enrollment_id,sfs.rollno as Roll_NO,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,sms.cid as Course_id,ifnull(sms.cdate,'-') as Date,cfd.syear as Sem_year,sms.sem as Sem,sfs.batch as Batch_code,sms.branch as Branch_code,cm.course as Course_name,cm.uname as University,list.status as Status,sfp.bdate as Initial_paid_date,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as Balance_Fee from (SELECT @s:= 0) AS s, (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,CertificationType as ctype,CDate as cdate,Sem as sem 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 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 + (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,RollNO as rollno,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 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 left join (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd @@ -126,8 +129,9 @@ group by cid order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid - where sms.sid != 'null' + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father 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 "; if ($br!= ''){ @@ -144,8 +148,8 @@ order by CourseID) as cm $sql.=" and u.uid = '".$u."'"; } - $sql.=" group by ssid,scid,fbatch,lcode,fbatch,fid,sem"; - $sql.=" order by sl"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem"; + $sql.=" order by SL_NO"; $leadDet=$this->db->query($sql); $mstatusDetails = $leadDet->result(); if (count($mstatusDetails) > 0) { @@ -161,7 +165,7 @@ order by CourseID) as cm } public function certificate_status($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,sms.certname,std.father,std.phone,sms.cid as scid,sms.lcode,sms.adate as adate,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,list.status,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sum(sfp.bamount) as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as balance + $sql = "select @s:=@s+1 SL_NO,sms.sid as Student_id,ifnull(scd.eid,0) as Enrollment_id,std.name as Student_name,sms.certname as Certificate_name,std.father as Father,std.phone as Phone_number,sms.cid as Course_id,sms.adate as Date,cfd.syear as Sem_year,sfs.batch as Batch_code,sms.branch as Branch_code,cm.course as Course_name,cm.uname as University,list.status as Status,sfp.bdate as Document_fee_paid_date,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as Balance_fee from (SELECT @s:= 0) AS s, (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 FROM T_ApplicationStatus as app left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType @@ -172,6 +176,7 @@ group by sid,cid,lcode,branch) as sms group by sid,fid,cid,batch) as sfs on sfs.sid=sms.sid and sms.cid=sfs.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 left join (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd @@ -186,8 +191,9 @@ group by cid order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid - where sms.sid != 'null' + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father 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 "; if ($br!= ''){ @@ -201,11 +207,11 @@ order by CourseID) as cm } if ($u!= ''){ - $sql.=" and u.uid = '".$u."'"; + $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by ssid,scid,fbatch,lcode,fbatch,fid"; - $sql.=" order by sl"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code"; + $sql.=" order by SL_NO"; $leadDet=$this->db->query($sql); $cert_statusDetails = $leadDet->result(); if (count($cert_statusDetails) > 0) { @@ -221,10 +227,10 @@ order by CourseID) as cm } public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,ams.certname,sms.ccmts,ams.acmts,std.father,std.phone,sms.cid as scid,sms.lcode,sms.cdate,ams.adate as adate,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,sms.sem,list.status,alist.astatus,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sfp.bamount as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sfp.bamount) as balance + $sql = "select @s:=@s+1 SL_NO,sms.sid as Student_id,scd.eid as Enrollment_id,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,sms.cid as Course_id,sfs.batch as Batch_code,sms.branch as Branch_code,cm.course as course_name,cm.uname as University,sfp.bdate as Document_fee_paid_date,((sfs.cf + sfs.stf + sfs.others)-sfp.bamount) as Balance_fee,cfd.syear as Sem_year,sms.sem as Sem,list.status as Markcard_status,sms.mdate as Markcard_date,sms.mcmts as Markcard_comments,ams.certname as Certificate_name,alist.astatus as Certificate_status,ams.adate as Certificate_date,ams.acmts as Certificate_comments from (SELECT @s:= 0) AS s, (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode, - CertificationType as ctype,CDate as cdate,Sem as sem,Comments as ccmts + 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 @@ -242,6 +248,7 @@ left join as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype 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 left join @@ -260,9 +267,9 @@ left join order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father - FROM T_StudentDetails) as std on std.sid=sms.sid - where sms.sid != 'null' + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father 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 "; if ($br!= ''){ @@ -283,12 +290,12 @@ left join $fromd= date("Y-m-d",strtotime($from)); $tod=date("Y-m-d",strtotime($to)); - $sql.="and sms.cdate >= '".$fromd."' - and sms.cdate <= '".$tod."'"; + $sql.="and sfp.bdate >= '".$fromd."' + and sfp.bdate <= '".$tod."'"; } - $sql.=" group by ssid,scid,fbatch,fbatch,fid,sem"; - $sql.=" order by sl"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem"; + $sql.=" order by SL_NO"; $leadDet=$this->db->query($sql); $mcert_statusDetails = $leadDet->result(); @@ -305,7 +312,7 @@ left join } public function expense($from=null,$to=null){ - $sql = "SELECT dbm.Date as date,exp.TypeName as exp_name,sum(dbm.Amount) as amount FROM T_Income_Outcome_Master exp + $sql = "SELECT dbm.Date as date,exp.TypeName as Expense_name,sum(dbm.Amount) as Amount FROM T_Income_Outcome_Master exp join T_DayBookMaster dbm on dbm.Type=exp.ID where dbm.Name = 'I001' and dbm.Status = 'Approved' "; @@ -318,7 +325,7 @@ left join and dbm.Date <= '".$tod."'"; } - $sql.=" group by exp_name"; + $sql.=" group by Expense_name"; $leadDet=$this->db->query($sql); @@ -336,7 +343,7 @@ left join } public function answer_booklet($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,std.father,std.phone,sms.cid as scid,sms.sem,sms.lcode,sms.adate as adate,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,list.status,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sum(sfp.bamount) as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as balance + $sql = "select @s:=@s+1 SL_NO,sms.sid as Student_id,scd.eid as Enrollment_id,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,sms.cid as Course_id,sfs.batch as Batch_code,sms.branch as Branch_code,sms.adate as Date,cfd.syear as Sem_year,sms.sem as Sem,cm.course as Course_name,cm.uname as University,list.status as Status from (SELECT @s:= 0) AS s, (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as adate,Sem as sem FROM T_AnswerBookletStatus @@ -349,6 +356,7 @@ left join as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype 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 left join @@ -364,9 +372,9 @@ left join order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father - FROM T_StudentDetails) as std on std.sid=sms.sid - where sms.sid != 'null' + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father 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 "; if ($br!= ''){ @@ -384,8 +392,8 @@ left join $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by ssid,scid,fbatch,lcode,fbatch,fid,sem"; - $sql.=" order by sl"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem"; + $sql.=" order by SL_NO"; $leadDet=$this->db->query($sql); @@ -403,7 +411,7 @@ left join } public function app_pending($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,std.father,std.phone,sms.cid as scid,sms.lcode,sms.adate as adate,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,list.status,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sum(sfp.bamount) as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as balance + $sql = "select @s:=@s+1 SL_NO,sms.sid as Student_id,scd.eid as Enrollment_id,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,sms.cid as Course_id,cfd.syear as Sem_year,sfs.batch as Batch_code,sms.branch as Branch_code,cm.course as Course_name,cm.uname as University,list.status as Status,sfp.bdate as Admission_date from (SELECT @s:= 0) AS s, (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 FROM T_ApplicationStatus as app left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType @@ -416,7 +424,7 @@ left join as sfs on sfs.sid=sms.sid and sms.cid=sfs.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 ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails group by StudentID,FeesID) +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 left join @@ -432,9 +440,9 @@ left join order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father - FROM T_StudentDetails) as std on std.sid=sms.sid - where sms.sid != 'null' + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father 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 "; if ($br!= ''){ @@ -452,8 +460,8 @@ left join $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by ssid,scid,fbatch,lcode,fbatch,fid"; - $sql.=" order by sl"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code"; + $sql.=" order by SL_NO"; $leadDet=$this->db->query($sql); @@ -471,57 +479,50 @@ left join } public function doc_pending($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,std.father,std.phone,sms.cid as scid,sms.lcode,sms.adate as adate,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,list.status,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sum(sfp.bamount) as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as balance - from (SELECT @s:= 0) AS s, - (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 FROM T_ApplicationStatus as app -left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType -where CertificateName != 'APPLICATION' 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 -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 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 -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 -left join - (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) - as list on list.lcode=sms.lcode -left join + $sql = "SELECT @s:=@s+1 SL_NO,sdt.StudentID as Student_id,scd.eid as Enrollment_id,sfb.bdate as Admission_date,std.name Student_name,std.father as Father_name,std.phone as Phone_number,lt.CreatedBranch as Branch_code,sfb.batch as Batch_code,lt.Course as Course_name,lt.University as University,uc.cid as Course_id,cfd.syear as Sem_year,sdt.StatusName as Status + FROM (SELECT @s:= 0) AS s,T_Student_DocumentTrack_Details as sdt + join T_Lead_Tracking as lt on lt.PendingDocStatus=sdt.ID + left join + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sdt.StudentID + 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 -left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father - FROM T_StudentDetails) as std on std.sid=sms.sid - where sms.sid != 'null' + 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 uc on uc.course=lt.Course + 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=uc.cid + left join + (select sfp.sid,sfp.bdate,sfs.batch,sfs.cid from (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 + 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.fid=sfp.fid and sfs.sid=sfp.sid + group by sfs.sid,sfs.cid) as sfb on sfb.sid=sdt.StudentID and sfb.cid=uc.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=sdt.StudentID and scd.cid=uc.cid and scd.branch=uc.branch + where std.active = 1 + "; if ($br!= ''){ - $sql.=" and sms.branch = '".$br."'"; + $sql.=" and lt.CreatedBranch = '".$br."'"; } if ($bat!= ''){ - $sql.=" and b.bcode = '".$bat."'"; + $sql.=" and sfb.batch = '".$bat."'"; } if ($u!= ''){ - $sql.=" and cm.uid = '".$u."'"; + $sql.=" and uc.cuid = '".$u."'"; } - $sql.=" group by ssid,scid,fbatch,lcode,fbatch,fid"; - $sql.=" order by sl"; + $sql.="group by Student_id,Course_id,Batch_code,Branch_code "; + $sql.=" order by SL_NO"; $leadDet=$this->db->query($sql); @@ -539,19 +540,20 @@ left join } public function wav_ref($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,std.name,std.father,std.phone,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,sfs.cid as scid,sms.waiver_bill,sms.waiver,sms.referal_bill,sms.referal,sms.cmts + $sql = "select @s:=@s+1 SL_NO,sms.sid as Student_id,scd.eid as Enrollment_id,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,cfd.syear as Sem_year,sfs.batch as Batch_code,scd.branch as Branch_code,sfs.cid as Course_id,cm.course as Course_name,cm.uname as University,sms.waiver_bill as Waiver_bill,sms.waiver as Waiver_amount,sms.referal_bill as Referal_bill,sms.referal as Referal_amount,sms.cmts as Comments from (SELECT @s:= 0) AS s, (SELECT StudentID as sid,CommentsForStudent as cmts,FeesId as fid, IF(ModeOfPayment = 'WAIVER', BillNO,0) AS waiver_bill, IF(ModeOfPayment = 'WAIVER', sum(BillAmount), 0) AS waiver, IF(ModeOfPayment = 'REFERRAL', BillNO, 0) AS referal_bill, IF(ModeOfPayment = 'REFERRAL', sum(BillAmount), 0) AS referal FROM T_Students_Fees_PaidDetails + where IsActive = 1 group by waiver_bill,referal_bill) 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 left join - (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,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=sfs.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 @@ -563,9 +565,8 @@ left join order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father - FROM T_StudentDetails) as std on std.sid=sms.sid - where sms.sid != 'null' + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid + where std.active = 1 "; @@ -584,8 +585,8 @@ left join $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by ssid,scid,fbatch,fbatch,waiver_bill,referal_bill"; - $sql.=" order by sl"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Waiver_bill,Referal_bill"; + $sql.=" order by SL_NO"; $leadDet=$this->db->query($sql); @@ -603,7 +604,7 @@ left join } public function examfee($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,std.name,std.father,std.phone,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,sfs.cid as scid,sms.cmts,sms.stf,sms.branch + $sql = "select @s:=@s+1 SL_NO,sms.sid as Student_id,scd.eid as Enrollment_id,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,cfd.syear as Sem_year,sfs.batch as Batch_code,cm.course as Course_name,cm.uname as University,sfs.cid as Course_id,sms.cmts as Comments,sms.stf as Amount,sms.branch as Branch_code from (SELECT @s:= 0) AS s, (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 != '' @@ -612,7 +613,7 @@ 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 left join - (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,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=sfs.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 @@ -624,9 +625,9 @@ left join order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father - FROM T_StudentDetails) as std on std.sid=sms.sid - where sms.sid != 'null' + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid + where std.active = 1 + "; if ($br!= ''){ @@ -644,8 +645,8 @@ left join $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by ssid,scid,fbatch,fbatch"; - $sql.=" order by sl"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code"; + $sql.=" order by SL_NO"; $leadDet=$this->db->query($sql); @@ -662,61 +663,54 @@ left join } public function balfee($bat=null,$br=null,$u=null){ - $count="SELECT distinct StudentID as sid FROM T_Students_Fees_PaidDetails"; - $sc=$this->db->query($count); - $ct = $sc->result(); - $results=array(); - $answer=array(); - $sid= array(); - - $yy = new RecursiveIteratorIterator(new RecursiveArrayIterator($ct)); - foreach($yy as $t) { - $sid[]=$t; - } - $s=count($sid); - // echo $sid; - // print_r($s);die(); - - // while($sid<=$s){ - for($i=0;$i<$s;$i++){ - $sql = " SELECT @s:=@s+1 sl,ID,StudentID as sid,std.name as name,std.father as father,std.phone as phone,b.batch as batch,br.bname as bname,sfs.cid as cid,u.uname as uname,cm.course as course,cfd.syear as syear,sum(BillAmount) as bamount,sum(sfs.cf) as crsfee,sum(sfs.stf) as stf,sum(sfs.others) as others,(sum(sfs.cf) + sum(sfs.stf) + sum(sfs.others)) as total,(sum(sfs.cf) + (sum(sfs.stf) + sum(sfs.others)) - ifnull(sfp.BillAmount,0)) as balance,InternalComments as cmts, - (SELECT BillNO as billno FROM T_Students_Fees_PaidDetails WHERE StudentID = '".$sid[$i]."' limit 0,1) AS 1billno, - (SELECT BillAmount as billamt FROM T_Students_Fees_PaidDetails WHERE StudentID = '".$sid[$i]."' limit 0,1) AS 1billamt, - (SELECT BillNO as billno FROM T_Students_Fees_PaidDetails WHERE StudentID = '".$sid[$i]."' limit 1,1) AS 2billno, - (SELECT BillAmount as billamt FROM T_Students_Fees_PaidDetails WHERE StudentID = '".$sid[$i]."' limit 1,1) AS 2billamt, - (SELECT BillNO as billno FROM T_Students_Fees_PaidDetails WHERE StudentID = '".$sid[$i]."' limit 2,1) AS 3billno, - (SELECT BillAmount as billamt FROM T_Students_Fees_PaidDetails WHERE StudentID = '".$sid[$i]."' limit 2,1) AS 3billamt, - (SELECT BillNO as billno FROM T_Students_Fees_PaidDetails WHERE StudentID = '".$sid[$i]."' limit 3,1) AS 4billno, - (SELECT BillAmount as billamt FROM T_Students_Fees_PaidDetails WHERE StudentID = '".$sid[$i]."' limit 3,1) AS 4billamt, - (SELECT BillNO as billno FROM T_Students_Fees_PaidDetails WHERE StudentID = '".$sid[$i]."' limit 4,1) AS 5billno, - (SELECT BillAmount as billamt FROM T_Students_Fees_PaidDetails WHERE StudentID = '".$sid[$i]."' limit 4,1) AS 5billamt - FROM T_Students_Fees_PaidDetails as sfp - 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,Comments as cmts FROM T_Students_Fees_Status - group by sid,batch) as sfs on sfs.sid=sfp.StudentID - left join - (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details, (SELECT @s:= 0) AS s) as cfd - on cfd.cid=sfs.cid - left join - (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm - on cm.cid=sfs.cid - left join - (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u - on u.uid=cm.uid - left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sfp.StudentID + + $sql = "SELECT sfp.StudentID as Student_id,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,sfs.batch as Batch_code,sfs.cid as Course_id,cm.course as Course_name,u.uname as University,sfs.branch as Branch_code,cfd.syear as Sem_year,(sfs.cf + sfs.stf + sfs.others) as Total,(sfb.bamount) as Paid_fee,((sfs.cf + sfs.stf + sfs.others) - (sfb.bamount)) as balance, + MAX(CASE WHEN Installment = 1 THEN sfp.BillNO END) as billno1, + MAX(CASE WHEN Installment = 1 THEN sfp.BillAmount END) as billamt1, + MAX(CASE WHEN Installment = 2 THEN sfp.BillNO END) as billno2, + MAX(CASE WHEN Installment = 2 THEN sfp.BillAmount END) as billamt2, + MAX(CASE WHEN Installment = 3 THEN sfp.BillNO END) as billno3, + MAX(CASE WHEN Installment = 3 THEN sfp.BillAmount END) as billamt3, + MAX(CASE WHEN Installment = 4 THEN sfp.BillNO END) as billno4, + MAX(CASE WHEN Installment = 4 THEN sfp.BillAmount END) as billamt4, + MAX(CASE WHEN Installment = 5 THEN sfp.BillNO END) as billno5, + MAX(CASE WHEN Installment = 5 THEN sfp.BillAmount END) as billamt5, + MAX(CASE WHEN Installment = 6 THEN sfp.BillNO END) as billno6, + MAX(CASE WHEN Installment = 6 THEN sfp.BillAmount END) as billamt6, + MAX(CASE WHEN Installment = 7 THEN sfp.BillNO END) as billno7, + MAX(CASE WHEN Installment = 7 THEN sfp.BillAmount END) as billamt7, + MAX(CASE WHEN Installment = 8 THEN sfp.BillNO END) as billno8, + MAX(CASE WHEN Installment = 8 THEN sfp.BillAmount END) as billamt8, + MAX(CASE WHEN Installment = 9 THEN sfp.BillNO END) as billno9, + MAX(CASE WHEN Installment = 9 THEN sfp.BillAmount END) as billamt9, + MAX(CASE WHEN Installment = 10 THEN sfp.BillNO END) as billno10, + MAX(CASE WHEN Installment = 10 THEN sfp.BillAmount END) as billamt10 + FROM T_Students_Fees_PaidDetails as sfp + left join (SELECT FeesID as fid,BatchCode as batch,BranchCode as branch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others,Comments as cmts FROM T_Students_Fees_Status + group by fid,sid,batch,branch) as sfs on sfs.fid=sfp.FeesID and sfs.sid=sfp.StudentID + 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 + left join + (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm + on cm.cid=sfs.cid left join - (SELECT BatchCode as bcode,BatchName as batch FROM T_BatchMaster) as b on b.bcode=sfs.batch - left join - (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,BranchID as bid FROM T_Student_CourseDetails) as scd on scd.sid=sfp.StudentID - left join - (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=scd.bid - where StudentID = '".$sid[$i]."' - "; + (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u + on u.uid=cm.uid + left join + (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father,IsActive as active FROM T_StudentDetails where IsActive = 1) as std on std.sid=sfp.StudentID + left join + (SELECT BatchCode as bcode,BatchName as batchname FROM T_BatchMaster) as b on b.bcode=sfs.batch + left join + (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sfp.UpdatedBy + left join + (SELECT StudentID as sid,FeesID as fid,BillNo as billno,sum(BillAmount) as bamount FROM T_Students_Fees_PaidDetails + group by sid,fid) as sfb on sfb.sid=sfp.StudentID and sfb.fid=sfp.FeesID + where sfp.IsActive = 1 "; if ($br!= ''){ - $sql.=" and sms.branch = '".$br."'"; + $sql.=" and br.brcode = '".$br."'"; } if ($bat!= ''){ @@ -729,13 +723,14 @@ left join $sql.=" and u.uid = '".$u."'"; } - $sql.=" group by sid,cid,batch"; - $sql.=" order by sl"; + $sql.=" group by Student_id,Batch_code,Course_id,Branch_code"; + $leadDet=$this->db->query($sql); - $answer[] = $leadDet->result(); + $answer = $leadDet->result(); + if (count($answer) > 0) { $results['balfeeList'] = true; @@ -744,7 +739,7 @@ left join $results['balfeeList'] = false; $results['message'] = 'No record found'; } - } + return $results; } diff --git a/Apollo/api/application/models/University_model.php b/Apollo/api/application/models/University_model.php index 69966e78..470eeb59 100755 --- a/Apollo/api/application/models/University_model.php +++ b/Apollo/api/application/models/University_model.php @@ -34,10 +34,35 @@ class University_model extends CI_Model $results['message'] = 'No record found'; } return $results; + + print_r($results); } // update univesity details - public function update_university_details($updateFor, $Arr) { + public function update_university_details($updateFor, $Arr,$imageName, $imageSource, $imageSize) { + + if($imageSource == '') + { + //echo "if"; + $imageNameDb = 'default.jpeg'; + // $Arr['ProfilePicPath'] = "university/".$imageNameDb; + } + + else + { + //echo "else"; + $target = "../images/university/"; + $getUploadStatus = $this->upload_image($imageSource, $imageSize, $target); + $imageNameDb = $getUploadStatus['status'] == true ? $getUploadStatus['imageName'] : $getUploadStatus['imageName'] = 'default.jpeg'; + // echo $imageNameDb; + $Arr['ProfilePicPath'] = "university/".$imageNameDb; + } + + + // print_r($Arr); + // die(); + + $this->db->where('UniversityID', $updateFor); $this->db->where('BranchCode', $Arr['BranchCode']); $this->db->where('ID', $Arr['ID']); @@ -47,7 +72,7 @@ class University_model extends CI_Model $result['message'] = "Successfully University details Updated"; } else { $result['updateUniversityStatus'] = false; - $result['message'] = "Successfully University details Updated"; + $result['message'] = "University details not Updated"; } return $result; } @@ -69,7 +94,35 @@ class University_model extends CI_Model } // add university details - public function insert_Univ($arr) { + public function insert_Univ($arr,$imageName, $imageSource, $imageSize) { + + // echo $imageName; + // echo $imageSource; + // echo $imageSize; + + if($imageSource == '') + { + //echo "if"; + $imageNameDb = 'default.jpeg'; + $arr['ProfilePicPath'] = "university/".$imageNameDb; + } + + else + { + //echo "else"; + $target = "../images/university/"; + $getUploadStatus = $this->upload_image($imageSource, $imageSize, $target); + $imageNameDb = $getUploadStatus['status'] == true ? $getUploadStatus['imageName'] : $getUploadStatus['imageName'] = 'default.jpeg'; + // echo $imageNameDb; + $arr['ProfilePicPath'] = "university/".$imageNameDb; + } + + + // // echo $imageName; + // // echo $imageSource; + // // echo $imageSize; + // echo $imageSource; + //die(); $this->db->select('*'); $this->db->from(UNIVERSITY); $this->db->where('UniversityID', $arr['UniversityID']); @@ -81,7 +134,7 @@ class University_model extends CI_Model $this->db->insert(UNIVERSITY, $arr); if ($this->db->affected_rows() == '1') { $result['addUniv'] = true; - $result['message'] = "Successfully University details added"; + $result['message'] = "Successfully University details added"; } else { $result['addUniv'] = false; $result['message'] = "Something went wrong.please try again"; @@ -382,4 +435,30 @@ class University_model extends CI_Model return $result; } + + // image upload in taget path + public function upload_image( $imageSource, $size, $target ) { + + //echo "fn"; + $key2 = substr(str_shuffle('abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 12); + $new_regNo = "Dri_" . $key2 . "." . 'jpeg'; + $targetPlace = $target . $new_regNo; + // echo $imageSource; + // exit(); + if(!move_uploaded_file($imageSource , $targetPlace)) + {//echo "if"; + return $result['status'] = false; + + $result['imageName'] = $new_regNo; + } + else + { + // echo "else"; + $result['status'] = true; + $result['imageName'] = $new_regNo; + + return $result; + } + } + } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 9cd324d7..dd1ce883 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -498,6 +498,13 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } angular.element('.ng-invalid[name=' + firstError + ']').focus(); } else { + // count exist payment length report purpose + $scope.existPaidCount=1; + angular.forEach($scope.existStudentFeesDetails,function (values) { + if(updateModel.feesType.FeesID==values.FeesID){ + $scope.existPaidCount=parseInt($scope.existPaidCount)+parseInt(values.paidDetails.length); + } + }); $scope.ldloading = {}; $scope.ldloading[loading.replace('-', '_')] = true; @@ -519,7 +526,6 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n billDate: $scope.billDate, billAmount:updateModel.billAmount, modeOfPayment: updateModel.paymentOn.paymentOn, - commentsForStudent: updateModel.studComments, internalComments: updateModel.internalComments, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, @@ -529,7 +535,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n course: myModel.CourseName, //statusCode: updateModel.statusCode, requestedBranch : JSON.parse(localStorage.getItem('localObj')).localBranchID, - currentBalance : $scope.currentBalance + currentBalance : $scope.currentBalance, + existPaidCount : $scope.existPaidCount } diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 6998328b..4fdeb08c 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -64,7 +64,26 @@ app.controller('report_ans_bookletCtrl', ["$scope", "API_POINTS", "$http", "Swee }); } - + var mystyle = { + sheetid: 'ANSWER BOOKLET STATUS REPORT', + headers: true, + caption: { + title:'ANSWER BOOKLET STATUS REPORT', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:10px' + }, + + }; + + + + $scope.exportData = function () { + alasql('SELECT * INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]); + }; }]); diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index d22e308e..768223dd 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -64,7 +64,26 @@ app.controller('report_app_pendingCtrl', ["$scope", "API_POINTS", "$http", "Swee }); } - + var mystyle = { + sheetid: 'APPLICAITON PENDING STUDENT LIST REPORT', + headers: true, + caption: { + title:'APPLICAITON PENDING STUDENT LIST REPORT', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:10px' + }, + + }; + + + + $scope.exportData = function () { + alasql('SELECT * 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 cec1dea0..0e46804f 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -3,9 +3,14 @@ app.controller('report_balfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window', function ($scope, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window) { - // DataTables configurable options - - + // to generate serial number + // $scope.serial = 1; + // $scope.itemPerPage=10 + // $scope.indexCount = function(newPageNumber){ + + // $scope.serial = newPageNumber * $scope.itemPerPage - ($scope.itemPerPage-1); + // } + //to filter labels $scope.filters = { "branch": "", "university": "", @@ -33,9 +38,9 @@ app.controller('report_balfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAler } }); } - + // response data $scope.onSubmit = function () { - //alert($scope.batch.name); + $scope.balfee_data = ''; $scope.message = ''; var response_data = { @@ -64,6 +69,26 @@ app.controller('report_balfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAler }); } + var mystyle = { + sheetid: 'BALANCE FEE STATUS REPORT', + headers: true, + caption: { + title:'BALANCE FEE STATUS REPORT', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:10px' + }, + + }; + + + + $scope.exportData = function () { + alasql('SELECT * INTO XLS("Balancefee_status.xls",?) FROM ?',[mystyle,$scope.balfee_data]); + }; }]); diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index 53c0388c..5168b284 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -62,6 +62,26 @@ app.controller('report_certificateCtrl', ["$scope", "API_POINTS", "$http", "Swee }); } + var mystyle = { + sheetid: 'CERTIFICATE STATUS REPORT', + headers: true, + caption: { + title:'CERTIFICATE STATUS REPORT', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:10px' + }, + + }; + + + + $scope.exportData = function () { + alasql('SELECT * INTO XLS("Certificate_status.xls",?) FROM ?',[mystyle,$scope.cert_data]); + }; }]); diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index fa011528..1750ef44 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -64,7 +64,26 @@ app.controller('report_doc_pendingCtrl', ["$scope", "API_POINTS", "$http", "Swee }); } - + var mystyle = { + sheetid: 'DOCUMENT PENDING STUDENT LIST REPORT', + headers: true, + caption: { + title:'DOCUMENT PENDING STUDENT LIST REPORT', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:10px' + }, + + }; + + + + $scope.exportData = function () { + alasql('SELECT * INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]); + }; }]); diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index d7a3baba..bca1a0df 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -62,9 +62,41 @@ app.controller('report_examfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAle } }); - + $scope.getstf = function(){ + var totalf = 0; + for(var i = 0; i < $scope.examfee_data.length; i++){ + var item = $scope.examfee_data[i]; + totalf += parseFloat(item.Amount); + } + return totalf; } + } - + var mystyle = { + sheetid: 'EXAM WRITING FEE REPORT', + headers: true, + caption: { + title:'EXAM WRITING FEE REPORT', + + + }, + // style:'background:#00FF00', + column: { + style:'font-size:12px' + }, + + // column: {style:{Font:{Bold:"1"}}}, + // rows: {1:{style:{Font:{Color:"#FF0077"}}}}, + // cells: {1:{1:{ + // style: {Font:{Color:"#00FFFF"}} + // }}} + + }; + + + + $scope.exportData = function () { + alasql('SELECT * INTO XLS("Exam_writing_fee_report.xls",?) FROM ?',[mystyle,$scope.examfee_data]); + }; }]); diff --git a/Apollo/assets/js/controllers/report_expenseCtrl.js b/Apollo/assets/js/controllers/report_expenseCtrl.js index faa64494..974c038d 100755 --- a/Apollo/assets/js/controllers/report_expenseCtrl.js +++ b/Apollo/assets/js/controllers/report_expenseCtrl.js @@ -62,7 +62,27 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle }); } - + + var mystyle = { + sheetid: 'EXPENSE REPORT', + headers: true, + caption: { + title:'EXPENSE REPORT', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:10px' + }, + + }; + + + + $scope.exportData = function () { + alasql('SELECT * INTO XLS("Expense_report.xls",?) FROM ?',[mystyle,$scope.expense_data]); + }; }]); diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index 5484847a..101ea374 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -66,7 +66,26 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "API_POINTS", "$htt }); } - + var mystyle = { + sheetid: 'MARKCARD/CERTIFICATE STATUS REPORT', + headers: true, + caption: { + title:'MARKCARD/CERTIFICATE STATUS REPORT', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:10px' + }, + + }; + + + + $scope.exportData = function () { + alasql('SELECT * INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]); + }; }]); diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index 11cea2a2..f254efb7 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -62,7 +62,30 @@ app.controller('report_markcard_statusCtrl', ["$scope", "API_POINTS", "$http", " }); } - + var mystyle = { + sheetid: 'MARKCARD STATUS REPORT', + headers: true, + caption: { + title:'MARKCARD STATUS REPORT', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:10px' + }, + + }; + + + + $scope.exportData = function () { + alasql('SELECT * INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]); + }; + + + + }]); diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index b23c806c..13ff3575 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -1,9 +1,9 @@ 'use strict'; /*** controller***/ app.controller('report_study_material_statusCtrl', ["$scope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window', - function ($scope, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window) { + function ($scope,apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, DTOptionsBuilder, DTColumnBuilder) { - // DataTables configurable options + // DataTables configurable options $scope.filters = { @@ -27,7 +27,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "API_POINTS", "$ht $scope.batch = response.data.batch; $scope.branch = response.data.branch; $scope.university = response.data.university; - console.log($scope.branch); + //console.log($scope.branch); } else { } }); @@ -62,6 +62,65 @@ app.controller('report_study_material_statusCtrl', ["$scope", "API_POINTS", "$ht }); } + var mystyle = { + sheetid: 'STUDY MATERIAL STATUS REPORT', + headers: true, + caption: { + title:'STUDY MATERIAL STATUS REPORT', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:10px;' + }, + // row: { + // style:'border:1px solid black; padding-left:5px; padding-right:5px' + // }, + // columns: [ + // {columnid:'email'}, + // {columnid:'dob', title: 'Birthday', width:300}, + // {columnid:'name'}, + // { + // columnid:'name', + // title: 'Number of letters in name', + // width: '300px', + // cell: { + // value: function(value){return value.length} + // } + // }, + // ], + // row: { + // style: function(sheet,row,rowidx){ + // return 'background:'+(rowidx%2?'red':'yellow'); + // } + // }, + // rows: { + // 'border:1px black dotted; padding-left:5px; padding-right:5px' + // 4:{cell:{style:'background:blue'}} + // }, + // cells: { + // 2:{ + // 2:{ + // style: 'font-size:45px;background:pink', + // value: function(value){return value.substr(1,3);} + // } + // } + // } +}; + + + +$scope.exportData = function () { + alasql('SELECT * INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]); +}; + + + +$scope.exportExcel= function () { + alasql('SELECT * INTO XLSX("Study_material_status.xlsx",{headers:true}) \ + FROM HTML("#data",{headers:true})'); +} }]); diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index b5fa33d2..e2548d3d 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -63,9 +63,45 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S } }); - + $scope.getwaiver = function(){ + var total = 0; + for(var i = 0; i < $scope.waiver_referal_data.length; i++){ + var item = $scope.waiver_referal_data[i]; + total += parseFloat(item.Waiver_amount); + } + return total; } + $scope.getref = function(){ + var totalf = 0; + for(var i = 0; i < $scope.waiver_referal_data.length; i++){ + var item = $scope.waiver_referal_data[i]; + totalf += parseFloat(item.Referal_amount); + } + return totalf; } } + var mystyle = { + sheetid: 'WAIVER AND REFERAL REPORT', + headers: true, + caption: { + title:'WAIVER AND REFERAL REPORT', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:10px' + }, + + }; + + + + $scope.exportData = function () { + alasql('SELECT * INTO XLS("Waiver_referal_report.xls",?) FROM ?',[mystyle,$scope.waiver_referal_data]); + }; + + + }]); diff --git a/Apollo/assets/js/controllers/universityCtrl.js b/Apollo/assets/js/controllers/universityCtrl.js index 41b43480..d9627339 100755 --- a/Apollo/assets/js/controllers/universityCtrl.js +++ b/Apollo/assets/js/controllers/universityCtrl.js @@ -12,6 +12,7 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams // get local cliend details var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); + //alert(JSON.stringify(localDetail)); $scope.myModel = { 'UniversityID': '', @@ -21,6 +22,9 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams 'EmailID': '', 'Address': '', 'switchsetting': true, + + + }; @@ -63,7 +67,7 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams if (response.data.univList) { $scope.loader = false; $scope.emptyUniversity = true; - $scope.data = response.data.university_details; + $scope.univ = response.data.university_details; } else { $scope.loader = false; $scope.emptyUniversity = false; @@ -95,6 +99,56 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams }); } + + + + //--------------------------------------------------------------> + // getting for image to show + //--------------------------------------------------------------> + + $scope.stepsModel = []; + $scope.imageUpload = function (event) { + var files = event.target.files; //FileList object + + for (var i = 0; i < files.length; i++) { + var file = files[i]; + var reader = new FileReader(); + reader.onload = $scope.imageIsLoaded; + reader.readAsDataURL(file); + } + } + + $scope.imageIsLoaded = function (e) { + $scope.$apply(function () { + // $scope.stepsModel.push(e.target.result); + $scope.stepsModel[0] = e.target.result; + }); + } + + + //an array of files selected + $scope.filesimage = []; + + //listen for the file selected event + $scope.$on("fileSelected", function (event, args) { + $scope.$apply(function () { + //add the file object to the scope's files collection + $scope.filesimage[0] = args.file; + + // console.log($scope.filesimage); + }); + }); + + + // reset image + $scope.resetImage = function () { + $scope.filesimage.length = 0; + $scope.stepsModel.length = 0; + } + + + //------------------image functions over ----------> + $scope.setEditId = function (id) { // alert(id); $scope.editId = id; @@ -106,6 +160,7 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams } $scope.updateUniversityDetails = function (form, p) { + //alert() var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -123,6 +178,14 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); } else { p.IsActive = p.IsActive === true ? 1 : 0; + var idProof = $scope.filesimage[0]; + + + if(idProof === undefined) + { + + //alert('if') + // alert(JSON.stringify(p)) var req = { method: 'POST', url: apiPoint.url + 'updateUniversityDetail/', @@ -130,7 +193,7 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams 'Content-Type': 'application/json' }, data: { - data: p, + data: JSON.stringify(p), updatedBy: localDetails.localUserID, branchCode: localDetails.localBranchID } @@ -145,6 +208,36 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams swal(" ", "Something went wrong, please try again.", "error"); } }); + } + + + else + { + +//alert('else') + var formData = new FormData(); + var idProof = $scope.filesimage[0]; + //alert(idProof) + + formData.append("data", JSON.stringify(p)); + formData.append("updatedBy", localDetails.localUserID); + formData.append("branchCode", localDetails.localBranchID); + formData.append('idProof', idProof); + + $http.post(apiPoint.url + 'updateUniversityDetail/', formData, { + transformRequest: angular.identity, + headers: { 'Content-Type': undefined, 'Process-Data': false }, + }).success(function (data) { + + if (data.updateUniversityStatus == true) { + swal("Success!", data.message, "success"); + $state.go($state.current, {}, { reload: true }); + } else { + // $scope.ldloading1[loading.replace('-', '_')] = false; + swal("Failed!", data.message, "error"); + } + }); + } } } @@ -168,32 +261,62 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); } else { $scope.myModel.switchsetting = $scope.myModel.switchsetting === true ? 1 : 0; - var req = { - method: 'POST', - url: apiPoint.url + 'insertUniversity/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - data: $scope.myModel, - branchCode: localDetails.localBranchID, - createdBy: localDetails.localUserID, - } - }; - $http(req).then(function (response) { - if (response.data.addUniv == true) { - swal("", "University details added successfully.", "success"); - $state.go($state.current, {}, { reload: true }); - } - else if(response.data.addUniv == false){ - swal("","This University Id is already exist!", "error"); - } - else { - // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("","Something went wrong, please try again.", "error"); - } - }); + var idProof = $scope.filesimage[0]; + var formData = new FormData(); + //var idProof = $scope.filesimage[0]; + + //alert(idProof); + // var req = { + // method: 'POST', + // url: apiPoint.url + 'insertUniversity/', + // headers: { + // 'Content-Type': 'application/json' + // }, + // data: { + // data: $scope.myModel, + // branchCode: localDetails.localBranchID, + // createdBy: localDetails.localUserID, + // } + // }; + formData.append("data", JSON.stringify($scope.myModel)); + formData.append("branchCode", localDetails.localBranchID); + formData.append("createdBy", localDetails.localUserID); + formData.append('idProof', idProof); + + + $http.post(apiPoint.url + 'insertUniversity/', formData, { + transformRequest: angular.identity, + headers: { 'Content-Type': undefined, 'Process-Data': false }, + }).success(function (data) { + if (data.addUniv == true) { + // swal("Success!", data.message, "success"); + // $state.go($state.current, {}, { reload: true }); + swal("Success!", data.message, "success"); + $state.go($state.current, {}, { reload: true }); + } else { + // $scope.ldloading1[loading.replace('-', '_')] = false; + swal("Failed!", data.message, "error"); + } + }); + + + + + // $http(req).then(function (response) { + // if (response.data.addUniv == true) { + // swal("", "University details added successfully.", "success"); + // $state.go($state.current, {}, { reload: true }); + // } + // else if(response.data.addUniv == false){ + // swal("","This University Id is already exist!", "error"); + + // } + // else { + // // $scope.ldloading1[loading.replace('-', '_')] = false; + // swal("","Something went wrong, please try again.", "error"); + // } + // }); } }, reset: function (form) { @@ -212,3 +335,22 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams } }]); + + + +// file upload directive +app.directive('fileUpload', function () { + return { + scope: true, //create a new scope + link: function (scope, el, attrs) { + el.bind('change', function (event) { + var files = event.target.files; + //iterate files since 'multiple' may be specified on the element + for (var i = 0; i < files.length; i++) { + //emit event upward + scope.$emit("fileSelected", { file: files[i] }); + } + }); + } + }; +}); diff --git a/Apollo/assets/views/editUniversityDetails.html b/Apollo/assets/views/editUniversityDetails.html index ef32b48c..0405c4d5 100755 --- a/Apollo/assets/views/editUniversityDetails.html +++ b/Apollo/assets/views/editUniversityDetails.html @@ -88,7 +88,94 @@ + + +
+ + +
+ + + + + + +
+
+ +
+
Update Profile Picture
+
+ +
+ +
+
+ + +
+
+ +
+ + + +
+
+ + +
+
+ +
+
+
+
+ + + +
+ + + +
+
+
+ + + + + + +
diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index dd96ee81..20d23f51 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -385,6 +385,11 @@ Exam Writing Fee Report +
  • + + Balance Fee Report + +
    • diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index 76e7a820..85046d93 100755 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -75,13 +75,11 @@
    - - - +
    - +
    @@ -89,7 +87,7 @@ - + @@ -104,16 +102,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index 1f85667d..3de3706f 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -75,13 +75,11 @@
    - - - +
    -
    SL.NoStudent IDEnrollment ID Student Name Father Name Course
    {{p.sl}}{{p.ssid}}{{p.name}}{{p.father}}{{p.course}}{{p.syear}}({{p.sem}}){{p.phone}}{{p.uname}}{{p.status}}{{p.adate}}{{p.SL_NO}}{{p.Enrollment_id}}{{p.Student_id}}{{p.Father_name}}{{p.Course_name}}{{p.Sem_year}}({{p.Sem}}){{p.Phone_number}}{{p.University}}{{p.Status}}{{p.Date}}
    +
    @@ -90,7 +88,7 @@ - + @@ -105,16 +103,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html index 7efc0001..74f95d9a 100755 --- a/Apollo/assets/views/report_balance_fee.html +++ b/Apollo/assets/views/report_balance_fee.html @@ -13,7 +13,7 @@ } th { - cursor: pointer; + cursor: pointer; } */
    @@ -92,21 +81,20 @@
    - - - +
    -
    SL.No Admission DateStudent IDEnrollment ID Student Name Father Name Course
    {{p.sl}}{{p.adate}}{{p.ssid}}{{p.name}}{{p.father}}{{p.course}}{{p.syear}}{{p.phone}}{{p.uname}}{{p.status}}{{p.SL_NO}}{{p.Admission_date}}{{p.Enrollment_id}}{{p.Student_id}}{{p.Father_name}}{{p.Course_name}}{{p.Sem_year}}{{p.Phone_number}}{{p.University}}{{p.Status}}
    - + +
    - + + @@ -120,18 +108,19 @@ - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/Apollo/assets/views/report_studymaterialstatus.html b/Apollo/assets/views/report_studymaterialstatus.html index 2a4beeff..f67279cc 100755 --- a/Apollo/assets/views/report_studymaterialstatus.html +++ b/Apollo/assets/views/report_studymaterialstatus.html @@ -16,17 +16,13 @@ cursor: pointer; } */ -
    -
    SL.No Intial Payment Paid DateStudent IDEnrollment ID Student NameRoll NO Father Name Course Sem/Year
    {{p.sl}}{{p.bdate}}{{p.ssid}}{{p.name}}{{p.father}}{{p.course}}{{p.syear}}({{p.sem}}){{p.phone}}{{p.uname}}{{p.balance}}{{p.status}}{{p.cdate}}{{p.SL_NO}}{{p.Initial_paid_date}}{{p.Enrollment_id}}{{p.Student_id}}{{p.Roll_NO}}{{p.Father_name}}{{p.Course_name}}{{p.Sem_year}}({{p.Sem}}){{p.Phone_number}}{{p.University}}{{p.Balance_Fee}}{{p.Status}}{{p.Date}}
    +
    +
    + - + - + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html index 9867a940..62a36782 100755 --- a/Apollo/assets/views/report_waiver_referal.html +++ b/Apollo/assets/views/report_waiver_referal.html @@ -16,8 +16,6 @@ cursor: pointer; } */ -
    @@ -75,19 +73,23 @@
    - - - +
    -
    SL.No Initial Payment Paid DateStudent IDEnrollment ID Student Name Father Name Course Sem/Year Phone No UniversityBalance Fee Study Material StatusBalance Fee Date
    {{p.sl}}{{p.bdate}}{{p.ssid}}{{p.name}}{{p.father}}{{p.course}}{{p.syear}}({{p.sem}}){{p.phone}}{{p.uname}}{{p.balance}}{{p.status}}{{p.date}}{{p.SL_NO}}{{p.Initial_paid_date}}{{p.Enrollment_id}}{{p.Student_name}}{{p.Father_name}}{{p.Course_name}}{{p.Sem_year}}({{p.Sem}}){{p.Phone_number}}{{p.University}}{{p.Balance_fee}}{{p.Status}}{{p.Date}}
    +
    - + + + + + + + @@ -95,7 +97,7 @@ - + @@ -112,26 +114,39 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + + + + + + + + + + + + + +
    Sum of Waiver Fee Sum of Referal Fee
    SL.NoStudent IDEnrollment ID Student Name Father Name Course
    {{p.sl}}{{p.ssid}}{{p.name}}{{p.father}}{{p.course}}{{p.syear}}{{p.phone}}{{p.waiver_bill}}{{p.waiver}}{{p.referal_bill}}{{p.referal}}{{p.cmts}}
    {{p.SL_NO}}{{p.Enrollment_id}}{{p.Student_name}}{{p.Father_name}}{{p.Course_name}}{{p.Sem_year}}{{p.Phone_number}}{{p.Waiver_bill}}{{p.Waiver_amount}}{{p.Referal_bill}}{{p.Referal_amount}}{{p.Comments}}
    Total{{ getwaiver() }}{{ getref() }}

    {{message}}

    diff --git a/Apollo/assets/views/university.html b/Apollo/assets/views/university.html index dba0e9b3..21e166f8 100755 --- a/Apollo/assets/views/university.html +++ b/Apollo/assets/views/university.html @@ -61,7 +61,7 @@ - + {{p.UniversityID}} {{p.UniversityShortName}} @@ -178,6 +178,71 @@ Address is required
    + + + + +
    +
    +
    +
    + +
    + + +
    +
    +
    University Logo
    +
    + +
    +
    + +
    +
    + + +
    +
    + +
    +
    +
    +
    + + + +
    + + + +
    +
    +
    +
    +
    + + + + + + + + + +