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:
dineshkumarkannan 2018-08-21 18:13:54 +05:30
commit 0d8f9fd4a4
32 changed files with 538 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/api/application/controllers/Report.php
View File

@ -385,8 +385,6 @@ class Report extends REST_Controller {
} }
public function getAllUniversity_post() public function getAllUniversity_post()
{ {
@ -446,6 +444,4 @@ class Report extends REST_Controller {
} }

66
Apollo/api/application/models/Dashboard_model.php
View File

@ -81,7 +81,6 @@ class Dashboard_model extends CI_Model
$this->db->where('BranchCode',$details['localBranchID']); $this->db->where('BranchCode',$details['localBranchID']);
$getUnivDetails = $this->db->get(); $getUnivDetails = $this->db->get();
if($getUnivDetails->result()){ if($getUnivDetails->result()){
$resultDetails['resultStatus']=true;
foreach ($getUnivDetails->result() as $rows){ foreach ($getUnivDetails->result() as $rows){
$fetchDetails['UniversityID']=$rows->UniversityID; $fetchDetails['UniversityID']=$rows->UniversityID;
$fetchDetails['UniversityName']=$rows->UniversityName; $fetchDetails['UniversityName']=$rows->UniversityName;
@ -103,9 +102,12 @@ class Dashboard_model extends CI_Model
$resultDetails['universityFeesDetails']=$getFeesArray; $resultDetails['universityFeesDetails']=$getFeesArray;
} }
else{ else{
$resultDetails['resultStatus']=false; $resultDetails['details']=false;
$resultDetails['Message']="No records found!"; $resultDetails['Message']="No records found!";
$resultDetails['universityFeesDetails']=false;
} }
$resultDetails['batchFeesDetails']=$this->getBatchPendingFees($details['localBranchID']);
return $resultDetails; return $resultDetails;
} }
/* /*
@ -116,7 +118,6 @@ class Dashboard_model extends CI_Model
$feesDetails=array(); $feesDetails=array();
$feesDetails['UniversityID']=$universityID; $feesDetails['UniversityID']=$universityID;
$feesDetails['UniversityName']=$universityName; $feesDetails['UniversityName']=$universityName;
$this->db->select("SUM(SFS.CourseFees) as PayableFees"); $this->db->select("SUM(SFS.CourseFees) as PayableFees");
$this->db->from( STUDENTS_FEES_STATUS . ' as SFS'); $this->db->from( STUDENTS_FEES_STATUS . ' as SFS');
$this->db->join( COURSE . ' as CU', 'CU.CourseID = SFS.CourseID'); $this->db->join( COURSE . ' as CU', 'CU.CourseID = SFS.CourseID');
@ -138,6 +139,7 @@ class Dashboard_model extends CI_Model
$this->db->join( COURSE . ' as CU', 'CU.CourseID = SFS.CourseID'); $this->db->join( COURSE . ' as CU', 'CU.CourseID = SFS.CourseID');
$this->db->where('CU.UniversityID',$universityID); $this->db->where('CU.UniversityID',$universityID);
$this->db->where('CU.BranchCode',$branchCode); $this->db->where('CU.BranchCode',$branchCode);
$this->db->where('SFP.IsActive','1');
$this->db->order_by('CU.CourseID','DESC'); $this->db->order_by('CU.CourseID','DESC');
$getUnivPaidFeesDetails = $this->db->get(); $getUnivPaidFeesDetails = $this->db->get();
if($getUnivPaidFeesDetails->result()){ if($getUnivPaidFeesDetails->result()){
@ -153,6 +155,64 @@ class Dashboard_model extends CI_Model
} }
/*
* get batch pending fees details
* created by kms
* */
public function getBatchPendingFees($branchCode=null){
$this->db->distinct();
$this->db->select('BatchCode,BatchName');
$this->db->from(BATCH);
$this->db->order_by('BatchID','DESC');
$this->db->where('BranchCode',$branchCode);
$getBatchDetails = $this->db->get();
if($getBatchDetails->result()){
foreach ($getBatchDetails->result() as $bRows){
$batchFeesDetails['BatchCode']=$bRows->BatchCode;
$batchFeesDetails['BatchName']=$bRows->BatchName;
$this->db->select("SUM(SFS.CourseFees) as PayableFees");
$this->db->from( STUDENTS_FEES_STATUS . ' as SFS');
$this->db->where('SFS.BatchCode',$bRows->BatchCode);
$this->db->where('SFS.BranchCode',$branchCode);
$getBatchFeesDetails = $this->db->get();
if($getBatchFeesDetails->result()){
foreach ($getBatchFeesDetails->result() as $bpayableRow){
$batchFeesDetails['PayableFees']=$bpayableRow->PayableFees;
}
}
else{
$batchFeesDetails['PayableFees']=0;
}
// get paid details
$this->db->select("SUM(SFP.BillAmount) as PaidFees");
$this->db->from( STUDENTS_FEES_PAID . ' as SFP');
$this->db->join( STUDENTS_FEES_STATUS . ' as SFS', 'SFS.FeesID = SFP.FeesId');
$this->db->where('SFP.IsActive','1');
$this->db->where('SFS.BatchCode',$bRows->BatchCode);
$this->db->where('SFS.BranchCode',$branchCode);
$getBatchPaidFeesDetails = $this->db->get();
if($getBatchPaidFeesDetails->result()){
foreach ($getBatchPaidFeesDetails->result() as $bpaidRow){
$batchFeesDetails['PaidFees']=$bpaidRow->PaidFees;
}
}
else{
$batchFeesDetails['PaidFees']=0;
}
$fetchBatchFees[]=$batchFeesDetails;
}
return $fetchBatchFees;
}
else{
return false;
}
}
} }

95
Apollo/api/application/models/Fees_status_model.php
View File

