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

merge changes

Browse Source
This commit is contained in:
gayathri1990 2018-08-20 18:06:16 +05:30
commit d1041c5e0d
45 changed files with 1361 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Apollo/api/application/config/constants.php
View File

@ -154,14 +154,20 @@ defined('SESSIONSCHEDULE') OR define('SESSIONSCHEDULE','T_SessionSchedule_Master
defined('SESSIONSCHEDULEDETAILS') OR define('SESSIONSCHEDULEDETAILS','T_SessionSchedule_Details');
defined('STUDENTDOCUMENTDETAILS') OR define('STUDENTDOCUMENTDETAILS','T_StudentDocumentsDetails');
defined('STUDENTDOCUMENTTRACKDETAILS') OR define('STUDENTDOCUMENTTRACKDETAILS','T_Student_DocumentTrack_Details');
defined('REGISTRATIONDETAILS') OR define('REGISTRATIONDETAILS','T_Registration_Details');
// define APPLICATION certificate type constant
defined('APPLICATION_CONST') OR define('APPLICATION_CONST','APPLICATION');
// registration type constant
defined('NEWREGISTRATION_CONST') OR define('NEWREGISTRATION_CONST','New Registration');
defined('RE_REGISTRATION_CONST') OR define('RE_REGISTRATION_CONST','Re-registration');
//end of database table name
//encripted password -> md5
defined('ENCR_PASSWORD') OR define('ENCR_PASSWORD','e99a18c428cb38d5f260853678922e03');
//end of encripted password
//end of encripted password

7
Apollo/api/application/config/database.php
View File

@ -75,10 +75,17 @@ $query_builder = TRUE;
$db['default'] = array(
'dsn' => '',
<<<<<<< HEAD
// 'hostname' => 'apollodec.com',
// 'username' => 'apollod4_SIT',
// 'password' => 'apollosit1234',
// 'database' => 'apollod4_ApolloDECNEWSIT',
=======
'hostname' => 'apollodec.com',
// 'username' => 'apollod4_SIT',
// 'password' => 'apollosit1234',
// 'database' => 'apollod4_ApolloDECNEWSIT',
>>>>>>> 3f287c92a22bb6528c89be19aabcde2ec3393f70
'username' => 'apollod4_DEV',
'password' => 'apollo1234',
'database' => 'apollod4_ApolloDECDev',

4
Apollo/api/application/config/routes.php
View File

@ -192,6 +192,10 @@ $route['getAllDayBookDetails'] = 'DayBook_Controller/getAllDayBookDetails';
$route['update_DayBookDetails'] = 'DayBook_Controller/update_DayBookDetailsData';
$route['AllgetUniversity'] = 'Report/getAllUniversity';
$route['NewregDetails'] = 'Report/NewregDetails';
/* Add New Contact Group */
$route['addNewGroup'] = 'Broadcast_Controller/addNewGroup';
$route['getGroups'] = 'Broadcast_Controller/getGroups';

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

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

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

@ -383,6 +383,65 @@ class Report extends REST_Controller {
}
public function getAllUniversity_post()
{
//echo 'in';
$branchId = $this->post('branchId');
// echo $branchId;
// die();
$univlist = $this->report_model->GetAllUniversity($branchId);
if($univlist)
{
$univlist['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($univlist, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else
{
$this->response([
'message' => 'No records found!',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND);
}
}
public function NewregDetails_post()
{
$det['from'] = $this->post('from');
$det['to'] = $this->post('to');
$det['university'] = $this->post('university');
// print_r($det);
$newlist = $this->report_model->GetNewRegList($det);
if($newlist)
{
$newlist['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($newlist, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else
{
$this->response([
'message' => 'No records found!',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND);
}
}

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

@ -97,8 +97,10 @@ class Dashboard_model extends CI_Model
$fetchDetails['StudentCounts']=0;
}
$getArray[]=$fetchDetails;
$getFeesArray[]= $this->getUniversityFeesPending($rows->UniversityName,$rows->UniversityID,$details['localBranchID']);
}
$resultDetails['details']=$getArray;
$resultDetails['universityFeesDetails']=$getFeesArray;
}
else{
$resultDetails['resultStatus']=false;
@ -106,6 +108,51 @@ class Dashboard_model extends CI_Model
}
return $resultDetails;
}
/*
* get university pending fees details
* created by kms
* */
public function getUniversityFeesPending($universityName=null,$universityID=null,$branchCode=null){
$feesDetails=array();
$feesDetails['UniversityID']=$universityID;
$feesDetails['UniversityName']=$universityName;
$this->db->select("SUM(SFS.CourseFees) as PayableFees");
$this->db->from( STUDENTS_FEES_STATUS . ' as SFS');
$this->db->join( COURSE . ' as CU', 'CU.CourseID = SFS.CourseID');
$this->db->where('CU.UniversityID',$universityID);
$this->db->where('CU.BranchCode',$branchCode);
$this->db->order_by('CU.CourseID','DESC');
$getUnivFeesDetails = $this->db->get();
if($getUnivFeesDetails->result()){
foreach ($getUnivFeesDetails->result() as $payableRow){
$feesDetails['PayableFees']=$payableRow->PayableFees;
}
}
else{
$feesDetails['PayableFees']=0;
}
$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->join( COURSE . ' as CU', 'CU.CourseID = SFS.CourseID');
$this->db->where('CU.UniversityID',$universityID);
$this->db->where('CU.BranchCode',$branchCode);
$this->db->order_by('CU.CourseID','DESC');
$getUnivPaidFeesDetails = $this->db->get();
if($getUnivPaidFeesDetails->result()){
foreach ($getUnivPaidFeesDetails->result() as $paidRow){
$feesDetails['PaidFees']=$paidRow->PaidFees;
}
}
else{
$feesDetails['PaidFees']=0;
}
return $feesDetails;
}
}

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

@ -1208,7 +1208,7 @@ class Fees_status_model extends CI_Model
else{
$this->db->insert(STUDENTS_FEES_STATUS, $details);
$this->db->select('FeesID');
$this->db->select('FeesID,BatchCode,StudentID,CourseID,FeesType');
$this->db->where('CourseID', $details['CourseID']);
$this->db->where('StudentID', $details['StudentID']);
$this->db->where('FeesType', $details['FeesType']);
@ -1223,6 +1223,7 @@ class Fees_status_model extends CI_Model
$insertInstallment['DueDate'] = $jrow['DueDate'];
$insertInstallment['CreatedBy'] = $details['CreatedBy'];
$insertInstallment['CreatedOn'] = $details['CreatedOn'];
if($jrow['ID'] =='' OR $jrow['ID'] =='undefined'){
$this->db->insert(FEES_INSTALLMENT, $insertInstallment);
}
@ -1250,9 +1251,66 @@ class Fees_status_model extends CI_Model
$result['message'] = "Successfully fees details is added.";
}
// update registration details
if($jsonData){
$this->updateRegistrationDetails($details,$installmentFeesID);
}
return $result;
}
/*
* insert registration details while set fees
* created by kms
* */
public function updateRegistrationDetails($details=null,$feesStatusID=null){
$this->db->select('Student_Fee_Status_Id,RegistrationMode');
$this->db->where('CourseID', $details['CourseID']);
$this->db->where('StudentID', $details['StudentID']);
$checkCourseFees=$this->db->get(REGISTRATIONDETAILS);
if($checkCourseFees->num_rows()<=0){
// insert registration details table
$inserRegistartion['Student_Fee_Status_Id']=$feesStatusID;
$inserRegistartion['BatchCode']=$details['BatchCode'];
$inserRegistartion['StudentID']=$details['StudentID'];
$inserRegistartion['CourseID']=$details['CourseID'];
$inserRegistartion['FeeType']=$details['FeesType'];
$inserRegistartion['RegistrationMode']=1;
$inserRegistartion['RegistrationType']=NEWREGISTRATION_CONST;
$inserRegistartion['BranchCode']=$details['BranchCode'];
$inserRegistartion['CreatedBy']=$details['CreatedBy'];
$inserRegistartion['CreatedOn']=$details['CreatedOn'];
$this->db->insert(REGISTRATIONDETAILS, $inserRegistartion);
}
else if($checkCourseFees->num_rows()>=1){
$this->db->select('Student_Fee_Status_Id,RegistrationMode');
$this->db->where('Student_Fee_Status_Id', $feesStatusID);
$checkRegistrationEntry=$this->db->get(REGISTRATIONDETAILS);
if($checkRegistrationEntry->num_rows()>0){
$updateRegistration['BatchCode']=$details['BatchCode'];
$updateRegistration['BranchCode']=$details['BranchCode'];
$updateRegistration['UpdatedBy']=$details['CreatedBy'];
$updateRegistration['UpdatedOn']=$details['CreatedOn'];
$this->db->where('Student_Fee_Status_Id',$feesStatusID);
$this->db->update(REGISTRATIONDETAILS, $updateRegistration);
}
else{
$reRegistartion['Student_Fee_Status_Id']=$feesStatusID;
$reRegistartion['BatchCode']=$details['BatchCode'];
$reRegistartion['StudentID']=$details['StudentID'];
$reRegistartion['CourseID']=$details['CourseID'];
$reRegistartion['FeeType']=$details['FeesType'];
$reRegistartion['RegistrationMode']=0;
$reRegistartion['RegistrationType']=RE_REGISTRATION_CONST;
$reRegistartion['BranchCode']=$details['BranchCode'];
$reRegistartion['CreatedBy']=$details['CreatedBy'];
$reRegistartion['CreatedOn']=$details['CreatedOn'];
$this->db->insert(REGISTRATIONDETAILS, $reRegistartion);
}
}
return true;
}
/*
* insert day book master while fees update
* created by kms

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

@ -250,49 +250,46 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
}
public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.idate,'-') as idate,ifnull(sms.istatus,'-') as istatus,ifnull(sms.rdate,'-') as rdate,ifnull(sms.rstatus,'-') as rstatus,ifnull(sms.acmts,'-') as cmnts,sms.certname as Certificate_name
from
(SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,
CertificationType as ctype,CDate as mdate,Sem as sem,Comments as mcmts
FROM T_CertificationStatus
WHERE ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem)
group by sid,sem,cid,lcode,branch) as sms
left join
(SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname
(SELECT c.ID as id,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName as status,c.CertificationType as ctype,c.CDate as adate,c.Comments as acmts,c.CertificationType as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',c.CDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',c.CDate,'-') as rdate
FROM T_CertificationStatus c
left join T_PickListDetails p on p.ListCode=c.ListCode
left join T_CertificationMaster cm on cm.CertificationID=c.CertificationType
WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem,CertificationType)
and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED')
group by sid,sem,cid,branch,ctype
union
SELECT app.ID as id,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,app.CertificationType as ctype,app.AppDate as adate,app.Comments as acmts,cm.CertificateName as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',app.AppDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',app.AppDate,'-') as rdate
FROM T_ApplicationStatus as app
left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
where CertificationType != 'CERT024' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode)
group by sid,cid,lcode,branch)
as ams on ams.branch=sms.branch and ams.sid=sms.sid
left join T_PickListDetails p on p.ListCode=app.ListCode
where CertificateName not like 'APPLICATION%' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType) and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED')
group by sid,cid,lcode,branch,ctype) as sms
left join
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype, sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others
FROM T_Students_Fees_Status
group by sid,fid,cid,batch)
as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype
as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid
left join
(SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails
where IsActive = 1
group by sid,fid,billno)
as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
as sfp on sfp.sid=sms.sid and sfp.fid=sfs.fid
left join
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.cid=sms.cid
left join
(SELECT ListCode as lcode,ListName as status FROM T_PickListDetails)
as list on list.lcode=sms.lcode
left join
(SELECT ListCode as lcode,ListName as astatus FROM T_PickListDetails)
as alist on alist.lcode=ams.lcode
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sms.cid
left join
(SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course,
UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm
left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID
group by cid
order by CourseID)
as cm on cm.cid=cfd.ccid
as cm on cm.cid=sms.cid
left join
(SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
where std.active = 1 and sms.branch = '".$br."'
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid
where std.active = 1 and sms.branch = '".$br."'
";
if ($bat!= ''){
@ -314,7 +311,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
}
$sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year";
$sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem_year,Certificate_name";
$leadDet=$this->db->query($sql);
@ -498,19 +495,16 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
}
public function doc_pending($bat=null,$br=null,$u=null){
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.adate,
ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.follow_date as fdate
from
(SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,list.ListName as status,app.ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app
left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
left join T_PickListDetails list on list.ListCode=app.ListCode
where list.ListName = 'PENDING' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode)
group by sid,cid,lcode,branch) as sms
(select StudentID as sid,Details as certname,DocumentDate as follow_date,StatusName as status
from T_Student_DocumentTrack_Details
where StatusName not like 'CLOSED') as sms
left join
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype, sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,BranchCode as branch
FROM T_Students_Fees_Status
group by sid,fid,cid,batch)
as sfs on sfs.sid=sms.sid and sms.cid=sfs.cid
as sfs on sfs.sid=sms.sid
left join
(SELECT ID,StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails
WHERE IsActive = 1 and ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails group by StudentID,FeesID)
@ -527,8 +521,8 @@ left join
as cm on cm.cid=cfd.ccid
left join
(SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch
where std.active = 1 and sms.branch = '".$br."'
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
where std.active = 1 and sfs.branch = '".$br."'
";
@ -542,7 +536,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
$sql.=" and cm.uid = '".$u."'";
}
$sql.="group by Student_id,Course_id,Batch_code,Branch_code,Sem_year ";
$sql.="group by Student_id,Course_id,Batch_code,Branch_code";
@ -843,5 +837,82 @@ from T_Lead_Tracking_Followup as ltf
$batchDetails = $this->db->get(BATCH);
return $batchDetails->result();
}
public function GetAllUniversity($branchId)
{
$this->db->select('UniversityID,UniversityName');
$this->db->from('T_UniversityMaster');
$this->db->where('T_UniversityMaster.BranchCode',$branchId);
$searchDetails = $this->db->get();
if($searchDetails->result())
{
//print_r($searchDetails->result());
$result_array['UnivStatus'] = true;
$result_array['details'] = $searchDetails->result();
}
else
{
$result_array['UnivStatus'] = false;
$result_array['details'] = "No records found!";
}
return $result_array;
}
public function GetNewRegList($det)
{
$fdate=$det['from'];
$tdate=$det['to'];
$fromd= date("Y-m-d",strtotime($fdate));
$tod=date("Y-m-d",strtotime($tdate));
$university = $det['university'];
// echo 'f'.$fromd.'t'.$tod;
// die();
$subQuery='SELECT T_StudentDetails.StudentID,DOJ,BatchName,CourseName ,T_Student_CourseDetails.UniversityID, T_Student_CourseDetails.CourseID, Firstname,T_StudentDetails. MobileNumber, Fathername, UniversityName,CourseName FROM T_Student_CourseDetails
JOIN T_StudentDetails ON T_StudentDetails.StudentID=T_Student_CourseDetails.StudentID
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_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode
WHERE T_Registration_Details.RegistrationType = ? and str_to_date(DOJ,?)>=? and str_to_date(DOJ,?)<=? and T_Registration_Details.RegistrationMode=?';
$query = $this->db->query($subQuery,array(NewReg,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1'));
$searchDetails =$query->result();
//print_r( $this->db->last_query());
//die();
//print_r($searchDetails);die();
if($searchDetails)
{
//print_r($searchDetails->result());
$result_array['searchst'] = true;
$result_array['details'] = $query->result();
}
else
{
$result_array['searchst'] = false;
$result_array['details'] = "No records found!";
}
return $result_array;
}
}

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

@ -91,7 +91,8 @@
"wav_ref": "WAIVER AND REFERAL REPORT",
"examfee": "EXAM WRITING FEE REPORT",
"balfee": "FEE BALANCE REPORT",
"lead": "LEAD TRACKING REPORT"
"lead": "LEAD TRACKING REPORT",
"newreg":"NEW REG REPORT"
},
"student": {

4
Apollo/assets/js/config.constant.js
View File

@ -138,6 +138,10 @@ app.constant('JS_REQUIRES', {
'datacorrectionCtrl': 'assets/js/controllers/datacorrectionCtrl.js',
/*
* */
'newreg_reportCtrl': 'assets/js/controllers/newreg_reportCtrl.js',
/*

8
Apollo/assets/js/config.router.js
View File

@ -186,6 +186,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
ncyBreadcrumb: {
label: 'datacorrection'
},
}).state('app.daybooksuperadmin.datacorrection', {
url: '/datacorrection',
templateUrl: "assets/views/data_correction.html",
resolve: loadSequence('datacorrectionCtrl','ngTable', 'ladda', 'angular-ladda'),
title: 'datacorrection',
ncyBreadcrumb: {
label: 'datacorrection'
},
}).state('app.master.studentStatusUpdate', {
url: '/default activity',
templateUrl: "assets/views/studentStatusUpdate.html",

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

@ -291,6 +291,7 @@ app.controller('OnotherCtrl', ["$scope", "toaster", "$filter", "$http", "API_POI
* */
$scope.getUniversityRegisteredDetails = function () {
$scope.registerdStudentDetails="";
$scope.universityFeesDetails="";
$scope.notEmptyRegistration=true;
var req = {
method: 'POST',
@ -306,9 +307,11 @@ app.controller('OnotherCtrl', ["$scope", "toaster", "$filter", "$http", "API_POI
if (response.data) {
$scope.notEmptyRegistration=response.data.resultStatus;
$scope.registerdStudentDetails=response.data.details;
$scope.universityFeesDetails=response.data.universityFeesDetails;
} else {
$scope.registerdStudentDetails="";
$scope.universityFeesDetails="";
$scope.notEmptyRegistration=false;
}
});

27
Apollo/assets/js/controllers/daybookCtrl.js
View File

@ -210,12 +210,8 @@ $scope.dayBookApprovalAccess = '';
$scope.copyModel = function (p) {
var inc = $scope.incomeExpenseType.filter((inc)=>inc.ID == p.Type);
console.log(inc);
$scope.incexp = inc[0];
console.log($scope.incexp.ID);
console.log(p);
$scope.myModel = {
"id": p.ID,
"date": p.Date,
@ -452,6 +448,29 @@ $scope.dayBookApprovalAccess = '';
}
}
}
function styleXl(){
var mystyle = {
sheetid: 'DAYBOOK DETAILS',
headers: true,
caption: {
title:'DAYBOOK DETAILS'+ '('+ $scope.searchData.date + ' - ' + $scope.searchData.dateTo +')',
width: '300px',
style:'font-size:50px;color:blue;'
},
// style:'background:#00FF00',
column: {
style:'font-size:25px; color:blue;'
}
};
return mystyle;
}
$scope.exportData = function () {
alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, PaidTo as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ReceiptNoComments as Comments, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance, Reason, Activity INTO XLS("daybook_details.xls",?) FROM ?',[styleXl(),$scope.data]);
};
}]);

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

