From cf1dd7d39355bf290dc13431138e85c0b5ffbf1c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 17 Aug 2018 18:03:01 +0530 Subject: [PATCH 1/6] dashboard changes --- Apollo/assets/views/dashboard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html index f34898a6..da44e16c 100755 --- a/Apollo/assets/views/dashboard.html +++ b/Apollo/assets/views/dashboard.html @@ -36,7 +36,7 @@ -->
- +
From 7572f257c4ea532ed9fd9d979f6fcbecff9e1aa7 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Fri, 17 Aug 2018 18:11:18 +0530 Subject: [PATCH 2/6] status updation chages , file name changes : kdk --- .../models/StatusUpdation_model.php | 100 ++++++++++++------ .../api/application/models/Student_model.php | 47 ++++++++ Apollo/assets/i18n/en.json | 5 +- Apollo/assets/js/config.constant.js | 4 +- Apollo/assets/js/config.router.js | 20 ++-- ...StatusCtrl.js => certificateStatusCtrl.js} | 2 +- ...ionStatusCtrl.js => markcardStatusCtrl.js} | 2 +- Apollo/assets/views/partials/nav.html | 26 ++--- ...on_status.html => certificate_status.html} | 24 ++--- ...ation_status.html => markcard_status.html} | 6 +- 10 files changed, 162 insertions(+), 74 deletions(-) rename Apollo/assets/js/controllers/{applicationStatusCtrl.js => certificateStatusCtrl.js} (99%) mode change 100755 => 100644 rename Apollo/assets/js/controllers/{certificationStatusCtrl.js => markcardStatusCtrl.js} (98%) mode change 100755 => 100644 rename Apollo/assets/views/status-update/{application_status.html => certificate_status.html} (98%) mode change 100755 => 100644 rename Apollo/assets/views/status-update/{certification_status.html => markcard_status.html} (99%) mode change 100755 => 100644 diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index de6003a1..e5fddb90 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -68,6 +68,7 @@ class StatusUpdation_model extends CI_Model { // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it."; $this->smssend($arr, $mesg); + $this->mailsend($arr, $mesg, $cerNamtToMsg); } else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') { $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']); $getSemYearMsg = $this->get_couser_name($arr[0]['CourseID']); @@ -75,6 +76,7 @@ class StatusUpdation_model extends CI_Model { // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; $mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg."; $this->smssend($arr, $mesg); + $this->mailsend($arr, $mesg, $cerNamtToMsg); } else { } @@ -121,6 +123,7 @@ class StatusUpdation_model extends CI_Model { // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it."; $this->smssend($arr, $mesg); + $this->mailsend($arr, $mesg, $cerNamtToMsg); } else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') { $cerNamtToMsg = 'Mark Card'; $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); @@ -128,6 +131,7 @@ class StatusUpdation_model extends CI_Model { // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; $mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg."; $this->smssend($arr, $mesg); + $this->mailsend($arr, $mesg, $cerNamtToMsg); } else { } // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; @@ -174,6 +178,15 @@ class StatusUpdation_model extends CI_Model { return $roleDetails->MobileNumber; } + // self function for getting registered email for mail send + public function get_registered_email($num) { + $this->db->select('EmailID'); + $this->db->from(STUDENTS); + $this->db->where('StudentID', $num); + $roleDetails = $this->db->get()->first_row(); + return $roleDetails->EmailID; + } + // self function for getting the status for the LISTCODE public function get_ListCode_status($listCode) { $this->db->select('ListName'); @@ -297,8 +310,23 @@ class StatusUpdation_model extends CI_Model { $this->db->insert_batch(ANSWER_BOOKLET, $arr); if ($this->db->affected_rows() >= 1) { $this->updateBookletStatusInCallTrack($arr, $reqDetails); - $result['addStatus'] = true; - $result['message'] = "Successfully Answer Booklet Status Updated"; + $studentName = $this->getStudentName($arr[0]['StudentID']); + $statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']); + // $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']); + if( $statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED'){ + $cerNamtToMsg = 'Answer booklet'; + $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); + $getSemYearANDType = "$getSemYearMsg $cerNamtToMsg"; + // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; + $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received."; + $this->smssend($arr, $mesg); + $this->mailsend($arr, $mesg, $cerNamtToMsg); + $result['addStatus'] = true; + $result['message'] = "Successfully Answer Booklet Status Updated"; + }else{ + $result['addStatus'] = true; + $result['message'] = "Successfully Answer Booklet Status Updated"; + } } else { $result['addStatus'] = false; $result['message'] = "Something went wrong.please try again"; @@ -340,6 +368,7 @@ class StatusUpdation_model extends CI_Model { // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it."; $this->smssend($arr, $mesg); + $this->mailsend($arr, $mesg, $cerNamtToMsg); } else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') { $cerNamtToMsg = 'Study Material'; $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); @@ -347,6 +376,7 @@ class StatusUpdation_model extends CI_Model { // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; $mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg."; $this->smssend($arr, $mesg); + $this->mailsend($arr, $mesg, $cerNamtToMsg); } else { } } @@ -549,34 +579,44 @@ class StatusUpdation_model extends CI_Model { return $output; } - // public function mailsend() { - // //Load email library - // $this->load->library('email'); - // //SMTP & mail configuration - // $config = array( - // 'protocol' => 'smtp', - // 'smtp_host' => 'ssl://smtp.example.com', - // 'smtp_port' => 465, - // 'smtp_user' => 'email@example.com', - // 'smtp_pass' => 'email_password', - // 'mailtype' => 'html', - // 'charset' => 'utf-8' - // ); - // $this->email->initialize($config); - // $this->email->set_mailtype("html"); - // $this->email->set_newline("\r\n"); - // //Email content - // $htmlContent = '

Sending email via SMTP server

'; - // $htmlContent .= '

This email has sent via SMTP server from CodeIgniter application.

'; - // // Email body load the html template - // // $body = $this->load->view('emails/anillabs.php',$data,TRUE); - // $this->email->to('recipient@example.com'); - // $this->email->from('sender@example.com','MyWebsite'); - // $this->email->subject('How to send email via SMTP server in CodeIgniter'); - // $this->email->message($htmlContent); - // //Send email - // $this->email->send(); - // } + public function mailsend($arr, $msg, $sub) { + $emails = array(); + foreach ($arr as $ar) { + $mobi = $this->get_registered_email($ar['StudentID']); + array_push($emails, "$mobi"); + } + $list = implode(',', $emails); + //Load email library + $this->load->library('email'); + //SMTP & mail configuration + $config = array( + 'protocol' => 'ssmtp', + 'smtp_host' => 'ssl://smtp.example.com', + 'smtp_port' => 465, + 'smtp_user' => 'noreply@apollodec.com', + 'smtp_pass' => 'Apollo@123', + 'mailtype' => 'html', + 'charset' => 'utf-8' + ); + $this->email->initialize($config); + $this->email->set_mailtype("html"); + $this->email->set_newline("\r\n"); + //Email content + // $htmlContent = '

Sending email via SMTP server

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

Sending email via SMTP server

'; + $htmlContent = $msg; + // Email body load the html template + // $body = $this->load->view('emails/anillabs.php',$data,TRUE); + $this->email->to($list); + $this->email->from('noreply@apollodec.com','Apollo'); + $subj = $sub; + $this->email->subject($subj); + $this->email->message($htmlContent); + //Send email + $result = $this->email->send(); + // echo $this->email->print_debugger(); exit(); + return $result; + + } + } \ No newline at end of file diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 6898b6e5..f2cdad8a 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -104,8 +104,9 @@ "MAIN": "UPDATE STATUS ", "STUDYMATERIAL": "STUDY MATERIAL", "ANSWERBOOKLET": "ANSWER BOOKLET", - "CERTIFICATION": "MARK CARD", - "APPLICATION" : "DOCUMENTS" + "MARKCARD": "MARK CARD", + "APPLICATION" : "DOCUMENTS", + "CERTIFICATE": "CERTIFICATE" } }, "status": { diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 165e47e5..7c846dc0 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -153,11 +153,11 @@ app.constant('JS_REQUIRES', { /* * student Certification status updation * */ - 'certificationStatusCtrl': 'assets/js/controllers/certificationStatusCtrl.js', + 'markcardStatusCtrl': 'assets/js/controllers/markcardStatusCtrl.js', /* * student Certification status updation * */ - 'applicationStatusCtrl': 'assets/js/controllers/applicationStatusCtrl.js', + 'certificateStatusCtrl': 'assets/js/controllers/certificateStatusCtrl.js', /* * Certificate Type * */ diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 053d2cf3..e384da6e 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -307,22 +307,22 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'Answer Booklet' }, // resolve: loadSequence('wizardCtrl') - }).state('app.student.status.certificationstatus', { - url: '/certificationstatus', - templateUrl: "assets/views/status-update/certification_status.html", + }).state('app.student.status.markcardstatus', { + url: '/markcardstatus', + templateUrl: "assets/views/status-update/markcard_status.html", title: 'Mark Card', - resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificationStatusCtrl'), + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'markcardStatusCtrl'), ncyBreadcrumb: { label: 'Mark Card' }, // resolve: loadSequence('wizardCtrl') - }).state('app.student.status.applicationstatus', { - url: '/applicationstatus', - templateUrl: "assets/views/status-update/application_status.html", - title: 'Documents Status', - resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'), + }).state('app.student.status.certificatestatus', { + url: '/certificatestatus', + templateUrl: "assets/views/status-update/certificate_status.html", + title: 'Certificate Status', + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificateStatusCtrl'), ncyBreadcrumb: { - label: 'Documents Status' + label: 'Certificate Status' }, // resolve: loadSequence('wizardCtrl') }).state('app.status.application', { diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/certificateStatusCtrl.js old mode 100755 new mode 100644 similarity index 99% rename from Apollo/assets/js/controllers/applicationStatusCtrl.js rename to Apollo/assets/js/controllers/certificateStatusCtrl.js index 9ed53ff7..54d7a0b0 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificateStatusCtrl.js @@ -1,6 +1,6 @@ 'use strict'; /*** controller for Wizard Form example***/ -app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie ,dateListDescService) { +app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie ,dateListDescService) { /** * Application status update search / Document status update diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/markcardStatusCtrl.js old mode 100755 new mode 100644 similarity index 98% rename from Apollo/assets/js/controllers/certificationStatusCtrl.js rename to Apollo/assets/js/controllers/markcardStatusCtrl.js index e67f0b91..4a263ded --- a/Apollo/assets/js/controllers/certificationStatusCtrl.js +++ b/Apollo/assets/js/controllers/markcardStatusCtrl.js @@ -1,6 +1,6 @@ 'use strict'; /*** controller for Wizard Form example***/ -app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) { +app.controller('markcardStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) { /** * Certification status update search / Mark card status update diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 04e3c930..8ddcfff2 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -199,13 +199,13 @@
  • - + Certification
  • - - Application + + Certificate
    • @@ -643,13 +643,13 @@
  • - - Certification + + Markcard
  • - - Application + + Certificate
    • @@ -1010,12 +1010,12 @@
  • - - Certification + + Markcard
  • - + Application
    • @@ -1266,12 +1266,12 @@
  • - - Certification + + Markcard
  • - + Application
    • diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/certificate_status.html old mode 100755 new mode 100644 similarity index 98% rename from Apollo/assets/views/status-update/application_status.html rename to Apollo/assets/views/status-update/certificate_status.html index 6010dc41..e6d00097 --- a/Apollo/assets/views/status-update/application_status.html +++ b/Apollo/assets/views/status-update/certificate_status.html @@ -2,7 +2,7 @@
    -

    {{ mainTitle }}

    +

    {{ mainTitle }}

    Update certificate status.
    @@ -14,7 +14,7 @@
    -
    +
    @@ -241,25 +241,25 @@
    - Document Type is Required + Certificate Type is Required
    - Document Number is Required + Certificate Number is Required
    @@ -352,25 +352,25 @@
    - Document Type is Required + Certificate Type is Required
    - Document Number is Required + Certificate Number is Required
    diff --git a/Apollo/assets/views/status-update/certification_status.html b/Apollo/assets/views/status-update/markcard_status.html old mode 100755 new mode 100644 similarity index 99% rename from Apollo/assets/views/status-update/certification_status.html rename to Apollo/assets/views/status-update/markcard_status.html index ae8fef58..17634fbd --- a/Apollo/assets/views/status-update/certification_status.html +++ b/Apollo/assets/views/status-update/markcard_status.html @@ -2,8 +2,8 @@
    -

    {{ mainTitle }}

    - Update certification status. +

    {{ mainTitle }}

    + Update markcard status.
    @@ -14,7 +14,7 @@
    -
    +
    From 0bb74f4d141185279f5d7a4f54e498bde4933ef7 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 17 Aug 2018 18:11:37 +0530 Subject: [PATCH 3/6] report issues fixes --- Apollo/api/application/controllers/Report.php | 29 +++++- .../api/application/models/Reports_model.php | 95 +++++++++++++++---- Apollo/assets/i18n/en.json | 3 +- .../js/controllers/report_ans_bookletCtrl.js | 8 +- .../js/controllers/report_app_pendingCtrl.js | 6 +- .../js/controllers/report_balfeeCtrl.js | 6 +- .../js/controllers/report_certificateCtrl.js | 10 +- .../js/controllers/report_doc_pendingCtrl.js | 6 +- .../js/controllers/report_examfeeCtrl.js | 6 +- .../report_markcard_certificateCtrl.js | 10 +- .../controllers/report_markcard_statusCtrl.js | 8 +- .../report_study_material_statusCtrl.js | 51 ++++++---- .../controllers/report_waiver_referalCtrl.js | 6 +- .../assets/views/hallticket/semcoursemap.html | 64 ++++++------- .../assets/views/report_answer_booklets.html | 14 +-- .../views/report_application_pending.html | 14 +-- Apollo/assets/views/report_balance_fee.html | 42 ++++---- .../views/report_certificate_status.html | 59 +++++++++--- .../assets/views/report_document_pending.html | 24 ++--- .../assets/views/report_exam_writing_fee.html | 38 ++++---- .../views/report_mark_certificate_status.html | 33 +++---- .../assets/views/report_markcardstatus.html | 10 +- .../views/report_studymaterialstatus.html | 12 +-- .../assets/views/report_waiver_referal.html | 12 +-- 24 files changed, 347 insertions(+), 219 deletions(-) diff --git a/Apollo/api/application/controllers/Report.php b/Apollo/api/application/controllers/Report.php index 8a5eb136..d089469b 100755 --- a/Apollo/api/application/controllers/Report.php +++ b/Apollo/api/application/controllers/Report.php @@ -91,7 +91,9 @@ class Report extends REST_Controller { $bat = $this->post('batch'); $br = $this->post('branch'); $u = $this->post('university'); - $getStatus = $this->report_model->certificate_status($bat,$br,$u); + $from = $this->post('from'); + $to = $this->post('to'); + $getStatus = $this->report_model->certificate_status($bat,$br,$u,$from,$to); //print_r($getStatus); if ($getStatus) { @@ -339,7 +341,30 @@ class Report extends REST_Controller { public function filters_post() { $br = $this->post('branch'); - $getStatus = $this->report_model->filters($br); + $getStatus = $this->report_model->getUniversity($br); + //print_r($getStatus); + if ($getStatus) + { + $getStatus['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'No records found!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + + + } + public function BatchName_post() + { + $br = $this->post('branch'); + $batch = $this->post('batch'); + $getStatus = $this->report_model->BatchName($br,$batch); //print_r($getStatus); if ($getStatus) { diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 79de6b99..f116fba3 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -34,7 +34,7 @@ order by CourseID) as cm on cm.cid=cfd.ccid left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,AlternateNumber,PresentAddress as address FROM T_StudentDetails where IsActive = 1) as std on std.sid=sms.sid -left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid +left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid where sms.branch = '".$br."' "; @@ -64,17 +64,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function filters($br){ - $sql = "SELECT distinct BatchCode as batchcode,BatchName as batch,BatchDate FROM T_BatchMaster -where BranchCode = '".$br."'"; - $b=$this->db->query($sql); - $batch = $b->result(); - if (count($batch) > 0) { - $results['batchlist'] = true; - $results['batch'] = $batch; - } else { - $results['batchlist'] = false; - $results['message'] = 'No record found'; - } + $sql = "SELECT distinct UniversityID as uid,UniversityName as university FROM T_UniversityMaster where BranchCode = '".$br."'"; @@ -89,13 +79,30 @@ where BranchCode = '".$br."'"; } return $results; + } + public function BatchName($br,$batch){ + $sql = "SELECT distinct BatchCode as batchcode,BatchName as batch,BatchDate FROM T_BatchMaster +where BranchCode = '".$br."' and BatchName = '".$batch."'"; + $b=$this->db->query($sql); + $batch = $b->result(); + if (count($batch) > 0) { + $results['batchlists'] = true; + $results['batchName'] = $batch; + } else { + $results['batchlists'] = false; + $results['message'] = 'No record found'; + } + + + } public function markcard($bat=null,$br=null,$u=null){ $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfs.rollno,'-') as Roll_NO,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.cdate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Initial_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_Fee,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,appdate,ansdate from - (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,CertificationType as ctype,CDate as cdate,Sem as sem FROM T_CertificationStatus -WHERE ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem) + (SELECT c.ID,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName,c.CertificationType as ctype,c.CDate as cdate,c.Sem as sem FROM T_CertificationStatus c + left join T_PickListDetails p on p.ListCode=c.ListCode +WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem) group by sid,sem,cid,lcode,branch) as sms left join (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,RollNO as rollno,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others FROM T_Students_Fees_Status @@ -161,7 +168,7 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=cfd.syear return $results; } - public function certificate_status($bat=null,$br=null,$u=null){ + public function certificate_status($bat=null,$br=null,$u=null,$from=null,$to=null){ $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber from @@ -218,6 +225,14 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen $sql.=" and cm.uid = '".$u."'"; } + if ($from != '' and $to != ''){ + $fromd= date("Y-m-d",strtotime($from)); + $tod=date("Y-m-d",strtotime($to)); + + $sql.="and STR_TO_DATE(ams.adate,'%d-%m-%Y') >= '".$fromd."' + and STR_TO_DATE(ams.adate,'%d-%m-%Y') <= '".$tod."'"; + + } $sql.=" group by Student_id,Course_id,Batch_code,Branch_code"; $leadDet=$this->db->query($sql); @@ -319,7 +334,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen $sql = "SELECT ifnull(dbm.Date,'-') as date,ifnull(exp.TypeName,'-') as Expense_name,ifnull(sum(dbm.Amount),0) as Amount FROM (SELECT @s:= 0) AS s,T_Income_Outcome_Master exp join T_DayBookMaster dbm on dbm.Type=exp.ID - where dbm.Name = 'I001' and dbm.Status = 'Approved' and exp.BranchCode = '".$br."' + where dbm.Name = 'I001' and exp.TypeName not like 'FEES' and dbm.Status = 'Approved' and exp.BranchCode = '".$br."' "; if ($from and $to != ''){ @@ -348,7 +363,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function answer_booklet($bat=null,$br=null,$u=null){ - $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate,listdate.rcvedate + $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate as issuedate,listdate.rcvedate as rcvedate,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as balance from (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as @@ -422,7 +437,7 @@ group by sid public function app_pending($bat=null,$br=null,$u=null){ $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,ifnull(sfp.bdate,'-') as Admission_date, - ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber + ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,sms.adate as appdate from (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,list.ListName as status,app.ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType @@ -784,5 +799,49 @@ from T_Lead_Tracking_Followup as ltf return $results; } + public function getUniversity($br=null) + { + $this->db->select('UniversityID,UniversityName'); + $this->db->where('IsActive','1'); + $this->db->where('BranchCode',$br); + $this->db->order_by('CreatedOn','DESC'); + $university = $this->db->get(UNIVERSITY); + + if($university->result()){ + $result = array(); + $result['univlist'] = true; + foreach ($university->result() as $row) + { + + $university_array['universityID'] = $row->UniversityID; + $university_array['universityName'] = $row->UniversityName; + $university_array['batchDetails']= $this->getBatch($row->UniversityID,$br); + $result_array[]=$university_array; + } + $result['university']= $result_array; + } + else { + $result['univlist'] = false; + $result['message'] = "No records found!"; + $result['universityID'] = ""; + $result['universityName'] = ""; + $result['batchDetails']= ""; + } + + + return $result; + + } + + public function getBatch($universityID=null,$br=null) + { + $this->db->select('BatchCode,BatchName'); + $this->db->where('UniversityID',$universityID); + $this->db->where('IsActive','1'); + $this->db->where('BranchCode',$br); + $this->db->order_by('BatchCode','ASC'); + $batchDetails = $this->db->get(BATCH); + return $batchDetails->result(); + } } \ No newline at end of file diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index d4c1260e..2c8f0340 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -81,14 +81,13 @@ "report": { "TITLE": "REPORTS", "studmatstatus": "STUDY MATERIAL STATUS ", - "unidataupload":"UNIVERSITY DATA UPLOAD", "mstatus": "MARK CARD STATUS ", "certificate_status": "CERTIFICATE STATUS ", "certificate_mark_status": "MARKCARD/CERTIFICATE ISSUED STATUS ", "expense": "EXPENSE REPORT ", "answer_booklets": "ANSWER BOOKLETS STATUS REPORT ", "app_pending": "APPLICATION PENDING STUDENT LIST REPORT", - "doc_pending": "DOCUMENT PENDING STUDENT LIST REPORT", + "doc_pending": "STUDENT DOCUMENTS PENDING REPORT", "wav_ref": "WAIVER AND REFERAL REPORT", "examfee": "EXAM WRITING FEE REPORT", "balfee": "FEE BALANCE REPORT", diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index c35c524d..90bc2c36 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -39,7 +39,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod // DataTables configurable options - $scope.filters = { + $scope.univModel = { "branch": "", "university": "", "batch": "", @@ -95,8 +95,8 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.filters.university, - batch: $scope.filters.batch + university: $scope.univModel.university.universityID, + batch: $scope.univModel.batch } @@ -133,7 +133,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Status as AnswerBookletStatus,Date as Date INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(balance AS NUMBER) as BalanceFee,issuedate as IssuedToStudentDate,rcvedate as ReceivedFromStudentDate,Status as AnswerBookletStatus,Date as Date INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]); }; /*modal controller diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index 6f5f5fa6..8cca0fef 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -39,7 +39,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod // DataTables configurable options - $scope.filters = { + $scope.univModel = { "branch": "", "university": "", "batch": "", @@ -95,8 +95,8 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.filters.university, - batch: $scope.filters.batch + university: $scope.univModel.university.universityID, + batch: $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index cb0d843e..aab98246 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -47,7 +47,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", // $scope.serial = newPageNumber * $scope.itemPerPage - ($scope.itemPerPage-1); // } //to filter labels - $scope.filters = { + $scope.univModel = { "branch": "", "university": "", "batch": "", @@ -103,8 +103,8 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.filters.university, - batch: $scope.filters.batch + university: $scope.univModel.university.universityID, + batch: $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index 15daec08..81ffff7b 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -39,10 +39,12 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod // DataTables configurable options - $scope.filters = { + $scope.univModel = { "branch": "", "university": "", "batch": "", + "from_date": "", + "to_date": "", }; @@ -94,8 +96,10 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.filters.university, - batch: $scope.filters.batch + university: $scope.univModel.university.universityID, + batch: $scope.univModel.batch, + from : $scope.univModel.from_date, + to : $scope.univModel.to_date } }; diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index f032cefd..b646cb4f 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -39,7 +39,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod // DataTables configurable options - $scope.filters = { + $scope.univModel = { "branch": "", "university": "", "batch": "", @@ -95,8 +95,8 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.filters.university, - batch: $scope.filters.batch + university: $scope.univModel.university.universityID, + batch: $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index 18bce29f..35937f3b 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -39,7 +39,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", // DataTables configurable options - $scope.filters = { + $scope.univModel = { "branch": "", "university": "", "batch": "", @@ -95,8 +95,8 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.filters.university, - batch: $scope.filters.batch + university: $scope.univModel.university.universityID, + batch: $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index f0db496b..d4e31322 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -39,7 +39,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco // DataTables configurable options - $scope.filters = { + $scope.univModel = { "branch": "", "university": "", "batch": "", @@ -96,10 +96,10 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.filters.university, - batch: $scope.filters.batch, - from : $scope.filters.from_date, - to : $scope.filters.to_date + university: $scope.univModel.university.universityID, + batch: $scope.univModel.batch, + from : $scope.univModel.from_date, + to : $scope.univModel.to_date } }; diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index f6fe4989..d76fc58e 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -39,7 +39,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", // DataTables configurable options - $scope.filters = { + $scope.univModel = { "branch": "", "university": "", "batch": "", @@ -95,8 +95,8 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.filters.university, - batch: $scope.filters.batch + university: $scope.univModel.university.universityID, + batch: $scope.univModel.batch } }; @@ -124,7 +124,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", }, // style:'background:#00FF00', column: { - style:'font-size:10px' + style:'font-size:16px' }, }; diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index 3b71259a..f17415b7 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -1,7 +1,7 @@ 'use strict'; /*** controller***/ -app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootScope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService","$modal", - function ($scope, $filter,$rootScope,apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService,$modal,$log) { +app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootScope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService","$modal","$timeout", + function ($scope, $filter,$rootScope,apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService,$modal,$timeout,$log) { /** * auto call tracking @@ -39,7 +39,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc // DataTables configurable options - $scope.filters = { + $scope.univModel = { "branch": "", "university": "", "batch": "", @@ -61,27 +61,44 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc }; $http(filterlist).then(function (response) { if (response.data) { - $scope.batch=[]; - $scope.batchlist = response.data.batch; $scope.university = response.data.university; //Desc order Batchlist - angular.forEach($scope.batchlist,function (values,key) { - var parts = values.BatchDate.split("-"); - $scope.batch.push({ - "batchcode":values.batchcode, - "batch":values.batch + '('+ values.batchcode + ')', - "BatchDate":values.BatchDate, - "givenDateObject":new Date(parts[2], parts[1] - 1, parts[0]) - }) - }); + // call service for make a list in desc order based on date - $scope.batch=dateListDescService.getOrderByList($scope.batch); + // console.log(response.data.batch); // console.log($scope.batch); } else { } }); } + //dropdown values for batch + $scope.getBatch = function(Form,filters){ + $scope.batchValue= filters.university; + + var filterBatch = { + method: 'POST', + url: apiPoint.url + 'report_BatchName/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID, + batch : $scope.batchValue + } + + }; + //console.log($scope.batchValue); + $scope.batchName = ""; + $http(filterBatch).then(function (response) { + if (response.data) { + + $scope.batchName = response.data.batchName; + console.log($scope.batchName); + } else { + } + }); + } $scope.onSubmit = function() { //alert($scope.batch.name); @@ -95,8 +112,8 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc }, data: { branch : JSON.parse(localStorage.getItem('localObj')).localBranchID, - university : $scope.filters.university, - batch : $scope.filters.batch + university : $scope.univModel.university.universityID, + batch : $scope.univModel.batch } }; diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index 2c918064..a7daf5f4 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -6,7 +6,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S // DataTables configurable options - $scope.filters = { + $scope.univModel = { "branch": "", "university": "", "batch": "", @@ -63,8 +63,8 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.filters.university, - batch: $scope.filters.batch + university: $scope.univModel.university.universityID, + batch: $scope.univModel.batch } diff --git a/Apollo/assets/views/hallticket/semcoursemap.html b/Apollo/assets/views/hallticket/semcoursemap.html index 569963b2..aad606fb 100755 --- a/Apollo/assets/views/hallticket/semcoursemap.html +++ b/Apollo/assets/views/hallticket/semcoursemap.html @@ -114,11 +114,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -132,11 +132,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -156,11 +156,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -179,11 +179,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -203,11 +203,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -221,11 +221,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -245,11 +245,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -263,11 +263,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -367,11 +367,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -385,11 +385,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -410,11 +410,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -433,11 +433,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -458,11 +458,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -476,11 +476,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -501,11 +501,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} @@ -519,11 +519,11 @@ - {{$item.SubjectName}} + {{$item.SubjectCode}}-{{$item.SubjectName}} - {{x.SubjectName}} + {{x.SubjectCode}}-{{x.SubjectName}} diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index e450ccf7..a9e0e5a6 100755 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -35,25 +35,23 @@ td,th {
    -
    +
    - - - +
    - - - +
    @@ -98,6 +96,7 @@ td,th { Sem/Year Phone No University + Balance Fee Issued To Student Date Received From Student Date Answer Booklet Status @@ -117,6 +116,7 @@ td,th { {{p.Sem_year}}({{p.Sem}}) {{p.Phone_number}} {{p.University}} + {{p.balance}} {{p.issuedate}} {{p.rcvedate}} {{p.Status}} diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index ec146e3b..5f07d8da 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -37,25 +37,23 @@
    -
    +
    - - - +
    - - - +
    @@ -102,6 +100,7 @@ Phone No University Application Status + Date @@ -120,6 +119,7 @@ {{p.Phone_number}} {{p.University}} {{p.Status}} + {{p.appdate}} diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html index 8cf35652..b7bf6f22 100755 --- a/Apollo/assets/views/report_balance_fee.html +++ b/Apollo/assets/views/report_balance_fee.html @@ -29,26 +29,24 @@
    -
    - - - -
    -
    - - - -
    +
    + + + +
    +
    + + + +
    @@ -75,8 +73,10 @@
    Paid:Rs.{{getpaid()}}
    +
    - Balance:{{getbalance()/gettotal()*100 | number : 2 || "0"}}% + Balance:Rs.{{getbalance()}} + ({{getbalance()/gettotal()*100 | number : 2 || "0"}}%)
    diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html index 46c15679..1129dc61 100755 --- a/Apollo/assets/views/report_certificate_status.html +++ b/Apollo/assets/views/report_certificate_status.html @@ -35,30 +35,65 @@ td,th {
    -
    +
    - - - +
    -
    +
    - - - +
    - +
    +
    +
    + +
    + + -
    -
    +
    +
    +
    + +
    + + + +
    +
    + + +
    +
    -
    +
    diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html index 2a7bbd37..98bfaebd 100755 --- a/Apollo/assets/views/report_document_pending.html +++ b/Apollo/assets/views/report_document_pending.html @@ -35,25 +35,25 @@ td,th {
    -
    +
    - - - + +
    - + +
    @@ -100,8 +100,8 @@ td,th { Phone No University Document Applied Date - + Pending Document + @@ -120,8 +120,8 @@ td,th { {{p.Phone_number}} {{p.University}} {{p.adate}} - + {{p.certname}} + diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html index d3d12c41..f06966a0 100755 --- a/Apollo/assets/views/report_exam_writing_fee.html +++ b/Apollo/assets/views/report_exam_writing_fee.html @@ -35,26 +35,24 @@
    -
    - - - -
    -
    - - - -
    +
    + + + +
    +
    + + + +
    diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index 90e76c4b..945b94a2 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -40,20 +40,18 @@ td,th { University - - - +
    - - - +
    @@ -142,12 +140,11 @@ td,th { Phone No University Balance Fee - Markcard Status - Date - Markcard Issued Comments Certificates Name - Certificates Status - Date + Received Status + Received Date + Issued Status + Issued Date Certificate Issued Comments @@ -165,13 +162,13 @@ td,th { {{p.Phone_number}} {{p.University}} {{p.Balance_fee}} - {{p.Markcard_status}} - {{p.Markcard_date}} - {{p.Markcard_comments}} - {{p.Certificate_name}} - {{p.Certificate_status}} - {{p.Certificate_date}} - {{p.Certificate_comments}} + {{p.Certificate_name}} + {{p.received_status}} + {{p.received_date}} + {{p.issued_status}} + {{p.issued_date}} + {{p.issued_comments}} + diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html index 5768c9a3..dbcb0ab4 100755 --- a/Apollo/assets/views/report_markcardstatus.html +++ b/Apollo/assets/views/report_markcardstatus.html @@ -31,20 +31,18 @@ University - - - +
    - - - +
    +
    +
    + + +
    +
    +
    + + + +
    +
    + Search +
    +
    + + + + Enter a valid mobile number + + +
    + +
    + + + + Invalid student name +
    +
    + + + +
    + + + +
    +
    + + +
    +
    + +
    +
    + +
    + +
    +

    {{load}}

    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TypeReceipt NoPaid To / Received FromDateSemVoucher Number / Bill NumberAmountAction
    {{p.ListName}}{{p.ReceiptNo}}{{p.PaidTo}}{{p.Date}}{{p.FeePaymentDetails}}{{p.VoucherNumber}}{{p.Amount}}
    +
    +
    + +
    + + diff --git a/Apollo/assets/views/edit_daybookentries.html b/Apollo/assets/views/edit_daybookentries.html new file mode 100644 index 00000000..f6a89d89 --- /dev/null +++ b/Apollo/assets/views/edit_daybookentries.html @@ -0,0 +1,122 @@ +
    +
    +
    +
    +
    + + Update Day Book Details + +
    + +
    + +
    + +
    +
    +
    + + +
    + + +
    + + + + + +
    + +
    + + + + + +
    + +
    + + + + + + + +
    + + +
    + + + +
    + + + + +
    + + + + +
    + + + +
    + +
    + + + +
    +
    + + +
    + +
    + +
    + +
    +
    +
    +
    + + + + +
    +
    +
    + +
    +
    +
    + \ No newline at end of file diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 3fbf0151..ec04b8a2 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -199,13 +199,13 @@
  • - + Certification
  • - - Certificate + + Application
    • @@ -307,6 +307,13 @@ +
  • + + DATA CORRECTION + +
    • + + @@ -411,11 +418,6 @@
    @@ -775,6 +777,14 @@ +
  • + + DATA CORRECTION + +
    • + + + @@ -880,11 +890,6 @@
    @@ -1276,12 +1292,12 @@
  • - - Markcard + + Certification
  • - + Application
    • From dbc0cf50d609cb4e85ebcff8320c9291701ba50e Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Sat, 18 Aug 2018 09:56:05 +0530 Subject: [PATCH 6/6] main nav details changes : kdk --- Apollo/assets/i18n/en.json | 4 +-- Apollo/assets/js/config.constant.js | 4 +-- Apollo/assets/js/config.router.js | 20 +++++------ .../js/controllers/certificateStatusCtrl.js | 35 +++++++++---------- .../js/controllers/markcardStatusCtrl.js | 35 ++++++++----------- Apollo/assets/views/partials/nav.html | 32 ++++++++--------- 6 files changed, 60 insertions(+), 70 deletions(-) diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 454c8886..a36e505b 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -104,8 +104,8 @@ "MAIN": "UPDATE STATUS ", "STUDYMATERIAL": "STUDY MATERIAL", "ANSWERBOOKLET": "ANSWER BOOKLET", - "CERTIFICATION": "MARK CARD", - "APPLICATION" : "DOCUMENTS" + "MARKCARD": "MARK CARD", + "CERTIFICATE" : "CERTIFICATE" } }, "status": { diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 3eabac83..5fbe55ab 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -156,11 +156,11 @@ app.constant('JS_REQUIRES', { /* * student Certification status updation * */ - 'certificationStatusCtrl': 'assets/js/controllers/certificationStatusCtrl.js', + 'markcardStatusCtrl': 'assets/js/controllers/markcardStatusCtrl.js', /* * student Certification status updation * */ - 'applicationStatusCtrl': 'assets/js/controllers/applicationStatusCtrl.js', + 'certificateStatusCtrl': 'assets/js/controllers/certificateStatusCtrl.js', /* * Certificate Type * */ diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index bf4bb81e..0760db6b 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -315,22 +315,22 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'Answer Booklet' }, // resolve: loadSequence('wizardCtrl') - }).state('app.student.status.certificationstatus', { - url: '/certificationstatus', - templateUrl: "assets/views/status-update/certification_status.html", + }).state('app.student.status.markcard', { + url: '/markcard', + templateUrl: "assets/views/status-update/markcard_status.html", title: 'Mark Card', - resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificationStatusCtrl'), + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'markcardStatusCtrl'), ncyBreadcrumb: { label: 'Mark Card' }, // resolve: loadSequence('wizardCtrl') - }).state('app.student.status.applicationstatus', { - url: '/applicationstatus', - templateUrl: "assets/views/status-update/application_status.html", - title: 'Documents Status', - resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'), + }).state('app.student.status.certificate', { + url: '/certificate', + templateUrl: "assets/views/status-update/certificate_status.html", + title: 'Certificate Status', + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificateStatusCtrl'), ncyBreadcrumb: { - label: 'Documents Status' + label: 'Certificate Status' }, // resolve: loadSequence('wizardCtrl') }).state('app.status.application', { diff --git a/Apollo/assets/js/controllers/certificateStatusCtrl.js b/Apollo/assets/js/controllers/certificateStatusCtrl.js index 54d7a0b0..4f632fed 100644 --- a/Apollo/assets/js/controllers/certificateStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificateStatusCtrl.js @@ -28,32 +28,29 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); - const localUpdateStatus = 'APPICATION_STATUS'; + const localUpdateStatus = 'CERTIFICATE_STATUS'; $scope.localTypeSuperAdmin = false; $scope.localBranchDetails = ''; $scope.init = function () { + // var logcheck = JSON.parse(localStorage.getItem('localObj')); - var logcheck = JSON.parse(localStorage.getItem('localObj')); - - const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { - console.log("if"); - }else { - if(logcheck != null && LOCALTYPE !='R001') { - console.log("else if"); - $state.go('app.dashboard'); - } else { - - console.log("else else"); - //ipCookie.remove('cookiechk'); - window.localStorage.clear(); - $state.go('login.signin'); - } - } - + // const LOCALTYPE = logcheck.localType; + // if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + // console.log("if"); + // }else { + // if(logcheck != null && LOCALTYPE !='R001') { + // console.log("else if"); + // $state.go('app.dashboard'); + // } else { + // console.log("else else"); + // //ipCookie.remove('cookiechk'); + // window.localStorage.clear(); + // $state.go('login.signin'); + // } + // } if (localDetail != null) { if (localDetails.localType === 'R004') { diff --git a/Apollo/assets/js/controllers/markcardStatusCtrl.js b/Apollo/assets/js/controllers/markcardStatusCtrl.js index 4a263ded..8fb63ce8 100644 --- a/Apollo/assets/js/controllers/markcardStatusCtrl.js +++ b/Apollo/assets/js/controllers/markcardStatusCtrl.js @@ -32,28 +32,21 @@ app.controller('markcardStatusCtrl', ["$scope", "toaster", "$filter", "ngTablePa $scope.init = function () { +// const LOCALTYPE = localDetail.localType; +// if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { +// console.log("if"); +// }else { +// if(localDetail != null && LOCALTYPE !='R001') { +// console.log("else if"); +// $state.go('app.dashboard'); +// } else { - - const LOCALTYPE = localDetail.localType; - if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { - console.log("if"); - }else { - if(localDetail != null && LOCALTYPE !='R001') { - console.log("else if"); - $state.go('app.dashboard'); - } else { - - console.log("else else"); - //ipCookie.remove('cookiechk'); - //window.localStorage.clear(); - $state.go('login.signin'); - } - } - - - - - +// console.log("else else"); +// //ipCookie.remove('cookiechk'); +// //window.localStorage.clear(); +// $state.go('login.signin'); +// } +// } if (localDetail != null) { if (localDetails.localType === 'R004') { diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index ec04b8a2..b5a0d5e4 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -199,13 +199,13 @@
  • - - Certification + + MarkCard
  • - - Application + + Certificate
    • @@ -650,13 +650,13 @@
  • - - Certification + + Markcard
  • - - Application + + Certificate
    • @@ -1025,13 +1025,13 @@
  • - - Certification + + Markcard
  • - - Application + + Certificate
    • @@ -1292,13 +1292,13 @@
  • - - Certification + + Markcard
  • - - Application + + Certificate