diff --git a/application/config/constants.php b/application/config/constants.php index 3406345..aa8b5f9 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -90,3 +90,5 @@ define('THE_DELETE_ALERT_MSG', "Are you sure, you want to delete this %s"); define('THE_ADD_ERROR_MSG', "Oops.. Something went wrong while adding the %s"); define('THE_UPDATE_ERROR_MSG', "Oops.. Something went wrong while updating the %s"); + +define('STUDENT_PROFILE_PATH',"https://ezydemo.com/erisn-classroom/assets_student/application/"); diff --git a/application/config/database.php b/application/config/database.php index 99a79cf..54dc8b7 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -98,8 +98,8 @@ $query_builder = TRUE; $db['default'] = array( 'dsn' => '', 'hostname' => 'localhost', - 'username' => 'erisn9_ec_lms', - 'password' => 'jk}=yafmw@OU', + 'username' => 'root', + 'password' => '', 'database' => 'erisn9_erisn_classroom_lms', 'dbdriver' => 'mysqli', 'dbprefix' => '', @@ -120,8 +120,8 @@ $db['default'] = array( $db['erisnClassroom'] = array( 'dsn' => '', 'hostname' => 'localhost:3306', - 'username' => 'erisn9_erisnclassroom', - 'password' => 'Ab=*Ur{]qOSb', + 'username' => 'root', + 'password' => '', 'database' => 'erisn9_erisnclassroom', 'dbdriver' => 'mysqli', 'dbprefix' => '', diff --git a/application/config/routes.php b/application/config/routes.php index 009d6c4..cf16880 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -73,7 +73,7 @@ $route['receive-book'] = 'LmsAdmin/receive_book'; $route['receive-book-detail/(:any)'] = 'LmsAdmin/receive_book_detail/$1'; $route['students'] = 'LmsAdmin/students'; -$route['students-info'] = 'LmsAdmin/students_info'; +$route['students-info/(:num)'] = 'LmsAdmin/students_info/$1'; $route['damaged-books'] = 'LmsAdmin/damaged_books'; $route['damaged-books-details/(:num)'] = 'LmsAdmin/damaged_books_details/$1'; diff --git a/application/controllers/LmsAdmin.php b/application/controllers/LmsAdmin.php index 8921c12..67a1033 100644 --- a/application/controllers/LmsAdmin.php +++ b/application/controllers/LmsAdmin.php @@ -894,9 +894,7 @@ class LmsAdmin extends CI_Controller { $id = $_POST['id']; $tableName = $_POST['tableName']; - if($tableName == 'lms_end_users'){ - $where = ' unq_id='."'$id'"; - }elseif($tableName == 'lms_books'){ + if($tableName == 'lms_books'){ $where = ' isbn='."'$id'"; } $data = $this->LmsAdmin_Model->getData($tableName, $where); @@ -916,6 +914,13 @@ class LmsAdmin extends CI_Controller } print_r(json_encode($data)); } + + public function getStudentDataById() + { + $stdIs = $_POST['id']; + $data = $this->LmsAdmin_Model->getStudentDataById($stdIs); + print_r(json_encode($data)); + } //end issued book //start returned book @@ -1014,7 +1019,8 @@ class LmsAdmin extends CI_Controller if(count($_POST) > 0) { $eu_id = $_POST['eu_unique_id']; - $euId = $this->db->get_where('lms_end_users', ['unq_id'=> $eu_id])->row_array(); + $euId = $this->LmsAdmin_Model->getStudentDataById($eu_id); + $where = " eu_unique_id="."'$eu_id'"; $existsUser = $this->LmsAdmin_Model->getData('lms_book_transactions', $where); if(!$existsUser) @@ -1048,9 +1054,9 @@ class LmsAdmin extends CI_Controller $data['title'] = 'Receive Book'; $where = " id="."'$euId'"; - $data['userData'] = $this->LmsAdmin_Model->getData('lms_end_users', $where); + $data['userData'] = $this->LmsAdmin_Model->getStudentInfo($where); if($data['userData']){ - $eu_unique_id = $data['userData']['unq_id']; + $eu_unique_id = $data['userData']['studentId']; $userWhere = " eu_unique_id="."'$eu_unique_id'"; $data['bookDetail'] = $this->LmsAdmin_Model->getData('lms_book_transactions', $userWhere); } @@ -1139,8 +1145,8 @@ class LmsAdmin extends CI_Controller $userData = ''; $data['studentData'] = $this->fecthUserData($userData); - $distinct = $this->db->distinct(); - $data['classData'] = $this->LmsAdmin_Model->get_user_data('lms_end_users', '', $distinct); + // $distinct = $this->db->distinct(); + // $data['classData'] = $this->LmsAdmin_Model->get_user_data('lms_end_users', '', $distinct); $this->load->view('lms-admin/common/left-menu', $data); $this->load->view('lms-admin/common/header', $data); @@ -1153,19 +1159,19 @@ class LmsAdmin extends CI_Controller public function fecthUserData($userData=array()) { - if(isset($userData['class']) && !empty($userData['class'])){ - $class = $userData['class']; - $where = " unq_id LIKE '%ECS%' AND class_name="."'$class'"; - }else{ - $where = " unq_id LIKE '%ECS%'"; - } - $userLists = $this->LmsAdmin_Model->get_user_data('lms_end_users', $where, ''); + // if(isset($userData['class']) && !empty($userData['class'])){ + // $class = $userData['class']; + // $where = " unq_id LIKE '%ECS%' AND class_name="."'$class'"; + // }else{ + // $where = " unq_id LIKE '%ECS%'"; + // } + $userLists = $this->LmsAdmin_Model->get_user_data('students'); $liData['studentData'] = $userLists; $returnPage = $this->load->view('lms-admin/students-reload', $liData, true); return $returnPage; } - public function students_info() + public function students_info($stdId = '') { if (!file_exists(APPPATH.'views/lms-admin/students-info.php')) show_404(); @@ -1173,6 +1179,8 @@ class LmsAdmin extends CI_Controller if($_SESSION['lmsAULoginData']['lms_lin_login'] == 1){ $data['title'] = 'Student Info'; + $where = " id=".$stdId; + $data['studentInfo'] = $this->LmsAdmin_Model->getStudentInfo($where); $this->load->view('lms-admin/common/left-menu', $data); $this->load->view('lms-admin/common/header', $data); $this->load->view('lms-admin/students-info', $data); diff --git a/application/models/LmsAdmin_Model.php b/application/models/LmsAdmin_Model.php index f665a0e..7d1e463 100644 --- a/application/models/LmsAdmin_Model.php +++ b/application/models/LmsAdmin_Model.php @@ -526,19 +526,28 @@ class LmsAdmin_Model extends CI_Model //end returned book //start student - public function get_user_data($table, $where, $distinct) + public function get_user_data($table) { - if($distinct!='') - { - $distinct; - $this->db->select('class_name'); - return $this->db->get($table)->result_array(); - }else{ - $this->db->order_by('id', 'DESC'); - $this->db->where($where); - return $this->db->get($table)->result_array(); - } - + $CI = &get_instance(); + $ecDB = $CI->load->database('erisnClassroom', TRUE); + $query = $ecDB->query("SELECT c.id,c.name, c.studentId,c.mobile,(select classroom_name from classroom a join student_batch b on a.id=b.classroom_id WHERE b.student_id=c.id) as class_name FROM students c ORDER BY c.id"); + return $query->result_array(); + } + + public function getStudentInfo($where) + { + $CI = &get_instance(); + $ecDB = $CI->load->database('erisnClassroom', TRUE); + $ecDB->where($where); + return $ecDB->get('students')->row_array(); + } + + public function getStudentDataById($stdIs) + { + $CI = &get_instance(); + $ecDB = $CI->load->database('erisnClassroom', TRUE); + $query = $ecDB->query("SELECT c.id,c.mobile,c.name,(select classroom_name from classroom a join student_batch b on a.id=b.classroom_id WHERE b.student_id=c.id) as class_name FROM students c WHERE c.studentId='$stdIs'"); + return $query->row_array(); } //end student /*############################################ ENDDD Of Coding By Keerthi ############################################*/ diff --git a/application/views/lms-admin/add-edit-issue-book.php b/application/views/lms-admin/add-edit-issue-book.php index 4798e8e..1f38d2f 100644 --- a/application/views/lms-admin/add-edit-issue-book.php +++ b/application/views/lms-admin/add-edit-issue-book.php @@ -155,17 +155,16 @@