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

Compare commits

base: Apollo-DEC:e8e25d86604cd602abd512ff4a6d6d81a43ba729
Branches Tags
Apollo-DEC:master
Apollo-DEC:ApolloDEC/Branch1
...
compare: Apollo-DEC:4e69762cb00374cd5f75322e5266fcd6274b356a
Branches Tags
Apollo-DEC:ApolloDEC/Branch1
Apollo-DEC:master

10 Commits
e8e25d8660 ... 4e69762cb0

Author SHA1 Message Date
Sanjeev
4e69762cb0 echo removed : ps 2021-04-19 10:14:54 +05:30
Sanjeev
b9ff784dbe issues fixed : ps 2021-04-17 20:03:26 +05:30
Sanjeev
b4b6342627 sms related changes : ps 2021-04-17 19:38:29 +05:30
Sanjeev
d61bde0cdd Issues fixes : ps 2021-04-17 19:25:34 +05:30
Sanjeev
e3a7c98df6 issues fixes : ps 2021-04-09 16:04:57 +05:30
Sanjeev
6c9a6fdee7 fixes : ps 2021-04-09 12:51:24 +05:30
Sanjeev
c8cdfe6c8e changes : ps 2021-04-03 20:36:28 +05:30
Sanjeev
80dd3a636d template changes : ps 2021-04-03 14:37:02 +05:30
Sanjeev
146a8b3378 issues fixes : ps 2021-03-31 21:34:51 +05:30
Sanjeev
6c5fdbaa68 live issues fixes : ps 2021-03-16 21:46:15 +05:30
43 changed files with 283 additions and 231 deletions
Show Stats Expand all files Collapse all files

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

