diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php index d5f21239..e0d83a26 100755 --- a/Apollo/api/application/config/database.php +++ b/Apollo/api/application/config/database.php @@ -76,17 +76,17 @@ $query_builder = TRUE; $db['default'] = array( 'dsn' => '', 'hostname' => 'apollodec.com', - 'username' => 'apollod4_DEV', - 'password' => 'apollo1234', - 'database' => 'apollod4_ApolloDECDev', + 'username' => 'apollod4_DEV', + 'password' => 'apollo1234', + 'database' => 'apollod4_ApolloDECDev', - // 'username' => 'apollod4_SIT', - // 'password' => 'apollosit1234', - // 'database' => 'apollod4_ApolloDECNEWSIT', + // 'username' => 'apollod4_SIT', + // 'password' => 'apollosit1234', + // 'database' => 'apollod4_ApolloDECNEWSIT', - // 'username' => 'apollod4_PROD', - // 'password' => 'approd!2017', - // 'database' =>'apollod4_ApolloDECNEWPROD', + // 'username' => 'apollod4_PROD', + // 'password' => 'approd!2017', + // 'database' =>'apollod4_ApolloDECNEWPROD', 'dbdriver' => 'mysqli', 'dbprefix' => '', diff --git a/Apollo/api/application/models/Login_model.php b/Apollo/api/application/models/Login_model.php index bfb292bc..3796d709 100755 --- a/Apollo/api/application/models/Login_model.php +++ b/Apollo/api/application/models/Login_model.php @@ -325,7 +325,7 @@ class Login_model extends CI_Model $message = urlencode($message); // echo $message;die; $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=PROMOTIONAL_HIGH"); + 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_RETURNTRANSFER, TRUE); $output = curl_exec($ch); curl_close($ch); diff --git a/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js b/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js index 532b7061..b9f84ed6 100644 --- a/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js +++ b/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js @@ -259,7 +259,7 @@ $scope.tod = to_dt; }; console.log(mystyle); - alasql('SELECT UniversityName,Cash,Cheque,Referal,Onlinec as OnlineTransaction,WAIVER as Waiver,Card as CardTransaction,Total INTO XLS("Fee Paid List report.xls",?) FROM ?',[mystyle,$scope.newreglist]); + alasql('SELECT UniversityName as University,Cash,Cheque,Referal,Onlinec as OnlineTransaction,WAIVER as Waiver,Card as CreditDebitCard,Total INTO XLS("Fee Paid List report.xls",?) FROM ?',[mystyle,$scope.newreglist]); }; diff --git a/Apollo/assets/js/controllers/newreg_reportCtrl.js b/Apollo/assets/js/controllers/newreg_reportCtrl.js index 6eae364b..cfde210a 100644 --- a/Apollo/assets/js/controllers/newreg_reportCtrl.js +++ b/Apollo/assets/js/controllers/newreg_reportCtrl.js @@ -231,7 +231,7 @@ $scope.tod = to_dt; }; // console.log(mystyle); - alasql('SELECT SL_NO,BillDate as InitialPaymentPaidDate,CONCAT(Firstname,Lastname) as StudentName,Fathername,CourseName,Sem_Year as SEM_or_YEAR,MobileNumber as Phone_No,UniversityName,ReferedBy,ReferersMobileNumber,CONCAT(Fname,Lname) as AdmittedBY INTO XLS("New Registration report.xls",?) FROM ?',[mystyle,$scope.newreglist]); + alasql('SELECT SL_NO,BillDate as InitialPaymentPaidDate,CONCAT(Firstname,Lastname) as StudentName,Fathername,CourseName as Course,Sem_Year as SEM_YEAR,MobileNumber as Phone_No,UniversityName as University,ReferedBy,ReferersMobileNumber,CONCAT(Fname,Lname) as AdmittedBY INTO XLS("New Registration report.xls",?) FROM ?',[mystyle,$scope.newreglist]); //console.log($scope.fullincomedetail); // alasql('SELECT DOJ as RegistrationDate,Firstname as Name,Fathername,UniversityName,BatchName,CourseName,MobileNumber INTO XLS("New Registration report.xls",?) FROM ?',[mystyle,$scope.newreglist]); diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 7eebd3ab..e6572286 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -175,7 +175,7 @@ $scope.generateButtonStatus = false; $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,University as University,CAST(balance AS NUMBER) as BalanceFee,issuedate as IssuedToStudentDate,rcvedate as ReceivedFromStudentDate,Status as AnswerBookletStatus,Date as Date INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as Course,Sem_year as SemYear,University as University,CAST(balance AS NUMBER) as BalanceFee,issuedate as IssuedToStudentDate,rcvedate as ReceivedFromStudentDate,Status as AnswerBookletStatus,Date as Date INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]); }; $scope.$watch(function () { $scope.filteredItems = $scope.$eval(" ans_book_data | filter: search "); diff --git a/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js b/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js index 47421eb2..e7983005 100644 --- a/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js @@ -179,7 +179,7 @@ $scope.generateButtonStatus = false; $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,init_date as InititalPaymentDate,eid as EnrollmentID,Student_name as StudentName,FatherName as FatherName,Course_name as CourseName,University as University,StatusName as ApplicationPendingStatus,adate as Date INTO XLS("ApplicationStatusReport.xls",?) FROM ?',[mystyle,$scope.app_pending_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,init_date as InititalPaymentDate,eid as EnrollmentID,Student_name as StudentName,FatherName as FatherName,Course_name as Course,University as University,StatusName as ApplicationStatus,adate as Date INTO XLS("ApplicationStatusReport.xls",?) FROM ?',[mystyle,$scope.app_pending_data]); }; $scope.$watch(function () { diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index 5c3d2bb5..89b944f8 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -184,7 +184,7 @@ $scope.generateButtonStatus = false; $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,initialPaid as CertificateFeePaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,University as University,CAST(balance AS NUMBER) as Balance,certname as CertificateName,status as CertificateStatus,adate as Date INTO XLS("Certificate_status.xls",?) FROM ?',[mystyle,$scope.cert_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,initialPaid as CertificateFeePaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as Course,University as University,CAST(balance AS NUMBER) as Balance,certname as CertificateName,status as CertificateStatus,adate as Date INTO XLS("Certificate_status.xls",?) FROM ?',[mystyle,$scope.cert_data]); }; $scope.$watch(function () { $scope.filteredItems = $scope.$eval(" cert_data | filter: search "); diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index 2a818f51..7c77eda7 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -175,7 +175,7 @@ $scope.generateButtonStatus = false; $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,University as University,fdate as Followupdate,certname as DocumentName INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as Course,University as University,fdate as Followupdate,certname as PendingDocument INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]); }; $scope.$watch(function () { $scope.filteredItems = $scope.$eval(" doc_pending_data | filter: search "); diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index c8744603..6cdfcb81 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -176,7 +176,7 @@ $scope.generateButtonStatus = false; $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,University as University,CAST(Amount AS NUMBER) as ExamWritingFee,Comments as Comments INTO XLS("Exam_writing_fee_report.xls",?) FROM ?',[mystyle,$scope.examfee_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as Course,Sem_year as SemYear,University as University,Stafname as Admitted By,CAST(Amount AS NUMBER) as SumofExamWritingFee,Comments as Comments INTO XLS("Exam_writing_fee_report.xls",?) FROM ?',[mystyle,$scope.examfee_data]); }; $scope.$watch(function () { $scope.filteredItems = $scope.$eval(" examfee_data | filter: search "); diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index 16a12d7f..4bab44ba 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -194,7 +194,7 @@ $scope.generateButtonStatus = false; $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Student_name as StudentName,Father_name as FatherName,University as University,Course_name as CourseName,Sem_year as SemYear,Certificate_name as CertificateName,rstatus as ReceivedStatus,rdate as ReceivedDate,istatus as IssuedStatus,issuedate as IssuedDate,acmts as CertificateIssuedComments,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Student_name as StudentName,Father_name as FatherName,University as University,Course_name as Course,Sem_year as SemYear,Certificate_name as CertificateName,rstatus as ReceivedStatus,rdate as ReceivedDate,istatus as IssuedStatus,issuedate as IssuedDate,acmts as CertificateIssuedComments,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]); }; $scope.$watch(function () { $scope.filteredItems = $scope.$eval(" mark_cert_data | filter: search "); diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index 691a2253..760e78a8 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -175,7 +175,7 @@ $scope.generateButtonStatus = false; $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentID,Roll_NO as RollNO,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,University as University,CAST(Balance_Fee AS NUMBER) as BalanceFee,appdate as ApplicationSentDate,ansdate as AnswerBookletSentDate,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaymentPaidDate,Enrollment_id as EnrollmentID,Roll_NO as RollNO,Student_name as StudentName,Father_name as FatherName,Course_name as Course,Sem_year as Sem/Year,University as University,CAST(Balance_Fee AS NUMBER) as BalanceFee,appdate as ApplicationSenttoUnivDate,ansdate as AnswerBookletSenttoUnivDate,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]); }; $scope.$watch(function () { $scope.filteredItems = $scope.$eval(" markcard_data | filter: search "); diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index 3eefff8c..af1a0792 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -178,7 +178,7 @@ $scope.generateButtonStatus = false; $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem as SemYear,University,CAST(Balance_fee AS NUMBER) as BalanceFee,appdate as ApplicationSendtoUnivDate,Status as StudyMaterialStatus,Date as Date INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaymentPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as Course,Sem as SemYear,University,CAST(Balance_fee AS NUMBER) as BalanceFee,appdate as ApplicationSendtoUnivDate,Status as StudyMaterialStatus,Date as Date INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]); }; $scope.$watch(function () { diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index f94d622d..a8adcf5b 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -157,7 +157,7 @@ $scope.generateButtonStatus = false; $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,University as University,staffname as Waiver_ReferalGivenBy,Waiver_bill as WaiverBillNo,CAST(Waiver_amount AS NUMBER) as WaiverAmount,Referal_bill as ReferalBillNo,CAST(Referal_amount AS NUMBER) as ReferalAmount,Comments as Comments INTO XLS("Waiver_referal_report.xls",?) FROM ?',[mystyle,$scope.waiver_referal_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as Course,Sem_year as SemYear,University as University,Stafname as AdmittedBy,staffname as Waiver_ReferalGivenBy,Waiver_bill as WaiverBillNo,CAST(Waiver_amount AS NUMBER) as WaiverAmount,Referal_bill as ReferalBillNo,CAST(Referal_amount AS NUMBER) as ReferalAmount,Comments as Comments INTO XLS("Waiver_referal_report.xls",?) FROM ?',[mystyle,$scope.waiver_referal_data]); }; /*modal controller * */