@ -1759,29 +1759,79 @@ class Fees_status_model extends CI_Model
if($row->ProgramType==REGULARFEES OR $row->ProgramType==LATERALFEES){ if($row->ProgramType==REGULARFEES OR $row->ProgramType==LATERALFEES){
foreach ($singleFeesDetails as $Fees){ foreach ($singleFeesDetails as $Fees){
$insertStudyBook['Sem']=$Fees; $insertStudyBook['Sem']=$Fees;
// insert study material details // check study material status exist or not
$this->db->insert(STUDY_MATERIAL_STATUS, $insertStudyBook); $this->db->select('CourseID');
// insert answer booklet details $this->db->where('CourseID',$row->FeesType);
$this->db->insert(ANSWER_BOOKLET, $insertStudyBook); $this->db->where('Sem',$Fees);
$this->db->where('BranchCode',$feesDetails['UpdatedBy']);
$this->db->where('StudentID',$feesDetails['StudentID']);
$existStudyMaterialDetails = $this->db->get(STUDY_MATERIAL_STATUS);
if($existStudyMaterialDetails->num_rows()<1){
// insert mark card details // insert study material details
$insertMark['Sem']=$Fees; $this->db->insert(STUDY_MATERIAL_STATUS, $insertStudyBook);
$this->db->insert(CERTIFICATION_STATUS, $insertMark); }
// check answer book;et exist or not
$this->db->select('CourseID');
$this->db->where('CourseID',$row->FeesType);
$this->db->where('BranchCode',$feesDetails['UpdatedBy']);
$this->db->where('StudentID',$feesDetails['StudentID']);
$existAnsBookDetails = $this->db->get(ANSWER_BOOKLET);
if($existAnsBookDetails->num_rows()<1) {
// insert answer booklet details
$this->db->insert(ANSWER_BOOKLET, $insertStudyBook);
}
// check certificate exist or not
$this->db->select('CourseID');
$this->db->where('CourseID',$row->FeesType);
$this->db->where('Sem',$row->Sem_Year);
$this->db->where('BranchCode',$feesDetails['UpdatedBy']);
$this->db->where('StudentID',$feesDetails['StudentID']);
$existAnsBookDetails = $this->db->get(CERTIFICATION_STATUS);
if($existAnsBookDetails->num_rows()<1) {
// insert mark card details
$insertMark['Sem'] = $row->Sem_Year;
$this->db->insert(CERTIFICATION_STATUS, $insertMark);
}
} }
} }
else{ else{
$insertStudyBook['Sem']=$row->Sem_Year; $insertStudyBook['Sem'] = $row->Sem_Year;
// insert study material details $this->db->select('CourseID');
$this->db->insert(STUDY_MATERIAL_STATUS, $insertStudyBook); $this->db->where('CourseID',$row->FeesType);
// insert answer booklet details $this->db->where('BranchCode',$feesDetails['UpdatedBy']);
$this->db->insert(ANSWER_BOOKLET, $insertStudyBook); $this->db->where('StudentID',$feesDetails['StudentID']);
// insert mark card details $existStudyMaterialDetails = $this->db->get(STUDY_MATERIAL_STATUS);
$insertMark['Sem']=$row->Sem_Year; if($existStudyMaterialDetails->num_rows()<1) {
$this->db->insert(CERTIFICATION_STATUS, $insertMark);
// insert study material details
$this->db->insert(STUDY_MATERIAL_STATUS, $insertStudyBook);
}
// check answer book;et exist or not
$this->db->select('CourseID');
$this->db->where('CourseID',$row->FeesType);
$this->db->where('BranchCode',$feesDetails['UpdatedBy']);
$this->db->where('StudentID',$feesDetails['StudentID']);
$existAnsBookDetails = $this->db->get(ANSWER_BOOKLET);
if($existAnsBookDetails->num_rows()<1) {
// insert answer booklet details
$this->db->insert(ANSWER_BOOKLET, $insertStudyBook);
}
// check certificate exist or not
$this->db->select('CourseID');
$this->db->where('CourseID',$row->FeesType);
$this->db->where('BranchCode',$feesDetails['UpdatedBy']);
$this->db->where('StudentID',$feesDetails['StudentID']);
$existAnsBookDetails = $this->db->get(CERTIFICATION_STATUS);
if($existAnsBookDetails->num_rows()<1) {
// insert mark card details
$insertMark['Sem'] = $row->Sem_Year;
$this->db->insert(CERTIFICATION_STATUS, $insertMark);
}
} }
@ -1793,6 +1843,7 @@ class Fees_status_model extends CI_Model
else{ else{
$this->db->select('CertificationID'); $this->db->select('CertificationID');
$this->db->where('CertificateName',$fetchData[0]->FeesType); $this->db->where('CertificateName',$fetchData[0]->FeesType);
$this->db->where('BranchCode',$feesDetails['UpdatedBy']);
$this->db->where('IsActive','1'); $this->db->where('IsActive','1');
$getEndFeesDetails = $this->db->get(CERTIFICATION_MASTER)->last_row(); $getEndFeesDetails = $this->db->get(CERTIFICATION_MASTER)->last_row();
if($getEndFeesDetails){ if($getEndFeesDetails){
@ -1805,8 +1856,16 @@ class Fees_status_model extends CI_Model
$insertDocs['CreatedBy']=$feesDetails['CreatedBy']; $insertDocs['CreatedBy']=$feesDetails['CreatedBy'];
$insertDocs['CreatedOn']=$feesDetails['CreatedOn']; $insertDocs['CreatedOn']=$feesDetails['CreatedOn'];
$insertDocs['CertificationType']=$getEndFeesDetails->CertificationID; $insertDocs['CertificationType']=$getEndFeesDetails->CertificationID;
// insert application details $this->db->select('CourseID');
$this->db->insert(APPLICATION_STATUS,$insertDocs); $this->db->where('CourseID',$courseID);
$this->db->where('BranchCode',$feesDetails['UpdatedBy']);
$this->db->where('StudentID',$feesDetails['StudentID']);
$this->db->where('CertificationType',$getEndFeesDetails->CertificationID);
$existApplicationDetails = $this->db->get(APPLICATION_STATUS);
if($existApplicationDetails->num_rows()<1) {
// insert application details
$this->db->insert(APPLICATION_STATUS, $insertDocs);
}
} }

17
Apollo/api/application/models/Hallticket_model.php
View File

@ -810,7 +810,7 @@ class Hallticket_model extends CI_Model
} }
array_splice($id['FeeDetails'][$key2],0,6,$in1); array_splice($id['FeeDetails'][$key2],0,6,$in1[0]);
} }
@ -832,7 +832,7 @@ class Hallticket_model extends CI_Model
// } // }
array_splice($id['FeeDetails'][$key2],0,6,$in2); array_splice($id['FeeDetails'][$key2],0,6,$in2[0]);
} }
@ -854,7 +854,7 @@ class Hallticket_model extends CI_Model
// } // }
array_splice($id['FeeDetails'][$key2],0,6,$in3); array_splice($id['FeeDetails'][$key2],0,6,$in3[0]);
} }
@ -876,7 +876,7 @@ class Hallticket_model extends CI_Model
// } // }
array_splice($id['FeeDetails'][$key2],0,6,$in4); array_splice($id['FeeDetails'][$key2],0,6,$in4[0]);
} }
$studentIDs['NUMTYPE'] = 'YEAR'; $studentIDs['NUMTYPE'] = 'YEAR';
@ -1031,8 +1031,10 @@ class Hallticket_model extends CI_Model
{ {
foreach($studentIDs as $student) foreach($studentIDs as $student)
{ {
if(!empty($student['FeeDetails'])) if(!empty($student['FeeDetails']))
{ {
foreach($student['FeeDetails'][0] as $key => $fees) foreach($student['FeeDetails'][0] as $key => $fees)
{ {
@ -1045,16 +1047,13 @@ class Hallticket_model extends CI_Model
$HallTicketStudentID = $this->db->insert_id(); $HallTicketStudentID = $this->db->insert_id();
$this->db->trans_complete(); $this->db->trans_complete();
foreach($fees as $subject) $tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$fees->SubjectID,'ExamDate'=>$fees->ScheduleDate,'FromTime'=>$fees->FromTime,'EndTime'=>$fees->ToTime);
{
$tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$subject->SubjectID,'ExamDate'=>$subject->ScheduleDate,'FromTime'=>$subject->FromTime,'EndTime'=>$subject->ToTime);
$this->db->trans_start(); $this->db->trans_start();
$this->db->insert('T_Hallticket_Subject_Details',$tempSubjectArray); $this->db->insert('T_Hallticket_Subject_Details',$tempSubjectArray);
$this->db->trans_complete(); $this->db->trans_complete();
}
} }
} }
} }

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