@ -463,5 +463,6 @@ $route['getUnmatchedFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controlle
$route['addToAccountStateList'] = 'Receive_Enrolment_Fees_Univ_Controller/addToAccountStateList';
$route['addUniversityPaymentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addUniversityPaymentDetails';
$route['updateUniversityPaymentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/updateUniversityPaymentDetails';
$route['testsmsandmailflow'] = 'Student_Controller/testsmsandmailflow';

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

@ -132,7 +132,8 @@ class Call_Tracking_Controller extends REST_Controller {
$leadDetails = $this->Calltracking_model->addleadDetails($AssignedTo,$lead_details,$tracking_details,$tracking_followup_details,$message);
// Check if the users data store contains users (in case the database result returns NULL)
// Check if the users data store contains users (in case the database result returns NULL)
if ($leadDetails)
{
$leadDetails['status'] = REST_Controller::HTTP_OK;

14
Apollo/api/application/controllers/Student_Controller.php
View File

@ -873,7 +873,19 @@ class Student_Controller extends REST_Controller {
}
}
public function testsmsandmailflow_get(){
$studentAdd = $this->student_model->testsmsandmailflow();
if ($studentAdd) {
$studentAdd['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($studentAdd, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
} else {
// Set the response and exit
$this->response(['message' => 'No users were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
public function getEmployeeDetailsBranch_post() {
$data = $this->post('data');
$loginUserId = $data['localUserID'];

23
Apollo/api/application/models/Broadcast_model.php
View File

@ -266,14 +266,27 @@ class Broadcast_model extends CI_Model {
continue;
}
}
$this->db->insert_batch('T_BroadcastStatus', $data);
if ($this->db->affected_rows() >= 1) {
$result['msgStatus'] = true;
$result['message'] = "Successfully Messages Sent!!";
} else {
$this->db->db_debug = false;
$res = $this->db->insert_batch('T_BroadcastStatus', $data);
if(!$res)
{
$error = $this->db->error();
//
$result['msgStatus'] = false;
$result['error'] = $error;
$result['message'] = "error!!";
}
else
{
if ($this->db->affected_rows() >= 1) {
$result['msgStatus'] = true;
$result['message'] = "Successfully Messages Sent!!";
} else {
$result['msgStatus'] = false;
$result['message'] = "error!!";
}
}
// print_r($data);
// exit();
// $msgID = $arrss[1];

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

@ -417,7 +417,9 @@ class Calltracking_model extends CI_Model {
// $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education College for the course '.$CourseName.'. Pls feel free to call us for more information at '.$Sname.'- '.$SMobileno.'';
$msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education College for the course '.$CourseName.'. Pls feel free to call '.$Sname.' for more information at '.$SMobileno.'.';
$msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education College for the course '.$CourseName.'. Pls feel free to call '.$Sname.' for more information at '.$SMobileno.'. APOLLO DEC';
//echo $msg;
$messa = urlencode($msg);
//echo $messa ;
@ -455,8 +457,14 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
$this->mailsend($Email, $msg);
$this->db->insert_batch('T_BroadcastStatus', $data);
$this->db->db_debug = false;
$res = $this->db->insert_batch('T_BroadcastStatus', $data);
if(!$res){
$error = $this->db->error();
$result['msgStatus'] = false;
$result['error'] = $error;
$result['message'] = "error!!";
}
}
@ -2054,8 +2062,8 @@ public function GetStaffCountDetails($branchID,$myDate)
}
}
}
$result_array['searchst'] = true;
$result_array['details'] = $filtered_array;
if(!empty($filtered_array)){$result_array['searchst'] = true;$result_array['details'] = $filtered_array;
}else{$result_array['searchst'] = false;$result_array['details'] = "No records found!";}
}
else
{

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

@ -467,7 +467,10 @@ class DayBook_model extends CI_Model
try {
// load fees status model
$this->load->model('Fees_status_model');
$this->Fees_status_model->deleteStudentStatusEntry($getID);
/** comment due to
* 1 .Create new received fees entry after deleting the previously created received fees entry ,in that time don't display the status as "Blank" In Mark card and certificate report when the status already updated from student status update screen
* $this->Fees_status_model->deleteStudentStatusEntry($getID);
*/
// end fees status model
// $sql1 = " DELETE FROM ".STUDENTS_FEES_PAID." WHERE ID ='$getID'";
$sql1 = "UPDATE ".STUDENTS_FEES_PAID." SET IsActive ='0' WHERE ID ='$getID'";

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

@ -567,7 +567,8 @@ class Fees_status_model extends CI_Model
$dayBookEntry = $this->insertDayBookMaster($feesPaidDetails,$feesPayedID,$courseID,$feesName);
// set message content
$message='Thanks for the payment of Rs.'.$feesPaidDetails['BillAmount'].',BillNo-'. $feesPaidDetails['BillNO'].' for '. strtolower($smsDetails['FeesName']).' your balance fees is Rs.'.$smsDetails['CurrentBalance'].'.';
// $message='Thanks for the payment of Rs.'.$feesPaidDetails['BillAmount'].',BillNo-'. $feesPaidDetails['BillNO'].' for '. strtolower($smsDetails['FeesName']).' your balance fees is Rs.'.$smsDetails['CurrentBalance'].'.';
$message='Thanks for the payment of Rs.'.$feesPaidDetails['BillAmount'].',BillNo-'. $feesPaidDetails['BillNO'].' for '. strtolower($smsDetails['FeesName']).' your balance fees is Rs.'.$smsDetails['CurrentBalance'].'. APOLLO DEC';
$studentDetails = $this->get_registered_mobile($feesPaidDetails['StudentID']);
$this->smssend($studentDetails->MobileNumber,$message);
}
@ -1684,7 +1685,7 @@ class Fees_status_model extends CI_Model
if($row->Amount > $getStudentPaiDetails[0]->BillAmount){
$studentDetails = $this->get_registered_mobile($row->StudentID);
$message ="Dear ". strtolower($studentDetails->Firstname)." your ". strtolower($row->Name)." installment due is on $row->DueDate.Please clear the dues.";
$message ="Dear ". strtolower($studentDetails->Firstname)." your ". strtolower($row->Name)." installment due is on $row->DueDate.Please clear the dues. APOLLO DEC";
$this->smssend($studentDetails->MobileNumber,$message);
}
@ -1712,7 +1713,7 @@ class Fees_status_model extends CI_Model
$getStudentPaiDetails1 = $this->db->get()->result();
if($row1->Amount > $getStudentPaiDetails1[0]->BillAmount){
$studentDetails1 = $this->get_registered_mobile($row1->StudentID);
$message1 ="Dear ". strtolower($studentDetails1->Firstname)." your ". strtolower($row1->Name)." installment due is on $row1->DueDate.Please clear the dues.";
$message1 ="Dear ". strtolower($studentDetails1->Firstname)." your ". strtolower($row1->Name)." installment due is on $row1->DueDate.Please clear the dues. APOLLO DEC";
$this->smssend($studentDetails1->MobileNumber,$message1);
}
@ -1747,7 +1748,8 @@ class Fees_status_model extends CI_Model
$this->updateFeesStatusInCallTrack($row2->StudentID,$row2->CourseID);
// send notification to student
$getStudentPaiDetails2 = $this->get_registered_mobile($row2->StudentID);
$message2 ="Dear ". strtolower($getStudentPaiDetails2->Firstname)." your ". strtolower($row2->Name)." installment date is overdue.Please clear this immediately.Ignore if already paid.";
// $message2 ="Dear ". strtolower($getStudentPaiDetails2->Firstname)." your ". strtolower($row2->Name)." installment date is overdue.Please clear this immediately.Ignore if already paid.";
$message2 ="Dear ". strtolower($getStudentPaiDetails2->Firstname)." your ". strtolower($row2->Name)." installment date is overdue.Please clear this immediately.Ignore if already paid. APOLLO DEC";
$this->smssend($getStudentPaiDetails2->MobileNumber,$message2);
}
@ -2047,7 +2049,7 @@ class Fees_status_model extends CI_Model
$this->db->where('SFP.FeesId',$feesDetails['FeesId']);
$this->db->where('SFP.IsActive','1');
$existDetails = $this->db->get();
if($existDetails->num_rows()>1){
if($existDetails->num_rows()>0){
return true;
}
else{

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

@ -89,7 +89,8 @@ class Forgot_model extends CI_Model {
// echo $mobile;
// echo $messa;
// die();
$message ="Your new password for logging into Apollo student portal is $messa. Please change the password as soon as you login.";
// $message ="Your new password for logging into Apollo student portal is $messa. Please change the password as soon as you login.";
$message ="Your new password for logging into Apollo student portal is $messa. Please change the password as soon as you login. APOLLO DEC";
$mobile = "91$mobile";
$message = urlencode($message);

8
Apollo/api/application/models/Login_model.php
View File

@ -204,12 +204,14 @@ class Login_model extends CI_Model
foreach($searchDetails->result() as $mo)
{
$contact = $mo->MobileNumber;
// $contact = "9092279559";
// $contact = "6369084112";
}
$string2 = str_shuffle('1234567890');
$otp = substr($string2,0,6);
//$otp = '431528';
// $otp = '431528';
$save['OTP'] = $otp;
$save['UpdatedOn'] = date('Y-m-d H:i:s');
@ -222,6 +224,7 @@ class Login_model extends CI_Model
if($query == 1)
{
$sms = $this->smssend($mobileno,$otp);
}
@ -765,7 +768,8 @@ class Login_model extends CI_Model
//echo $mobile;
$message ="Your One Time Password to Login to apollodec.com is $OTP. This is valid for 10 minutes.";
// $message ="Your One Time Password to Login to apollodec.com is $OTP. This is valid for 10 minutes.";
$message ="Your One Time Password to Login to apollodec.com is $OTP. This is valid for 10 minutes. APOLLO DEC";
$mobile = "91$mobile";
$message = urlencode($message);
// echo $message;die;

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

@ -202,64 +202,53 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
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
WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus GROUP BY StudentID,CourseID,BranchCode,Sem)
GROUP BY sid,sem,cid,lcode,branch) AS sms
ON sfs.sid=sms.sid AND sms.cid=sfs.ftype
LEFT JOIN
(SELECT StudentID AS sid,FeesId AS fid,BillDate AS bdate,sum(BillAmount) AS bamount,BillNO AS billno FROM T_Students_Fees_PaidDetails
WHERE IsActive = 1
GROUP BY sid,fid) AS sfp
ON sfp.sid=sfs.sid AND sfp.fid=sfs.fid
LEFT JOIN
(SELECT ID AS cid,CourseID AS ccid,FeesType AS ftype,Sem_Year AS syear FROM T_Course_Fees_Details) AS cfd
ON cfd.cid=sfs.ftype
LEFT JOIN
(SELECT ListCode AS lcode,ListName AS STATUS FROM T_PickListDetails) AS `list`
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
WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus GROUP BY StudentID,CourseID,BranchCode,Sem)
GROUP BY sid,sem,cid,lcode,branch) AS sms
ON sfs.sid=sms.sid AND sms.cid=sfs.ftype and sms.branch ='".$br."'
LEFT JOIN
(SELECT StudentID AS sid,FeesId AS fid,BillDate AS bdate,sum(BillAmount) AS bamount,BillNO AS billno
FROM T_Students_Fees_PaidDetails
WHERE IsActive = 1
GROUP BY sid,fid) AS sfp
ON sfp.sid=sfs.sid AND sfp.fid=sfs.fid
LEFT JOIN
(SELECT ID AS cid,CourseID AS ccid,FeesType AS ftype,Sem_Year AS syear FROM T_Course_Fees_Details) AS cfd
ON cfd.cid=sfs.ftype
LEFT JOIN
(SELECT ListCode AS lcode,ListName AS STATUS FROM T_PickListDetails) AS list
ON list.lcode=sms.lcode
LEFT JOIN
(SELECT CourseID AS cid,cm.UniversityID AS cuid,u.UniversityID AS uid,CourseName AS course,UniversityName AS uname,cm.BranchCode AS branch FROM T_CourseMaster AS cm
LEFT JOIN T_UniversityMaster AS u ON u.UniversityID=cm.UniversityID
GROUP BY cid
ORDER BY CourseID) AS cm
LEFT JOIN
(SELECT CourseID AS cid,cm.UniversityID AS cuid,u.UniversityID AS uid,CourseName AS course,UniversityName AS uname,cm.BranchCode AS branch FROM T_CourseMaster AS cm
LEFT JOIN T_UniversityMaster AS u ON u.UniversityID=cm.UniversityID
GROUP BY cid ORDER BY CourseID) AS cm
ON cm.cid=cfd.ccid
LEFT JOIN
(SELECT StudentID AS sid,MobileNumber AS phone,IsActive AS active,concat(FirstName,' ',Lastname) AS NAME,Fathername AS father,PermanentAddress AS address,AlternateNumber FROM T_StudentDetails) AS std
ON std.sid=sfs.sid
LEFT JOIN (SELECT StudentID AS sid,UniversityID AS uid,CourseID AS cid,EnrollmentID AS eid,BranchID AS branch,ifnull(STATUS,'-') AS coursestatus FROM T_Student_CourseDetails) AS scd
ON scd.sid=sfs.sid AND scd.cid = sfs.cid
LEFT JOIN (SELECT ID,StudentID AS sid,Sem,CourseID,Comments,
IF(ListName = 'SENT TO UNIVERSITY', AnsDate,'-') AS ansdate,CourierDetails AS courierdetails
FROM T_AnswerBookletStatus abs
LEFT JOIN T_PickListDetails `list` ON list.ListCode=abs.ListCode
WHERE AnsDate IS NOT NULL AND ID IN (SELECT max(ID) FROM T_AnswerBookletStatus WHERE AnsDate IS NOT NULL GROUP BY StudentID,Sem,CourseID)
GROUP BY sid,Sem,CourseID) AS andate
ON andate.sid = sfs.sid AND andate.Sem = cfd.syear AND andate.CourseID = sfs.ftype
LEFT JOIN (SELECT rd.StudentID AS sid,rd.CourseID AS cid,max(IF(list.ListName = 'SENT TO UNIVERSITY', afs.AppFormDate,'-')) AS appdate,Sem_Year AS sem
FROM T_Registration_Details rd
LEFT JOIN T_ApplicationFormStatus afs ON afs.Registration_Details_ID=rd.ID
LEFT JOIN T_PickListDetails `list` ON list.ListCode=afs.ListCode
LEFT JOIN T_Course_Fees_Details cf ON cf.ID=rd.FeeType
GROUP BY sid,sem) AS apdate
ON apdate.sid=sfs.sid AND apdate.sem=cfd.syear
LEFT JOIN BalFees bal ON bal.student=sfs.sid AND bal.feestype=sfs.ftype AND bal.semyr=cfd.syear AND bal.totalpayable is not null
LEFT JOIN
(SELECT StudentID AS sid,MobileNumber AS phone,IsActive AS active,concat(FirstName,' ',Lastname) AS NAME,Fathername AS father,PermanentAddress AS address,AlternateNumber FROM T_StudentDetails) AS std
ON std.sid=sfs.sid
LEFT JOIN
(SELECT StudentID AS sid,UniversityID AS uid,CourseID AS cid,EnrollmentID AS eid,BranchID AS branch,ifnull(STATUS,'-') AS coursestatus FROM T_Student_CourseDetails) AS scd
ON scd.sid=sfs.sid AND scd.cid = sfs.cid
LEFT JOIN
(SELECT ID,StudentID AS sid,Sem,CourseID,Comments,
IF(ListName = 'SENT TO UNIVERSITY', AnsDate,'-') AS ansdate,CourierDetails AS courierdetails
FROM T_AnswerBookletStatus abs
LEFT JOIN T_PickListDetails `list` ON list.ListCode=abs.ListCode
WHERE AnsDate IS NOT NULL AND ID IN (SELECT max(ID) FROM T_AnswerBookletStatus WHERE AnsDate IS NOT NULL GROUP BY StudentID,Sem,CourseID)
GROUP BY sid,Sem,CourseID) AS andate
ON andate.sid = sfs.sid AND andate.Sem = cfd.syear AND andate.CourseID = sfs.ftype
LEFT JOIN
(SELECT rd.StudentID AS sid,rd.CourseID AS cid,max(IF(list.ListName = 'SENT TO UNIVERSITY', afs.AppFormDate,'-')) AS appdate,Sem_Year AS sem
FROM T_Registration_Details rd
LEFT JOIN T_ApplicationFormStatus afs ON afs.Registration_Details_ID=rd.ID
LEFT JOIN T_PickListDetails `list` ON list.ListCode=afs.ListCode
LEFT JOIN T_Course_Fees_Details cf ON cf.ID=rd.FeeType
GROUP BY sid,sem) AS apdate
ON apdate.sid=sfs.sid AND apdate.sem=cfd.syear
LEFT JOIN BalFees bal ON bal.student=sfs.sid AND bal.feestype=sfs.ftype AND bal.semyr=cfd.syear AND bal.totalpayable is not null
where std.active = 1 and sfs.branch = '".$br."' ";
if ($bat!= ''){
@ -277,7 +266,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
else{
$getStatusName =$this->db->query("Select ListName from T_PickListDetails where ListCode = '".$st."' and BranchCode = '".$br."' and IsActive ='1'")->row();
if($getStatusName->ListName == "BLANK"){
$sql.="and list.lcode IS null OR list.status = 'BLANK'";
$sql.="and ((list.lcode IS null) OR (list.status = 'BLANK'))";
}else{
$sql.="and list.lcode = '".$st."'"; }
}
@ -293,7 +282,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
$sql.=" and sfs.fid IS not null";
$sql.=" AND (scd.coursestatus IS NULL OR (scd.coursestatus != 'Refund_issued' AND scd.coursestatus != 'Discontinued' AND scd.coursestatus != 'Cancelled'))";
$sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year";
// print_r($sql);die();
// print_r($sql);die();
$leadDet=$this->db->query($sql);
$mstatusDetails = $leadDet->result();
if (count($mstatusDetails) > 0) {

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

@ -60,6 +60,7 @@ class StatusUpdation_model extends CI_Model {
// echo APPLICATION_STATUS;
// print_r($arr);die();
$this->db->insert_batch(APPLICATION_STATUS, $arr);
$msgId = "";
if ($this->db->affected_rows() >= 1) {
if ($this->get_ListCode_status($arr[0]['ListCode'])) {
$dateToMsg = $arr[0]['AppDate'];
@ -72,8 +73,8 @@ class StatusUpdation_model extends CI_Model {
$getSemYearMsg = $this->get_couser_name($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);
$mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it. APOLLO DEC";
$msgId = $this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
} else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
// $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
@ -81,8 +82,8 @@ class StatusUpdation_model extends CI_Model {
$getSemYearMsg = $this->get_couser_name($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);
$mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg. APOLLO DEC";
$msgId = $this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
} else {
}
@ -94,6 +95,7 @@ class StatusUpdation_model extends CI_Model {
}
$this->updateDocumentStatusInCallTrack($arr, $reqDetails);
$result['addStatus'] = true;
$result['SMSstatus'] = $msgId;
$result['message'] = "Successfully Documents Status Updated";
} else {
$result['addStatus'] = false;
@ -186,7 +188,7 @@ class StatusUpdation_model extends CI_Model {
// print_r($arr);
// exit();
$msgId = "";
$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.
@ -212,8 +214,8 @@ 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 )
{
// if($answerBookletStatus['isIssueToStudentExist'] == 0 )
// {
// if ($this->get_ListCode_status($arr[0]['ListCode'])) {
$dateToMsg = $arr[0]['CDate'];
@ -226,7 +228,7 @@ class StatusUpdation_model extends CI_Model {
// 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')){
@ -235,8 +237,8 @@ class StatusUpdation_model extends CI_Model {
$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);
$mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it. APOLLO DEC";
$msgId = $this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
@ -261,9 +263,10 @@ class StatusUpdation_model extends CI_Model {
// $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";
$result['SMSstatus'] = $msgId;
} else {
$result['addStatus'] = false;
$result['message'] = "Something went wrong.please try again";
@ -514,6 +517,7 @@ class StatusUpdation_model extends CI_Model {
// update study material status
public function update_semyear($arr) {
$this->db->insert_batch(STUDY_MATERIAL_STATUS, $arr);
$msgId = "";
if ($this->db->affected_rows() >= 1) {
if ($this->get_ListCode_status($arr[0]['ListCode']) == true) {
$dateToMsg = $arr[0]['SDate'];
@ -526,21 +530,22 @@ class StatusUpdation_model extends CI_Model {
$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);
$mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it. APOLLO DEC";
$msgId = $this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
} else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
$cerNamtToMsg = 'Study Material';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
$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);
$mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg. APOLLO DEC";
$msgId = $this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
} else {
}
}
$result['addStatus'] = true;
$result['SMSstatus'] = $msgId;
$result['message'] = "Successfully Study Material Status Updated";
} else {
$result['addStatus'] = false;
@ -742,7 +747,8 @@ class StatusUpdation_model extends CI_Model {
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, "https://smsapi.24x7sms.com/api_2.0/SendSMS.aspx?APIKEY=xegCdYUIMf3&MobileNo=" . $mobile . "&SenderID=APODEC&Message=" . $message . "&ServiceName=TEMPLATE_BASED");
curl_setopt($ch, CURLOPT_URL, "https://smsapi.24x7sms.com/api_2.0/SendSMS.aspx?APIKEY=xegCdYUIMf3&MobileNo=".$mobile."&SenderID=APODEC&Message=".$message."&ServiceName=TEMPLATE_BASED");
// echo "https://smsapi.24x7sms.com/api_2.0/SendSMS.aspx?APIKEY=xegCdYUIMf3&MobileNo=".$mobile."&SenderID=APODEC&Message=".$message."&ServiceName=TEMPLATE_BASED";
curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
$output = curl_exec($ch);
curl_close($ch);
@ -775,10 +781,31 @@ class StatusUpdation_model extends CI_Model {
}
$this->db->insert_batch('T_BroadcastStatus', $data);
// $this->db->insert_batch('T_BroadcastStatus', $data);
return $output;
// return $output;
if($msgId){
$res = $this->db->insert_batch('T_BroadcastStatus', $data);
if(!$res)
{
$error = $this->db->error();
return $error;
return $error;
return $error;
return $error;
return $error;
return $error;
return $error;
}else{
return ($msgId ? true : false);
}
}else{
return false;
}
}
public function mailsend($arr, $msg, $sub) {

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

@ -1077,43 +1077,40 @@ if(count($qry)>0)
public function add_student($Arr, $courseArr, $imagename, $imageSource, $size) {
// print_r($courseArr);die();
$Enrollment = $courseArr['EnrollmentID'];
$Enrollment = $courseArr['EnrollmentID'];
if($Enrollment !='')
{
if($Enrollment !='')
{
$this->db->select('*');
$this->db->from('T_Student_CourseDetails');
$this->db->where('EnrollmentID',$Enrollment);
$this->db->where('UniversityID',$courseArr['UniversityID']);
$qry=$this->db->get();
$qry=$qry->result();
$this->db->select('*');
$this->db->from('T_Student_CourseDetails');
$this->db->where('EnrollmentID',$Enrollment);
$this->db->where('UniversityID',$courseArr['UniversityID']);
$qry=$this->db->get();
$qry=$qry->result();
//print_r($this->db->last_query());die();
//print_r($this->db->last_query());die();
//echo count($qry);die();
//echo count($qry);die();
if(count($qry)>0)
{
$result['addStudentStatus'] = false;
$result['message'] = "EnrollmentID Already Exists";
if(count($qry)>0)
{
$result['addStudentStatus'] = false;
$result['message'] = "EnrollmentID Already Exists";
return $result;
return $result;
}
}
}
}
// echo $this->getBranchActiveStatusforStuAdd($courseArr['BranchID'])['branch_active_status'];exit();
if ($this->getBranchActiveStatusforStuAdd($courseArr['BranchID']) ['branch_active_status'] === '1') {
// echo $this->getBranchActiveStatusforStuAdd($courseArr['BranchID'])['branch_active_status'];exit();
if ($this->getBranchActiveStatusforStuAdd($courseArr['BranchID']) ['branch_active_status'] === '1') {
// echo 'in';exit();
if ($imageSource == '') { // add employee without image
if ($imageSource == '') { // add employee without image
$imageNameDb = 'default.jpeg';
$Arr['ProfilePicPath'] = "student/" . $imageNameDb;
// print_r($Arr);
@ -1144,7 +1141,7 @@ if(count($qry)>0)
$userId = $Arr['MobileNumber'];
$getUnivName = $this->getUnivName($courseArr['UniversityID'], $courseArr['BranchID']);
$getCourseName = $this->getCourseName($courseArr['CourseID'], $courseArr['BranchID']);
$msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123";
$msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123. APOLLO DEC";
$arr = $userId;
$this->smssend($arr, $msg);
$emailId = $Arr['EmailID'];
@ -1197,7 +1194,7 @@ if(count($qry)>0)
$getUnivName = $this->getUnivName($courseArr['UniversityID'], $courseArr['BranchID']);
$getCourseName = $this->getCourseName($courseArr['CourseID'], $courseArr['BranchID']);
$msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123";
$msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123 APOLLO DEC";
$arr = $userId;
$this->smssend($arr, $msg);
$emailId = $Arr['EmailID'];
@ -1228,7 +1225,15 @@ if(count($qry)>0)
}
public function testsmsandmailflow(){
$msg = "Thanks for registering with us for Course";
$arr = "6369084112";
$result['message'] = $this->smssend($arr, $msg);
$emailId = "sanjeev.p@venbainfotech.com";
$sub = ' Apollo - test';
$result['message2'] = $this->mailsend($emailId, $msg, $sub);
return $result;
}
// check existing data while update
public function check_update_exist($exceptId, $datas, $checkFor) {
if ($checkFor == 'mobileNumber') {
@ -1805,8 +1810,6 @@ if(count($qry)>0)
$output = curl_exec($ch);
curl_close($ch);
$arrss = explode('<br>', $output);
$time = date('Y-m-d H:i:s');
@ -1832,10 +1835,18 @@ if(count($qry)>0)
}
}
$this->db->db_debug = false;
$res = $this->db->insert_batch('T_BroadcastStatus', $data);
if(!$res)
{
$error = $this->db->error();
return $error;
$this->db->insert_batch('T_BroadcastStatus', $data);
return $output;
}else{
return $output;
}
}
public function mailsend($arr, $msg, $sub) {

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

@ -67,12 +67,12 @@ class Studentview_model extends CI_Model
$this->db->from( LOGIN . ' as LO');
$this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID');
$this->db->join( STUDENTCOURSE . ' as STC', 'STC.StudentID = ST.StudentID');
$this->db->join(STUDENTS_FEES_PAID . ' as SFP','SFP.StudentID = ST.StudentID ');
$this->db->join(STUDENTS_FEES_STATUS . ' as SFS','SFS.FeesID = SFP.FeesId and SFS.StudentID = SFP.StudentID');
$this->db->join(STUDENTS_FEES_PAID . ' as SFP','SFP.StudentID = ST.StudentID ','left');
$this->db->join(STUDENTS_FEES_STATUS . ' as SFS','SFS.FeesID = SFP.FeesId and SFS.StudentID = SFP.StudentID','left');
$this->db->where('ST.MobileNumber', $requestedBy);
$this->db->where('STC.BranchID', $requestedBranch);
$studentDetails = $this->db->get()->first_row();
// print_r($studentDetails);
// print_r($this->db->last_query());die();
if($studentDetails){
$result['studentStatus'] = true;

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

@ -603,7 +603,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (arr,type,filterby) {
var values = arr;
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 = values;}
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++)
@ -614,16 +624,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++)
@ -634,16 +634,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',

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

@ -553,7 +553,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -2521,7 +2521,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -554,7 +554,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -571,7 +571,18 @@ 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' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
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++)
@ -582,16 +593,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++)
@ -602,16 +603,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',

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

@ -2067,7 +2067,18 @@ 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' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
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++)
@ -2078,16 +2089,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++)
@ -2098,16 +2099,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',

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

@ -2703,7 +2703,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)
@ -2752,6 +2752,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
});
modalInstance1.result.then(function (selectedItem) {
console.log("selectedItem",selectedItem);
$scope.selected = selectedItem;
}, function () {
$log.info('Modal dismissed at: ' + new Date());

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

@ -572,7 +572,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -573,7 +573,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -405,7 +405,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -482,7 +482,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -527,7 +527,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -482,7 +482,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -556,7 +556,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -532,7 +532,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -477,7 +477,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -481,7 +481,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -274,7 +274,7 @@ $scope.generateButtonStatus = false;
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -502,7 +502,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -502,7 +502,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -477,7 +477,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -222,7 +222,7 @@ $scope.generateButtonStatus = false;
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -1037,7 +1037,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -3861,10 +3861,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
};
$scope.open1 = function (values,type,filterby) {
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 == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

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

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

@ -551,7 +551,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
});
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -550,7 +550,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -551,7 +551,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
});
};
$scope.open1 = function (values,type,filterby) {
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
if(type == '1' || type == '2'){ var result = values;}
if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = [];
for (var i = 0; i < values.length; i++)

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

@ -163,7 +163,7 @@
<fieldset>
<div class="col-md-1 col-md-offset-10">
<button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button>
<button class="btn btn-success btn-o" ng-click="calltracking()">Update</button>
</div>

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

@ -13,17 +13,22 @@
</tr>
</thead>
<tbody ng-repeat="l in items1.InstallmentDetails">
<tr>
<tbody ng-if="items1.InstallmentDetails.length!=0">
<tr ng-repeat="l in items1.InstallmentDetails">
<td>{{l.Name}}</td>
<td>{{l.Amount}}</td>
<td>{{l.DueDate}}</td>
</tr>
</tbody>
<tbody ng-if="items1.InstallmentDetails.length==0">
<tr>
<td colspan="3"><center> Details Not Found </center></td>
</tr>
</tbody>
</table>
<table class="table" ng-if="selectedtype=='2'">
@ -37,7 +42,7 @@
</tr>
</thead>
<tbody>
<tbody ng-if="items1.paidDetails.length!=0" >
<tr ng-repeat="v in items1.paidDetails">
<td>{{v.BillNO}}</td>
<td>{{v.BillAmount}}</td>
@ -46,7 +51,12 @@
<td>{{v.ModeOfPayment}}</td>
</tr>
</tbody>
<tbody ng-if="items1.paidDetails.length==0">
<tr>
<td colspan="5"><center> Details Not Found </center></td>
</tr>
</tbody>
</table>
<ul ng-if="selectedtype=='3' && items1!=false" >
<label style="background-color:black;">Batch History</label>