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

Fixes : ps

Browse Source
This commit is contained in:
Sanjeev 2021-02-06 23:44:45 +05:30
parent 159d5a7b83
commit a8f4d850a6
49 changed files with 559 additions and 662 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Apollo/api/application/controllers/Fees_Status_Controller.php
View File

@ -237,6 +237,9 @@ class Fees_Status_Controller extends REST_Controller {
* */
public function setFeesForStudent_post()
{
// echo "I am Here Setfees for Students";
// print_r($this->post());
// exit;
$now = new DateTime();
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
$details['StudentID'] = $this->post('studID');
@ -307,6 +310,9 @@ class Fees_Status_Controller extends REST_Controller {
* */
public function deleteSetFeesDetails_post(){
$details['FeesID'] = $this->post('feesAssignID');
// print_r($this->post('requestedtBy'));
// exit();
$deleteSetFeesDetails = $this->Fees_model->deleteSetFees($details);
if ($deleteSetFeesDetails)
{

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

@ -43,7 +43,9 @@ class Report extends REST_Controller {
$bat = $this->post('batch');
$br = $this->post('branch');
$u = $this->post('university');
$getStatus = $this->report_model->status($bat,$br,$u);
$s = $this->post('status');
// print_r($this->post());
$getStatus = $this->report_model->status($bat,$br,$u,$s);
//print_r($getStatus);
if ($getStatus)
{
@ -74,12 +76,9 @@ class Report extends REST_Controller {
if(!empty($result)){$getStatus['markcardstatus'] = $result;
$cnt = count($getStatus['markcardstatus']);
$getStatus['markcardstatus'][$cnt+1]["ListCode"] = FEESUPDATE;
$getStatus['markcardstatus'][$cnt+1]["ListName"] = "BLANK";
$getStatus['markcardstatus'][$cnt+1]["ListCode"] = "all";
$getStatus['markcardstatus'][$cnt+1]["ListName"] = "ALL";
$getStatus['markcardstatus'][$cnt+1]["StudentActivityCode"]= 'C001';
$getStatus['markcardstatus'][$cnt+2]["ListCode"] = "all";
$getStatus['markcardstatus'][$cnt+2]["ListName"] = "ALL";
$getStatus['markcardstatus'][$cnt+2]["StudentActivityCode"]= 'C001';
}
else{ $getStatus['markcardstatus'] = array();}
$getStatus['status'] = REST_Controller::HTTP_OK;
@ -137,8 +136,8 @@ class Report extends REST_Controller {
if(!empty($result)){$getStatus['certificatestatus'] = $result;
$cnt = count($getStatus['certificatestatus']);
$getStatus['certificatestatus'][$cnt+1]["StudentActivityCode"]= 'A001';
$getStatus['certificatestatus'][$cnt+1]["ListCode"] = FEESUPDATE;
$getStatus['certificatestatus'][$cnt+1]["ListName"] = "BLANK";
$getStatus['certificatestatus'][$cnt+1]["ListCode"] = "all";
$getStatus['certificatestatus'][$cnt+1]["ListName"] = "ALL";
}
else{ $getStatus['certificatestatus'] = array();}
$getStatus['status'] = REST_Controller::HTTP_OK;
@ -239,8 +238,9 @@ class Report extends REST_Controller {
$bat = $this->post('batch');
$br = $this->post('branch');
$u = $this->post('university');
$s = $this->post('status');
$getStatus = $this->report_model->answer_booklet($bat,$br,$u);
$getStatus = $this->report_model->answer_booklet($bat,$br,$u,$s);
//print_r($getStatus);
if ($getStatus)
{
@ -484,11 +484,24 @@ class Report extends REST_Controller {
public function filters_post()
{
$br = $this->post('branch');
$activityCode = $this->post('activity');
$getStatus = $this->report_model->getUniversity($br);
//print_r($getStatus);
// print_r($getStatus);
if ($getStatus)
{
$getStatus['status'] = REST_Controller::HTTP_OK;
if($activityCode != "" ){
// if($activityCode == "application"){}else{}
$details = $this->report_model->getDefaultActivity($activityCode,$br);
if(!empty($details)){$getStatus['statusList'] = $details;
$cnt = count($getStatus['statusList']);
$getStatus['statusList'][$cnt]["StudentActivityCode"]= $activityCode;
$getStatus['statusList'][$cnt]["ListCode"] = "all";
$getStatus['statusList'][$cnt]["ListName"] = "ALL";
}
else{ $getStatus['statusList'] = array();}
}
else{ $getStatus['statusList'] = array(); }
// Set the response and exit
$this->response($getStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}

3
Apollo/api/application/models/Calltracking_model.php
View File

@ -1995,7 +1995,8 @@ public function GetStaffCallDetails($branchID,$myDate,$staff)
$Details = $this->db->get()->result();
// print_r($this->db->last_query());die();
// print_r($this->db->last_query());
// exit();
if($Details)
{

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

@ -1211,15 +1211,13 @@ class Fees_status_model extends CI_Model
* */
public function setFees($details=null,$jsonData=null){
// echo 'Set Fee Function ** ';
//echo 'in';
// print_r($details);
// print_r($jsonData);
// die();
//print_r($jsonData);
$RollNo= $details['RollNo'];
//Existing Or Not using RollNo
if($RollNo !='')
{
@ -1261,6 +1259,7 @@ class Fees_status_model extends CI_Model
$CF_FeeID = $result2->ID;
$check = 0;// id has value means Sem1 Already Exist so NewReg Set t0 0 no value in ID(which means Empty) newreg value 1;
// This for Fees Type
if($CF_FeeID == $details['FeesType']){
$check = 0;
}else{
@ -1281,7 +1280,9 @@ class Fees_status_model extends CI_Model
// from T_Students_Fees_Status sfs
// left join T_Course_Fees_Details cf on sfs.CourseID = cf.CourseID
// where sfs.StudentID = 4101 and cf.CourseID = 22 and cf.ID =748;
// If $checkExist->result() has value means Updating the Details. No Value means Inserting (in else part)
// If feesstatus table has value means Updating the Details.
// No Value means Inserting (in else part)
if($checkExist->result()){
$feesId = $checkExist->result();
$updateDetails['CourseFees'] = $details['CourseFees'];
@ -1307,6 +1308,7 @@ class Fees_status_model extends CI_Model
$insertInstallment['CreatedOn'] = $details['CreatedOn'];
if($jrow['ID'] =='' OR $jrow['ID'] =='undefined'){
$this->db->insert(FEES_INSTALLMENT, $insertInstallment);
//tbl 2 Fees Installament.
}
else{
$updateInstallment['FeesID'] = $installmentFeesID;
@ -1323,7 +1325,7 @@ class Fees_status_model extends CI_Model
}
//feeid Update on fees Status Table
$this->db->where('FeesID', $feesId[0]->FeesID);
$this->db->update(STUDENTS_FEES_STATUS, $updateDetails);
$result['setStatus'] = true;
@ -1379,25 +1381,27 @@ class Fees_status_model extends CI_Model
}
$fromd= date("d-m-Y",strtotime($details['CreatedOn']));
// 'PPC' 'TC' 'MC' 'DC' means also updated in Applicationstatus
if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC')
|| ($details['FeesType'] == 'DC'))
{
if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC')|| ($details['FeesType'] == 'DC'))
{
$this->db->select('ListCode');
$this->db->from('T_PickListDetails');
$this->db->where('ListName','EXPECTED');
$this->db->where('IsActive',1);
$this->db->where('BranchCode',$details['BranchCode']);
// $this->db->select('ListCode');
// $this->db->from('T_PickListDetails');
// $this->db->where('ListName','EXPECTED');
// $this->db->where('BranchCode',$details['BranchCode']);
$searchDetails = $this->db->get();
$getId=$searchDetails->result();
// $searchDetails = $this->db->get();
// $getId=$searchDetails->result();
$listcode='';
// $listcode='';
// foreach($getId as $ge)
// {
// $listcode=$ge->ListCode;
// }
$listcode=FEESUPDATE;
foreach($getId as $ge)
{
$listcode=$ge->ListCode;
}
$appstatus['StudentID'] = $details['StudentID'];
$appstatus['CourseID'] = $details['CourseID'];
@ -1414,6 +1418,8 @@ class Fees_status_model extends CI_Model
}
// update registration details
if($jsonData){
//check point 1
//also insert the status on Help of Register tbl id T_ApplicationFormStatus;
$this->updateRegistrationDetails($details,$installmentFeesID,$check);
}
@ -1507,22 +1513,22 @@ class Fees_status_model extends CI_Model
}
// $this->db->select('ListCode');
// $this->db->from('T_PickListDetails');
// $this->db->where('ListName','EXPECTED');
// $this->db->where('BranchCode',$details['BranchCode']);
$this->db->select('ListCode');
$this->db->from('T_PickListDetails');
$this->db->where('ListName','EXPECTED');
$this->db->where('IsActive',1);
$this->db->where('BranchCode',$details['BranchCode']);
// $searchDetails = $this->db->get();
// $getId=$searchDetails->result();
$searchDetails = $this->db->get();
$getId=$searchDetails->result();
// $listcode='';
$listcode='';
// Expected Remove because mentioned ON Apollo XL sheet(30.11.2020)
// foreach($getId as $ge)
// {
// $listcode=$ge->ListCode;
// }
foreach($getId as $ge)
{
$listcode=$ge->ListCode;
}
$listcode=FEESUPDATE;
$fromd= date("d-m-Y",strtotime($details['CreatedOn']));
@ -2019,7 +2025,9 @@ class Fees_status_model extends CI_Model
$this->db->where('ListName','NOT APPLICABLE');
}
else{
$this->db->where('ListName','Fees update Status');
// Status
// $this->db->where('ListName','Fees update Status');
$this->db->where('ListName','EXPECTED');
}
$this->db->where('BranchCode',$feesDetails['UpdatedBy']);

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

@ -7,7 +7,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
class Reports_model extends CI_Model
{
public function status($bat=null,$br=null,$u=null){
public function status($bat=null,$br=null,$u=null,$s=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(sms.branch,'-') as Branch,ifnull(sms.date,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_Code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.Status,'-') as Status,ifnull(bal.balpayable,0) as Balance_fee,ifnull(sfp.bdate,'-') as Initial_paid_date, ifnull(std.AlternateNumber,'-') as AlternateNumber,ifnull(std.address,'-') as address,cm.uid as univID,ifnull(apdate.appdate,'-') as appdate
from
@ -56,11 +56,15 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=sms.sem
$sql.=" and cm.uid = '".$u."'";
}
if($s != ''){
if($s=="all"){ $sql.=""; }
else{ $sql.="and list.lcode = '".$s."'"; }
}
$sql.=" group by Student_id,Course_id,Branch,Batch_code,Sem,univID";
$leadDet=$this->db->query($sql);
$statusDetails = $leadDet->result();
//print_r($this->db->last_query());die();
// print_r($this->db->last_query());die();
if (count($statusDetails) > 0) {
$results['statusList'] = true;
@ -74,7 +78,6 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=sms.sem
}
public function filters($br){
//University name
$sql = "SELECT distinct UniversityID as uid,UniversityName as university FROM T_UniversityMaster
where BranchCode = '".$br."'";
@ -196,10 +199,9 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
if(andate.courierdetails = '','-',ifnull(andate.courierdetails,'-')) AS Courier_Details,
if(sfs.batchname = '','-',IFNULL(sfs.batchname, '-')) AS Batch_Name
FROM (SELECT FeesID AS fid,T_Students_Fees_Status.BatchCode AS batch,T_BatchMaster.BatchName AS batchname,StudentID AS sid,RollNO AS rollno,CourseID AS cid,FeesType AS ftype,sum(CourseFees) AS cf,Sum(STFOrWR) AS stf,sum(Others) AS others , T_Students_Fees_Status.BranchCode AS branch
FROM T_Students_Fees_Status
LEFT JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Students_Fees_Status.BatchCode
GROUP BY sid,fid,cid,batch) AS sfs
FROM T_Students_Fees_Status
LEFT JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Students_Fees_Status.BatchCode
GROUP BY sid,fid,cid,batch) AS sfs
LEFT JOIN
(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,c.CreatedOn FROM T_CertificationStatus c
LEFT JOIN T_PickListDetails p ON p.ListCode=c.ListCode
@ -271,10 +273,8 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
}
if ($st != ''){
if ($st == FEESUPDATE){
$sql.=" and (list.lcode IS NULL OR list.lcode = '')";}
else if($st=="all"){ $sql.=""; }
else{ $sql.="and list.lcode = '".$st."'";}
if($st=="all"){ $sql.=""; }
else{ $sql.="and list.lcode = '".$st."'"; }
}
if ($from != ''){
$fromd= date("Y-m-d",strtotime($from));
@ -551,10 +551,7 @@ sfs.branch = '".$br."'";
}
if ($from != ''){
$fromd= date("Y-m-d",strtotime($from));
$sql.="and sfb.bdate >= '".$fromd."'
";
$sql.="and sfb.bdate >= '".$fromd."'";
}
if ($to != ''){
@ -564,12 +561,9 @@ sfs.branch = '".$br."'";
}
if ($st != ''){
if($st == FEESUPDATE){
$sql.=" and sms.lcode = '".FEESUPDATE."'";
}else{
$sql.=" and sms.lcode = '".$st."'";
}
}
if($st=="all"){ $sql.=""; }
else{ $sql.=" and sms.lcode = '".$st."'"; }
}
$sql.=" and sfs.fid IS not null";
$sql.=" group by Student_id,cid,fid,ctype";
$sql.=" ORDER BY sfb.bdate ASC";
@ -821,8 +815,9 @@ FROM T_Income_Outcome_Master exp
return $results;
}
public function answer_booklet($bat=null,$br=null,$u=null){
// public function answer_booklet($bat=null,$br=null,$u=null){
public function answer_booklet($bat=null,$br=null,$u=null,$s=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,ifnull(idate.issuedate,'-') as issuedate,ifnull(rdate.rcvedate,'-') as rcvedate,ifnull(bal.balpayable,'-') as balance, sms.CourierDetails as CD
from
@ -885,12 +880,19 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
$sql.=" and cm.uid = '".$u."'";
}
if($s != ''){
if ($s != ''){
if($s=="all"){ $sql.=""; }
else{ $sql.="and list.lcode = '".$s."'"; }
}
}
$sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem";
$leadDet=$this->db->query($sql);
$answer = $leadDet->result();
// print_r($this->db->last_query());die();
if (count($answer) > 0) {
$results['ans_bookletList'] = true;
$results['ans_book_data'] = $answer;

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

@ -102,16 +102,94 @@ class StatusUpdation_model extends CI_Model {
return $result;
}
// public function update_certificateStatus($arr) {
// $this->db->insert_batch(CERTIFICATION_STATUS, $arr);
// if ($this->db->affected_rows() >= 1) {
// //If condition for Check ANSWERBOOKLET_STATUS, If it is null or 'Issued to Student' for do not send sms.
// $answerBookletStatus = $this->getAnswerBookletStatus($arr[0]['StudentID'],$arr[0]['CourseID'],$arr[0]['BranchCode'],$arr[0]['Sem']);
// //print_r($answerBookletStatus);
// //echo $answerBookletStatus['ListName'];
// //die();
// //echo "COURSE ====$arr[0]['CourseID']";
// //echo "PARENT -- $answerBookletStatus";
// $getlastansbookstatus = $this->GetLastAns_status($arr[0]['StudentID'],$arr[0]['Sem'],$arr[0]['CourseID']);
// // $latestappstatus='';
// // if(!empty($getlastansbookstatus))
// // {
// // foreach($getlastansbookstatus as $get)
// // {
// // $latestappstatus= $get->ListCode;
// // }
// // }
// $upperresult=strtoupper($getlastansbookstatus);
// $WithoutspaceStatus = preg_replace('/\s+/', '',$upperresult);
// // echo $arr[0]['ListCode'];
// // die();
// if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0)
// {
// //echo "SEND SMS";
// if ($this->get_ListCode_status($arr[0]['ListCode'])) {
// //echo 'in';
// $dateToMsg = $arr[0]['CDate'];
// $studentName = $this->getStudentName($arr[0]['StudentID']);
// $CmntToMsg = $arr[0]['Comments'];
// $statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
// $issuecheck = strtoupper($statuToMsg);
// $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
// //echo $withoutspaceissue;die();
// // $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
// // if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){
// if(strpos($WithoutspaceStatus,'RECEIVED')){
// $cerNamtToMsg = 'Mark Card';
// $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, Please come and collect it.";
// $this->smssend($arr, $mesg);
// $this->mailsend($arr, $mesg, $cerNamtToMsg);
// }
// else if($withoutspaceissue == 'ISSUEDTOSTUDENT' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
// $cerNamtToMsg = 'Mark Card';
// $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
// $getSemYearANDType = "$getSemYearMsg $cerNamtToMsg";
// // $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.";
// // $mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg.";
// // $this->smssend($arr, $mesg);
// }
// }///else {echo "DO NOT SEND SMS";}
// $result['addStatus'] = true;
// $result['message'] = "Successfully Mark Card Status Updated";
// } else {
// $result['addStatus'] = false;
// $result['message'] = "Something went wrong.please try again";
// }
// return $result;
// }
// update certificate stauts
public function update_certificateStatus($arr) {
// echo "hai hello check me again";
// print_r($arr);
// exit();
$this->db->insert_batch(CERTIFICATION_STATUS, $arr);
if ($this->db->affected_rows() >= 1) {
//If condition for Check ANSWERBOOKLET_STATUS, If it is null or 'Issued to Student' for do not send sms.
//If condition for Check ANSWERBOOKLET_STATUS, If it is null or 'Issued to Student' for do not send sms.
$answerBookletStatus = $this->getAnswerBookletStatus($arr[0]['StudentID'],$arr[0]['CourseID'],$arr[0]['BranchCode'],$arr[0]['Sem']);
// print_r($answerBookletStatus);
// echo $answerBookletStatus['ListName'];
@ -120,7 +198,6 @@ class StatusUpdation_model extends CI_Model {
$getlastansbookstatus = $this->GetLastAns_status($arr[0]['StudentID'],$arr[0]['Sem'],$arr[0]['CourseID']);
// $latestappstatus='';
// if(!empty($getlastansbookstatus))
// {
@ -134,9 +211,10 @@ class StatusUpdation_model extends CI_Model {
$WithoutspaceStatus = preg_replace('/\s+/', '',$upperresult);
//If condition for Check ANSWERBOOKLET_STATUS, If it is null or 'Issued to Student' for do not send sms.
if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0)
// if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0)
if($answerBookletStatus['isIssueToStudentExist'] == 0 )
{
if ($this->get_ListCode_status($arr[0]['ListCode'])) {
// if ($this->get_ListCode_status($arr[0]['ListCode'])) {
$dateToMsg = $arr[0]['CDate'];
$studentName = $this->getStudentName($arr[0]['StudentID']);
@ -145,11 +223,13 @@ class StatusUpdation_model extends CI_Model {
$issuecheck = strtoupper($statuToMsg);
$withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
// print_r($WithoutspaceStatus);
// exit;
// $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
// if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){
if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){
// if($WithoutspaceStatus == 'SENTTOUNIVERSITY'){
// if condition for answerbookletstatus
if(strpos($WithoutspaceStatus,'RECEIVED')){
// if(strpos($WithoutspaceStatus,'RECEIVED')){
$cerNamtToMsg = 'Mark Card';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
@ -175,15 +255,13 @@ class StatusUpdation_model extends CI_Model {
// $this->smssend($arr, $mesg);
// $this->mailsend($arr, $mesg, $cerNamtToMsg);
// }
else {
else {
}
// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
// $mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg.";
// $this->smssend($arr, $mesg);
}
}///else {echo "DO NOT SEND SMS";}
// }//
}///else {echo "DO NOT SEND SMS";}
$result['addStatus'] = true;
$result['message'] = "Successfully Mark Card Status Updated";
} else {
@ -391,19 +469,17 @@ class StatusUpdation_model extends CI_Model {
$UpperstatusToMsg = strtoupper($statuToMsg);
$WithoutspaceStatus = preg_replace('/\s+/', '', $UpperstatusToMsg);
// echo $WithoutspaceStatus;
// $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
if( $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){
$cerNamtToMsg = 'Answer booklet';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
$getSemYearANDType = "$getSemYearMsg";
// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
// $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received.";
$mesg = "Answer booklet Received - Dear $studentName, Your answer booklet for $getSemYearANDType has been received.";
// $this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
// $cerNamtToMsg = 'Answer booklet';
// $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
// $getSemYearANDType = "$getSemYearMsg";
// // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
// // $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received.";
// $mesg = "Answer booklet Received - Dear $studentName, Your answer booklet for $getSemYearANDType has been received.";
// $this->smssend($arr, $mesg);
// $this->mailsend($arr, $mesg, $cerNamtToMsg);
$result['addStatus'] = true;
$result['message'] = "Successfully Answer Booklet Status Updated";
}else{

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

@ -84,7 +84,7 @@ class Student_model extends CI_Model {
return $result;
}
// get student list based on login user
public function get_student_list($loginUserId, $loginUserBranchId, $loginUserType, $getSearchData,$batchcode) {
public function get_student_list($loginUserId, $loginUserBranchId, $loginUserType, $getSearchData,$batchcode=null) {
if ($loginUserType == SUPER_ADMIN) {
// list for super admin based on branch

6
Apollo/api/application/models/Studentview_model.php
View File

@ -685,7 +685,8 @@ class Studentview_model extends CI_Model
JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType
LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode
LEFT JOIN T_BatchMaster as t4 on t4.BatchCode = t2.BatchCode
WHERE t2.StudentID =? AND t2.CourseID = ? and t1.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)';
WHERE t2.StudentID =? AND t2.CourseID = ? and t1.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)
ORDER BY t1.AppFormDate DESC, CFD.Sem_Year ASC';
$subquery_old='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ?';
$query = $this->db->query($subquery,array($studentid,$courseid));
@ -695,6 +696,7 @@ class Studentview_model extends CI_Model
if(count($fromTypes)>0)
{
return $fromTypes;
// return $this->db->last_query();
}
else
@ -748,7 +750,7 @@ class Studentview_model extends CI_Model
}
public function getbatchHistory($studentID=null,$courseID=null,$requestedBranch=null){
$this->db->select('CS.StudentID,CS.CourseID,B1.BatchName as ExistValue,B2.BatchName as NewValue,ST.Firstname as UpdatedBy,DATE_FORMAT(CS.UpdatedOn, "%d-%m-%Y %h:%i %p") as UpdatedOn');
$this->db->select("CS.StudentID,CS.CourseID, ifnull(B1.BatchName,'-') as ExistValue,ifnull(B2.BatchName,'-') as NewValue,ST.Firstname as UpdatedBy,DATE_FORMAT(CS.UpdatedOn, '%d-%m-%Y %h:%i %p') as UpdatedOn,CS.Sem");
$this->db->from('T_Student_BatchHistory as CS');
$this->db->join(BATCH.' as B1', 'B1.BatchCode = CS.ExistValue and B1.BranchCode = "'.$requestedBranch.'"','left');
$this->db->join(BATCH.' as B2', 'B2.BatchCode = CS.NewValue and B2.BranchCode = "'.$requestedBranch.'"','left');

32
Apollo/assets/js/controllers/applicationStatusCtrl.js
View File

@ -553,7 +553,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -564,16 +574,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -584,16 +584,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

32
Apollo/assets/js/controllers/callTrackingCtrl.js
View File

@ -2515,7 +2515,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -2526,16 +2536,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -2546,16 +2546,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',
controller: 'ModalInstanceCtrl1',

32
Apollo/assets/js/controllers/certificateStatusCtrl.js
View File

@ -554,7 +554,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -565,16 +575,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -585,16 +585,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',
controller: 'ModalInstanceCtrl1',

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

@ -2703,7 +2703,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -2714,16 +2724,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -2734,16 +2734,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',
controller: 'ModalInstanceCtrl1',

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

@ -572,7 +572,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -583,16 +593,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -603,16 +603,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',
controller: 'ModalInstanceCtrl1',

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

@ -58,8 +58,8 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
// 'Content-Type': 'application/json'
// },
// data: {
// branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
// branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
// constant:""
// }
// };

32
Apollo/assets/js/controllers/markcardStatusCtrl.js
View File

@ -573,7 +573,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -584,16 +594,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -604,16 +604,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',
controller: 'ModalInstanceCtrl1',

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

@ -405,7 +405,17 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -416,16 +426,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -436,16 +436,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',
controller: 'ModalInstanceCtrl1',

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

@ -51,8 +51,7 @@ $scope.generateButtonStatus = false;
"branch": "",
"university": "",
"batch": "",
"status":"",
};
$scope.filters = function () {
@ -63,8 +62,8 @@ $scope.generateButtonStatus = false;
'Content-Type': 'application/json'
},
data: {
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
activity :'B001'
}
};
@ -73,6 +72,7 @@ $scope.generateButtonStatus = false;
$scope.batch=[];
$scope.batchlist = response.data.batch;
$scope.university = response.data.university;
$scope.statuslist = response.data.statusList;
//Desc order Batchlist
angular.forEach($scope.batchlist,function (values,key) {
var parts = values.BatchDate.split("-");
@ -135,8 +135,8 @@ $scope.generateButtonStatus = false;
data: {
branch: JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch
batch: $scope.univModel.batch,
status:$scope.univModel.status
}
};
@ -482,7 +482,17 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -493,16 +503,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -513,16 +513,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',
controller: 'ModalInstanceCtrl1',

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

@ -527,7 +527,17 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -538,16 +548,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -558,16 +558,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',
controller: 'ModalInstanceCtrl1',

36
Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js
View File

@ -61,8 +61,8 @@ $scope.generateButtonStatus = false;
'Content-Type': 'application/json'
},
data: {
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
activity : ""
}
};
@ -482,7 +482,17 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -493,16 +503,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -513,16 +513,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',
controller: 'ModalInstanceCtrl1',

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

@ -72,8 +72,8 @@ $scope.generateButtonStatus = false;
'Content-Type': 'application/json'
},
data: {
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
activity:""
}
};
@ -556,7 +556,17 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -567,16 +577,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -587,16 +587,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',
controller: 'ModalInstanceCtrl1',

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

@ -532,7 +532,17 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -543,16 +553,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -563,16 +563,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

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

@ -63,8 +63,8 @@ $scope.generateButtonStatus = false;
'Content-Type': 'application/json'
},
data: {
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
activity:""
}
};
@ -477,7 +477,17 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -488,16 +498,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -508,16 +508,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

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

@ -63,8 +63,8 @@ $scope.generateButtonStatus = false;
'Content-Type': 'application/json'
},
data: {
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
activity:""
}
};
@ -481,7 +481,17 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -492,16 +502,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -512,16 +512,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

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

@ -52,8 +52,8 @@ $scope.generateButtonStatus = false;
'Content-Type': 'application/json'
},
data: {
branch: JSON.parse(sessionStorage.getItem('localObj')).localBranchID
branch: JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
activity:""
}
};

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

@ -274,7 +274,17 @@ $scope.generateButtonStatus = false;
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -285,16 +295,6 @@ $scope.generateButtonStatus = false;
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -305,16 +305,6 @@ $scope.generateButtonStatus = false;
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

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

@ -67,8 +67,8 @@ $scope.generateButtonStatus = false;
'Content-Type': 'application/json'
},
data: {
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
activity:""
}
};
@ -502,7 +502,17 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -513,16 +523,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -533,16 +533,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

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

@ -502,7 +502,17 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -513,16 +523,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -533,16 +533,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

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

@ -53,7 +53,7 @@ $scope.generateButtonStatus = false;
"branch": "",
"university": "",
"batch": "",
"status":""
};
$scope.filters = function () {
@ -64,14 +64,15 @@ $scope.generateButtonStatus = false;
'Content-Type': 'application/json'
},
data: {
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
activity:"M001"
}
};
$http(filterlist).then(function (response) {
if (response.data) {
$scope.university = response.data.university;
$scope.statuslist = response.data.statusList;
//Desc order Batchlist
// call service for make a list in desc order based on date
@ -136,7 +137,8 @@ $scope.generateButtonStatus = false;
data: {
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
university : $scope.filterUniv.universityID,
batch : $scope.univModel.batch
batch : $scope.univModel.batch,
status:$scope.univModel.status
}
};
@ -475,7 +477,17 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -486,16 +498,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -506,16 +508,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

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

@ -31,7 +31,8 @@ $scope.generateButtonStatus = false;
'Content-Type': 'application/json'
},
data: {
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
activity:""
}
@ -221,7 +222,17 @@ $scope.generateButtonStatus = false;
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -232,16 +243,6 @@ $scope.generateButtonStatus = false;
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -252,16 +253,6 @@ $scope.generateButtonStatus = false;
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

32
Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js
View File

@ -1037,7 +1037,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -1048,16 +1058,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -1068,16 +1068,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

11
Apollo/assets/js/controllers/staffleadCtrl.js
View File

@ -192,6 +192,7 @@ $scope.AssignedStaff_id ='';
$scope.getLeadDetails = function (staff)
{
$scope.trackingEditLoading = true;
var assignedstaffid = staff.AssignedStaff;
var checkdate = $scope.tod;
@ -221,6 +222,8 @@ $scope.AssignedStaff_id ='';
$scope.SatffCallDetails=response.data.details;
$scope.calldetnodata=true;
$scope.calldetdata=false;
$scope.trackingdetails=true;
$scope.trackingEditLoading=false;
// console.log(response.data.details);
// console.log($scope.SatffCallDetails)
@ -235,10 +238,12 @@ $scope.AssignedStaff_id ='';
} else {
// swal("Failed!", "No details Availble", "warning");
swal("Failed!", "No details Availble", "warning");
$scope.calldetdata=true;
$scope.calldetnodata=false;
$scope.trackingdetails=false;
$scope.trackingEditLoading=false;
}
@ -251,7 +256,3 @@ $scope.AssignedStaff_id ='';
}]);

36
Apollo/assets/js/controllers/studentCtrl.js
View File

@ -3861,7 +3861,20 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
console.log('values',values);
console.log(filterby);
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -3872,16 +3885,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -3892,16 +3895,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

32
Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js
View File

@ -782,7 +782,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
});
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -793,16 +803,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -813,16 +813,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({

32
Apollo/assets/js/controllers/student_university_fee_compare.js
View File

@ -551,7 +551,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
});
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -562,16 +572,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -582,16 +582,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

32
Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
View File

@ -550,7 +550,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -561,16 +571,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -581,16 +581,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

32
Apollo/assets/js/controllers/univFormPaymentCtrl.js
View File

@ -551,7 +551,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
});
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '4'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -562,16 +572,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '5'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
if(type == '6'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -582,16 +582,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}
}
}
if(type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
{
if (values[i].Sem === filterby)
{
result.push(values[i]);
}
}
}
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',

5
Apollo/assets/views/StaffLeadDetails.html
View File

@ -28,8 +28,9 @@
<th>Follow up Comments</th>
<th>Status</th>
</tr>
</thead>
<tbody>
<tr dir-paginate="p in SatffCallDetails|filter:search:strict|itemsPerPage:10">
<tr dir-paginate="p in SatffCallDetails|filter:search:strict|itemsPerPage:100">
<td>{{p.SL_NO}}</td>
<td>{{p.Firstname}}{{p.Lastname}}</td>
<td>{{p.University}}</td>
@ -41,8 +42,6 @@
<td>{{p.ListName}}</td>
</tr>
</tbody>
</thead>
</table>
<div class="row">
<div class="col-md-12">

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

@ -62,6 +62,16 @@ td,th {
</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> Status </label><br>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="status" ng-model="univModel.status">
<option value="" selected>Select Status</option>
<option ng-repeat="details in statuslist" value="{{details.ListCode}}">{{details.ListName}}</option>
</select>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >

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

@ -85,6 +85,7 @@
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.from_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" ng-change="changeDate()"
ng-keydown="$event.preventDefault(); startOpen = true;"
show-button-bar="true" />
</div>
</div>
@ -96,6 +97,7 @@
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.to_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" ng-change="changeToDate()"
ng-keydown="$event.preventDefault(); startOpen = true;"
show-button-bar="true" />
</div>
</div>
@ -106,7 +108,9 @@
</label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.updated_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" show-button-bar="true" />
placeholder="Select Date" close-text="Close" show-button-bar="true"
ng-keydown="$event.preventDefault(); startOpen = true;"
/>
</div>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">

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

@ -87,6 +87,7 @@ td,th {
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.from_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" ng-change="changeDate()"
ng-keydown="$event.preventDefault(); startOpen = true;"
show-button-bar="true" />
</div>
@ -99,7 +100,7 @@ td,th {
</label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.to_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" ng-change="changeToDate()"
placeholder="Select Date" close-text="Close" ng-change="changeToDate()" ng-keydown="$event.preventDefault(); startOpen = true;"
show-button-bar="true" />
</div>

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

@ -37,6 +37,7 @@
<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()"
ng-keydown="$event.preventDefault(); startOpen = 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>
@ -51,6 +52,7 @@
<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="toDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
ng-keydown="$event.preventDefault(); startOpen = 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>

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

@ -101,6 +101,7 @@ 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();click()"
ng-keydown="$event.preventDefault(); startOpen = true;"
show-button-bar="true" ng-change=click() required/>
<span style="color:red;" ng-if="show" ng-show="Form.addDate.$dirty && Form.addDate.$error.required">Please select From Date.</span>
@ -114,7 +115,7 @@ td,th {
</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="toDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate();click()"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate();click()" ng-keydown="$event.preventDefault(); startOpen = true;"
show-button-bar="true" required/>
<span style="color:red;" ng-if="show" ng-show="Form.toDate.$dirty && Form.toDate.$error.required">Please select To Date.</span>

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

@ -76,6 +76,7 @@
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.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()"
ng-keydown="$event.preventDefault(); startOpen = true;"
show-button-bar="true" />
</div>
@ -89,6 +90,7 @@
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.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()"
ng-keydown="$event.preventDefault(); startOpen = true;"
show-button-bar="true" />
</div>

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

@ -69,6 +69,7 @@
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.from_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" ng-change="changeDate()"
ng-keydown="$event.preventDefault(); startOpen = true;"
show-button-bar="true" />
</div>
@ -80,6 +81,7 @@
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.to_date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" ng-change="changeToDate()"
ng-keydown="$event.preventDefault(); startOpen = true;"
show-button-bar="true" />
</div>

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

@ -49,6 +49,14 @@
<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>Status</label><br>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="status" ng-model="univModel.status">
<option value="" selected>Select Status</option>
<option ng-repeat="details in statuslist" value="{{details.ListCode}}">{{details.ListName}}</option>
</select>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div class="pull-right">

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

@ -145,6 +145,7 @@
name="date"
datepicker-options="dateOptions"
placeholder="Select Date"
ng-keydown="$event.preventDefault(); startOpen = true;"
close-text="Close" ng-change="getDateFormat(myModel.date,'1');" required="required" ng-readonly="true"/>
<span class="error text-small block"
ng-if="Form.date.$dirty && Form.date.$error.required">Session date is required.</span>

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

@ -154,6 +154,7 @@
placeholder="Select Date"
min-date="minDate"
max-date="futureDate"
ng-keydown="$event.preventDefault(); startOpen = true;"
close-text="Close" required="required"/>
<span class="error text-small block"
ng-if="Form.date.$dirty && Form.date.$error.required">Date is required.</span>

5
Apollo/assets/views/stafflead.html
View File

@ -86,7 +86,7 @@
</thead>
<!-- <tbody dir-paginate="p in SatffCountDetails|filter:search:strict|itemsPerPage:10"> -->
<tbody dir-paginate="p in SatffCountDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
<tbody dir-paginate="p in SatffCountDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:100">
<tr >
<td>{{p.SL_NO}}</td>
@ -107,8 +107,7 @@
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>

5
Apollo/assets/views/student/studentPaymentModal.html
View File

@ -49,8 +49,9 @@
</table>
<ul ng-if="selectedtype=='3' && items1!=false" >
<li ng-repeat="bh in items1">
<div> <b>{{bh.UpdatedBy}}</b> &nbsp; Updated The Batch On &nbsp; {{bh.UpdatedOn}} &nbsp;&nbsp; <i>{{bh.ExistValue}}</i> &nbsp;&nbsp; into &nbsp;&nbsp; <i>{{bh.NewValue}}</i> </div>
<label style="background-color:black;">Batch History</label>
<li ng-repeat="bh in items1" style="background-color:black;">
<div> <b>{{bh.UpdatedBy}}</b> &nbsp; Updated The Batch On &nbsp; {{bh.UpdatedOn}} &nbsp;&nbsp; <i>{{bh.ExistValue}}</i> &nbsp;&nbsp; into &nbsp;&nbsp; <i>{{bh.NewValue}}</i>&nbsp; in {{bh.Sem}}</div>
</li>
</ul>
<center ng-if="selectedtype=='3' && items1==false" > Batch History Not Found </center>