@ -151,7 +151,6 @@ $scope.dayBookApprovalAccess = '';
if (response.data.typeNameStatus) {
$scope.incomeExpenseName = response.data.typeList;
$scope.incomeExpenseType = response.data.typeNameList;
} else {
}
});
}
@ -208,9 +207,7 @@ $scope.dayBookApprovalAccess = '';
}
$scope.copyModel = function (p) {
//console.log(p);
var inc = $scope.incomeExpenseType.filter((inc)=>inc.ID == p.Type);
console.log(inc);
$scope.incexp = inc[0];
$scope.myModel = {
@ -447,6 +444,26 @@ $scope.dayBookApprovalAccess = '';
}
}
}
function styleXl(){
var mystyle = {
sheetid: 'DAYBOOK DETAILS',
headers: true,
caption: {
title:'DAYBOOK DETAILS'+ '('+ $scope.searchData.date + ' - ' + $scope.searchData.dateTo +')',
width: '300px',
style:'font-size:50px;color:blue;'
},
// style:'background:#00FF00',
column: {
style:'font-size:11px; color:blue;'
}
};
return mystyle;
}
$scope.exportData = function () {
alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, PaidTo as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ReceiptNoComments as Comments, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance, Reason, Activity INTO XLS("daybook_details.xls",?) FROM ?',[styleXl(),$scope.data]);
};
}]);

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

