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

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

Browse Source
This commit is contained in:
gayathri1990 2018-08-18 10:42:16 +05:30
commit 6abd65c9be
40 changed files with 1230 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,6 +187,11 @@ $route['IncomeExpenseDetails'] = 'DayBook_Controller/getIncomeExpenseDetails';
$route['ViewFullIncomeDetails'] = 'DayBook_Controller/ViewFullIncomeDetails';
$route['GetSubTypes'] = 'DayBook_Controller/GetSubTypes';
$route['getAllDayBookDetails'] = 'DayBook_Controller/getAllDayBookDetails';
$route['update_DayBookDetails'] = 'DayBook_Controller/update_DayBookDetailsData';
/* Add New Contact Group */
$route['addNewGroup'] = 'Broadcast_Controller/addNewGroup';
$route['getGroups'] = 'Broadcast_Controller/getGroups';

48
Apollo/api/application/controllers/DayBook_Controller.php
View File

@ -449,5 +449,53 @@ class DayBook_Controller extends REST_Controller {
], REST_Controller::HTTP_NOT_FOUND);
}
}
public function getAllDayBookDetails_post()
{
$search['Firstname'] = $this->post('studentName');
$search['MobileNumber'] = $this->post('mobileNumber');
$search['receipt'] = $this->post('receipt');
$allfinace = $this->daybook_model->GetAllDaybook($search);
//print_r($allfinace);
if($allfinace)
{
$allfinace['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($allfinace, 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 update_DayBookDetailsData_post()
{
$now = new DateTime();
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
$up_details['ID']= $this->post('ID');
//$up_details['Date'] =$this->post('Date');
$up_details['Amount'] = $this->post('Amount');
$up_details['Reason'] = $this->post('Reason');
$up_details['IsActive'] = $this->post('IsActive');
$up_details['FeesPaymentID'] = $this->post('FID');
$up_details['requestedtBy'] = $this->post('requestedtBy');
$up_details['branchId'] = $this->post('branchId');
$updatevalue = $this->daybook_model->UpdateDayFee($up_details);
}
}

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

@ -91,7 +91,9 @@ class Report extends REST_Controller {
$bat = $this->post('batch');
$br = $this->post('branch');
$u = $this->post('university');
$getStatus = $this->report_model->certificate_status($bat,$br,$u);
$from = $this->post('from');
$to = $this->post('to');
$getStatus = $this->report_model->certificate_status($bat,$br,$u,$from,$to);
//print_r($getStatus);
if ($getStatus)
{
@ -339,7 +341,30 @@ class Report extends REST_Controller {
public function filters_post()
{
$br = $this->post('branch');
$getStatus = $this->report_model->filters($br);
$getStatus = $this->report_model->getUniversity($br);
//print_r($getStatus);
if ($getStatus)
{
$getStatus['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($getStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else
{
// Set the response and exit
$this->response([
'message' => 'No records found!',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
public function BatchName_post()
{
$br = $this->post('branch');
$batch = $this->post('batch');
$getStatus = $this->report_model->BatchName($br,$batch);
//print_r($getStatus);
if ($getStatus)
{

3
Apollo/api/application/controllers/Reregister_Controller.php
View File

@ -158,7 +158,8 @@ class Reregister_Controller extends REST_Controller {
}
public function getSubject_post(){
$SemesterID = $this->post('SemNum');
$Sem = $this->post('SemNum');
$SemesterID = ucfirst($Sem);
$branchId = $this->post('branchId');
$course = $this->post('Course');
$sem = '';

99
Apollo/api/application/models/DayBook_model.php
View File

@ -753,4 +753,103 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
return $result;
}
public function GetAllDaybook($search=null)
{
//if($search['MobileNumber']!='' && $search['Firstname']!='' && $search['receipt']!='')
//{
$this->db->select('T_DayBookMaster.ID,Name,Type,Amount,Date,T_DayBookMaster.Description,VoucherNumber,PaidTo,T_DayBookMaster.ModeOfPayment,FeePaymentDetails,Firstname,ListName,T_DayBookMaster.ReceiptNo,T_Students_Fees_PaidDetails.IsActive as IsActive,T_Students_Fees_PaidDetails.ID as FID,T_DayBookMaster.Reason as Reason');
$this->db->from('T_DayBookMaster');
$this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_DayBookMaster.StudentID','left');
$this->db->join('T_PickListDetails','T_PickListDetails.ListCode=T_DayBookMaster.Name','left');
$this->db->join('T_Students_Fees_PaidDetails','T_Students_Fees_PaidDetails.ID = T_DayBookMaster.FeesPaymentID');
if($search['MobileNumber']!='')
{
$this->db->where('T_StudentDetails.MobileNumber',$search['MobileNumber']);
}
if($search['Firstname']!='')
{
// $this->db->like('ST.Firstname','%'.$search['Firstname'].'%');
$this->db->like('T_StudentDetails.Firstname',$search['Firstname'],'both');
}
if($search['receipt']!='')
{
$this->db->where('T_DayBookMaster.VoucherNumber',$search['receipt']);
$this->db->or_where('T_DayBookMaster.ReceiptNo',$search['receipt']);
}
$searchDetails = $this->db->get();
if($searchDetails->result())
{
//print_r($searchDetails->result());
$result_array['studentStatus'] = true;
$result_array['details'] = $searchDetails->result();
}
else
{
$result_array['studentStatus'] = false;
$result_array['details'] = "No records found!";
}
return $result_array;
//}
// else{
// $result_array['studentStatus'] = false;
// $result_array['details'] = "No records found!";
// }
}
public function UpdateDayFee($up_details)
{
//echo $up_details['ID'];
//UpdatedOn
$time = date('Y-m-d H:i:s');
$dateTime = $time;
// echo $dateTime;
// die();
$daybookarr['ID'] = $up_details['ID'];
// $daybookarr['IsActive'] = $up_details['IsActive'];
$daybookarr['Reason'] = $up_details['Reason'];
$daybookarr['UpdatedOn'] = $dateTime;
$daybookarr['UpdatedBy'] =$up_details['requestedtBy'];
if($up_details['IsActive'] == 0)
{
$daybookarr['Status'] = 'Cancel';
}
else
{
$daybookarr['Status'] = 'Approved';
}
$this->db->where('ID', $daybookarr['ID']);
$this->db->update('T_DayBookMaster', $daybookarr);
$feearr['ID'] = $up_details['FeesPaymentID'];
$feearr['IsActive'] = $up_details['IsActive'];
$feearr['UpdatedOn'] = $dateTime;
$feearr['UpdatedBy'] = $up_details['branchId'];
$this->db->where('ID', $feearr['ID']);
$this->db->update('T_Students_Fees_PaidDetails', $feearr);
return TRUE;
}
}

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

@ -34,7 +34,7 @@ order by CourseID) as cm
on cm.cid=cfd.ccid
left join
(SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,AlternateNumber,PresentAddress as address FROM T_StudentDetails where IsActive = 1) as std on std.sid=sms.sid
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid
where sms.branch = '".$br."'
";
@ -64,17 +64,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
}
public function filters($br){
$sql = "SELECT distinct BatchCode as batchcode,BatchName as batch,BatchDate FROM T_BatchMaster
where BranchCode = '".$br."'";
$b=$this->db->query($sql);
$batch = $b->result();
if (count($batch) > 0) {
$results['batchlist'] = true;
$results['batch'] = $batch;
} else {
$results['batchlist'] = false;
$results['message'] = 'No record found';
}
$sql = "SELECT distinct UniversityID as uid,UniversityName as university FROM T_UniversityMaster
where BranchCode = '".$br."'";
@ -89,13 +79,30 @@ where BranchCode = '".$br."'";
}
return $results;
}
public function BatchName($br,$batch){
$sql = "SELECT distinct BatchCode as batchcode,BatchName as batch,BatchDate FROM T_BatchMaster
where BranchCode = '".$br."' and BatchName = '".$batch."'";
$b=$this->db->query($sql);
$batch = $b->result();
if (count($batch) > 0) {
$results['batchlists'] = true;
$results['batchName'] = $batch;
} else {
$results['batchlists'] = false;
$results['message'] = 'No record found';
}
}
public function markcard($bat=null,$br=null,$u=null){
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfs.rollno,'-') as Roll_NO,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(sms.cdate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Initial_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_Fee,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,appdate,ansdate
from
(SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,CertificationType as ctype,CDate as cdate,Sem as sem FROM T_CertificationStatus
WHERE ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem)
(SELECT c.ID,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName,c.CertificationType as ctype,c.CDate as cdate,c.Sem as sem FROM T_CertificationStatus c
left join T_PickListDetails p on p.ListCode=c.ListCode
WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem)
group by sid,sem,cid,lcode,branch) as sms
left join
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,RollNO as rollno,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others FROM T_Students_Fees_Status
@ -161,7 +168,7 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=cfd.syear
return $results;
}
public function certificate_status($bat=null,$br=null,$u=null){
public function certificate_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
from
@ -218,6 +225,14 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
$sql.=" and cm.uid = '".$u."'";
}
if ($from != '' and $to != ''){
$fromd= date("Y-m-d",strtotime($from));
$tod=date("Y-m-d",strtotime($to));
$sql.="and STR_TO_DATE(ams.adate,'%d-%m-%Y') >= '".$fromd."'
and STR_TO_DATE(ams.adate,'%d-%m-%Y') <= '".$tod."'";
}
$sql.=" group by Student_id,Course_id,Batch_code,Branch_code";
$leadDet=$this->db->query($sql);
@ -319,7 +334,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
$sql = "SELECT ifnull(dbm.Date,'-') as date,ifnull(exp.TypeName,'-') as Expense_name,ifnull(sum(dbm.Amount),0) as Amount FROM (SELECT @s:= 0) AS s,T_Income_Outcome_Master exp
join T_DayBookMaster dbm on dbm.Type=exp.ID
where dbm.Name = 'I001' and dbm.Status = 'Approved' and exp.BranchCode = '".$br."'
where dbm.Name = 'I001' and exp.TypeName not like 'FEES' and dbm.Status = 'Approved' and exp.BranchCode = '".$br."'
";
if ($from and $to != ''){
@ -348,7 +363,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
}
public function answer_booklet($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(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate,listdate.rcvedate
$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(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate as issuedate,listdate.rcvedate as rcvedate,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as balance
from
(SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as
@ -422,7 +437,7 @@ group by sid
public function app_pending($bat=null,$br=null,$u=null){
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,ifnull(sfp.bdate,'-') as Admission_date,
ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,sms.adate as appdate
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
@ -784,5 +799,49 @@ from T_Lead_Tracking_Followup as ltf
return $results;
}
public function getUniversity($br=null)
{
$this->db->select('UniversityID,UniversityName');
$this->db->where('IsActive','1');
$this->db->where('BranchCode',$br);
$this->db->order_by('CreatedOn','DESC');
$university = $this->db->get(UNIVERSITY);
if($university->result()){
$result = array();
$result['univlist'] = true;
foreach ($university->result() as $row)
{
$university_array['universityID'] = $row->UniversityID;
$university_array['universityName'] = $row->UniversityName;
$university_array['batchDetails']= $this->getBatch($row->UniversityID,$br);
$result_array[]=$university_array;
}
$result['university']= $result_array;
}
else {
$result['univlist'] = false;
$result['message'] = "No records found!";
$result['universityID'] = "";
$result['universityName'] = "";
$result['batchDetails']= "";
}
return $result;
}
public function getBatch($universityID=null,$br=null)
{
$this->db->select('BatchCode,BatchName');
$this->db->where('UniversityID',$universityID);
$this->db->where('IsActive','1');
$this->db->where('BranchCode',$br);
$this->db->order_by('BatchCode','ASC');
$batchDetails = $this->db->get(BATCH);
return $batchDetails->result();
}
}

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

@ -68,6 +68,7 @@ class StatusUpdation_model extends CI_Model {
// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
$mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it.";
$this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
} else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
$cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
$getSemYearMsg = $this->get_couser_name($arr[0]['CourseID']);
@ -75,6 +76,7 @@ class StatusUpdation_model extends CI_Model {
// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
$mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg.";
$this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
} else {
}
@ -121,6 +123,7 @@ class StatusUpdation_model extends CI_Model {
// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
$mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it.";
$this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
} else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
$cerNamtToMsg = 'Mark Card';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
@ -128,6 +131,7 @@ class StatusUpdation_model extends CI_Model {
// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
$mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg.";
$this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
} else {
}
// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
@ -174,6 +178,15 @@ class StatusUpdation_model extends CI_Model {
return $roleDetails->MobileNumber;
}
// self function for getting registered email for mail send
public function get_registered_email($num) {
$this->db->select('EmailID');
$this->db->from(STUDENTS);
$this->db->where('StudentID', $num);
$roleDetails = $this->db->get()->first_row();
return $roleDetails->EmailID;
}
// self function for getting the status for the LISTCODE
public function get_ListCode_status($listCode) {
$this->db->select('ListName');
@ -297,8 +310,23 @@ class StatusUpdation_model extends CI_Model {
$this->db->insert_batch(ANSWER_BOOKLET, $arr);
if ($this->db->affected_rows() >= 1) {
$this->updateBookletStatusInCallTrack($arr, $reqDetails);
$result['addStatus'] = true;
$result['message'] = "Successfully Answer Booklet Status Updated";
$studentName = $this->getStudentName($arr[0]['StudentID']);
$statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
// $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
if( $statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED'){
$cerNamtToMsg = 'Answer booklet';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
$getSemYearANDType = "$getSemYearMsg $cerNamtToMsg";
// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
$mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received.";
$this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
$result['addStatus'] = true;
$result['message'] = "Successfully Answer Booklet Status Updated";
}else{
$result['addStatus'] = true;
$result['message'] = "Successfully Answer Booklet Status Updated";
}
} else {
$result['addStatus'] = false;
$result['message'] = "Something went wrong.please try again";
@ -340,6 +368,7 @@ class StatusUpdation_model extends CI_Model {
// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
$mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it.";
$this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
} else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
$cerNamtToMsg = 'Study Material';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
@ -347,6 +376,7 @@ class StatusUpdation_model extends CI_Model {
// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
$mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg.";
$this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
} else {
}
}
@ -549,34 +579,44 @@ class StatusUpdation_model extends CI_Model {
return $output;
}
// public function mailsend() {
// //Load email library
// $this->load->library('email');
// //SMTP & mail configuration
// $config = array(
// 'protocol' => 'smtp',
// 'smtp_host' => 'ssl://smtp.example.com',
// 'smtp_port' => 465,
// 'smtp_user' => 'email@example.com',
// 'smtp_pass' => 'email_password',
// 'mailtype' => 'html',
// 'charset' => 'utf-8'
// );
// $this->email->initialize($config);
// $this->email->set_mailtype("html");
// $this->email->set_newline("\r\n");
// //Email content
// $htmlContent = '<h1>Sending email via SMTP server</h1>';
// $htmlContent .= '<p>This email has sent via SMTP server from CodeIgniter application.</p>';
// // Email body load the html template
// // $body = $this->load->view('emails/anillabs.php',$data,TRUE);
// $this->email->to('recipient@example.com');
// $this->email->from('sender@example.com','MyWebsite');
// $this->email->subject('How to send email via SMTP server in CodeIgniter');
// $this->email->message($htmlContent);
// //Send email
// $this->email->send();
// }
public function mailsend($arr, $msg, $sub) {
$emails = array();
foreach ($arr as $ar) {
$mobi = $this->get_registered_email($ar['StudentID']);
array_push($emails, "$mobi");
}
$list = implode(',', $emails);
//Load email library
$this->load->library('email');
//SMTP & mail configuration
$config = array(
'protocol' => 'ssmtp',
'smtp_host' => 'ssl://smtp.example.com',
'smtp_port' => 465,
'smtp_user' => 'noreply@apollodec.com',
'smtp_pass' => 'Apollo@123',
'mailtype' => 'html',
'charset' => 'utf-8'
);
$this->email->initialize($config);
$this->email->set_mailtype("html");
$this->email->set_newline("\r\n");
//Email content
// $htmlContent = '<h1>Sending email via SMTP server</h1>';
$htmlContent = $msg;
// Email body load the html template
// $body = $this->load->view('emails/anillabs.php',$data,TRUE);
$this->email->to($list);
$this->email->from('noreply@apollodec.com','Apollo');
$subj = $sub;
$this->email->subject($subj);
$this->email->message($htmlContent);
//Send email
$result = $this->email->send();
// echo $this->email->print_debugger(); exit();
return $result;
}
/*
* update followup details for booklet details in call tracking
* created by kms

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

@ -592,6 +592,9 @@ class Student_model extends CI_Model {
$msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123";
$arr = $userId;
$this->smssend($arr, $msg);
$emailId = $Arr['EmailID'];
$sub = ' Apollo - Course Registration';
$this->mailsend($emailId, $msg, $sub);
$result['addStudentStatus'] = true;
$result['message'] = "Successfully student details added";
} else {
@ -636,11 +639,15 @@ class Student_model extends CI_Model {
$this->db->insert(LOGIN, $loginArr);
if ($this->db->affected_rows() == '1') {
$userId = $Arr['MobileNumber'];
$getUnivName = $this->getUnivName($courseArr['UniversityID'], $courseArr['BranchID']);
$getCourseName = $this->getCourseName($courseArr['CourseID'], $courseArr['BranchID']);
$msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123";
$arr = $userId;
$this->smssend($arr, $msg);
$emailId = $Arr['EmailID'];
$sub = ' Apollo - Course Registration';
$this->mailsend($emailId, $msg, $sub);
$result['addStudentStatus'] = true;
$result['message'] = "Successfully student details added";
} else {
@ -1170,4 +1177,44 @@ class Student_model extends CI_Model {
return $output;
}
public function mailsend($arr, $msg, $sub) {
// $emails = array();
// foreach ($arr as $ar) {
// $mobi = $this->get_registered_email($ar['StudentID']);
// array_push($emails, "$mobi");
// }
// $list = implode(',', $emails);
$list = $arr;
//Load email library
$this->load->library('email');
//SMTP & mail configuration
$config = array(
'protocol' => 'ssmtp',
'smtp_host' => 'ssl://smtp.example.com',
'smtp_port' => 465,
'smtp_user' => 'noreply@apollodec.com',
'smtp_pass' => 'Apollo@123',
'mailtype' => 'html',
'charset' => 'utf-8'
);
$this->email->initialize($config);
$this->email->set_mailtype("html");
$this->email->set_newline("\r\n");
//Email content
// $htmlContent = '<h1>Sending email via SMTP server</h1>';
$htmlContent = $msg;
// Email body load the html template
// $body = $this->load->view('emails/anillabs.php',$data,TRUE);
$this->email->to($list);
$this->email->from('noreply@apollodec.com','Apollo');
$subj = $sub;
$this->email->subject($subj);
$this->email->message($htmlContent);
//Send email
$result = $this->email->send();
// echo $this->email->print_debugger(); exit();
return $result;
}
}

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

@ -81,14 +81,13 @@
"report": {
"TITLE": "REPORTS",
"studmatstatus": "STUDY MATERIAL STATUS ",
"unidataupload":"UNIVERSITY DATA UPLOAD",
"mstatus": "MARK CARD STATUS ",
"certificate_status": "CERTIFICATE STATUS ",
"certificate_mark_status": "MARKCARD/CERTIFICATE ISSUED STATUS ",
"expense": "EXPENSE REPORT ",
"answer_booklets": "ANSWER BOOKLETS STATUS REPORT ",
"app_pending": "APPLICATION PENDING STUDENT LIST REPORT",
"doc_pending": "DOCUMENT PENDING STUDENT LIST REPORT",
"doc_pending": "STUDENT DOCUMENTS PENDING REPORT",
"wav_ref": "WAIVER AND REFERAL REPORT",
"examfee": "EXAM WRITING FEE REPORT",
"balfee": "FEE BALANCE REPORT",
@ -105,8 +104,8 @@
"MAIN": "UPDATE STATUS ",
"STUDYMATERIAL": "STUDY MATERIAL",
"ANSWERBOOKLET": "ANSWER BOOKLET",
"CERTIFICATION": "MARK CARD",
"APPLICATION" : "DOCUMENTS"
"MARKCARD": "MARK CARD",
"CERTIFICATE" : "CERTIFICATE"
}
},
"status": {
@ -140,7 +139,8 @@
"APPROVAL": "APPROVE EXPENSE",
"DAYBOOKDETAILS": "DAYBOOK DETAILS",
"DAYBOOKAPPROVAL": "DAYBOOK APPROVAL",
"INCOMEEXPENSEREPORT" : "PROFIT-LOSS STATEMENT"
"INCOMEEXPENSEREPORT" : "PROFIT-LOSS STATEMENT",
"DATACORRECTION" : "DATA CORRECTION"
},
"mydetails": {
"MAIN": "MY DETAILS"

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

@ -133,7 +133,10 @@ app.constant('JS_REQUIRES', {
'income_reportCtrl': 'assets/js/controllers/income_reportCtrl.js',
/*
* */
'datacorrectionCtrl': 'assets/js/controllers/datacorrectionCtrl.js',
/*
@ -153,11 +156,11 @@ app.constant('JS_REQUIRES', {
/*
* student Certification status updation
* */
'certificationStatusCtrl': 'assets/js/controllers/certificationStatusCtrl.js',
'markcardStatusCtrl': 'assets/js/controllers/markcardStatusCtrl.js',
/*
* student Certification status updation
* */
'applicationStatusCtrl': 'assets/js/controllers/applicationStatusCtrl.js',
'certificateStatusCtrl': 'assets/js/controllers/certificateStatusCtrl.js',
/*
* Certificate Type
* */

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

@ -178,6 +178,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
ncyBreadcrumb: {
label: 'income_expense'
},
}).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",
@ -307,22 +315,22 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
label: 'Answer Booklet'
},
// resolve: loadSequence('wizardCtrl')
}).state('app.student.status.certificationstatus', {
url: '/certificationstatus',
templateUrl: "assets/views/status-update/certification_status.html",
}).state('app.student.status.markcard', {
url: '/markcard',
templateUrl: "assets/views/status-update/markcard_status.html",
title: 'Mark Card',
resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificationStatusCtrl'),
resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'markcardStatusCtrl'),
ncyBreadcrumb: {
label: 'Mark Card'
},
// resolve: loadSequence('wizardCtrl')
}).state('app.student.status.applicationstatus', {
url: '/applicationstatus',
templateUrl: "assets/views/status-update/application_status.html",
title: 'Documents Status',
resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'),
}).state('app.student.status.certificate', {
url: '/certificate',
templateUrl: "assets/views/status-update/certificate_status.html",
title: 'Certificate Status',
resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificateStatusCtrl'),
ncyBreadcrumb: {
label: 'Documents Status'
label: 'Certificate Status'
},
// resolve: loadSequence('wizardCtrl')
}).state('app.status.application', {

37
Apollo/assets/js/controllers/applicationStatusCtrl.js → Apollo/assets/js/controllers/certificateStatusCtrl.js Executable file → Normal file
View File

@ -1,6 +1,6 @@
'use strict';
/*** controller for Wizard Form example***/
app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie ,dateListDescService) {
app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie ,dateListDescService) {
/**
* Application status update search / Document status update
@ -28,32 +28,29 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk');
const localUpdateStatus = 'APPICATION_STATUS';
const localUpdateStatus = 'CERTIFICATE_STATUS';
$scope.localTypeSuperAdmin = false;
$scope.localBranchDetails = '';
$scope.init = function () {
// var logcheck = JSON.parse(localStorage.getItem('localObj'));
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
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');
}
}
// const LOCALTYPE = logcheck.localType;
// if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
// 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');
// }
// }
if (localDetail != null) {
if (localDetails.localType === 'R004') {

233
Apollo/assets/js/controllers/datacorrectionCtrl.js Normal file
View File

@ -0,0 +1,233 @@
'use strict';
/*** controller***/
app.controller('datacorrectionCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state","$modal","$log",
function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,$modal,$log){
//function ($scope, apiPoint, $http, SweetAlert, $state,$modal, md5, ipCookie, $window, dateListDescService) {
// DataTables configurable options
$scope.filters = {
"Date": "",
//"to_date": "",
};
// $scope.initHead = function() {
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
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.init = function(){
console.log('gf');
}
// $scope.click = function (form,myModel)
// {
// alert()
// };
$scope.studentInfo="";
$scope.getStudentDetails = function (form,myModel) {
// console.log(form.$invalid)
// alert()
var mobileNumber = myModel.mobileNumber;
//console.log(mobileNumber);
var studentName = myModel.studentName;
//console.log(studentName);
var receipt = myModel.receipt;
//console.log(receipt);
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("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
$scope.isLoaderShow= false
var getStudent = {
method: 'POST',
url: apiPoint.url + 'getAllDayBookDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
studentName: myModel.studentName,
mobileNumber: myModel.mobileNumber,
receipt: myModel.receipt,
// course:myModel.courseName,
requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
requestedDept: JSON.parse(localStorage.getItem('localObj')).localType,
}
};
$http(getStudent).then(function (response) {
if (response.data.status==200 && response.data.studentStatus) {
$scope.studentInfo=response.data.details;
console.log($scope.studentInfo);
} else {
$scope.studentInfo="";
$scope.isLoaderShow = true;
$scope.load = "No Records Found";
}
});
}
}
// $scope.setDate = function(p)
// {
// alert()
// }
$scope.updatestatus = function (myModel, form, loading)
{
//alert(myModel.ID)
//alert(myModel.Reason);
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 mmonth = d.getUTCMonth() + 1;
var myear = d.getUTCFullYear();
var CDate = mdate+"-"+mmonth+"-"+myear;
//console.log(CDate)
var IsActive = '';
if(myModel.IsActive == true)
{
IsActive =1;
}
else if(myModel.IsActive == false)
{
IsActive =0;
}
var updatedaybook = {
method: 'POST',
url: apiPoint.url + 'update_DayBookDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
studentName: myModel.studentName,
mobileNumber: myModel.mobileNumber,
receipt: myModel.receipt,
ID : myModel.ID,
FID : myModel.FID,
Date :myModel.Date,
Amount :myModel.Amount,
Reason : myModel.Reason,
IsActive : IsActive,
// course:myModel.courseName,
requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
requestedDept: JSON.parse(localStorage.getItem('localObj')).localType,
}
};
$http(updatedaybook).then(function (response) {
swal('Change Saved Successfully', response.data.message, "success");
$scope.close();
});
};
$scope.OpenWindowStatus = false;
$scope.editId = -1;
$scope.setEditId = function (P)
{ //alert(P);
$scope.editId = P;
}
$scope.close = function ()
{
$scope.editId = -1;
}
}]);

37
Apollo/assets/js/controllers/certificationStatusCtrl.js → Apollo/assets/js/controllers/markcardStatusCtrl.js Executable file → Normal file
View File

@ -1,6 +1,6 @@
'use strict';
/*** controller for Wizard Form example***/
app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) {
app.controller('markcardStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) {
/**
* Certification status update search / Mark card status update
@ -32,28 +32,21 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$scope.init = function () {
// const LOCALTYPE = localDetail.localType;
// if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
// console.log("if");
// }else {
// if(localDetail != null && LOCALTYPE !='R001') {
// console.log("else if");
// $state.go('app.dashboard');
// } else {
const LOCALTYPE = localDetail.localType;
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
console.log("if");
}else {
if(localDetail != 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');
}
}
// console.log("else else");
// //ipCookie.remove('cookiechk');
// //window.localStorage.clear();
// $state.go('login.signin');
// }
// }
if (localDetail != null) {
if (localDetails.localType === 'R004') {

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

@ -39,7 +39,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
// DataTables configurable options
$scope.filters = {
$scope.univModel = {
"branch": "",
"university": "",
"batch": "",
@ -95,8 +95,8 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.filters.university,
batch: $scope.filters.batch
university: $scope.univModel.university.universityID,
batch: $scope.univModel.batch
}
@ -133,7 +133,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,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 AnswerBookletStatus,Date as Date INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]);
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(balance AS NUMBER) as BalanceFee,issuedate as IssuedToStudentDate,rcvedate as ReceivedFromStudentDate,Status as AnswerBookletStatus,Date as Date INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]);
};
/*modal controller

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

@ -39,7 +39,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
// DataTables configurable options
$scope.filters = {
$scope.univModel = {
"branch": "",
"university": "",
"batch": "",
@ -95,8 +95,8 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.filters.university,
batch: $scope.filters.batch
university: $scope.univModel.university.universityID,
batch: $scope.univModel.batch
}

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

@ -47,7 +47,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
// $scope.serial = newPageNumber * $scope.itemPerPage - ($scope.itemPerPage-1);
// }
//to filter labels
$scope.filters = {
$scope.univModel = {
"branch": "",
"university": "",
"batch": "",
@ -103,8 +103,8 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.filters.university,
batch: $scope.filters.batch
university: $scope.univModel.university.universityID,
batch: $scope.univModel.batch
}

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

@ -39,10 +39,12 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
// DataTables configurable options
$scope.filters = {
$scope.univModel = {
"branch": "",
"university": "",
"batch": "",
"from_date": "",
"to_date": "",
};
@ -94,8 +96,10 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.filters.university,
batch: $scope.filters.batch
university: $scope.univModel.university.universityID,
batch: $scope.univModel.batch,
from : $scope.univModel.from_date,
to : $scope.univModel.to_date
}
};

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

@ -39,7 +39,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
// DataTables configurable options
$scope.filters = {
$scope.univModel = {
"branch": "",
"university": "",
"batch": "",
@ -95,8 +95,8 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.filters.university,
batch: $scope.filters.batch
university: $scope.univModel.university.universityID,
batch: $scope.univModel.batch
}

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

@ -39,7 +39,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
// DataTables configurable options
$scope.filters = {
$scope.univModel = {
"branch": "",
"university": "",
"batch": "",
@ -95,8 +95,8 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.filters.university,
batch: $scope.filters.batch
university: $scope.univModel.university.universityID,
batch: $scope.univModel.batch
}

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

@ -39,7 +39,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
// DataTables configurable options
$scope.filters = {
$scope.univModel = {
"branch": "",
"university": "",
"batch": "",
@ -96,10 +96,10 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.filters.university,
batch: $scope.filters.batch,
from : $scope.filters.from_date,
to : $scope.filters.to_date
university: $scope.univModel.university.universityID,
batch: $scope.univModel.batch,
from : $scope.univModel.from_date,
to : $scope.univModel.to_date
}
};

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

@ -39,7 +39,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
// DataTables configurable options
$scope.filters = {
$scope.univModel = {
"branch": "",
"university": "",
"batch": "",
@ -95,8 +95,8 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.filters.university,
batch: $scope.filters.batch
university: $scope.univModel.university.universityID,
batch: $scope.univModel.batch
}
};
@ -124,7 +124,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
},
// style:'background:#00FF00',
column: {
style:'font-size:10px'
style:'font-size:16px'
},
};

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

@ -1,7 +1,7 @@
'use strict';
/*** controller***/
app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootScope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService","$modal",
function ($scope, $filter,$rootScope,apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService,$modal,$log) {
app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootScope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService","$modal","$timeout",
function ($scope, $filter,$rootScope,apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService,$modal,$timeout,$log) {
/**
* auto call tracking
@ -39,7 +39,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
// DataTables configurable options
$scope.filters = {
$scope.univModel = {
"branch": "",
"university": "",
"batch": "",
@ -61,27 +61,44 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
};
$http(filterlist).then(function (response) {
if (response.data) {
$scope.batch=[];
$scope.batchlist = response.data.batch;
$scope.university = response.data.university;
//Desc order Batchlist
angular.forEach($scope.batchlist,function (values,key) {
var parts = values.BatchDate.split("-");
$scope.batch.push({
"batchcode":values.batchcode,
"batch":values.batch + '('+ values.batchcode + ')',
"BatchDate":values.BatchDate,
"givenDateObject":new Date(parts[2], parts[1] - 1, parts[0])
})
});
// call service for make a list in desc order based on date
$scope.batch=dateListDescService.getOrderByList($scope.batch);
// console.log(response.data.batch);
// console.log($scope.batch);
} else {
}
});
}
//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() {
//alert($scope.batch.name);
@ -95,8 +112,8 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
},
data: {
branch : JSON.parse(localStorage.getItem('localObj')).localBranchID,
university : $scope.filters.university,
batch : $scope.filters.batch
university : $scope.univModel.university.universityID,
batch : $scope.univModel.batch
}
};

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

@ -6,7 +6,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
// DataTables configurable options
$scope.filters = {
$scope.univModel = {
"branch": "",
"university": "",
"batch": "",
@ -63,8 +63,8 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.filters.university,
batch: $scope.filters.batch
university: $scope.univModel.university.universityID,
batch: $scope.univModel.batch
}

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

@ -36,7 +36,7 @@
</div>-->
<div class="panel-body">
<label class="text-bold">{{registration.UniversityName | uppercase}}</label>
<label>{{registration.UniversityName | uppercase}}</label>
<div>
<label>No of Registration &nbsp;:&nbsp;<span>{{registration.StudentCounts}}</span></label>
</div>

171
Apollo/assets/views/data_correction.html Normal file
View File

@ -0,0 +1,171 @@
<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">DATA CORRECTION</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="datacorrectionCtrl">
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
<div class="row">
<fieldset>
<legend>Search</legend>
<div class="row">
<div class="col-md-3 form-group" ng-class="{'has-error':Form.mobilenumber.$dirty && Form.mobilenumber.$invalid}">
<label>
Mobile Number
</label>
<input type="text" placeholder="Search Mobile Number" ladda="ldloading1.zoom_in" data-style="zoom-in"
autofocus tabindex="1" class="form-control" name="mobilenumber" id="mobilenumber" ng-minlength="10" ng-maxlength="12"
ng-model="myModel.mobileNumber" ng-pattern="/^[0-9]*$/"/>
<span class="error text-small block"
ng-if="Form.mobilenumber.$error.maxlength || Form.mobilenumber.$error.minlength || Form.mobilenumber.$error.pattern">Enter a valid mobile number</span>
</div>
<div class="col-md-3 form-group">
<label>
Student First Name
</label>
<input type="text" placeholder="Search Student Name"
tabindex="2" class="form-control" name="studentname"
ng-model="myModel.studentName" ng-pattern="/^[a-zA-Z.\s]*$/" />
<span class="error text-small block"
ng-if="Form.studentname.$dirty && Form.studentname.$error.pattern">Invalid student name </span>
</div>
<div class="col-md-3 form-group">
<label>
RECEIPT NUMBER
</label>
<input type="text" placeholder="Search Receipt Number"
tabindex="2" class="form-control" name="receipt"
ng-model="myModel.receipt" />
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div class="pull-right">
<button type="submit" ng-click="getStudentDetails(Form,myModel);" class="btn btn-success btn-o" tabindex="8">
Submit
</button>
</div>
</div>
</div>
</fieldset>
</div>
<div ng-if="isLoaderShow">
<center> <h1>{{load}}</h1> </center>
</div>
<!-- {{studentInfo}} -->
<div class="col-md-12">
<div class="table-responsive">
<table id="datatable" class="table table-hover">
<thead>
<tr >
<th style="font-size: 12px;">Type</th>
<th style="font-size: 12px;">Receipt No</th>
<th style="font-size: 12px;">Paid To / Received From</th>
<th style="font-size: 12px">Date</th>
<th style="font-size: 12px;">Sem</th>
<th style="font-size: 12px;">Voucher Number / Bill Number</th>
<th style="font-size: 12px;">Amount</th>
<!-- <th style="font-size: 12px;">Status</th> -->
<th style="font-size: 12px;">Action</th>
</tr>
</thead>
<tbody dir-paginate="p in studentInfo|filter:search:strict|itemsPerPage:10">
<tr>
<td>{{p.ListName}}</td>
<td>{{p.ReceiptNo}}</td>
<td>{{p.PaidTo}}</td>
<td>{{p.Date}}</td>
<td>{{p.FeePaymentDetails}}</td>
<td>{{p.VoucherNumber}}</td>
<td>{{p.Amount}}</td>
<td><span><a class="text-azure" id="editRowBtn{{p.ID}}" ng-click="setEditId(p.ID);"><b class="glyphicon glyphicon-pencil" tooltip="Edit Details" aria-hidden="true"></b></a> </span></td>
<!-- <td></td> -->
</tr>
<tr ng-show="editId === p.ID" ng-if="editId === p.ID">
<td colspan="12" ng-include src="'assets/views/edit_daybookentries.html'"></td>
</tr>
</tbody>
</table>
</div>
</div>
</form>

122
Apollo/assets/views/edit_daybookentries.html Normal file
View File

@ -0,0 +1,122 @@
<form name="Form" id="form" novalidate>
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<fieldset>
<legend>
Update Day Book Details
</legend>
<div>
<input type="hidden" name="ID" id="ID" ng-model="p.ID">
</div>
<div>
<input type="hidden" name="feeid" ng-model="p.FID">
</div>
<div class="row">
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.edittype.$dirty && Form.edittype.$invalid, 'has-success':Form.edittype.$valid}">
<label >
Type <span class="symbol required"></span>
</label>
<input type="text" tabindex="3" class="form-control" name="editListName" ng-model="p.ListName" readonly="true" capitalize
required/>
</div>
<div class="col-md-3 form-group" ng-if="p.ReceiptNo!=null">
<label>
Receipt No <span class="symbol required"></span>
</label>
<input type="text" placeholder="Enter Name" tabindex="5" class="form-control" name="editReceipt" ng-model="p.ReceiptNo" capitalize
required readonly="true" />
</div>
<div class="col-md-3 form-group" >
<label>
Paid to / Received From <span class="symbol required"></span>
</label>
<input type="text" placeholder="Enter Name" tabindex="5" class="form-control" name="editName" readonly="true" ng-model="p.PaidTo" capitalize
required/>
</div>
<div class="col-md-3 form-group" >
<label>
Date <span class="symbol required"></span>
</label>
<!-- <input type="text" placeholder="Enter Name" tabindex="5" class="form-control" name="edit" ng-model="p.Date" capitalize
required/> -->
<input type="text" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.Date" is-open="startOpen" ng-init="startOpen = false" name="date" datepicker-options="dateOptions" placeholder="Select Date"
min-date="currentDate" max-date="futureDate" ng-changes="setDate();"
close-text="Close" required="required" ng-readonly="true"/>
</div>
<div class="col-md-3 form-group" >
<label>
Amount <span class="symbol required"></span>
</label>
<input type="text" tabindex="5" class="form-control" name="editAmount" ng-model="p.Amount" readonly="true" capitalize required/>
</div>
<div class="col-md-3 form-group" >
<label>
Reason to Deactivate <span class="symbol required"></span>
</label>
<textarea type="text" placeholder="Enter Reason" tabindex="7" class="form-control" name="Messagebody" ng-model="p.Reason" required></textarea>
</div>
<div class="col-md-3">
<label>
Active/De-Active
</label>
<div ng-if="p.IsActive==true">
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
</div>
<div ng-if="p.IsActive==false">
<switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ladda="ldloading.zoom_in" tabindex="6" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updatestatus(p,Form,'zoom-in')">
Save
</button>
<input type="button" class="btn btn-warning btn-wide" tabindex="10" value="Cancel" ng-click="close()">
</input>
</div>
</div>
</div>
</fieldset>
</div>
</div>
</form>
<!-- class="editRowTd" -->

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

@ -199,13 +199,13 @@
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkSuperAdmin()">
Certification
<a ui-sref="app.student.status.markcard" translate="sidebar.nav.student.status.MARKCARD" ng-click="checkSuperAdmin()">
MarkCard
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkSuperAdmin()">
Application
<a ui-sref="app.student.status.certificate" translate="sidebar.nav.student.status.CERTIFICATE" ng-click="checkSuperAdmin()">
Certificate
</a>
</li>
</ul>
@ -307,6 +307,13 @@
</li>
<li ui-sref-active="active">
<a ui-sref="app.daybooksuperadmin.datacorrection" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span>
</a>
</li>
</ul>
</li>
@ -411,11 +418,6 @@
</div>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.reports.universityfileupload" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.report.unidataupload">University Data Upload</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.studymaterial" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.report.studmatstatus">Study Material Status</span>
@ -648,13 +650,13 @@
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkAdmin()">
Certification
<a ui-sref="app.student.status.markcard" translate="sidebar.nav.student.status.MARKCARD" ng-click="checkAdmin()">
Markcard
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkAdmin()">
Application
<a ui-sref="app.student.status.certificate" translate="sidebar.nav.student.status.CERTIFICATE" ng-click="checkAdmin()">
Certificate
</a>
</li>
</ul>
@ -775,6 +777,14 @@
</li>
<li ui-sref-active="active">
<a ui-sref="app.daybooksuperadmin.datacorrection" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span>
</a>
</li>
</ul>
@ -880,11 +890,6 @@
</div>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.reports.universityfileupload" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.report.unidataupload">University Data Upload</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.studymaterial" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.report.studmatstatus">Study Material Status</span>
@ -1020,13 +1025,13 @@
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkStaff()">
Certification
<a ui-sref="app.student.status.markcard" translate="sidebar.nav.student.status.MARKCARD" ng-click="checkStaff()">
Markcard
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkStaff()">
Application
<a ui-sref="app.student.status.certificate" translate="sidebar.nav.student.status.CERTIFICATE" ng-click="checkStaff()">
Certificate
</a>
</li>
</ul>
@ -1128,6 +1133,17 @@
<span class="title" translate="sidebar.nav.daybook.INCOMEEXPENSEREPORT"> DAY BOOK PROFIT-LOSS STATEMENT</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.daybooksuperadmin.datacorrection" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span>
</a>
</li>
</ul>
</li>
@ -1276,13 +1292,13 @@
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkStaff()">
Certification
<a ui-sref="app.student.status.markcard" translate="sidebar.nav.student.status.MARKCARD" ng-click="checkStaff()">
Markcard
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkStaff()">
Application
<a ui-sref="app.student.status.certificate" translate="sidebar.nav.student.status.CERTIFICATE" ng-click="checkStaff()">
Certificate
</a>
</li>
</ul>

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

@ -35,25 +35,23 @@ td,th {
<div class="row">
<div class="col-md-3">
<div class="col-md-3">
<label for="form-field-select-2">
University
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.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">
<option value="" selected>Select University</option>
<option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
</select>
</select>
</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="filters" ng-model="filters.batch">
<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">
<option value="" selected>Select Batch</option>
<option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
</select>
</select>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >
@ -98,6 +96,7 @@ td,th {
<th>Sem/Year</th>
<th>Phone No</th>
<th>University</th>
<th>Balance Fee</th>
<th>Issued To Student Date</th>
<th>Received From Student Date</th>
<th>Answer Booklet Status</th>
@ -117,6 +116,7 @@ td,th {
<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>{{p.University}}</td>
<td>{{p.balance}}</td>
<td>{{p.issuedate}}</td>
<td>{{p.rcvedate}}</td>
<td>{{p.Status}}</td>

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

@ -37,25 +37,23 @@
<div class="row">
<div class="col-md-3">
<div class="col-md-3">
<label for="form-field-select-2">
University
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.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">
<option value="" selected>Select University</option>
<option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
</select>
</select>
</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="filters" ng-model="filters.batch">
<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">
<option value="" selected>Select Batch</option>
<option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
</select>
</select>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >
@ -102,6 +100,7 @@
<th>Phone No</th>
<th>University</th>
<th>Application Status</th>
<th>Date</th>
@ -120,6 +119,7 @@
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<td>{{p.University}}</td>
<td>{{p.Status}}</td>
<td>{{p.appdate}}</td>
</tr>

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

@ -29,26 +29,24 @@
<div class="row">
<div class="col-md-3">
<label for="form-field-select-2">
University
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.university">
<option value="" selected>Select University</option>
<option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
</select>
</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="filters" ng-model="filters.batch">
<option value="" selected>Select Batch</option>
<option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
</select>
</div>
<div class="col-md-3">
<label for="form-field-select-2">
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">
<option value="" selected>Select University</option>
</select>
</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">
<option value="" selected>Select Batch</option>
</select>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >
@ -75,8 +73,10 @@
<div class="col-md-2">
<span>Paid:Rs.</span><span>{{getpaid()}}</span>
</div>
<div class="col-md-2">
<span>Balance:</span><span>{{getbalance()/gettotal()*100 | number : 2 || "0"}}%</span>
<span>Balance:Rs.</span><span>{{getbalance()}}</span>
<span>({{getbalance()/gettotal()*100 | number : 2 || "0"}}%)</span>
</div>
<div class="col-md-2">
<button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button>

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

@ -35,30 +35,65 @@ td,th {
<div class="row">
<div class="col-md-3">
<div class="col-md-4">
<label for="form-field-select-2">
University
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.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">
<option value="" selected>Select University</option>
<option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
</select>
</select>
</div>
<div class="col-md-3">
<div class="col-md-4">
<label for="form-field-select-2">
Batch
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.batch">
<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">
<option value="" selected>Select Batch</option>
<option ng-repeat="b in batch" value="{{b.batchcode}}">{{b.batch}}</option>
</select>
</select>
</div>
</div>
<div class="row">
<div class="col-md-4">
<!--<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 class="col-md-2" style="padding-top: 2.3%;">
<div class="pull-right">
</div>
</div>
<div class="col-md-4">
<!--<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">
Batch
</label>
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
<option value="" selected>Select Batch</option>
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
</select>
</div> -->
<div class="col-md-3" style="padding-top: 2.3%;">
<div >
<button type="submit" class="btn btn-success btn-o" tabindex="8">
Submit
@ -66,8 +101,8 @@ td,th {
</div>
</div>
</div>
</div>

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

@ -35,25 +35,25 @@ td,th {
<div class="row">
<div class="col-md-3">
<div class="col-md-3">
<label for="form-field-select-2">
University
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.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" >
<option value="" selected>Select University</option>
<option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
</select>
</select>
<!--<p ng-show="Form.university.$error.required">Providing a username is mandatory.</p>-->
</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="filters" ng-model="filters.batch">
<option value="" selected>Select Batch</option>
<option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
</select>
<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">
<option value="" selected >Select Batch</option>
</select>
<!-- <p ng-show="Form.batch.$error.required">Providing a username is mandatory.</p>-->
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >
@ -100,8 +100,8 @@ td,th {
<th>Phone No</th>
<th>University</th>
<th>Document Applied Date</th>
<!-- <th>Document Name</th>
<th>Document Status</th> -->
<th>Pending Document</th>
<!-- <th>Document Status</th> -->
@ -120,8 +120,8 @@ td,th {
<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.certname}}</td>
<td>{{p.Status}}</td> -->
<td>{{p.certname}}</td>
<!-- <td>{{p.Status}}</td> -->
</tr>

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

@ -35,26 +35,24 @@
<div class="row">
<div class="col-md-3">
<label for="form-field-select-2">
University
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.university">
<option value="" selected>Select University</option>
<option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
</select>
</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="filters" ng-model="filters.batch">
<option value="" selected>Select Batch</option>
<option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
</select>
</div>
<div class="col-md-3">
<label for="form-field-select-2">
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">
<option value="" selected>Select University</option>
</select>
</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">
<option value="" selected>Select Batch</option>
</select>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >

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

@ -40,20 +40,18 @@ td,th {
University
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.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">
<option value="" selected>Select University</option>
<option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
</select>
</select>
</div>
<div class="col-md-4">
<label for="form-field-select-2">
Batch
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.batch">
<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">
<option value="" selected>Select Batch</option>
<option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
</select>
</select>
</div>
</div>
<div class="row">
@ -142,12 +140,11 @@ td,th {
<th>Phone No</th>
<th>University</th>
<th>Balance Fee</th>
<th>Markcard Status</th>
<th>Date</th>
<th>Markcard Issued Comments</th>
<th>Certificates Name</th>
<th>Certificates Status</th>
<th>Date</th>
<th>Received Status</th>
<th>Received Date</th>
<th>Issued Status</th>
<th>Issued Date</th>
<th>Certificate Issued Comments</th>
</tr>
@ -165,13 +162,13 @@ td,th {
<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>{{p.Markcard_status}}</td>
<td>{{p.Markcard_date}}</td>
<td>{{p.Markcard_comments}}</td>
<td>{{p.Certificate_name}}</td>
<td>{{p.Certificate_status}}</td>
<td>{{p.Certificate_date}}</td>
<td>{{p.Certificate_comments}}</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>
</tr>
</tbody>

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

@ -31,20 +31,18 @@
University
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.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">
<option value="" selected>Select University</option>
<option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
</select>
</select>
</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="filters" ng-model="filters.batch">
<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">
<option value="" selected>Select Batch</option>
<option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
</select>
</select>
</div>
<!-- <div class="col-md-3">
<label for="form-field-select-2">

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

@ -28,20 +28,18 @@
University
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.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">
<option value="" selected>Select University</option>
<option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
</select>
</select>
</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="filters" ng-model="filters.batch">
<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">
<option value="" selected>Select Batch</option>
<option ng-repeat="b in batch" value="{{b.batchcode}}">{{b.batch}} </option>
</select>
</select>
</div>
<!-- <div class="col-md-3">
<label for="form-field-select-2">
@ -110,7 +108,7 @@
<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.Initial_paid_date}}</td>
<td>{{p.Enrollment_id}}</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>

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

@ -33,25 +33,23 @@
<div class="row">
<div class="col-md-3">
<div class="col-md-3">
<label for="form-field-select-2">
University
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.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">
<option value="" selected>Select University</option>
<option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
</select>
</select>
</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="filters" ng-model="filters.batch">
<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">
<option value="" selected>Select Batch</option>
<option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
</select>
</select>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >

24
Apollo/assets/views/status-update/application_status.html → Apollo/assets/views/status-update/certificate_status.html Executable file → Normal file
View File

@ -2,7 +2,7 @@
<section id="page-title">
<div class="row">
<div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.student.status.APPLICATION">{{ mainTitle }}</h1>
<h1 class="mainTitle" translate="sidebar.nav.student.status.CERTIFICATE">{{ mainTitle }}</h1>
<span class="mainDescription">Update certificate status.</span>
</div>
<div ncy-breadcrumb></div>
@ -14,7 +14,7 @@
<div class="row">
<div class="col-md-12">
<!-- /// controller: 'UserCtrl' - localtion: assets/js/controllers/userCtrl.js /// -->
<div ng-controller="applicationStatusCtrl">
<div ng-controller="certificateStatusCtrl">
<!-- start: STATUS -->
<div class="container" ng-init="init()">
<div class="row">
@ -241,25 +241,25 @@
<div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
<label for="form-field-select-2">
Document Type <span class="symbol required"></span>
Certificate Type <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype"
required>
<option value="" disabled selected>Select Document Type</option>
<option value="" disabled selected>Select Certificate Type</option>
<option ng-repeat="itemCerf in certificateData" value="{{itemCerf.CertificationID}}">{{itemCerf.CertificateName}}</option>
</select>
<span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Document Type is Required</span>
<span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Certificate Type is Required</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
<label>
Document Number
Certificate Number
</label>
<input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Document Number" class="form-control" ng-model="myStatusModel.certificateNumber"
/>
<span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Document Number is Required </span>
<span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Certificate Number is Required </span>
</div>
</div>
<div class="row">
@ -352,25 +352,25 @@
<div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
<label for="form-field-select-2">
Document Type <span class="symbol required"></span>
Certificate Type <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype"
required>
<option value="" disabled selected>Select Document Type</option>
<option value="" disabled selected>Select Certificate Type</option>
<option ng-repeat="itemCerf in certificateData" value="{{itemCerf.CertificationID}}">{{itemCerf.CertificateName}}</option>
</select>
<span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Document Type is Required</span>
<span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Certificate Type is Required</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
<label>
Document Number
Certificate Number
</label>
<input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Document Number" class="form-control" ng-model="myStatusModel.certificateNumber"
/>
<span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Document Number is Required </span>
<span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Certificate Number is Required </span>
</div>
</div>
<div class="row">

6
Apollo/assets/views/status-update/certification_status.html → Apollo/assets/views/status-update/markcard_status.html Executable file → Normal file
View File

@ -2,8 +2,8 @@
<section id="page-title">
<div class="row">
<div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.student.status.CERTIFICATION">{{ mainTitle }}</h1>
<span class="mainDescription">Update certification status.</span>
<h1 class="mainTitle" translate="sidebar.nav.student.status.MARKCARD">{{ mainTitle }}</h1>
<span class="mainDescription">Update markcard status.</span>
</div>
<div ncy-breadcrumb></div>
</div>
@ -14,7 +14,7 @@
<div class="row">
<div class="col-md-12">
<!-- /// controller: 'UserCtrl' - localtion: assets/js/controllers/userCtrl.js /// -->
<div ng-controller="certificationStatusCtrl">
<div ng-controller="markcardStatusCtrl">
<!-- start: STATUS -->
<div class="container" ng-init="init()">
<div class="row">