From a8f4d850a63c5eeb2b55e34126e549d16a278e1c Mon Sep 17 00:00:00 2001 From: Sanjeev Date: Sat, 6 Feb 2021 23:44:45 +0530 Subject: [PATCH] Fixes : ps --- .../controllers/Fees_Status_Controller.php | 6 + Apollo/api/application/controllers/Report.php | 33 +++-- .../application/models/Calltracking_model.php | 3 +- .../application/models/Fees_status_model.php | 78 ++++++----- .../api/application/models/Reports_model.php | 50 +++---- .../models/StatusUpdation_model.php | 122 ++++++++++++++---- .../api/application/models/Student_model.php | 2 +- .../application/models/Studentview_model.php | 6 +- .../js/controllers/applicationStatusCtrl.js | 32 ++--- .../assets/js/controllers/callTrackingCtrl.js | 32 ++--- .../js/controllers/certificateStatusCtrl.js | 32 ++--- .../assets/js/controllers/feesStatusCtrl.js | 32 ++--- .../js/controllers/generateHallTicketCtrl.js | 32 ++--- .../js/controllers/income_reportCtrl.js | 4 +- .../js/controllers/markcardStatusCtrl.js | 32 ++--- .../js/controllers/newreg_reportCtrl.js | 32 ++--- .../js/controllers/report_ans_bookletCtrl.js | 44 +++---- .../js/controllers/report_app_pendingCtrl.js | 32 ++--- .../report_app_pending_oldDataCtrl.js | 36 ++---- .../js/controllers/report_balfeeCtrl.js | 36 ++---- .../js/controllers/report_certificateCtrl.js | 32 ++--- .../js/controllers/report_doc_pendingCtrl.js | 36 ++---- .../js/controllers/report_examfeeCtrl.js | 36 ++---- .../js/controllers/report_expenseCtrl.js | 4 +- .../assets/js/controllers/report_leadCtrl.js | 32 ++--- .../report_markcard_certificateCtrl.js | 36 ++---- .../controllers/report_markcard_statusCtrl.js | 32 ++--- .../report_study_material_statusCtrl.js | 42 +++--- .../controllers/report_waiver_referalCtrl.js | 35 ++--- .../js/controllers/sendSMSsuperadminCtrl.js | 32 ++--- Apollo/assets/js/controllers/staffleadCtrl.js | 11 +- Apollo/assets/js/controllers/studentCtrl.js | 36 +++--- .../studentUnivFormIdFeeDetailsCtrl.js | 32 ++--- .../student_university_fee_compare.js | 32 ++--- .../js/controllers/studyMaterialStatusCtrl.js | 32 ++--- .../js/controllers/univFormPaymentCtrl.js | 32 ++--- Apollo/assets/views/StaffLeadDetails.html | 5 +- .../assets/views/report_answer_booklets.html | 10 ++ .../views/report_application_pending.html | 6 +- .../views/report_certificate_status.html | 3 +- Apollo/assets/views/report_expense.html | 2 + Apollo/assets/views/report_lead.html | 3 +- .../views/report_mark_certificate_status.html | 2 + .../assets/views/report_markcardstatus.html | 2 + .../views/report_studymaterialstatus.html | 8 ++ Apollo/assets/views/sessionMaster.html | 1 + Apollo/assets/views/sessionSchedule.html | 1 + Apollo/assets/views/stafflead.html | 5 +- .../views/student/studentPaymentModal.html | 5 +- 49 files changed, 559 insertions(+), 662 deletions(-) diff --git a/Apollo/api/application/controllers/Fees_Status_Controller.php b/Apollo/api/application/controllers/Fees_Status_Controller.php index e3b7c6e8..d9b7bee6 100755 --- a/Apollo/api/application/controllers/Fees_Status_Controller.php +++ b/Apollo/api/application/controllers/Fees_Status_Controller.php @@ -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) { diff --git a/Apollo/api/application/controllers/Report.php b/Apollo/api/application/controllers/Report.php index 4c3769d3..6d7d4d5e 100755 --- a/Apollo/api/application/controllers/Report.php +++ b/Apollo/api/application/controllers/Report.php @@ -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 } diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 1e490135..ce10798d 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -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) { diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 61001a2d..f1cf372b 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -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']); diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 71f61fc6..60ac2b3e 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -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; diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 5c8f3ef5..07c88f8e 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -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{ diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index 5f42773a..eacb498a 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -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 diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 0fab8662..f1e77282 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -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'); diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js index 8fd3b824..b48772de 100644 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index b4cca9d1..4088408f 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/certificateStatusCtrl.js b/Apollo/assets/js/controllers/certificateStatusCtrl.js index 758782dd..3c3da2fe 100644 --- a/Apollo/assets/js/controllers/certificateStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificateStatusCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index afce88df..2ae82fde 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index a6637b68..18bc84dd 100644 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index 4fa19581..a0a3cbdd 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -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:"" // } // }; diff --git a/Apollo/assets/js/controllers/markcardStatusCtrl.js b/Apollo/assets/js/controllers/markcardStatusCtrl.js index 15fc257f..0c565e34 100644 --- a/Apollo/assets/js/controllers/markcardStatusCtrl.js +++ b/Apollo/assets/js/controllers/markcardStatusCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/newreg_reportCtrl.js b/Apollo/assets/js/controllers/newreg_reportCtrl.js index 54d72c61..e4e155ba 100644 --- a/Apollo/assets/js/controllers/newreg_reportCtrl.js +++ b/Apollo/assets/js/controllers/newreg_reportCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 370d7b99..f00496e5 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index 3063a878..3a289164 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js b/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js index 7c5866e7..ca7df473 100644 --- a/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index 60b6295a..5c8a598b 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index d06b0c11..1bd24df5 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index 647ed8a2..b2ed5ded 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index 40639e09..e2d49f8d 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/report_expenseCtrl.js b/Apollo/assets/js/controllers/report_expenseCtrl.js index dacffcf8..57f0a399 100755 --- a/Apollo/assets/js/controllers/report_expenseCtrl.js +++ b/Apollo/assets/js/controllers/report_expenseCtrl.js @@ -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:"" } }; diff --git a/Apollo/assets/js/controllers/report_leadCtrl.js b/Apollo/assets/js/controllers/report_leadCtrl.js index be3b49a8..ed71dea2 100644 --- a/Apollo/assets/js/controllers/report_leadCtrl.js +++ b/Apollo/assets/js/controllers/report_leadCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index fa4b9537..92db9434 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index 3be86fbb..ad1d3547 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index 60387526..92e5aa70 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index 8f443e3f..b4277617 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index b1ece15a..8203d7cd 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/staffleadCtrl.js b/Apollo/assets/js/controllers/staffleadCtrl.js index 3988b431..4a270932 100644 --- a/Apollo/assets/js/controllers/staffleadCtrl.js +++ b/Apollo/assets/js/controllers/staffleadCtrl.js @@ -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 =''; }]); - - - - diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 174417bf..ddbbb003 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js index e981a56c..b940f6ed 100644 --- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js +++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js @@ -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({ diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index bdbe29ee..eb2e69f1 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -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', diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index ba8440b6..3fe4a265 100755 --- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js +++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js @@ -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', diff --git a/Apollo/assets/js/controllers/univFormPaymentCtrl.js b/Apollo/assets/js/controllers/univFormPaymentCtrl.js index 7a7fa52c..f7ea1d1b 100644 --- a/Apollo/assets/js/controllers/univFormPaymentCtrl.js +++ b/Apollo/assets/js/controllers/univFormPaymentCtrl.js @@ -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', diff --git a/Apollo/assets/views/StaffLeadDetails.html b/Apollo/assets/views/StaffLeadDetails.html index 490dd46d..7d486427 100644 --- a/Apollo/assets/views/StaffLeadDetails.html +++ b/Apollo/assets/views/StaffLeadDetails.html @@ -28,8 +28,9 @@ Follow up Comments Status + - + {{p.SL_NO}} {{p.Firstname}}{{p.Lastname}} {{p.University}} @@ -41,8 +42,6 @@ {{p.ListName}} - -
diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index 383cd52d..be27b0fe 100755 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -62,6 +62,16 @@ td,th { Please select Batch.
+ +
+
+ +
+ +
diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index a0afeff1..c4b1e3e7 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -85,6 +85,7 @@
@@ -96,6 +97,7 @@
@@ -106,7 +108,9 @@ + placeholder="Select Date" close-text="Close" show-button-bar="true" + ng-keydown="$event.preventDefault(); startOpen = true;" + />
diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html index 8caf7f6c..d3e8ff0b 100755 --- a/Apollo/assets/views/report_certificate_status.html +++ b/Apollo/assets/views/report_certificate_status.html @@ -87,6 +87,7 @@ td,th {
@@ -99,7 +100,7 @@ td,th { diff --git a/Apollo/assets/views/report_expense.html b/Apollo/assets/views/report_expense.html index def284e6..05ab16a2 100755 --- a/Apollo/assets/views/report_expense.html +++ b/Apollo/assets/views/report_expense.html @@ -37,6 +37,7 @@ Please select FromDate. @@ -51,6 +52,7 @@ Please select ToDate. diff --git a/Apollo/assets/views/report_lead.html b/Apollo/assets/views/report_lead.html index 290f8039..8ab53550 100644 --- a/Apollo/assets/views/report_lead.html +++ b/Apollo/assets/views/report_lead.html @@ -101,6 +101,7 @@ td,th { Please select From Date. @@ -114,7 +115,7 @@ td,th { Please select To Date. diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index cc8abb6e..797170ee 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -76,6 +76,7 @@ @@ -89,6 +90,7 @@ diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html index e5a8c191..d0bcbac9 100755 --- a/Apollo/assets/views/report_markcardstatus.html +++ b/Apollo/assets/views/report_markcardstatus.html @@ -69,6 +69,7 @@ @@ -80,6 +81,7 @@ diff --git a/Apollo/assets/views/report_studymaterialstatus.html b/Apollo/assets/views/report_studymaterialstatus.html index 46ace8fa..4774d088 100755 --- a/Apollo/assets/views/report_studymaterialstatus.html +++ b/Apollo/assets/views/report_studymaterialstatus.html @@ -49,6 +49,14 @@ Please select Batch. +
+
+ +
+
diff --git a/Apollo/assets/views/sessionMaster.html b/Apollo/assets/views/sessionMaster.html index 83744c43..07c61c73 100755 --- a/Apollo/assets/views/sessionMaster.html +++ b/Apollo/assets/views/sessionMaster.html @@ -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"/> Session date is required. diff --git a/Apollo/assets/views/sessionSchedule.html b/Apollo/assets/views/sessionSchedule.html index 012bd037..b137adc7 100755 --- a/Apollo/assets/views/sessionSchedule.html +++ b/Apollo/assets/views/sessionSchedule.html @@ -154,6 +154,7 @@ placeholder="Select Date" min-date="minDate" max-date="futureDate" + ng-keydown="$event.preventDefault(); startOpen = true;" close-text="Close" required="required"/> Date is required. diff --git a/Apollo/assets/views/stafflead.html b/Apollo/assets/views/stafflead.html index 07f3d517..0e677798 100644 --- a/Apollo/assets/views/stafflead.html +++ b/Apollo/assets/views/stafflead.html @@ -86,7 +86,7 @@ - + {{p.SL_NO}} @@ -107,8 +107,7 @@ - - +
diff --git a/Apollo/assets/views/student/studentPaymentModal.html b/Apollo/assets/views/student/studentPaymentModal.html index 1311fff2..103a52ed 100755 --- a/Apollo/assets/views/student/studentPaymentModal.html +++ b/Apollo/assets/views/student/studentPaymentModal.html @@ -49,8 +49,9 @@
Batch History Not Found