@ -14,7 +14,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
//In controller
$scope.exportAction = function(){
alert();
switch('excel'){
switch('excel'){
case 'pdf': $scope.$broadcast('export-pdf', {});
break;
case 'excel': $scope.$broadcast('export-excel', {});
@ -233,10 +233,6 @@ $scope.dayBookApprovalAccess = '';
$scope.incomeExpenseName = response.data.typeList;
$scope.incomeExpenseType = response.data.typeNameList;
console.log($scope.incomeExpenseName)
console.log($scope.incomeExpenseType);
} else {
}
});
}
@ -272,7 +268,6 @@ $scope.dayBookApprovalAccess = '';
$scope.myModelAdd.type = '';
$scope.getTypes = type === 'I002' ? $scope.getIncomeTypes : $scope.getExpenseTypes;
console.log($scope.getTypes)
};
$scope.editId = -1;
@ -316,7 +311,6 @@ $scope.dayBookApprovalAccess = '';
$scope.copyModel = function (p) {
var inc = $scope.incomeExpenseType.filter((inc)=>inc.ID == p.Type);
console.log(inc);
$scope.incexp = inc[0];
$scope.myModel = {
"id": p.ID,
@ -537,12 +531,10 @@ $scope.dayBookApprovalAccess = '';
$scope.daybookeditUpdate = {
submit: function (form, myModel) {
console.log(myModel.type);
//return false;
var firstError = null;
if (form.$invalid) {
alert();
var field = null, firstError = null;
for (field in form) {
if (field[0] != '$') {
@ -601,7 +593,7 @@ $scope.dayBookApprovalAccess = '';
style:'font-size:11px; color:blue;'
}
};
return mystyle
return mystyle;
}
$scope.exportData = function () {
alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, PaidTo as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ReceiptNoComments as Comments, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance, Reason, Activity INTO XLS("daybook_details.xls",?) FROM ?',[styleXl(),$scope.data]);

193
Apollo/assets/js/controllers/newreg_reportCtrl.js Normal file
View File

@ -0,0 +1,193 @@
'use strict';
/*** controller***/
app.controller('newreg_reportCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage" ,"$http", "$state","$modal","$log",
function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http,ipCookie ,$state,$modal,$log){
//function ($scope, apiPoint, $http, SweetAlert, $state,$modal, md5, ipCookie, $window, dateListDescService) {
// DataTables configurable options
$scope.filters = {
"from_date": "",
"to_date": "",
};
var localDetails = JSON.parse(localStorage.getItem('localObj'));
//var localDetails = ipCookie('cookiechk');
console.log(localDetails);
// $scope.initHead = function() {
//console.log('rfd');
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {
console.log("else if");
$state.go('app.dashboard');
} else {
console.log("else else");
//ipCookie.remove('cookiechk');
window.localStorage.clear();
$state.go('login.signin');
}
}
// }
$scope.universitySearchData = '';
$scope.init = function()
{
// alert()
var getuniv = {
method: 'POST',
url: apiPoint.url + 'AllgetUniversity/',
headers: {
'Content-Type': 'application/json'
},
data: {
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
}
};
$http(getuniv).then(function (response) {
if(response.status == 200)
{
$scope.universitySearchData=response.data.details;
}
});
};
//$scope.opinctotal='';
$scope.newreglist='';
$scope.isLoaderShow ='';
$scope.getDetails = function (form,myModel)
{
// alert('in')
console.log(form.$dirty);
var from = $scope.filters.from_date;
var to = $scope.filters.to_date;
var university = myModel.myUnivSearch
// console.log(from)
var getstudentdetails = {
method: 'POST',
url: apiPoint.url + 'NewregDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
university: university,
from : $scope.filters.from_date,
to : $scope.filters.to_date
}
}
$http(getstudentdetails).then(function (response) {
if(response.data.status == 200)
{
$scope.newreglist = response.data.details;
$scope.isLoaderShow = true;
}
else
{
$scope.isLoaderShow=false;
}
});
}
var mystyle = {
sheetid: 'New Registration List',
headers: true,
caption: {
title:'New Registration List',
width: '500px',
style:'font-size:50px;bold:true'
},
// style:'background:#00FF00',
column: {
style:'font-size:12px'
},
};
$scope.exportData = function ()
{
//alert()
//console.log($scope.fullincomedetail);
alasql('SELECT Firstname as Name,Fathername,CourseName,BatchName,UniversityName,DOJ as RegistrationDate,MobileNumber INTO XLS("New Registration report.xls",?) FROM ?',[mystyle,$scope.newreglist]);
};
$scope.OpenWindowStatus = false;
$scope.editId = -1;
$scope.setEditId = function (P)
{
//alert(P);
$scope.editId = P;
}
$scope.close = function ()
{
$scope.editId = -1;
}
$scope.fdate ='';
$scope.tdate ='';
//$scope.Subtypes = '';
}]);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -14,208 +14,311 @@
</section> -->
<!-- end: DASHBOARD TITLE -->
<!-- start: FEATURED BOX LINKS -->
<div class="container-fluid container-fullw bg-white" ng-controller="dashboardCtrl">
<!-- start student registration details-->
<div ng-if="getLoginType!='R004'" ng-controller="OnotherCtrl" data-ng-init="init()">
<div class="col-md-12">
<div class="panel panel-white" id="panel4">
<div class="panel-heading panel-white">
<h4 class="panel-title text-blue">University Registration</h4>
<div ng-controller="dashboardCtrl">
<div class="container-fluid container-fullw padding-bottom-10">
<div class="row" data-ng-init="initCallTracking()">
<div class="col-sm-12">
<div class="panel panel-white no-radius">
</div>
<div class="panel-body">
<div ng-if="notEmptyRegistration==false">
<center>
<h5 class="text-dark">No university details!</h5>
</center>
</div>
<div class="col-md-3" ng-if="notEmptyRegistration==true" ng-repeat="registration in registerdStudentDetails">
<div class="panel panel-white" id="{{registration.UniversityID}}">
<!--<div class="panel-heading panel-white">
<h4 class="panel-title text-blue">{{registration.UniversityID}}</h4>
<div class="panel-body no-padding">
</div>-->
<div class="panel-body">
<label>{{registration.UniversityName | uppercase}}</label>
<div>
<label>No of Registration &nbsp;:&nbsp;<span>{{registration.StudentCounts}}</span></label>
<tabset class="tabbable no-padding no-margin">
<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="emptyDataToday==true">
<center>
<h5 class="text-dark">No Followup!</h5>
</center>
</div>
<div class="cl-effect-13" style="float: right" ng-if="emptyDataToday==false">
<a ui-sref="app.call.tracking">
view more
</a>
</div>
<table class="table table-hover no-margin" ng-if="emptyDataToday==false" ng-controller="studentModalDemoCtrl">
<thead>
<tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
<tr>
<th> ID</th>
<th> Name</th>
<th>Mobile </th>
<th>Activity</th>
<th class="hidden-xs">Status</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="today in todayFolloupDetails">
<td>{{today.TrackingID}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(today);">{{today.LeadName}}</a></td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(today);">{{today.MobileNumber}}</a></td>
<td>{{today.ActivityName}}</td>
<td class="hidden-xs" ng-if="today.statusName=='CLOSE'"><span class="label label-sm label-success">{{today.statusName}}</span></td>
<td class="hidden-xs" ng-if="today.statusName!='CLOSE'"><span class="label label-sm label-warning">{{today.statusName}}</span></td>
</tr>
</tbody>
</table>
</div>
<div ng-if="getLoginType=='R004'" class="panel-scroll height-350" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="emptyDataToday==true">
<center>
<h5 class="text-dark">No Followup!</h5>
</center>
</div>
<div class="cl-effect-13" style="float: right" ng-if="emptyDataToday==false">
<a ui-sref="app.call.tracking">
view more
</a>
</div>
<table class="table table-hover no-margin" ng-if="emptyDataToday==false" ng-controller="studentModalDemoCtrl">
<thead>
<tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
<tr>
<th> ID</th>
<th> Name</th>
<th>Mobile </th>
<th>Activity</th>
<th class="hidden-xs">Status</th>
</div>
</div>
</div>
</tr>
</thead>
<tbody>
</div>
</div>
</div>
</div>
<!--end student registration-->
<div class="row" data-ng-init="initCallTracking()">
<div class="col-md-12">
<div class="col-sm-6">
<div class="container">
<div class="row">
<div class="panel panel-white" id="panel1">
<div class="panel-heading panel-white">
<h4 class="panel-title text-green">Follow Ups For Today : {{todayFolloupDetails.length}}</h4>
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
</div>
<div class="panel-body">
<div ng-if="emptyDataToday==true">
<center>
<h5 class="text-dark">No Followup!</h5>
</center>
</div>
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataToday==false">
<table class="table table-hover" ng-controller="studentModalDemoCtrl">
<thead>
<tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
<tr>
<th> ID</th>
<th> Name</th>
<th>Mobile </th>
<th>Activity</th>
<th class="hidden-xs">Status</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="today in todayFolloupDetails">
<td>{{today.TrackingID}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(today);">{{today.LeadName}}</a></td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(today);">{{today.MobileNumber}}</a></td>
<td>{{today.ActivityName}}</td>
<td class="hidden-xs" ng-if="today.statusName=='CLOSE'"><span class="label label-sm label-success">{{today.statusName}}</span></td>
<td class="hidden-xs" ng-if="today.statusName!='CLOSE'"><span class="label label-sm label-warning">{{today.statusName}}</span></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="row">
<div class="panel panel-white" id="panel3">
<div class="panel-heading panel-white">
<h4 class="panel-title text-purple"> Leads Created Today :{{leadDetails.length}}</h4>
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
<tr ng-repeat="today in todayFolloupDetails">
<td>{{today.TrackingID}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(today);">{{today.LeadName}}</a></td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(today);">{{today.MobileNumber}}</a></td>
<td>{{today.ActivityName}}</td>
<td class="hidden-xs" ng-if="today.statusName=='CLOSE'"><span class="label label-sm label-success">{{today.statusName}}</span></td>
<td class="hidden-xs" ng-if="today.statusName!='CLOSE'"><span class="label label-sm label-warning">{{today.statusName}}</span></td>
</tr>
</tbody>
</table>
</div>
<div class="panel-body">
</tab>
<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="emptyDataPending==true">
<center>
<h5 class="text-dark">No Pending Followup!</h5>
</center>
</div>
<div class="cl-effect-13" style="float: right" ng-if="emptyDataPending==false">
<a ui-sref="app.call.tracking">
view more
</a>
</div>
<table class="table table-hover" ng-if="emptyDataPending==false" ng-controller="studentModalDemoCtrl">
<thead>
<!-- <tr> -->
<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
<tr>
<th> ID</th>
<th> Name</th>
<th>Mobile </th>
<th>Activity</th>
<th>Followup </th>
<th class="hidden-xs">Status</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="pending in pendingFolloupDetails">
<td>{{pending.TrackingID}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(pending);">{{pending.LeadName}}</a></td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(pending);">{{pending.MobileNumber}}</a></td>
<td>{{pending.ActivityName}}</td>
<td>{{pending.FollowupOn}}</td>
<td class="hidden-xs"><span class="label label-sm label-danger">{{pending.statusName}}</span></td>
</tr>
</tbody>
</table>
</div>
<div ng-if="getLoginType=='R004'" class="panel-scroll height-350" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="emptyDataPending==true">
<center>
<h5 class="text-dark">No Pending Followup!</h5>
</center>
</div>
<div class="cl-effect-13" style="float: right" ng-if="emptyDataPending==false">
<a ui-sref="app.call.tracking">
view more
</a>
</div>
<table class="table table-hover" ng-if="emptyDataPending==false" ng-controller="studentModalDemoCtrl">
<thead>
<!-- <tr> -->
<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
<tr>
<th> ID</th>
<th> Name</th>
<th>Mobile </th>
<th>Activity</th>
<th>Followup </th>
<th class="hidden-xs">Status</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="pending in pendingFolloupDetails">
<td>{{pending.TrackingID}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(pending);">{{pending.LeadName}}</a></td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(pending);">{{pending.MobileNumber}}</a></td>
<td>{{pending.ActivityName}}</td>
<td>{{pending.FollowupOn}}</td>
<td class="hidden-xs"><span class="label label-sm label-danger">{{pending.statusName}}</span></td>
</tr>
</tbody>
</table>
</div>
</tab>
<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="emptyDataLead==true">
<center>
<h5 class="text-dark">No Lead Created By Today!</h5>
</center>
</div>
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataLead==false">
<table class="table table-hover" ng-controller="studentModalDemoCtrl">
<thead>
<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
<tr>
<th> ID</th>
<th> Name</th>
<th>Mobile </th>
<th>Activity</th>
<th>Followup </th>
<th class="hidden-xs">Status</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="lead in leadDetails">
<td>{{lead.TrackingID}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(lead);">{{lead.LeadName}}</a></td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(lead);">{{lead.MobileNumber}}</a></td>
<td>{{lead.ActivityName}}</td>
<td>{{lead.FollowupOn}}</td>
<td class="hidden-xs" ng-if="lead.statusName=='CLOSE'"><span class="label label-sm label-info">{{lead.statusName}}</span></td>
<td class="hidden-xs" ng-if="lead.statusName!='CLOSE'"><span class="label label-sm label-info">{{lead.statusName}}</span></td>
</tr>
</tbody>
</table>
<div class="cl-effect-13" style="float: right" ng-if="emptyDataLead==false && getLoginType=='R004' || getLoginType=='R003'">
<a ui-sref="app.call.lead">
view more
</a>
</div>
<table class="table table-hover" ng-if="emptyDataLead==false" ng-controller="studentModalDemoCtrl">
<thead>
<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
<tr>
<th> ID</th>
<th> Name</th>
<th>Mobile </th>
<th>Activity</th>
<th>Followup </th>
<th class="hidden-xs">Status</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="lead in leadDetails">
<td>{{lead.TrackingID}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(lead);">{{lead.LeadName}}</a></td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(lead);">{{lead.MobileNumber}}</a></td>
<td>{{lead.ActivityName}}</td>
<td>{{lead.FollowupOn}}</td>
<td class="hidden-xs" ng-if="lead.statusName=='CLOSE'"><span class="label label-sm label-info">{{lead.statusName}}</span></td>
<td class="hidden-xs" ng-if="lead.statusName!='CLOSE'"><span class="label label-sm label-info">{{lead.statusName}}</span></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div ng-if="getLoginType=='R004'" class="panel-scroll height-350" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="emptyDataLead==true">
<center>
<h5 class="text-dark">No Lead Created By Today!</h5>
</center>
</div>
<div class="cl-effect-13" style="float: right" ng-if="emptyDataLead==false && getLoginType=='R004' || getLoginType=='R003'">
<a ui-sref="app.call.lead">
view more
</a>
</div>
<table class="table table-hover" ng-if="emptyDataLead==false" ng-controller="studentModalDemoCtrl">
<thead>
<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
<tr>
<th> ID</th>
<th> Name</th>
<th>Mobile </th>
<th>Activity</th>
<th>Followup </th>
<th class="hidden-xs">Status</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="lead in leadDetails">
<td>{{lead.TrackingID}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(lead);">{{lead.LeadName}}</a></td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(lead);">{{lead.MobileNumber}}</a></td>
<td>{{lead.ActivityName}}</td>
<td>{{lead.FollowupOn}}</td>
<td class="hidden-xs" ng-if="lead.statusName=='CLOSE'"><span class="label label-sm label-info">{{lead.statusName}}</span></td>
<td class="hidden-xs" ng-if="lead.statusName!='CLOSE'"><span class="label label-sm label-info">{{lead.statusName}}</span></td>
</tr>
</tbody>
</table>
</div>
</tab>
</tabset>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="panel panel-white" id="panel2">
<div class="panel-heading panel-white">
<h4 class="panel-title text-red">Pending Follow Ups :{{pendingFolloupDetails.length}}</h4>
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
</div>
<div class="panel-body">
<div ng-if="emptyDataPending==true">
<center>
<h5 class="text-dark">No Pending Followup!</h5>
</center>
</div>
<div class="panel-scroll height-460" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataPending==false">
<table class="table table-hover" ng-controller="studentModalDemoCtrl">
<thead>
<!-- <tr> -->
<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
<tr>
<th> ID</th>
<th> Name</th>
<th>Mobile </th>
<th>Activity</th>
<th>Followup </th>
<th class="hidden-xs">Status</th>
</tr>
</thead>
<tbody>
</div>
<div class="row" ng-if="getLoginType!='R004'" ng-controller="OnotherCtrl" data-ng-init="init()">
<div class="col-sm-12">
<div class="panel panel-white no-radius">
<tr ng-repeat="pending in pendingFolloupDetails">
<td>{{pending.TrackingID}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(pending);">{{pending.LeadName}}</a></td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(pending);">{{pending.MobileNumber}}</a></td>
<td>{{pending.ActivityName}}</td>
<td>{{pending.FollowupOn}}</td>
<td class="hidden-xs"><span class="label label-sm label-danger">{{pending.statusName}}</span></td>
</tr>
</tbody>
<div class="panel-body no-padding">
</table>
</div>
<tabset class="tabbable no-padding no-margin">
<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="cl-effect-13" style="float: right" ng-if="getLoginType=='R004'">
<a ui-sref="app.student.studentDetailsSuperAdmin">
view more
</a>
</div>
<div class="cl-effect-13" style="float: right" ng-if="getLoginType!='R004'">
<a ui-sref="app.student.studentDetails">
view more
</a>
</div>
<table class="table no-margin">
<tbody>
<tr ng-repeat="registration in registerdStudentDetails">
<td><span class="text-small block text-light">University ID</span><span>{{registration.UniversityID}}</span></td>
<td><span class="text-small block text-light">University Name</span><span>{{registration.UniversityName | uppercase}}</span></td>
<td><span class="text-small block text-light">No of Registration</span><span>{{registration.StudentCounts}}</span></td>
</tr>
</tbody>
</table>
</div>
</tab>
<tab heading="University Pending Fees" class="padding-top-5">
<div class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<table class="table no-margin">
<tbody>
<tr ng-repeat="univFees in universityFeesDetails">
<td><span class="text-small block text-light">University ID</span><span>{{univFees.UniversityID}}</span></td>
<td><span class="text-small block text-light">University Name</span><span>{{univFees.UniversityName}}</span></td>
<td><span class="text-small block text-light">Payable Fees</span><span>{{univFees.PayableFees}}</span></td>
<td><span class="text-small block text-light">Paid Fees</span><span>{{univFees.PaidFees}}</span></td>
<td><span class="text-small block text-light">Balance Fees</span><span>{{univFees.PayableFees-univFees.PaidFees}}</span></td>
</tr>
</tbody>
</table>
</div>
</tab>
</tabset>
</div>
</div>
</div>
</div>
<!--<div class="row">
<div class="col-sm-6">
<div class="panel panel-white no-radius">
<div class="panel-heading border-bottom">
<h4 class="panel-title">New Users</h4>
</div>
<div class="panel-body">
<div ng-controller="OnotherCtrl">
<div class="text-center" data-ng-init="init()">
<span class="mini-pie"> <canvas class="tc-chart" tc-chartjs-doughnut chart-options="options" chart-data="data" chart-legend="chart3" width="100"></canvas> <span>{{total}}</span> </span>
</div>
<div class="margin-top-20 text-center legend-xs">
<div tc-chartjs-legend chart-legend="chart3" class="inline"></div>
</div>
</div>
</div>
</div>
</div>
</div>-->
</div>
<div>
</div>
</div>

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

@ -119,7 +119,8 @@
/*font-size: 16px;*/
}
</style>
<table class="table table-bordered">
<button ng-click="exportData()">export</button>
<table class="table table-bordered" export-table>
<thead>
<tr>
<th ng-click="sort('Date')">Date

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

@ -119,7 +119,8 @@
/*font-size: 16px;*/
}
</style>
<table class="table table-bordered">
<button ng-click="exportData()">export</button>
<table class="table table-bordered export-table">
<thead>
<tr>
<th ng-click="sort('Date')">Date

210
Apollo/assets/views/newreg_report.html Normal file
View File

@ -0,0 +1,210 @@
<style type="text/css">
.pad {
background-color: #eee;
padding: 4px;
}
.fif {
/* background-color: #ddd;*/
display: inline-block;
margin: 0 175px 0 0;
padding: 8px 8px;
text-align: left;
width: 200px;
}
.right {
/* background-color: #ddd;*/
display: inline-block;
/*margin: 0 25px 0 0;*/
padding: 1px 1px;
text-align: right;
}
.rightac {
/* background-color: #ddd;*/
display: inline-block;
margin: 0 175px 0 0;
padding: 8px 8px;
text-align: left;
width: 200px;
}
.a {
word-spacing: 9cm;
}
</style>
<section id="page-title">
<div class="row">
<div class="col-sm-8">
<h1 class="mainTitle">New Registration Report</h1>
</div>
<!-- <div ncy-breadcrumb></div> -->
</div>
</section>
<style>
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
}
th {
cursor: pointer;
} */
</style>
<script type="text/javascript" src="bower_components/ng-table-excel-export/ng-table-excel-export.min.js">
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="newreg_reportCtrl" data-ng-init="init()">
<form name="Form" id="form" novalidates method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
<div class="row">
<div class="col-md-3">
<!--<pre>{{searchData.date}}</pre>-->
<div data-ng-controller="DatepickerDemoCtrl">
<label>
From Date
</label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
show-button-bar="true" />
</div>
</div>
<div class="col-md-3">
<!--<pre>{{searchData.date}}</pre>-->
<div data-ng-controller="DatepickerDemoCtrl">
<label>
To Date
</label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.to_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
show-button-bar="true" />
</div>
</div>
<div class="col-md-3" >
<label for="form-field-select-2">
University
</label>
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="university" ng-model="myModel.myUnivSearch"
ng-click="getEmployeeList()">
<option value="" disabled selected>Select University</option>
<option ng-repeat="item in universitySearchData" value="{{item.UniversityID}}">{{item.UniversityName}}</option>
</select>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div class="pull-right">
<button type="submit" class="btn btn-success btn-o" ng-click="getDetails(Form,myModel);" tabindex="8">
Submit
</button>
</div>
</div>
</div>
</div>
</div>
</fieldset>
</form>
<!-- <pre>{{statusr | json}}</pre> -->
<div class="row" style="text-align: right;">
<div class="col-md-4">
<!-- <input class="form-control" type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" /> -->
</div>
<button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
<!-- <button type="button" ladda="ldloading1.zoom_in" tabindex="5" class="btn btn-success btn-o" data-style="zoom-in" ng-click="changeSem(myModel.universityName,myModel.courseName);">Generate PDF</button> -->
<!-- <button class="btn btn-success" id="print" ng-click="generatePDF();">Print</button></div> -->
</div>
<div>
<div ng-if="isLoaderShow">
<center> <h1>{{load}}</h1> </center>
</div>
<div class="col-md-12">
<div class="table-responsive">
<table id="datatable" class="table table-hover">
<thead>
<tr >
<th style="font-size: 12px;">Student Name</th>
<th style="font-size: 12px;">Father Name</th>
<th style="font-size: 12px;">Course</th>
<th style="font-size: 12px;">Batch</th>
<th style="font-size: 12px">University</th>
<th style="font-size: 12px;">Date Of Registration</th>
<th style="font-size: 12px;">Mobile</th>
<!-- <th style="font-size: 12px;">Amount</th>
<th style="font-size: 12px;">Action</th> -->
</tr>
</thead>
<tbody dir-paginate="p in newreglist|filter:search:strict|itemsPerPage:10">
<tr>
<td>{{p.Firstname}}</td>
<td>{{p.Fathername}}</td>
<td>{{p.CourseName}}</td>
<td>{{p.BatchName}}</td>
<td>{{p.UniversityName}}</td>
<td>{{p.DOJ}}</td>
<td>{{p.MobileNumber}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<!-- <div ng-if="load=0">
<b><h1 style="color:black;"><center> No Records Found</h1></center></b>
</div> -->
<!-- <dir-pagination-controls direction-links="true" boundary-links="true">
</dir-pagination-controls> -->
</div>
</div>

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

@ -483,6 +483,13 @@
<span class="title" translate="sidebar.nav.report.lead">Lead Tracking Report</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.newreg" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.report.newreg">New Registration</span>
</a>
</li>
@ -955,6 +962,13 @@
<span class="title" translate="sidebar.nav.report.lead">Lead Tracking Report</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.newreg" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.report.newreg">New Registration</span>
</a>
</li>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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