@ -34,7 +34,7 @@ order by CourseID) as cm
on cm.cid=cfd.ccid on cm.cid=cfd.ccid
left join 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 (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."' where sms.branch = '".$br."'
"; ";
@ -433,26 +433,24 @@ group by sid
} }
public function app_pending($bat=null,$br=null,$u=null){ 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, $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,
ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,sms.adate as appdate sms.adate as appdate,ifnull(reg.formtype,'-') as formtype,sfs.batch as batch
from 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_CertificationMaster cm on cm.CertificationID=app.CertificationType
left join T_PickListDetails list on list.ListCode=app.ListCode 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) 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) as sms group by sid,cid,lcode,branch,ctype) as sms
left join left join
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype, sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others (select 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
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 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 (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) WHERE IsActive = 1 and ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails group by StudentID,FeesID)
group by sid,fid,billno) 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 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 left join
(SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course, (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 UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm
@ -463,6 +461,9 @@ left join
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 (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,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."' 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.=" 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){ 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 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 (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 != '' where STFOrWR != ''
group by sid,batch,cid) as sms group by sid,fid,batch,cid) as sms
left join left join
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype FROM T_Students_Fees_Status (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
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,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sfs.cid
left join 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 left join
(SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course, (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 UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm
left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID
group by cid group by cid
order by CourseID) order by CourseID)
as cm on cm.cid=cfd.ccid as cm on cm.cid=sms.cid
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 (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."' where std.active = 1 and sms.branch = '".$br."'
@ -646,7 +644,7 @@ left join
if ($bat!= ''){ if ($bat!= ''){
$sql.=" and sfs.batch = '".$bat."'"; $sql.=" and sms.batch = '".$bat."'";
} }
if ($u!= ''){ if ($u!= ''){
@ -837,10 +835,7 @@ from T_Lead_Tracking_Followup as ltf
$batchDetails = $this->db->get(BATCH); $batchDetails = $this->db->get(BATCH);
return $batchDetails->result(); return $batchDetails->result();
} }
public function GetAllUniversity($branchId)
public function GetAllUniversity($branchId)
{ {
$this->db->select('UniversityID,UniversityName'); $this->db->select('UniversityID,UniversityName');
$this->db->from('T_UniversityMaster'); $this->db->from('T_UniversityMaster');
@ -884,9 +879,9 @@ JOIN T_StudentDetails ON T_StudentDetails.StudentID=T_Student_CourseDetails.Stud
JOIN T_UniversityMaster ON T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID JOIN T_CourseMaster ON T_CourseMaster.CourseID=T_Student_CourseDetails.CourseID JOIN T_UniversityMaster ON T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID JOIN T_CourseMaster ON T_CourseMaster.CourseID=T_Student_CourseDetails.CourseID
left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_CourseDetails.CourseID and T_Registration_Details.StudentID=T_Student_CourseDetails.StudentID left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_CourseDetails.CourseID and T_Registration_Details.StudentID=T_Student_CourseDetails.StudentID
left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode 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=?'; WHERE T_Registration_Details.RegistrationType = ? and str_to_date(DOJ,?)>=? and str_to_date(DOJ,?)<=? and T_Registration_Details.RegistrationMode=? and T_Student_CourseDetails.UniversityID=? group by T_Registration_Details.StudentID';
$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',$university));
$searchDetails =$query->result(); $searchDetails =$query->result();

6
Apollo/assets/i18n/en.json
View File

@ -83,16 +83,16 @@
"studmatstatus": "STUDY MATERIAL STATUS ", "studmatstatus": "STUDY MATERIAL STATUS ",
"mstatus": "MARK CARD STATUS ", "mstatus": "MARK CARD STATUS ",
"certificate_status": "CERTIFICATE 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 ", "expense": "EXPENSE REPORT ",
"answer_booklets": "ANSWER BOOKLETS STATUS 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", "doc_pending": "STUDENT DOCUMENTS PENDING REPORT",
"wav_ref": "WAIVER AND REFERAL REPORT", "wav_ref": "WAIVER AND REFERAL REPORT",
"examfee": "EXAM WRITING FEE REPORT", "examfee": "EXAM WRITING FEE REPORT",
"balfee": "FEE BALANCE REPORT", "balfee": "FEE BALANCE REPORT",
"lead": "LEAD TRACKING REPORT", "lead": "LEAD TRACKING REPORT",
"newreg":"NEW REG REPORT" "newreg":"NEW REG REPORT"
}, },
"student": { "student": {

BIN
Apollo/assets/images/logo.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

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

@ -292,6 +292,7 @@ app.controller('OnotherCtrl', ["$scope", "toaster", "$filter", "$http", "API_POI
$scope.getUniversityRegisteredDetails = function () { $scope.getUniversityRegisteredDetails = function () {
$scope.registerdStudentDetails=""; $scope.registerdStudentDetails="";
$scope.universityFeesDetails=""; $scope.universityFeesDetails="";
$scope.batchFeesDetails="";
$scope.notEmptyRegistration=true; $scope.notEmptyRegistration=true;
var req = { var req = {
method: 'POST', method: 'POST',
@ -308,10 +309,13 @@ app.controller('OnotherCtrl', ["$scope", "toaster", "$filter", "$http", "API_POI
$scope.notEmptyRegistration=response.data.resultStatus; $scope.notEmptyRegistration=response.data.resultStatus;
$scope.registerdStudentDetails=response.data.details; $scope.registerdStudentDetails=response.data.details;
$scope.universityFeesDetails=response.data.universityFeesDetails; $scope.universityFeesDetails=response.data.universityFeesDetails;
$scope.batchFeesDetails=response.data.batchFeesDetails;
} else { } else {
$scope.registerdStudentDetails=""; $scope.registerdStudentDetails="";
$scope.universityFeesDetails=""; $scope.universityFeesDetails="";
$scope.batchFeesDetails="";
$scope.notEmptyRegistration=false; $scope.notEmptyRegistration=false;
} }
}); });

33
Apollo/assets/js/controllers/datacorrectionCtrl.js
View File

@ -130,25 +130,34 @@ app.controller('datacorrectionCtrl', ["$scope","$rootScope","toaster", "$filter"
$scope.updatestatus = function (myModel, form, loading) $scope.updatestatus = function (myModel, form, loading)
{ {
//alert(myModel.ID)
//alert(myModel.Reason); var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$name;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[name=' + firstError + ']').focus();
swal("Please Enter Reason!", "", "error");
} else {
var d = new Date(myModel.Date); var d = new Date(myModel.Date);
// console.log(d.getUTCDate()); // Hours
// console.log(d.getUTCMonth());
// console.log(d.getUTCFullYear());
var mdate = d.getUTCDate() + 1; var mdate = d.getUTCDate() + 1;
var mmonth = d.getUTCMonth() + 1; var mmonth = d.getUTCMonth() + 1;
var myear = d.getUTCFullYear(); var myear = d.getUTCFullYear();
var CDate = mdate+"-"+mmonth+"-"+myear; var CDate = mdate+"-"+mmonth+"-"+myear;
//console.log(CDate) //console.log(CDate)
var IsActive = ''; var IsActive = '';
if(myModel.IsActive == true) if(myModel.IsActive == true)
@ -190,7 +199,9 @@ else if(myModel.IsActive == false)
}); });
}; }
};

268
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -2565,148 +2565,168 @@ $scope.open = function(coursefiltered,Subjects,sem){
}); });
}; };
$scope.generatePDF = function(){ $scope.generatePDF = function(){
var sem = "Sem/Year:"+$scope.sem; var innerContents = document.getElementById("reregisterform").innerHTML;
var universityaddress = encodeURIComponent($scope.Course.Address).replace(/[%2C %20]/g,' '); var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no');
$scope.universityAddress = universityaddress.replace(" "," ");; popupWinindow.document.open();
$scope.universitydetails = "Mobile: "+$scope.Course.UnivMobileNumber+",E-mail id:"+$scope.Course.EmailID; popupWinindow.document.write('<html>');
$scope.Enroll = "Enrolment No: "; popupWinindow.document.write('<style type="text/css" media="print">');
$scope.courseDetails = "Course Name: "+$scope.Course.CourseName+" specialization: "+$scope.Course.Specilization +sem popupWinindow.document.write('@page { size: portrait; }');
popupWinindow.document.write('.title{border:3px solid black;}');
popupWinindow.document.write('</style>');
popupWinindow.document.write(innerContents);
popupWinindow.document.write('</br>');
popupWinindow.document.write('</br>');
popupWinindow.document.write('</br>');
popupWinindow.document.write('</br>');
//popupWinindow.document.write(innerContents);
popupWinindow.document.write('</html>');
popupWinindow.document.close();
popupWinindow.focus();
popupWinindow.print();
popupWinindow.close();
// var sem = "Sem/Year:"+$scope.sem;
$scope.StudentName = "Name of the Candidate: "+$scope.Course.Firstname +' '+ $scope.Course.Lastname; // var universityaddress = encodeURIComponent($scope.Course.Address).replace(/[%2C %20]/g,' ');
$scope.StudentFatername = "Father's Name: "+$scope.Course.Fathername; // $scope.universityAddress = universityaddress.replace(" "," ");;
$scope.StudentMotherName = "Mother's Name: "+$scope.Course.MotherName; // $scope.universitydetails = "Mobile: "+$scope.Course.UnivMobileNumber+",E-mail id:"+$scope.Course.EmailID;
//var str = $scope.Student.PresentAddress; // $scope.Enroll = "Enrolment No: ";
// $scope.courseDetails = "Course Name: "+$scope.Course.CourseName+" specialization: "+$scope.Course.Specilization +sem
var str = encodeURIComponent($scope.Course.PermanentAddress).replace(/[%2C %20 %0A]/g,' '); // $scope.StudentName = "Name of the Candidate: "+$scope.Course.Firstname +' '+ $scope.Course.Lastname;
// $scope.StudentFatername = "Father's Name: "+$scope.Course.Fathername;
// $scope.StudentMotherName = "Mother's Name: "+$scope.Course.MotherName;
// //var str = $scope.Student.PresentAddress;
// var str = encodeURIComponent($scope.Course.PermanentAddress).replace(/[%2C %20 %0A]/g,' ');
// str.replace("%0A"," "); // // str.replace("%0A"," ");
// str.replace("%20"," "); // // str.replace("%20"," ");
// str.replace("%2C"," "); // // str.replace("%2C"," ");
$scope.StudnetAddress = "Address: "+ str.replace(" "," "); // $scope.StudnetAddress = "Address: "+ str.replace(" "," ");
$scope.StudentPin = "Pincode: .................. Mobile No: "+$scope.Course.MobileNumber+" Email ID: "+$scope.Course.EmailID; // $scope.StudentPin = "Pincode: .................. Mobile No: "+$scope.Course.MobileNumber+" Email ID: "+$scope.Course.EmailID;
// var sem1 = doc.autoTableHtmlToJson(document.getElementById(subject)); // // var sem1 = doc.autoTableHtmlToJson(document.getElementById(subject));
var universityname = $scope.Course.UniversityName; // var universityname = $scope.Course.UniversityName;
var universityCap = universityname.toUpperCase(); // var universityCap = universityname.toUpperCase();
var doc = new jsPDF('A4'); // var doc = new jsPDF('A4');
var img = document.getElementById("logo"); // var img = document.getElementById("logo");
var canvas = document.createElement("canvas"); // var canvas = document.createElement("canvas");
canvas.width = 100; // canvas.width = 100;
canvas.height = 100; // canvas.height = 100;
var ctx = canvas.getContext("2d"); // var ctx = canvas.getContext("2d");
ctx.drawImage(img, 0, 0,100,100); // ctx.drawImage(img, 0, 0,100,100);
var dataURL = canvas.toDataURL("image/png"); // var dataURL = canvas.toDataURL("image/png");
doc.rect(10, 10, 190, 280); // doc.rect(10, 10, 190, 280);
doc.text(70, 20, universityCap); // doc.text(70, 20, universityCap);
doc.text(80, 26,$scope.universityAddress); // doc.text(80, 26,$scope.universityAddress);
doc.addImage(dataURL, 'jpeg', 50, 13, 10, 10); // doc.addImage(dataURL, 'jpeg', 50, 13, 10, 10);
doc.setFontSize(14); // doc.setFontSize(14);
doc.text(70,32,"RE-REGISTRATION FORM"); // doc.text(70,32,"RE-REGISTRATION FORM");
doc.setFontSize(12); // doc.setFontSize(12);
doc.text(40,42,$scope.universitydetails); // doc.text(40,42,$scope.universitydetails);
doc.setFontSize(10); // doc.setFontSize(10);
doc.setFontSize(10); // doc.setFontSize(10);
var formdetails = "The form should be complete in all respects and to be filled by student in English CAPITAL letters in blue /black ink."; // var formdetails = "The form should be complete in all respects and to be filled by student in English CAPITAL letters in blue /black ink.";
var details = doc.splitTextToSize(formdetails,200); // var details = doc.splitTextToSize(formdetails,200);
doc.text(15,50,details); // doc.text(15,50,details);
doc.setFontSize(12); // doc.setFontSize(12);
doc.line(10, 45, 200, 45); // doc.line(10, 45, 200, 45);
var col = 45; // var col = 45;
var EnLen = $scope.Course.EnrollmentID.length; // var EnLen = $scope.Course.EnrollmentID.length;
//console.log(EnLen); // //console.log(EnLen);
var k = 0; // var k = 0;
if(EnLen !=0){ // if(EnLen !=0){
while( k<= EnLen-1){ // while( k<= EnLen-1){
//console.log(k); // //console.log(k);
doc.text(15,60,$scope.Enroll);doc.rect(col,57,5,5); // doc.text(15,60,$scope.Enroll);doc.rect(col,57,5,5);
col = col+1; // col = col+1;
doc.text(col,61,$scope.Course.EnrollmentID[k]); // doc.text(col,61,$scope.Course.EnrollmentID[k]);
col = parseInt(col)+4; // col = parseInt(col)+4;
k++; // k++;
} // }
}else{ // }else{
doc.text(15,60,$scope.Enroll); doc.rect(45,55,5,5);doc.rect(50,55,5,5);doc.rect(55,55,5,5);doc.rect(60,55,5,5);doc.rect(65,55,5,5);doc.rect(70,55,5,5);doc.rect(75,55,5,5);doc.rect(80,55,5,5);doc.rect(85,55,5,5);doc.rect(90,55,5,5);doc.rect(95,55,5,5);doc.rect(100,55,5,5);doc.rect(105,55,5,5);doc.rect(110,55,5,5);doc.rect(115,55,5,5);doc.rect(120,55,5,5);doc.rect(125,55,5,5); // doc.text(15,60,$scope.Enroll); doc.rect(45,55,5,5);doc.rect(50,55,5,5);doc.rect(55,55,5,5);doc.rect(60,55,5,5);doc.rect(65,55,5,5);doc.rect(70,55,5,5);doc.rect(75,55,5,5);doc.rect(80,55,5,5);doc.rect(85,55,5,5);doc.rect(90,55,5,5);doc.rect(95,55,5,5);doc.rect(100,55,5,5);doc.rect(105,55,5,5);doc.rect(110,55,5,5);doc.rect(115,55,5,5);doc.rect(120,55,5,5);doc.rect(125,55,5,5);
// doc.text(46,59,$scope.Student.EnrollmentID[0]);doc.text(51,59,$scope.Student.EnrollmentID[1]);doc.text(56,59,$scope.Student.EnrollmentID[2]);doc.text(61,59,$scope.Student.EnrollmentID[3]);doc.text(66,59,$scope.Student.EnrollmentID[4]); // // doc.text(46,59,$scope.Student.EnrollmentID[0]);doc.text(51,59,$scope.Student.EnrollmentID[1]);doc.text(56,59,$scope.Student.EnrollmentID[2]);doc.text(61,59,$scope.Student.EnrollmentID[3]);doc.text(66,59,$scope.Student.EnrollmentID[4]);
// doc.text(71,59,$scope.Student.EnrollmentID[5]);doc.text(76,59,$scope.Student.EnrollmentID[6]);doc.text(81,59,$scope.Student.EnrollmentID[7]);doc.text(86,59,$scope.Student.EnrollmentID[8]);doc.text(91,59,$scope.Student.EnrollmentID[9]); // // doc.text(71,59,$scope.Student.EnrollmentID[5]);doc.text(76,59,$scope.Student.EnrollmentID[6]);doc.text(81,59,$scope.Student.EnrollmentID[7]);doc.text(86,59,$scope.Student.EnrollmentID[8]);doc.text(91,59,$scope.Student.EnrollmentID[9]);
// doc.text(96,59,$scope.Student.EnrollmentID[10]);doc.text(101,59,$scope.Student.EnrollmentID[11]);doc.text(106,59,$scope.Student.EnrollmentID[12]); // // doc.text(96,59,$scope.Student.EnrollmentID[10]);doc.text(101,59,$scope.Student.EnrollmentID[11]);doc.text(106,59,$scope.Student.EnrollmentID[12]);
// //doc.text(111,59,$scope.Student.EnrollmentID[13]);doc.text(116,59,$scope.Student.EnrollmentID[14]);doc.text(121,59,$scope.Student.EnrollmentID[15]); // // //doc.text(111,59,$scope.Student.EnrollmentID[13]);doc.text(116,59,$scope.Student.EnrollmentID[14]);doc.text(121,59,$scope.Student.EnrollmentID[15]);
} // }
doc.setFontSize(10); // doc.setFontSize(10);
doc.text(15,70,$scope.courseDetails); // doc.text(15,70,$scope.courseDetails);
doc.setFontSize(12); // doc.setFontSize(12);
doc.text(15,80,"Examination Session: January ");doc.rect(73,77,5,5);doc.text(80,80,"June");doc.rect(90,77,5,5);doc.text(100,80,"Semester Mode");doc.rect(131,77,5,5);doc.text(140,80,"Yearly Mode");doc.rect(165,77,5,5); // doc.text(15,80,"Examination Session: January ");doc.rect(73,77,5,5);doc.text(80,80,"June");doc.rect(90,77,5,5);doc.text(100,80,"Semester Mode");doc.rect(131,77,5,5);doc.text(140,80,"Yearly Mode");doc.rect(165,77,5,5);
// doc.autoTable(sem1.columns, sem1.data, {margin: {top: 100},theme:'grid'}); // // doc.autoTable(sem1.columns, sem1.data, {margin: {top: 100},theme:'grid'});
doc.line(10, 83, 200, 83); // doc.line(10, 83, 200, 83);
doc.text(15,88,$scope.StudentName); // doc.text(15,88,$scope.StudentName);
doc.text(60,89,"......................................................................................................................"); // doc.text(60,89,"......................................................................................................................");
doc.text(15,95,$scope.StudentFatername); // doc.text(15,95,$scope.StudentFatername);
doc.text(43,96,"...................................................................................................................................."); // doc.text(43,96,"....................................................................................................................................");
doc.text(15,102,$scope.StudentMotherName); // doc.text(15,102,$scope.StudentMotherName);
doc.text(43,103,"...................................................................................................................................."); // doc.text(43,103,"....................................................................................................................................");
doc.text(15,110,$scope.StudnetAddress); // doc.text(15,110,$scope.StudnetAddress);
doc.text(30,111,"................................................................................................................................................"); // doc.text(30,111,"................................................................................................................................................");
doc.text(15,121,$scope.StudentPin); // doc.text(15,121,$scope.StudentPin);
doc.text // doc.text
doc.line(10, 125, 200,125); // doc.line(10, 125, 200,125);
doc.text(45,130,"SUBJECT / PAPER IN WHICH CANDIDATE APPEARING") // doc.text(45,130,"SUBJECT / PAPER IN WHICH CANDIDATE APPEARING")
doc.line(10, 131, 200, 131); // doc.line(10, 131, 200, 131);
doc.text(20,135,"SR.NO"); // doc.text(20,135,"SR.NO");
doc.text(60,135,"Subject Code"); // doc.text(60,135,"Subject Code");
doc.text(110,135,"Subject/Paper Code"); // doc.text(110,135,"Subject/Paper Code");
doc.line(10,137,200,137); // doc.line(10,137,200,137);
var row = 137; // var row = 137;
var no = 1; // var no = 1;
//console.log(); // //console.log();
angular.forEach($scope.Subject[0],function(subjectData,key){ // angular.forEach($scope.Subject[0],function(subjectData,key){
//for(var i=0;i<=$scope.Subject[key].length-1;i++){ // //for(var i=0;i<=$scope.Subject[key].length-1;i++){
// console.log(subjectData); // // console.log(subjectData);
doc.line(10,row,200,row); // doc.line(10,row,200,row);
no = no.toString(); // no = no.toString();
doc.text(20,row+5,no); // doc.text(20,row+5,no);
doc.text(65,row+5,subjectData.SubjectCode); // doc.text(65,row+5,subjectData.SubjectCode);
doc.setFontSize(10); // doc.setFontSize(10);
doc.text(100,row+5,subjectData.SubjectName); // doc.text(100,row+5,subjectData.SubjectName);
row = row+6; // row = row+6;
no = parseInt(no)+1; // no = parseInt(no)+1;
doc.line(10,row,200,row); // doc.line(10,row,200,row);
}); // });
var index = 14; // var index = 14;
var len = index-$scope.Subject[0].length; // var len = index-$scope.Subject[0].length;
//console.log(len); // //console.log(len);
for(var j=0;j<=len;j++){ // for(var j=0;j<=len;j++){
if(no <=9){ // if(no <=9){
no = no.toString(); // no = no.toString();
doc.text(20,row+5,no); // doc.text(20,row+5,no);
}else{ // }else{
no = no.toString(); // no = no.toString();
doc.text(19,row+5,no); // doc.text(19,row+5,no);
} // }
// doc.text(75,row+5,"--"); // // doc.text(75,row+5,"--");
// doc.text(120,row+5,"--"); // // doc.text(120,row+5,"--");
row = row+6; // row = row+6;
no = parseInt(no)+1; // no = parseInt(no)+1;
doc.line(10,row,200,row); // doc.line(10,row,200,row);
} // }
doc.line(10,240,200,240); // doc.line(10,240,200,240);
doc.text(15,250,"Fees Details: Cash / Cheque / DD"); // doc.text(15,250,"Fees Details: Cash / Cheque / DD");
doc.text(15,260,"DD No / Cheque No ....................... Dated ............... Bank ...................."); // doc.text(15,260,"DD No / Cheque No ....................... Dated ............... Bank ....................");
doc.text(15,270,"Amount ..................."); // doc.text(15,270,"Amount ...................");
doc.text(150,280,"Signature of Candidate"); // doc.text(150,280,"Signature of Candidate");
doc.save($scope.Course.Firstname +'_'+ $scope.Course.Lastname+'_'+$scope.sem+'.pdf'); // doc.save($scope.Course.Firstname +'_'+ $scope.Course.Lastname+'_'+$scope.sem+'.pdf');
} }

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

@ -638,28 +638,28 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
switch(i) switch(i)
{ {
case 0: case 0:
var firstTableID = tableid+'year10'; var firstTableID = tableid+'year1'+key;
//var SecTableID = tableid+'year11'; //var SecTableID = tableid+'year11';
semName = 'YEAR1'; semName = 'YEAR1';
break; break;
case 1: case 1:
var firstTableID = tableid+'year20'; var firstTableID = tableid+'year2'+key;
//var SecTableID = tableid+'year21'; //var SecTableID = tableid+'year21';
semName = 'YEAR2'; semName = 'YEAR2';
break; break;
case 2: case 2:
var firstTableID = tableid+'year30'; var firstTableID = tableid+'year3'+key;
//var SecTableID = tableid+'year31'; //var SecTableID = tableid+'year31';
semName = 'YEAR3'; semName = 'YEAR3';
break; break;
case 4: case 4:
var firstTableID = tableid+'year40'; var firstTableID = tableid+'year4'+key;
//var SecTableID = tableid+'year41'; //var SecTableID = tableid+'year41';
semName = 'YEAR4'; semName = 'YEAR4';

79
Apollo/assets/js/controllers/newreg_reportCtrl.js
View File

@ -83,16 +83,55 @@ app.controller('newreg_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
//$scope.opinctotal=''; //$scope.opinctotal='';
$scope.newreglist=''; $scope.newreglist='';
$scope.isLoaderShow =''; $scope.isLoaderShow ='';
$scope.load = '';
$scope.isShow= '';
$scope.fromd='';
$scope.tod='';
$scope.getDetails = function (form,myModel) $scope.getDetails = function (form,myModel)
{ {
// alert('in') // alert('in')
console.log(form.$dirty); //console.log(form.$dirty);
var from = $scope.filters.from_date; var from = $scope.filters.from_date;
var to = $scope.filters.to_date; var to = $scope.filters.to_date;
var university = myModel.myUnivSearch var university = myModel.myUnivSearch ;
// console.log(from) // console.log(from)
var f = new Date(from),
month = '' + (f.getMonth() + 1),
day = '' + f.getDate(),
year = f.getFullYear();
if (month.length < 2) month = '0' + month;
if (day.length < 2) day = '0' + day;
var from_dt = [day, month ,year].join('-');
var t = new Date(to),
month = '' + (t.getMonth() + 1),
day = '' + t.getDate(),
year = t.getFullYear();
if (month.length < 2) month = '0' + month;
if (day.length < 2) day = '0' + day;
var to_dt = [day, month ,year].join('-');
$scope.fromd = from_dt;
$scope.tod = to_dt;
var getstudentdetails = { var getstudentdetails = {
method: 'POST', method: 'POST',
@ -110,16 +149,20 @@ $scope.isLoaderShow ='';
$http(getstudentdetails).then(function (response) { $http(getstudentdetails).then(function (response) {
if(response.data.status == 200) if(response.data.status == 200 && response.data.searchst==true)
{ {
console.log(response.data);
$scope.newreglist = response.data.details; $scope.newreglist = response.data.details;
$scope.isLoaderShow = true; $scope.isShow=true;
$scope.isLoaderShow=false;
} }
else else
{ {
$scope.isLoaderShow=false; $scope.isLoaderShow=true;
$scope.isShow=false;
} }
@ -130,12 +173,23 @@ $scope.isLoaderShow ='';
var mystyle = {
sheetid: 'New Registration List',
$scope.exportData = function ()
{
//alert()
$scope.sam = 'New-Registration List from '+$scope.fromd+' to '+$scope.tod;
var mystyle = {
sheetid:$scope.sam,
headers: true, headers: true,
caption: { caption: {
title:'New Registration List', title: $scope.sam,
width: '500px', width: '1000px',
style:'font-size:50px;bold:true' style:'font-size:50px;bold:true'
}, },
// style:'background:#00FF00', // style:'background:#00FF00',
@ -144,12 +198,7 @@ $scope.isLoaderShow ='';
}, },
}; };
console.log(mystyle);
$scope.exportData = function ()
{
//alert()

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

@ -150,7 +150,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.exportData = function () { $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]);
}; };

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

@ -173,10 +173,10 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
} }
//Export to excel //Export to excel
var mystyle = { var mystyle = {
sheetid: 'BALANCE FEE STATUS REPORT', sheetid: 'FEE BALANCE REPORT',
headers: true, headers: true,
caption: { caption: {
title:'BALANCE FEE STATUS REPORT', title:'FEE BALANCE REPORT',
width: '300px', width: '300px',
style:'font-size:50px;' style:'font-size:50px;'
}, },

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

@ -150,7 +150,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.exportData = function () { $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 /*modal controller
* */ * */

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

@ -150,7 +150,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
$scope.exportData = function () { $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 /*modal controller
* */ * */

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

@ -142,7 +142,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
$scope.exportData = function () { $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]);
}; };

55
Apollo/assets/views/dashboard.html
View File

@ -23,6 +23,7 @@
<div class="panel-body no-padding"> <div class="panel-body no-padding">
<tabset class="tabbable no-padding no-margin"> <tabset class="tabbable no-padding no-margin">
<!-- start today followup details tab-->
<tab heading="Follow Ups For Today : {{todayFolloupDetails.length}}" class="padding-top-5 padding-left-5"> <tab heading="Follow Ups For Today : {{todayFolloupDetails.length}}" class="padding-top-5 padding-left-5">
<div ng-if="getLoginType!='R004'" class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType!='R004'" class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="emptyDataToday==true"> <div ng-if="emptyDataToday==true">
@ -97,6 +98,8 @@
</table> </table>
</div> </div>
</tab> </tab>
<!-- end today followup details tab-->
<!-- end pending track details tab-->
<tab heading="Pending Follow Ups : {{pendingFolloupDetails.length}}" class="padding-top-5"> <tab heading="Pending Follow Ups : {{pendingFolloupDetails.length}}" class="padding-top-5">
<div ng-if="getLoginType!='R004'" class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType!='R004'" class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
@ -179,6 +182,8 @@
</table> </table>
</div> </div>
</tab> </tab>
<!-- end pending track details tab-->
<!-- start today lead details tab-->
<tab heading="Leads Created Today : {{leadDetails.length}}" class="padding-top-5"> <tab heading="Leads Created Today : {{leadDetails.length}}" class="padding-top-5">
<div ng-if="getLoginType!='R004'" class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType!='R004'" class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="emptyDataLead==true"> <div ng-if="emptyDataLead==true">
@ -259,6 +264,7 @@
</table> </table>
</div> </div>
</tab> </tab>
<!-- end today lead details tab-->
</tabset> </tabset>
</div> </div>
</div> </div>
@ -272,21 +278,21 @@
<div class="panel-body no-padding"> <div class="panel-body no-padding">
<tabset class="tabbable no-padding no-margin"> <tabset class="tabbable no-padding no-margin">
<!-- start university registration details tab-->
<tab heading="University Registration" class="padding-top-5 padding-left-5"> <tab heading="University Registration" class="padding-top-5 padding-left-5">
<div class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div class="cl-effect-13" style="float: right" ng-if="getLoginType=='R004'"> <div class="cl-effect-13" style="float: right" ng-if="getLoginType=='R004' && registerdStudentDetails!=false">
<a ui-sref="app.student.studentDetailsSuperAdmin"> <a ui-sref="app.student.studentDetailsSuperAdmin">
view more view more
</a> </a>
</div> </div>
<div class="cl-effect-13" style="float: right" ng-if="getLoginType!='R004'"> <div class="cl-effect-13" style="float: right" ng-if="registerdStudentDetails!='R004' && registerdStudentDetails!=false">
<a ui-sref="app.student.studentDetails"> <a ui-sref="app.student.studentDetails">
view more view more
</a> </a>
</div> </div>
<table class="table no-margin"> <table class="table no-margin">
<tbody> <tbody>
<tr ng-repeat="registration in registerdStudentDetails"> <tr ng-repeat="registration in registerdStudentDetails">
@ -299,8 +305,21 @@
</table> </table>
</div> </div>
</tab> </tab>
<!-- end university registration details tab-->
<!-- start university fees details tab-->
<tab heading="University Pending Fees" class="padding-top-5"> <tab heading="University Pending Fees" class="padding-top-5">
<div class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div class="cl-effect-13" style="float: right" ng-if="getLoginType=='R004' && universityFeesDetails!=false">
<a ui-sref="app.reports.balfee">
view more
</a>
</div>
<div class="cl-effect-13" style="float: right" ng-if="getLoginType=='R003' && universityFeesDetails!=false">
<a ui-sref="app.reports.balfee">
view more
</a>
</div>
<table class="table no-margin"> <table class="table no-margin">
<tbody> <tbody>
<tr ng-repeat="univFees in universityFeesDetails"> <tr ng-repeat="univFees in universityFeesDetails">
@ -315,6 +334,36 @@
</table> </table>
</div> </div>
</tab> </tab>
<!-- end university fees details tab-->
<!--start batch fees details tab-->
<tab heading="Batch Pending Fees" class="padding-top-5">
<div class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div class="cl-effect-13" style="float: right" ng-if="getLoginType=='R004' && batchFeesDetails!=false">
<a ui-sref="app.reports.balfee">
view more
</a>
</div>
<div class="cl-effect-13" style="float: right" ng-if="getLoginType=='R003' && batchFeesDetails!=false">
<a ui-sref="app.reports.balfee">
view more
</a>
</div>
<table class="table no-margin">
<tbody>
<tr ng-repeat="batchFees in batchFeesDetails">
<td><span class="text-small block text-light">Batch Code</span><span>{{batchFees.BatchCode}}</span></td>
<td><span class="text-small block text-light">Batch Name</span><span>{{batchFees.BatchName}}</span></td>
<td><span class="text-small block text-light">Payable Fees</span><span>{{batchFees.PayableFees}}</span></td>
<td><span class="text-small block text-light">Paid Fees</span><span>{{batchFees.PaidFees}}</span></td>
<td><span class="text-small block text-light">Balance Fees</span><span>{{batchFees.PayableFees-batchFees.PaidFees}}</span></td>
</tr>
</tbody>
</table>
</div>
</tab>
<!-- end batch fees details tab-->
</tabset> </tabset>
</div> </div>
</div> </div>

8
Apollo/assets/views/daybook/dayBookApproval.html
View File

@ -69,7 +69,8 @@
</div> </div>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<!-- <div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<label for="form-field-select-2"> <label for="form-field-select-2">
Income/Expense Income/Expense
</label> </label>
@ -78,11 +79,12 @@
<option value="" selected>Select</option> <option value="" selected>Select</option>
<option value="I001">EXPENSE</option> <option value="I001">EXPENSE</option>
<option value="I002">INCOME</option> <option value="I002">INCOME</option>
<!-- <option ng-repeat="typeName in incomeExpenseName" ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
</select> </select>
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span> <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
</div> </div> -->
</div> </div>
<div> <div>
<div ng-show="loadingsearch" class="center"> <div ng-show="loadingsearch" class="center">

6
Apollo/assets/views/daybook/dayBookadminApproval.html
View File

@ -76,7 +76,7 @@
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br> <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
</div> </div>
<div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}"> <!-- <div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<label for="form-field-select-2"> <label for="form-field-select-2">
Income/Expense Income/Expense
</label> </label>
@ -85,11 +85,11 @@
<option value="" selected>Select</option> <option value="" selected>Select</option>
<option value="I001">EXPENSE</option> <option value="I001">EXPENSE</option>
<option value="I002">INCOME</option> <option value="I002">INCOME</option>
<!-- <option ng-repeat="typeName in incomeExpenseName" ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
</select> </select>
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span> <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
</div> </div> -->
</div> </div>
<div> <div>
<div ng-show="loadingsearch" class="center"> <div ng-show="loadingsearch" class="center">

4
Apollo/assets/views/daybook/daybooksuperAdminApproval.html
View File

@ -51,7 +51,7 @@
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br> <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
</div> </div>
<div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}"> <!-- <div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<label for="form-field-select-2"> <label for="form-field-select-2">
Income/Expense Income/Expense
</label> </label>
@ -63,7 +63,7 @@
</select> </select>
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span> <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
</div> </div> -->
</div> </div>
<div> <div>
<div ng-show="loadingsearch" class="center"> <div ng-show="loadingsearch" class="center">

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

@ -73,7 +73,7 @@
<div class="col-md-3 form-group" > <div class="col-md-3 form-group" ng-class="{'has-error':p.Reason.$dirty && p.Reason.$invalid, 'has-success':p.Reason.$valid}">
<label> <label>
Reason to Deactivate <span class="symbol required"></span> Reason to Deactivate <span class="symbol required"></span>
</label> </label>

28
Apollo/assets/views/hallticket/hallTicketPDF.html
View File

@ -71,7 +71,7 @@
<!-- END OF SEMESTER TYPE STUDENTS--> <!-- END OF SEMESTER TYPE STUDENTS-->
<!-- FOR YEAR TYPE STUDENTS--> <!-- FOR YEAR TYPE STUDENTS-->
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[0]" ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}"> <table width="100%" border="1" ng-if="studentObj.FeeDetails[0]" ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
<thead> <thead>
<tr> <tr>
@ -79,8 +79,8 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="sub in sem"> <tr ng-repeat="sub in studentObj.FeeDetails[0]">
<td ng-if="$parent.$index == 0">0{{sub.SemesterID}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-1}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime}}</td><td >&nbsp;</td> <td>0{{sub.SemesterID}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime}}</td><td >&nbsp;</td>
</tr> </tr>
</tbody> </tbody>
@ -88,16 +88,16 @@
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[1]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year2{{$index}}"> <table width="100%" border="1" ng-if = "studentObj.FeeDetails[1]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year2{{$index}}">
<thead> <thead>
<tr> <tr>
<th width="5%"><center>Sem/Year</center></th><th width="15%"><center>Paper Code</center></th><th><center>Subject Name</center></th><th width="15%"><center>Date</center></th><th width="20%"><center>Time</center></th><th width="5%"><center>Inv.sign</center></th> <th width="5%"><center>Sem/Year</center></th><th width="10%"><center>Paper Code</center></th><th><center>Subject Name</center></th><th width="15%"><center>Date</center></th><th width="20%"><center>Time</center></th><th width="5%"><center>Inv.sign</center></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="sub in sem"> <tr ng-repeat="sub in studentObj.FeeDetails[1]">
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-1}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-2}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime }} - {{sub.ToTime }}</td><td >&nbsp;</td> <td>0{{sub.SemesterID-1}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime }} - {{sub.ToTime }}</td><td >&nbsp;</td>
</tr> </tr>
</tbody> </tbody>
@ -105,16 +105,16 @@
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[2]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year3{{$index}}"> <table width="100%" border="1" ng-if ="studentObj.FeeDetails[2]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year3{{$index}}">
<thead> <thead>
<tr> <tr>
<th width="5%"><center>Sem/Year</center></th><th width="15%"><center>Paper Code</center></th><th><center>Subject Name</center></th><th width="15%"><center>Date</center></th><th width="20%"><center>Time</center></th><th width="5%"><center>Inv.sign</center></th> <th width="5%"><center>Sem/Year</center></th><th width="10%"><center>Paper Code</center></th><th><center>Subject Name</center></th><th width="15%"><center>Date</center></th><th width="20%"><center>Time</center></th><th width="5%"><center>Inv.sign</center></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="sub in sem"> <tr ng-repeat="sub in studentObj.FeeDetails[2]">
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-2}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-3}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime | date :"hh:mm: a"}}</td><td >&nbsp;</td> <td>0{{sub.SemesterID-2}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime | date :"hh:mm: a"}}</td><td >&nbsp;</td>
</tr> </tr>
</tbody> </tbody>
@ -122,7 +122,7 @@
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[3]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year4{{$index}}"> <table width="100%" border="1" ng-if = "studentObj.FeeDetails[3]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year4{{$index}}">
<thead> <thead>
<tr> <tr>
@ -130,8 +130,8 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="sub in sem"> <tr ng-repeat="sub in studentObj.FeeDetails[3]">
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-3}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-4}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime }} - {{sub.ToTime}}</td><td >&nbsp;</td> <td>0{{sub.SemesterID-3}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime }} - {{sub.ToTime}}</td><td >&nbsp;</td>
</tr> </tr>
</tbody> </tbody>

4
Apollo/assets/views/newreg_report.html
View File

@ -156,10 +156,10 @@
<div> <div>
<div ng-if="isLoaderShow"> <div ng-if="isLoaderShow">
<center> <h1>{{load}}</h1> </center> <center> <h1>No Records Found !!</h1> </center>
</div> </div>
<div class="col-md-12"> <div class="col-md-12" ng-if="isShow">
<div class="table-responsive"> <div class="table-responsive">
<table id="datatable" class="table table-hover"> <table id="datatable" class="table table-hover">
<thead> <thead>

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

@ -119,7 +119,7 @@ td,th {
<td>{{p.Sem_year}}({{p.Sem}})</td> <td>{{p.Sem_year}}({{p.Sem}})</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td> <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<td>{{p.University}}</td> <td>{{p.University}}</td>
<td>{{p.balance}}</td> <td style="text-align:right;">{{p.balance}}</td>
<td>{{p.issuedate}}</td> <td>{{p.issuedate}}</td>
<td>{{p.rcvedate}}</td> <td>{{p.rcvedate}}</td>
<td>{{p.Status}}</td> <td>{{p.Status}}</td>

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

@ -102,7 +102,8 @@
<th>Sem/Year</th> <th>Sem/Year</th>
<th>Phone No</th> <th>Phone No</th>
<th>University</th> <th>University</th>
<th>Application Status</th> <th>Application Pending Status</th>
<th>Form Type</th>
<th>Date</th> <th>Date</th>
@ -122,6 +123,7 @@
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td> <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<td>{{p.University}}</td> <td>{{p.University}}</td>
<td>{{p.Status}}</td> <td>{{p.Status}}</td>
<td>{{p.formtype}}</td>
<td>{{p.appdate}}</td> <td>{{p.appdate}}</td>

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

@ -89,7 +89,7 @@
<thead> <thead>
<tr> <tr>
<th colspan="9"></th> <th colspan="8"></th>
<th>Sum of Exam Writing Fee</th> <th>Sum of Exam Writing Fee</th>
<th></th> <th></th>
</tr> </tr>
@ -131,16 +131,15 @@
</tbody> </tbody>
<tfoot> <tfoot>
<td></td>
<td></td>
<td></td>
<td></td>
<td>Total</td> <td>Total</td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td style="text-align:right;">{{ getstf() }}</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td style="text-align:right;">{{ getstf() }}</td>
<td></td> <td></td>
</tfoot> </tfoot>

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

@ -81,7 +81,7 @@
<div class="col-md-4"> <div class="col-md-4">
<input class="form-control" type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" /> <input class="form-control" type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
</div> </div>
<button pdf-save-button="getpdf" pdf-name="someone.pdf" class="btn btn-success btn-o">PDF</button> <button pdf-save-button="getpdf" pdf-name="Expense_Report.pdf" class="btn btn-success btn-o">PDF</button>
<button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button> <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
</div> </div>

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

@ -120,7 +120,7 @@
<td>{{p.University}}</td> <td>{{p.University}}</td>
<td>{{p.Status}}</td> <td>{{p.Status}}</td>
<td>{{p.Date}}</td> <td>{{p.Date}}</td>
<td>{{p.Balance_fee}}</td> <td style="text-align:right;">{{p.Balance_fee}}</td>
</tr> </tr>

34
Apollo/assets/views/reregistration/reregistrationformpdf.html
View File

@ -1,8 +1,9 @@
<div class="container-fluid container-fullw bg-white" ng-controller="studentModalDemoCtrl">
<div class="container-fluid container-fullw bg-white" ng-controller="studentModalDemoCtrl">
<div class="col-md-offset-10 col-md-1"> <div class="col-md-offset-10 col-md-1">
<button class="btn btn-success" id="print"ng-click="generatePDF();">Print</button></div> <button class="btn btn-success" id="print"ng-click="generatePDF();">Print</button></div>
<div id="reregisterform"> <div id="reregisterform">
<table style="height: 341px;background-color: white;" width="578" border=1> <table style="height: 341px;background-color: white;border-collapse: collapse; color: black;" border="1" width="100%">
<tbody> <tbody>
<tr> <tr>
<td style="width: 253px; text-align: left;border-right-style: hidden;border-bottom-style: hidden;"><img src="images/{{Course.ProfilePicPath || university/No_Image.png}}" id="logo" style="width: 30%;"></td> <td style="width: 253px; text-align: left;border-right-style: hidden;border-bottom-style: hidden;"><img src="images/{{Course.ProfilePicPath || university/No_Image.png}}" id="logo" style="width: 30%;"></td>
@ -57,7 +58,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="3"> <td colspan="3">
<table style="height: 105px; width: 100%;"> <table style="height: 105px; width: 100%;border-collapse: collapse;" >
<tbody> <tbody>
<tr> <tr>
<td style="width: 28.0547%;">Name of the Cadidate:</td> <td style="width: 28.0547%;">Name of the Cadidate:</td>
@ -85,27 +86,30 @@
<br> <br>
<br> <br>
<tbody> <tbody>
<table style="height: 105px; width: 100%;border-collapse: collapse;color:black"border="1" ;>
<thead>
<tr> <tr>
<td style="width: 185px; text-align: center; color:blue;" colspan="3"><strong>&nbsp;SUBJECT / PAPER IN WHICH CANDIDATE APPEARING&nbsp;</strong></td> <td style="width: 185px; text-align: center; color:blue;" colspan="3"><strong>&nbsp;SUBJECT / PAPER IN WHICH CANDIDATE APPEARING&nbsp;</strong></td>
</tr> </tr>
<tr> <tr>
<th style="width: 185px; text-align: center;"><strong>&nbsp;SL.NO</strong></th> <th style="width:10%;text-align: center;"><strong>&nbsp;S.No</strong></th>
<th style="width: 185px; text-align: center;"><strong>&nbsp;Subject Code</strong></th> <th style="width:30%;text-align: center;"><strong>&nbsp;Subject Code</strong></th>
<th style="width: 186px; text-align: center;"><strong>&nbsp;Subject / Paper Code</strong></th> <th style="text-align: center;"><strong>&nbsp;Subject / Paper Code</strong></th>
</tr> </tr>
</thead>
<tbody>
<tr ng-repeat="sub in Subject[0]"> <tr ng-repeat="sub in Subject[0]">
<td style="width: 185px;">{{$index+1}}</td> <td style="text-align: center;">{{$index+1}}</td>
<td style="width: 185px;">{{sub.SubjectCode}}</td> <td style="text-align: center;">{{sub.SubjectCode}}</td>
<td style="width: 186px;">{{sub.SubjectName}}</td> <td style="width: 186px;">{{sub.SubjectName}}</td>
</tr> </tr>
</tbody>
</tbody>
<br/> <tfoot>
<tfoot>
<tr> <tr>
<td style="width: 185px;" colspan="3"> <td style="width: 185px;" colspan="3">
<p>&nbsp;<strong>Fees Details: Cash / Cheque / DD</strong></p> <p>&nbsp;<strong>Fees Details: Cash / Cheque / DD</strong></p>
@ -114,11 +118,15 @@
<p style="text-align: right;"><strong>Signature of Candidate</strong></p> <p style="text-align: right;"><strong>Signature of Candidate</strong></p>
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
</table>
</table> </table>
<br/> <br/>
<br/> <br/>
<br/> <br/>
<br/> <br/>
</div> </div>
</div> </div>
</div>

2
Apollo/assets/views/sendSMS/sendSMSsuperadmin.html
View File

@ -368,7 +368,7 @@
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="mobileNumList.grouptype" <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="mobileNumList.grouptype"
ng-Change="getall_Numbers(mobileNumList.grouptype);" required> ng-Change="getall_Numbers(mobileNumList.grouptype);" required>
<option value="" disabled selected>Select Group</option> <option value="" disabled selected>Select Group</option>
<option ng-repeat="p in statusInfo" value="{{p.ID}}">{{p.GroupName}}</option> <option ng-repeat="p in statusInfo" ng-if="p.IsActive" value="{{p.ID}}">{{p.GroupName}}</option>
</select> </select>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">

7
Apollo/assets/views/status-update/fees_status.html
View File

@ -82,10 +82,9 @@
<label> <label>
Course Course
</label> </label>
<select ui-select2 class="form-control" name="course" tabindex="4" id="course" <select ui-select2 class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="course" ng-model="myModel.courseName" ng-change="getStudentDetails(Form,myModel);">
ng-model="myModel.courseName" <option value="" selected>Select Course</option>
ng-options="courseDetails.CourseID as courseDetails.CourseName for courseDetails in myModel.universityName.courseDetails" ng-change="getStudentDetails(Form,myModel);"> <option ng-repeat="courseDetails in myModel.universityName.courseDetails" value="{{courseDetails.CourseID}}">{{courseDetails.CourseName}}</option>
<option value=""> Select Course</option>
</select> </select>
</div> </div>