20230207

1. Have to test and deploy in server.  2. add faculty detail into employee table and student detail  into employee table, 3. Change Teaching Assistant into multiple select 4. User Profile

admin/application/config/routes.php

@@ -55,6 +55,7 @@ $route['translate_uri_dashes'] = FALSE;
 $route['login'] = 'welcome/login';
 $route['dashboard'] = 'welcome/dashboard';
 $route['logout'] = 'welcome/logout';
+$route['change-password'] = 'welcome/changePassword';
 
 //Role//
 $route['roles'] = 'role/listrole';

admin/application/controllers/Degree.php

@@ -28,6 +28,8 @@ class Degree extends CI_Controller {
 	 */
 	public function degree_list()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		
 		$data['deg']=$this->Degree_model->deg_list();
 		$data['dep']=$this->Degree_model->get_dep();
 		$this->load->view('degree/degree_list',$data);
@@ -36,6 +38,8 @@ class Degree extends CI_Controller {
 	function add_degree()
 	{
 		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		$data['dep']=$this->Degree_model->get_dep();
 		$this->load->view('degree/add_degree',$data);
 		if($this->input->post('submit'))
@@ -49,7 +53,7 @@ class Degree extends CI_Controller {
 			$values=array('name'=>$name,
 			              'departmentId'=>$depId,
 						 'createdOn'=>date('Y-m-d'),
-						 'createdBy'=>1,
+						 'createdBy'=>$currentUser,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->insert_table($table,$values);
@@ -85,6 +89,8 @@ class Degree extends CI_Controller {
 	}
 	function editDegree($id)
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
 		
 		if($this->input->post('submit'))
 		{
@@ -96,7 +102,7 @@ class Degree extends CI_Controller {
 			$values=array('name'=>$degName,
 			             'departmentId'=>$depId,
 			             'upadatedOn'=>date('Y-m-d'),
-						 'updatedBy'=>1);
+						 'updatedBy'=>$currentUser);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			//echo $this->db->last_query();exit;
@@ -119,6 +125,9 @@ class Degree extends CI_Controller {
 	
 	function deleteDegree()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 			
@@ -126,7 +135,7 @@ class Degree extends CI_Controller {
 			//echo $degreeId;exit;
 			$table="degree";
 			$where=array("id"=>$degreeId);
-			$values=array('status'=>0);
+			$values=array('status'=>0,'updatedOn'=>date('Y-m-d'),'updatedBy'=>$currentUser);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			if($result)

admin/application/controllers/Department.php

@@ -38,6 +38,8 @@ class Department extends CI_Controller {
 	function add_department()
 	{
 		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		$this->load->view('department/add_department');
 		if($this->input->post('submit'))
 		{
@@ -69,7 +71,7 @@ class Department extends CI_Controller {
 			              'year'=>$year,
 			              'image'=>$user_img,
 						 'createdOn'=>date('Y-m-d'),
-						 'createdBy'=>1,
+						 'createdBy'=>$currentUser,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->insert_table($table,$values);
@@ -90,6 +92,9 @@ class Department extends CI_Controller {
 	
 	function editDepartment($id)
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 			$name=$this->input->post('name');
@@ -121,7 +126,7 @@ class Department extends CI_Controller {
 			             'year'=>$year,
 			             'image'=>$newImage,
 						 'updatedOn'=>date('Y-m-d'),
-						 'updatedBy'=>1,
+						 'updatedBy'=>$currentUser,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
@@ -147,13 +152,16 @@ class Department extends CI_Controller {
 	
 	function deleteDepartment()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 			$departmentId=$this->input->post('departmentId');
 			//echo $id ; exit;
 			$table="department";
 			$where=array("id"=>$departmentId);
-			$values=array('status'=>0);
+			$values=array('status'=>0,'updatedOn'=>date('Y-m-d'),'updatedBy'=>$currentUser);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			if($result)

admin/application/controllers/Employee.php

@@ -9,8 +9,6 @@ public function __construct()
 		$this->load->model('Commonsql_model'); 	
 	}
 	
-	
-	
 	public function employee_list()
 	{
 		if($this->session->userdata('id')==""){redirect('');}
@@ -30,6 +28,7 @@ public function __construct()
 	function add_employee()
 	{
 		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
 		
 		$data['role']=$this->Employee_model->list_role();
 		
@@ -41,7 +40,6 @@ public function __construct()
 			$roleId=$this->input->post('roleId');
 			$address=$this->input->post('address');
 			$email=$this->input->post('email');
-			$code=$this->input->post('code');
 			$user=$this->input->post('User');
 			$password=$this->input->post('Password');
 			
@@ -66,12 +64,11 @@ public function __construct()
 			             'roleId'=>$roleId,
 						 'address'=>$address,
 						 'email'=>$email,
-						 'pincode'=>$code,
 						 'image'=>$eImage,
 						 'username'=>$user,
 						 'password'=>md5($password),
 						 'createdOn'=>date('Y-m-d'),
-						 'createdBy'=>1,
+						 'createdBy'=>$currentUser,
 						 'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
 			//echo $this->db->last_query();exit;
@@ -93,6 +90,8 @@ public function __construct()
 	function editEmployee($empid)
 	{
 		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 			$employeename=$this->input->post('employeename');
@@ -100,7 +99,6 @@ public function __construct()
 			$mobileNumber=$this->input->post('mobileNumber');
 			$address=$this->input->post('address');
 			$email=$this->input->post('email');
-			$code=$this->input->post('code');
 			$image=$this->input->post('image');
 			$hiddenImage=$this->input->post('hiddenImage');
 			$username=$this->input->post('username');
@@ -136,12 +134,11 @@ public function __construct()
 			             'mobileNumber'=>$mobileNumber,
 						 'address'=>$address,
 						 'email'=>$email,
-						 'pincode'=>$code,
 						 'username'=>$username,
 						 'image'=>$newImage,
 						 'password'=>$newpassword,
 						 'updatedOn'=>date('Y-m-d'),
-						 'updatedBy'=>1,
+						 'updatedBy'=>$currentUser,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
@@ -167,6 +164,8 @@ public function __construct()
 	function deleteEmployee()
 	{
 		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 			//echo "test";exit;
@@ -174,7 +173,7 @@ public function __construct()
 			//echo $employeeId;exit;
 			$table="employee";
 			$where=array("id"=>$employeeId);
-			$values=array('status'=>0);
+			$values=array('status'=>0,'updatedOn'=>date('Y-m-d'),'updatedBy'=>$currentUser);
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			
 			if($result)

admin/application/controllers/Faculty.php

@@ -28,6 +28,8 @@ class Faculty extends CI_Controller {
 	 */
 	public function faculty_list()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		
 		$data['fac']=$this->Faculty_model->list_fa();
 		$this->load->view('faculty/faculty_list',$data);
 		 		 
@@ -43,6 +45,8 @@ class Faculty extends CI_Controller {
 
 	function add_faculty()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
 		
 		$this->load->view('faculty/add_faculty');
 		
@@ -89,9 +93,26 @@ class Faculty extends CI_Controller {
 						 'designation'=>$desi,
 						 'image'=>$f_img,
 						 'createdOn'=>date('Y-m-d'),
-						 'createdBy'=>1,
+						 'createdBy'=>$currentUser,
 						 'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
+			$facultyId=$this->db->insert_id();
+			
+			$table="employee";
+			$values=array('roleId'=>3,
+			              'typeId'=>$facultyId,
+			              'name'=>$name,
+			              'email'=>$email,
+						  'mobileNumber'=>$number,
+						  'address'=>$address,
+						  'image'=>$f_img,
+						  'username'=>$name,
+						  'password'=>md5($number),
+						  'createdOn'=>date('Y-m-d'),
+						  'createdBy'=>$currentUser,
+						  'status'=>1);
+						 
+			$result=$this->Commonsql_model->insert_table($table,$values);
 			if($result)
 						{
 							$this->session->set_userdata('suc','successfully added');
@@ -110,8 +131,11 @@ class Faculty extends CI_Controller {
 	
 	function editFaculty($id)
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
 		
 	    $data['fac']=$this->Faculty_model->get_fac($id);
+	    $data['employee']=$this->Faculty_model->get_employee($id);
         $this->load->view('faculty/edit_faculty',$data);
 		
 		if($this->input->post('submit'))
@@ -126,6 +150,7 @@ class Faculty extends CI_Controller {
 			$desi=$this->input->post('designation');
 			$image=$this->input->post('image');
 			$hiddenImage=$this->input->post('hiddenImage');
+			$employeeId=$this->input->post('employeeId');
 			
 			if($image==""){$newImage=$hiddenImage;}
 			
@@ -154,10 +179,23 @@ class Faculty extends CI_Controller {
 						 'designation'=>$desi,
 						 'image'=>$newImage,
 						 'updatedOn'=>date('Y-m-d'),
-						 'updatedBy'=>1);
+						 'updatedBy'=>$currentUser);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
-			//echo $this->last_query();exit;
+			
+			$table="employee";
+			$where=array("id"=>$employeeId);
+			$values=array('name'=>$name,
+			              'email'=>$email,
+						  'mobileNumber'=>$number,
+						  'address'=>$address,
+						  'image'=>$newImage,
+						  'username'=>$name,
+						  'password'=>md5($number),
+						  'createdOn'=>date('Y-m-d'),
+						  'updatedOn'=>date('Y-m-d'),
+						  'updatedBy'=>$currentUser);
+			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			if($result)
 			{
 				$this->session->set_userdata('suc','successfully Updated');
@@ -171,21 +209,20 @@ class Faculty extends CI_Controller {
 			}
 			
 		}
-		//echo "sdsd";exit;
-	
-		//echo $this->db->last_query();exit;
-		
 	}
 	
 	function deleteFaculty()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 			$facultyId=$this->input->post('facultyId');
 			
 			$table="faculty";
 			$where=array("id"=>$facultyId);
-			$values=array('status'=>0);
+			$values=array('status'=>0,'updatedOn'=>date('Y-m-d'),'updatedBy'=>$currentUser);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			if($result)

admin/application/controllers/Project.php

@@ -28,6 +28,8 @@ class Project extends CI_Controller {
 	 */
 	public function project_list()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		
 		$data['pro']=$this->Project_model->list_pro();
 		$this->load->view('project/project_list',$data);
 	}
@@ -41,6 +43,9 @@ class Project extends CI_Controller {
 	}
 	function add_project()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		$data['dep']=$this->Project_model->get_dep();
 		$data['stu']=$this->Project_model->get_stu();
 		$data['sub']=$this->Project_model->get_sub();
@@ -93,13 +98,14 @@ class Project extends CI_Controller {
 						 'drivelink'=>$drivelink,
 						 'vedio'=>$video,
 						 'createdOn'=>date('Y-m-d'),
-						 'createdBy'=>1,
+						 'createdBy'=>$currentUser,
 						 'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
 			
 			$projectId=$this->db->insert_id();
 			//Image table insert
 			$title		 	= $this->input->post('title');	
+			$muldescription	= $this->input->post('muldescription');	
 			
 			foreach($title as $key=>$value)
 			{
@@ -123,6 +129,7 @@ class Project extends CI_Controller {
 						$tablename='projectdetail';
 						$data=array('projectId'=>$projectId,
 									'title'=>$title[$key],
+									'description'=>$muldescription[$key],
 									'image'=>$pImage,
 									'status'=>1);
 							
@@ -150,6 +157,9 @@ class Project extends CI_Controller {
 	
 	function editProject($id)
 	{	
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		$data['dep']=$this->Project_model->get_dep();
 		$data['stu']=$this->Project_model->get_stu();
 		$data['sub']=$this->Project_model->get_sub();
@@ -201,16 +211,17 @@ class Project extends CI_Controller {
 						 'drivelink'=>$drivelink,
 						 'vedio'=>$video,
 						 'updatedOn'=>date('Y-m-d'),
-						 'updatedBy'=>1);
+						 'updatedBy'=>$currentUser);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			
 			//Image Multiple
 			$title = $this->input->post('title');	
+			$muldescription = $this->input->post('muldescription');	
 			$profileimage = $this->input->post('profileimage');	
 			$projectDetailId = $this->input->post('projectDetailName');	
 			$oldImage = $this->input->post('profileimageOld');	
-			//print_r ($projectDetailId);exit;
+			//print_r ($muldescription);exit;
 			
 			//Update old datas
 			foreach($title as $key=>$value)
@@ -239,6 +250,7 @@ class Project extends CI_Controller {
 				}
 				$tablename='projectdetail';
 				$data=array('title'=>$title[$key],
+							'description'=>$muldescription[$key],
 							'image'=>$newImage);
 				$where=array('id'=>$projectDetailId[$key]);
 				$result=$this->Commonsql_model->updateTable($tablename,$where,$data);
@@ -294,6 +306,7 @@ class Project extends CI_Controller {
 						$tablename='projectdetail';
 						$data=array('projectId'=>$id,
 							'title'=>$title[$key],
+							'description'=>$muldescription[$key],
 							'image'=>$image,
 							'status'=>1);
 							
@@ -322,13 +335,16 @@ class Project extends CI_Controller {
 	
 	function deleteProject()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 			$projectId=$this->input->post('projectId');
 			
 			$table="project";
 			$where=array("id"=>$projectId);
-			$values=array('status'=>0);
+			$values=array('status'=>0,'updatedOn'=>date('Y-m-d'),'updatedBy'=>$currentUser);
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			
 			$dTable="projectdetail";

admin/application/controllers/Role.php

@@ -19,6 +19,8 @@ public function __construct()
 	function addrole()
 	{
 		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 			$role=$this->input->post('rolename');
@@ -27,7 +29,7 @@ public function __construct()
 
 			$values=array('name'=>$role,
 						 'createdOn'=>date('Y-m-d'),
-						 'createdBy'=>1,
+						 'createdBy'=>$currentUser,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->insert_table($table,$values);
@@ -46,7 +48,9 @@ public function __construct()
 	}
 	function editrole()
 	{
-		//if($this->session->userdata('id')==""){redirect('');}
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 			$rolename=$this->input->post('rolename');
@@ -56,7 +60,7 @@ public function __construct()
 			$where=array("id"=>$primaryid);
 			$values=array('name'=>$rolename,
 						 'updatedOn'=>date('Y-m-d'),
-						 'updatedBy'=>1,
+						 'updatedBy'=>$currentUser,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
@@ -77,7 +81,9 @@ public function __construct()
 	}
 	function deleterole()
 	{
-		//if($this->session->userdata('id')==""){redirect('');}
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 
@@ -86,7 +92,7 @@ public function __construct()
 			$table="role";
 			$where=array("id"=>$primaryid);
 			$values=array(
-			'status'=>0);
+			'status'=>0,'updatedOn'=>date('Y-m-d'),'updatedBy'=>$currentUser);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			if($result)

admin/application/controllers/Semester.php

@@ -28,6 +28,8 @@ class Semester extends CI_Controller {
 	 */
 	public function semester_list()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		
 		$data['semester']=$this->Semester_model->list_semester();
 		$this->load->view('semester/semester_list',$data);
 	}
@@ -43,6 +45,9 @@ class Semester extends CI_Controller {
 	
 	function add_semester()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		$data['subject']=$this->Semester_model->listSubject();
 		$data['department']=$this->Semester_model->listDepartment();
 		$data['degree']=$this->Semester_model->listDegree();
@@ -61,7 +66,7 @@ class Semester extends CI_Controller {
 			$values=array(	'name'=>$name,
 							'year'=>$year,
 							'createdOn'=>date('Y-m-d'),
-							'createdBy'=>1,
+							'createdBy'=>$currentUser,
 							'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
 			$semesterId=$this->db->insert_id();
@@ -105,6 +110,9 @@ class Semester extends CI_Controller {
 	
 	function editSemester($id)
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		$data['subject']=$this->Semester_model->listSubject();
 		$data['degree']=$this->Semester_model->listDegree();
 		$data['getData']=$this->Semester_model->getSemester($id);
@@ -122,7 +130,7 @@ class Semester extends CI_Controller {
 			$values=array(	'name'=>$name,
 							'year'=>$year,
 							'updatedOn'=>date('Y-m-d'),
-							'updatedby'=>1);
+							'updatedby'=>$currentUser);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			//echo $this->db->last_query();exit;
@@ -210,13 +218,16 @@ class Semester extends CI_Controller {
 	
 	function deleteSemester()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 			$semesterId=$this->input->post('semesterId');
 			
 			$table="semester";
 			$where=array("id"=>$semesterId);
-			$values=array('status'=>0);
+			$values=array('status'=>0,'updatedOn'=>date('Y-m-d'),'updatedBy'=>$currentUser);
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			
 			$table="semesterdetail";

admin/application/controllers/Student.php

@@ -28,6 +28,7 @@ class Student extends CI_Controller {
 	 */
 	public function Student_list()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
 		$data['stu']=$this->Student_model->list_stu();
 		 $this->load->view('student/student_list',$data);
 	}
@@ -37,11 +38,13 @@ class Student extends CI_Controller {
 		if($this->session->userdata('id')==""){redirect('');}
 		
 		$data['viewStudent']=$this->Student_model->viewStudent($id);
-		//echo $this->db->last_query();exit;
 		$this->load->view('student/view_student',$data);
 	}
 	function add_student()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		$data['dep']=$this->Student_model->get_dep();
 		$this->load->view('student/add_student',$data);
 		
@@ -86,7 +89,7 @@ class Student extends CI_Controller {
 						 'image'=>$s_img,
 						 'dob'=>$date,
 						 'createdOn'=>date('Y-m-d'),
-						 'createdBy'=>1,
+						 'createdBy'=>$currentUser,
 						 'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
 			if($result)
@@ -107,6 +110,9 @@ class Student extends CI_Controller {
 	
 	function editStudent($id)
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		$data['dep']=$this->Student_model->get_dep();
 	    $data['stu']=$this->Student_model->get_stu($id);
         
@@ -146,8 +152,8 @@ class Student extends CI_Controller {
 						 'dob'=>$date,
 						 'gender'=>$gender,
 						 'image'=>$s_img,
-						 //'update_on'=>date('Y-m-d'),
+						 'update_on'=>date('Y-m-d'),
-						// 'update_by'=>1,
+						 'update_by'=>$currentUser,
 						 'status'=>1);
 						
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
@@ -170,13 +176,16 @@ class Student extends CI_Controller {
 	
 	function deleteStudent()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 			$studentId=$this->input->post('studentId');
 			
 			$table="student";
 			$where=array("id"=>$studentId);
-			$values=array('status'=>0);
+			$values=array('status'=>0,'updatedOn'=>date('Y-m-d'),'updatedBy'=>$currentUser);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			if($result)

admin/application/controllers/Subject.php

@@ -26,8 +26,11 @@ class Subject extends CI_Controller {
 	 * map to /index.php/welcome/<method_name>
 	 * @see https://codeigniter.com/user_guide/general/urls.html
 	 */
+	 
+	
 	public function subject_list()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
 		$data['subject']=$this->Subject_model->list_subject();
 		$this->load->view('subject/subject_list',$data);
 	}
@@ -43,20 +46,25 @@ class Subject extends CI_Controller {
 	
 	function add_subject()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		$data['degree']=$this->Subject_model->degreeList();
 		$data['faculty']=$this->Subject_model->facultyList();
-		
+		//$data['semester']=$this->Subject_model->semesterList();
 		
 		if($this->input->post('submit'))
 		{
 			$code=$this->input->post('subjectCode');
+			$subtitle=$this->input->post('subtitle');
 			$subject=$this->input->post('subject');
 		    $degree=$this->input->post('degree');
-			//$target['tar'] = $this->input->post('tar');
 			$faculty=$this->input->post('faculty');
+			$teachingAssistant=$this->input->post('assistant');
 		    $description=$this->input->post('description');
 			
 			$faculties = implode(",", (array)$faculty);
+			$assistant = implode(",", (array)$teachingAssistant);
 			//echo $faculties;exit;
 			if (!is_dir('uploads/subject')) {
 				mkdir('./uploads/subject', 0777, TRUE);
@@ -78,12 +86,15 @@ class Subject extends CI_Controller {
 			$table="subject";
 			$values=array('code'=>$code,
 			             'name'=>$subject,
+			             'subtitle'=>$subtitle,
 						 'degreeId'=>$degree,
+						 //'semesterId'=>$semesterId,
 						 'facultyId'=>$faculties,
+						 'teachingAssistant'=>$assistant,
 						 'image'=>$user_img,
 						 'description'=>$description,
 						 'createdOn'=>date('Y-m-d'),
-						 'createdBy'=>1,
+						 'createdBy'=>$currentUser,
 						 'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
 			
@@ -144,27 +155,34 @@ class Subject extends CI_Controller {
 	
 	function editSubject($id)
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		$data['sub']=$this->Subject_model->get_sub($id);
 		$data['degree']=$this->Subject_model->degreeList();
 		$data['faculty']=$this->Subject_model->facultyList();
 		
 		$data['getMultipleImage']=$this->Subject_model->getMultipleImage($id);
-		///echo $this->db->last_query();exit;
+		//echo $this->db->last_query();exit;
 
 		if($this->input->post('submit'))
 		{
 	         
 			$code=$this->input->post('code');
 			$sub=$this->input->post('subject');
+			$subtitle=$this->input->post('subtitle');
 		    $degreeId=$this->input->post('degree');
-			$semester=$this->input->post('semester');
+			//$semester=$this->input->post('semester');
 			$faculty=$this->input->post('faculty');
+			$teachingAssistant=$this->input->post('assistant');
+			
 			$description=$this->input->post('description');
 			$image=$this->input->post('image');
 			$hiddenImage=$this->input->post('hiddenImage');
 			
 			//print_r ($faculty);
 			$faculties = implode(",", (array)$faculty);
+			$assistant = implode(",", (array)$teachingAssistant);
 			//echo $faculties;exit;
 
 			if($image==""){$newImage=$hiddenImage;}
@@ -186,12 +204,14 @@ class Subject extends CI_Controller {
 			$where=array("id"=>$id);
 			$values=array('code'=>$code,
 			             'name'=>$sub,
+						 'subtitle'=>$subtitle,
 			             'degreeId'=>$degreeId,
 			             'facultyId'=>$faculties,
+			             'teachingAssistant'=>$assistant,
 			             'description'=>$description,
 			             'image'=>$newImage,
 						 'updatedOn'=>date('Y-m-d'),
-						 'updatedBy'=>1);
+						 'updatedBy'=>$currentUser);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			//echo $this->db->last_query();exit;
@@ -315,13 +335,16 @@ class Subject extends CI_Controller {
 	
 	function deleteSubject()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
 		if($this->input->post('submit'))
 		{
 			$subjectId=$this->input->post('subjectId');
 			
 			$table="subject";
 			$where=array("id"=>$subjectId);
-			$values=array('status'=>0);
+			$values=array('status'=>0,'updatedOn'=>date('Y-m-d'),'updatedBy'=>$currentUser);
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 
 			$dTable="subjectdetail";

admin/application/controllers/Welcome.php

@@ -7,6 +7,7 @@ class Welcome extends CI_Controller {
 	{
 		parent::__construct();
 		$this->load->model('Common_model');
+		$this->load->model('Commonsql_model');
 		$this->load->model('Project_model');
 	}
 
@@ -38,6 +39,7 @@ class Welcome extends CI_Controller {
 		{
 		$ch=$check->row();
 		$this->session->set_userdata('username',$ch->username);
+		$this->session->set_userdata('role',$ch->roleId);
 		$this->session->set_userdata('id',$ch->id);
 		$this->session->set_userdata('suc',' Successfully Logged in..!');
 		redirect('dashboard');
@@ -59,5 +61,56 @@ class Welcome extends CI_Controller {
         $this->session->sess_destroy();
 		redirect('');
 	}
+	public function getOldPassword()
+	{
+		$id=$_POST['employeeId'];
+		$oldpassword=$_POST['oldPassword'];
+		$currentPassword=md5($oldpassword);
+		
+		$password=$this->Project_model->getOldPassword($id);
+		if(isset($password) && $password->num_rows()>0)
+		{
+			 $li=$password->row();
+			 $dbpassword=$li->password;
+		}
+		if($currentPassword==$dbpassword)
+		{
+			echo "true";
+		}else
+		{
+			echo "false";
+		}
 		
 	}
+	public function changePassword()
+	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$currentUser=$this->session->userdata('id');
+		
+		if($this->input->post('submit'))
+		{
+			
+			$newpassword=$this->input->post('newpassword');
+			$employeeId=$this->input->post('employeeId');
+			
+			$table="employee";
+			$where=array("id"=>$employeeId);
+			$values=array('password'=>md5($newpassword),
+			              'updatedBy'=>$currentUser);
+						 
+			$result=$this->Commonsql_model->updateTable($table,$where,$values);
+			if($result)
+			{
+				$this->session->set_userdata('suc','successfully Updated');
+				redirect('change-password');
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('change-password');
+			}
+			
+		}
+		$this->load->view('changepassword');
+	}
+}

admin/application/models/Faculty_model.php

@@ -20,9 +20,10 @@ class Faculty_model extends CI_Model {
 	 
 	function get_fac($id)
 	{
-		$this->db->select('*');
+		$this->db->select('f.*,e.id as employeeId');
-		$this->db->from('faculty');
+		$this->db->from('faculty as f');
-		$this->db->where(array('status'=>1,'id'=>$id));
+		$this->db->join('employee as e','e.typeId=f.id','INNER');
+		$this->db->where(array('f.status'=>1,'f.id'=>$id,'e.roleId'=>3));
 		$query = $this->db->get();
 	//echo $this->db->last_query();exit;
 		return $query;

admin/application/models/Project_model.php

@@ -71,7 +71,7 @@ class Project_model extends CI_Model {
 	} 
 	 function get_semester()
 	{
-		$this->db->select('id,name');
+		$this->db->select('id,name,year');
 		$this->db->from('semester');
 		$this->db->where(array('status'=>1));
 		$query = $this->db->get();
@@ -148,11 +148,19 @@ class Project_model extends CI_Model {
 	}
 	function getMultipleImage($id)
 	{
-		$this->db->select('id,title,image,projectId');
+		$this->db->select('id,title,image,projectId,description as muldescription');
 		$this->db->from('projectdetail');
 		$this->db->where(array('status'=>1,'projectId'=>$id));
 		$query = $this->db->get();
 	//echo $this->db->last_query();
 		return $query;
 	} 
+	function getOldPassword($id)
+	{
+		$this->db->select('password');
+		$this->db->from('employee');
+		$this->db->where(array('status'=>1,'id'=>$id));
+		$result = $this->db->get();
+		return $result;
+	}
 }

admin/application/models/Semester_model.php

@@ -80,4 +80,15 @@ class Semester_model extends CI_Model {
 		$query = $this->db->get();
 		return $query;
 	} 
+	function getDegree($semesterId)
+	{
+		$this->db->select('deg.id as degId,deg.name as degName,sub.id as subjectId');
+		$this->db->from('semesterdetail as sd');
+		$this->db->join('degree as deg','deg.id=sd.degreeId','INNER');
+		$this->db->join('subject as sub ','sub.id=sd.subjectId','INNER');
+		$this->db->where(array('sd.status'=>1,'sd.semesterId'=>$semesterId));
+		$query = $this->db->get();
+		//echo $this->db->last_query();exit;
+		return $query;
+	}
 }

admin/application/models/Subject_model.php

@@ -16,6 +16,15 @@ class Subject_model extends CI_Model {
 	//echo $this->db->last_query();exit;
 		return $query;
 	}
+	function semesterList()
+	{
+		$this->db->select('id,name,year');
+		$this->db->from('semester');
+		$this->db->where(array('status'=>1));
+		$query = $this->db->get();
+	//echo $this->db->last_query();exit;
+		return $query;
+	} 
 	function facultyList()
 	{
 		$this->db->select('id,name');

admin/application/views/changepassword.php

@@ -0,0 +1,111 @@
+<link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<?php $this->load->view('includes/header');?>
+<?=
+$id=$this->session->userdata('id');
+?>
+<div class="page-container">
+	<!-- start sidebar menu -->
+	<?php $this->load->view('includes/sidebar');?>
+	<!-- start page content -->
+	<div class="page-content-wrapper">
+		<div class="page-content">
+			<div class="page-bar">
+				<div class="page-title-breadcrumb">
+					<div class=" pull-left">
+						<div class="page-title">My Profile</div>
+					</div>
+					<ol class="breadcrumb page-breadcrumb pull-right">
+						<li><i class="fa fa-home"></i>&nbsp;<a class="parent-item" href="<?=base_url();?>/dashboard">Home</a>&nbsp;<i class="fa fa-angle-right"></i>
+						</li>
+						<li class="active">My Profile</li>
+					</ol>
+				</div>
+			</div>
+			<!-- Midium Model -->
+			<?php $this->load->view('includes/msg');?>
+			<div class="row">
+				<div class="col-md-12 col-sm-12">
+					<div class="card card-box">
+						<div class="card-body" id="bar-parent">
+							<form action="<?=base_url();?>Welcome/changePassword" method="post">
+								<div class="form-body">
+									<div class="form-group row">
+										<label class="control-label col-md-3">Current Password
+											<span class="required"> * </span>
+										</label>
+										<div class="input-group col-md-5">
+											<input name="oldpassword" id="currentPassword" type="text" data-validation="required" placeholder="Enter your current password" class="form-control" /> 
+											<span class="input-group-btn" id="hideTick">
+												<button style="height: 39px;" type="button" class="btn btn-success btn-check"><i class="fa fa-check"></i></button>
+											</span>
+											<span class="input-group-btn wrongPassword" style="display:none" id="hideTick">
+												<button style="height: 39px;" type="button" class="btn btn-danger btn-check"><i class="fa fa-times"></i></button>
+											</span>
+											<input type="hidden" name="employeeId" value="<?=$id;?>" id="employeeId"/>
+										</div>
+										
+									</div>
+									<div class="form-group row">
+										<label class="control-label col-md-3">New Password
+											<span class="required"> * </span>
+										</label>
+										<div class="col-md-5">
+											<input name="newpassword" type="text" placeholder="Enter your New password" class="form-control" />
+										</div>
+									</div>
+								</div>
+								<div class="form-actions">
+									<div class="row">
+										<div class="offset-md-3 col-md-9">
+											<input type="submit" name="submit" class="btn btn-info m-r-20" value="Submit">
+											<button type="button" class="btn btn-default">Cancel</button>
+										</div>
+									</div>
+								</div>
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!-- Modal -->
+		</div>
+	</div>
+</div>
+<?php $this->load->view('includes/footer');?>
+<script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
+<script>
+$(document).ready(function() {
+    $("#hideTick").hide();
+});
+</script>
+<script>
+
+var base_path=$('body').attr('data-path');
+$("#currentPassword").keyup(function(){
+	var oldPassword=$("#currentPassword").val();
+	var employeeId=$('#employeeId').val();
+	//alert(oldPassword);
+	var url=base_path+"Welcome/getOldPassword";
+	//alert(url);
+	$.post(url,{oldPassword:oldPassword,employeeId:employeeId,csrf_test_name:$.cookie('csrf_cookie_name')},function(result)
+	{
+		if(result=="true")
+		{
+			$('input[type="submit"]').attr('disabled',false);
+			$("#hideTick").show();
+			$(".wrongPassword").css("display", "none");
+			
+		}
+		else
+		{
+			
+		$('input[type="submit"]').attr('disabled',true);
+		$("#hideTick").hide();
+		$(".wrongPassword").css("display", "block");
+			
+		}
+	});
+});
+</script>

admin/application/views/dashboard.php

@@ -107,7 +107,7 @@
 									<div class="row table-padding">
 										<div class="col-md-6 col-sm-6 col-xs-6">
 											<div class="btn-group">
-												<a href="book_appointment_material.html" id="addRow" class="btn btn-info">
+												<a href="<?=base_url();?>/add_project" id="addRow" class="btn btn-info">
 													Add New <i class="fa fa-plus"></i>
 												</a>
 											</div>

admin/application/views/employee/add.php

@@ -90,16 +90,6 @@
 										</div>
 									</div>
 									
-									<div class="form-group row">
-										<label class="control-label col-md-3">Pincode.
-											<span class="required"> * </span>
-										</label>
-										<div class="col-md-5">
-											<input name="code" type="text" data-validation="required" placeholder="Enter code" class="form-control input-height" /> 
-											</div>
-									</div>
-								
-									
 									<div class="form-group row">
 										<label class="control-label col-md-3">UserName.
 											<span class="required"> * </span>

admin/application/views/employee/edit.php

@@ -57,7 +57,6 @@ padding-top:8px;
 				$address=$e->address;
 				$email=$e->email;
 				$image	=$e->image;
-				$pincode=$e->pincode;
 				$username=$e->username;
 				$password=$e->password;
 				$roleId=$e->roleId;
@@ -145,14 +144,7 @@ padding-top:8px;
 										<img src="<?=base_url();?>/uploads/employee/<?=$image;?>" style="width:75px;height:75px;" /> 
 									</div>
 								</div>
-								<div class="form-group row">
+								
-									<label class="control-label col-md-3">Pincode.
-										<span class="required"> * </span>
-									</label>
-									<div class="col-md-5">
-										<input name="code" value="<?=$pincode;?>" data-validation="required" type="text" placeholder="Enter Code" class="form-control error" /> 
-										</div>
-								</div>
 								<div class="form-group row">
 									<label class="control-label col-md-3">UserName.
 										<span class="required"> * </span>

admin/application/views/employee/viewemployee.php

@@ -36,7 +36,6 @@
 								$address=$view->address;
 								$email=$view->email;
 								$image=$view->image;
-								$pincode=$view->pincode;
 								$username=$view->username;
 								
 							}
@@ -70,10 +69,7 @@
 										</div>
 										<hr>
 										<div class="row">
-											<div class="col-md-4 col-xs-6"> <strong>Pincode</strong>
+											
-												<br>
-												<p class="text-muted"><?=$pincode;?></p>
-											</div>
 											<div class="col-md-4 col-xs-6"> <strong>Username</strong>
 												<br>
 												<p class="text-muted"><?=$username;?></p>

admin/application/views/faculty/edit_faculty.php

@@ -58,6 +58,8 @@
 							$mobileNumber=$f->mobileNumber;
 							$designation=$f->designation;
 							$image=$f->image;
+							
+							$employeeId=$f->employeeId;	
 							if($gender==1){$genType="Male";}else{$genType="Female";}
 					} ?>
 					<div class="row">
@@ -84,6 +86,7 @@
 												<div class="col-md-5">											
 													<input type="text" value="<?=$name;?>" name="name" data-required="1" placeholder="Enter  name" class="form-control input-height">
 												</div>
+												<input type="hidden" name="employeeId" value="<?=$employeeId;?>"/>
 											</div>
 											 	<div class="form-group row">
 												<label class="control-label col-md-3">Email

admin/application/views/includes/footer.php

@@ -31,6 +31,7 @@
 	<script src="<?=base_url();?>/assets/chart-js/Chart.bundle.js"></script>
 	<script src="<?=base_url();?>/assets/chart-js/utils.js"></script>
 	<script src="<?=base_url();?>/assets/chart-js/home-data.js"></script>
+	<script src="<?=base_url();?>assets/jquery.cookie.min.js"></script>
 	<!-- end js include path -->
 </body>
 

admin/application/views/includes/header.php

@@ -33,7 +33,7 @@
 	<link rel="shortcut icon" href="assets/img/logo.png" />
 </head>
 <!-- END HEAD -->
-
+<?=$username=$this->session->userdata('username');?>
 <body data-path="<?=base_url();?>" class="page-header-fixed sidemenu-closed-hidelogo page-content-white page-md header-white white-sidebar-color logo-indigo">
 	<div class="page-wrapper">
 	<!-- start header -->
@@ -56,154 +56,6 @@
 		<!-- start header menu -->
 		<div class="top-menu">
 			<ul class="nav navbar-nav pull-right">
-						<!-- start language menu -->
-					
-						<!-- end language menu -->
-						<!-- start notification dropdown 
-						<li class="dropdown dropdown-extended dropdown-notification" id="header_notification_bar">
-							<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
-								<i class="fa fa-bell-o"></i>
-								<span class="badge headerBadgeColor1"> 6 </span>
-							</a>
-							<ul class="dropdown-menu">
-								<li class="external">
-									<h3><span class="bold">Notifications</span></h3>
-									<span class="notification-label purple-bgcolor">New 6</span>
-								</li>
-								<li>
-									<ul class="dropdown-menu-list small-slimscroll-style" data-handle-color="#637283">
-										<li>
-											<a href="javascript:;">
-												<span class="time">just now</span>
-												<span class="details">
-													<span class="notification-icon circle deepPink-bgcolor"><i class="fa fa-check"></i></span>
-													Congratulations!. </span>
-											</a>
-										</li>
-										<li>
-											<a href="javascript:;">
-												<span class="time">3 mins</span>
-												<span class="details">
-													<span class="notification-icon circle purple-bgcolor"><i class="fa fa-user o"></i></span>
-													<b>John Micle </b>is now following you. </span>
-											</a>
-										</li>
-										<li>
-											<a href="javascript:;">
-												<span class="time">7 mins</span>
-												<span class="details">
-													<span class="notification-icon circle blue-bgcolor"><i class="fa fa-comments-o"></i></span>
-													<b>Sneha Jogi </b>sent you a message. </span>
-											</a>
-										</li>
-										<li>
-											<a href="javascript:;">
-												<span class="time">12 mins</span>
-												<span class="details">
-													<span class="notification-icon circle pink"><i class="fa fa-heart"></i></span>
-													<b>Ravi Patel </b>like your photo. </span>
-											</a>
-										</li>
-										<li>
-											<a href="javascript:;">
-												<span class="time">15 mins</span>
-												<span class="details">
-													<span class="notification-icon circle yellow"><i class="fa fa-warning"></i></span> Warning! </span>
-											</a>
-										</li>
-										<li>
-											<a href="javascript:;">
-												<span class="time">10 hrs</span>
-												<span class="details">
-													<span class="notification-icon circle red"><i class="fa fa-times"></i></span> Application error. </span>
-											</a>
-										</li>
-									</ul>
-									<div class="dropdown-menu-footer">
-										<a href="javascript:void(0)"> All notifications </a>
-									</div>
-								</li>
-							</ul>
-						</li>
-						-->
-						<!-- end notification dropdown -->
-						<!-- start message dropdown 
-						<li class="dropdown dropdown-extended dropdown-inbox" id="header_inbox_bar">
-							<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
-								<i class="fa fa-envelope-o"></i>
-								<span class="badge headerBadgeColor2"> 2 </span>
-							</a>
-							<ul class="dropdown-menu">
-								<li class="external">
-									<h3><span class="bold">Messages</span></h3>
-									<span class="notification-label cyan-bgcolor">New 2</span>
-								</li>
-								<li>
-									<ul class="dropdown-menu-list small-slimscroll-style" data-handle-color="#637283">
-										<li>
-											<a href="#">
-												<span class="photo">
-													<img src="img/doc/doc2.jpg" class="img-circle" alt=""> </span>
-												<span class="subject">
-													<span class="from"> Sarah Smith </span>
-													<span class="time">Just Now </span>
-												</span>
-												<span class="message"> Jatin I found you on LinkedIn... </span>
-											</a>
-										</li>
-										<li>
-											<a href="#">
-												<span class="photo">
-													<img src="img/doc/doc3.jpg" class="img-circle" alt=""> </span>
-												<span class="subject">
-													<span class="from"> John Deo </span>
-													<span class="time">16 mins </span>
-												</span>
-												<span class="message"> Fwd: Important Notice Regarding Your Domain Name... </span>
-											</a>
-										</li>
-										<li>
-											<a href="#">
-												<span class="photo">
-													<img src="img/doc/doc1.jpg" class="img-circle" alt=""> </span>
-												<span class="subject">
-													<span class="from"> Rajesh </span>
-													<span class="time">2 hrs </span>
-												</span>
-												<span class="message"> pls take a print of attachments. </span>
-											</a>
-										</li>
-										<li>
-											<a href="#">
-												<span class="photo">
-													<img src="img/doc/doc8.jpg" class="img-circle" alt=""> </span>
-												<span class="subject">
-													<span class="from"> Lina Smith </span>
-													<span class="time">40 mins </span>
-												</span>
-												<span class="message"> Apply for Ortho Surgeon </span>
-											</a>
-										</li>
-										<li>
-											<a href="#">
-												<span class="photo">
-													<img src="img/doc/doc5.jpg" class="img-circle" alt=""> </span>
-												<span class="subject">
-													<span class="from"> Jacob Ryan </span>
-													<span class="time">46 mins </span>
-												</span>
-												<span class="message"> Request for leave application. </span>
-											</a>
-										</li>
-									</ul>
-									<div class="dropdown-menu-footer">
-										<a href="#"> All Messages </a>
-									</div>
-								</li>
-							</ul>
-						</li>
-						-->
-						<!-- end message dropdown -->
 				<!-- start manage user dropdown -->
 				<li class="dropdown dropdown-user">
 					<!--<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
@@ -213,13 +65,13 @@
 					</a>-->
 					<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
 						<img alt="" class="img-circle " src="assets/img/icon.jpg" />
-								<span class="username username-hide-on-mobile"> Student </span>
+						<span class="username username-hide-on-mobile"> <?=$username;?> </span>
 						<i class="fa fa-angle-down"></i>
 					</a>
 					<ul class="dropdown-menu dropdown-menu-default">
 						<li>
-									<a href="<?=base_url();?>profile">
+							<a href="<?=base_url();?>change-password">
-										<i class="icon-user"></i> Profile </a>
+								<i class="icon-user"></i> Change Password </a>
 						</li>
 						
 						<li>

admin/application/views/includes/sidebar.php

@@ -1,4 +1,6 @@
-
+<?php
+$roleId=$this->session->userdata('role');
+?>
 			<!-- start sidebar menu -->
 			<div class="sidebar-container">
 				<div class="sidemenu-container navbar-collapse collapse fixed-menu">
@@ -10,15 +12,7 @@
 									<span></span>
 								</div>
 							</li>
-							<!--<li class="sidebar-user-panel">
+							<?php if($roleId==1 || $roleId==2) { ?>
-								<div class="user-panel">
-									
-									<div class="pull-left info">
-										<p> Hi Welcome</p>
-										<a href="#"><i class="fa fa-circle user-online"></i><span class="txtOnline"> Online</span></a>
-									</div>
-								</div>
-							</li>-->
 								
 							<li class="nav-item start active open">
 								<a href="<?=base_url();?>dashboard" class="nav-link nav-toggle">
@@ -93,8 +87,53 @@
 								<i class="material-icons"> assignment</i>
 									<span class="title">Project</span></a>
 							</li>
+							<?php } 
+							if($roleId==3){?>
+							<li class="nav-item start active open">
+								<a href="<?=base_url();?>dashboard" class="nav-link nav-toggle">
+									<i class="material-icons">dashboard</i>
+									<span class="title">Dashboard</span>
+									<span class="selected"></span>
 									
 									
+								</a>
+								
+							</li>
+							<li class="nav-item">
+								<a href="<?=base_url();?>student" class="nav-link nav-toggle">
+								<i class="material-icons">group</i>
+									<span class="title">Student</span></a>
+							</li>
+							<li class="nav-item">
+								<a href="<?=base_url();?>project" class="nav-link nav-toggle">
+								<i class="material-icons"> assignment</i>
+									<span class="title">Project</span></a>
+							</li>
+							<?php 
+							}
+							?>
+							<?php
+							if($roleId==4)
+							{
+							?>
+							<li class="nav-item start active open">
+								<a href="<?=base_url();?>dashboard" class="nav-link nav-toggle">
+									<i class="material-icons">dashboard</i>
+									<span class="title">Dashboard</span>
+									<span class="selected"></span>
+									
+									
+								</a>
+								
+							</li>
+							<li class="nav-item">
+								<a href="<?=base_url();?>project" class="nav-link nav-toggle">
+								<i class="material-icons"> assignment</i>
+									<span class="title">Project</span></a>
+							</li>
+							<?php 
+							}
+							?>
 						</ul>
 					</div>
 				</div>

admin/application/views/profile - Copy.php

@@ -0,0 +1,81 @@
+<link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<?php $this->load->view('includes/header');?>
+<?=
+$id=$this->session->userdata('id');
+$role=$this->session->userdata('role');
+?>
+<div class="page-container">
+	<!-- start sidebar menu -->
+	<?php $this->load->view('includes/sidebar');?>
+	<!-- start page content -->
+	<div class="page-content-wrapper">
+		<div class="page-content">
+			<div class="page-bar">
+				<div class="page-title-breadcrumb">
+					<div class=" pull-left">
+						<div class="page-title">My Profile</div>
+					</div>
+					<ol class="breadcrumb page-breadcrumb pull-right">
+						<li><i class="fa fa-home"></i>&nbsp;<a class="parent-item" href="<?=base_url();?>/dashboard">Home</a>&nbsp;<i class="fa fa-angle-right"></i>
+						</li>
+						<li class="active">My Profile</li>
+					</ol>
+				</div>
+			</div>
+			<!-- Midium Model -->
+			<div class="row">
+				<div class="col-md-12 col-sm-12">
+					<div class="card card-box">
+						<div class="card-body" id="bar-parent">
+							<form action="<?=base_url();?>add_profile" method="post">
+								<div class="form-body">
+									<div class="form-group row">
+										<label class="control-label col-md-3">UserName
+											<span class="required"> * </span>
+										</label>
+										<div class="col-md-5">
+											<input name="user" type="text" placeholder="" class="form-control" /> 
+										</div>
+									</div>
+									<div class="form-group row">
+										<label class="control-label col-md-3">Password
+											<span class="required"> * </span>
+										</label>
+										<div class="col-md-5">
+											<input name="password" type="text" placeholder="" class="form-control" />
+										</div>
+									</div>
+									
+									<div class="form-group row">
+										<label class="control-label col-md-3">Profile Image
+										</label>
+										<div class="col-md-5">
+											<input name="profileImage" type="file" placeholder="" class="form-control" /> 
+										</div>
+									</div>
+									<div class="form-group row">
+										<div class="col-md-5">
+											<img src=""/> 
+										</div>
+									</div>
+								</div>
+								<div class="form-actions">
+									<div class="row">
+										<div class="offset-md-3 col-md-9">
+											<input type="submit" name="submit" class="btn btn-info m-r-20" value="Submit">
+											<button type="button" class="btn btn-default">Cancel</button>
+										</div>
+									</div>
+								</div>
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!-- Modal -->
+		</div>
+	</div>
+</div>
+<?php $this->load->view('includes/footer');?>

admin/application/views/profile.php

@@ -1,68 +0,0 @@
-<link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
-<?php $this->load->view('includes/header');?>
-       <div class="page-container">
-			<!-- start sidebar menu -->
-			<?php $this->load->view('includes/sidebar');?>
-			<!-- start page content -->
-			<div class="page-content-wrapper">
-				<div class="page-content">
-					<div class="page-bar">
-						<div class="page-title-breadcrumb">
-							<div class=" pull-left">
-								<div class="page-title">My Profile</div>
-							</div>
-							<ol class="breadcrumb page-breadcrumb pull-right">
-								<li><i class="fa fa-home"></i>&nbsp;<a class="parent-item" href="<?=base_url();?>/dashboard">Home</a>&nbsp;<i class="fa fa-angle-right"></i>
-								</li>
-								<li class="active">My Profile</li>
-							</ol>
-						</div>
-					</div>
-					<!-- Midium Model -->
-					<div class="row">
-						<div class="col-md-12 col-sm-12">
-							<div class="card card-box">
-								<div class="card-head">
-									<header>My Profile</header>	
-								</div>
-								<div class="card-body" id="bar-parent">
-									<form action="<?=base_url();?>add_profile" method="post">
-										<div class="form-body">
-											<div class="form-group row">
-												<label class="control-label col-md-3">UserName.
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-5">
-													<input name="user" type="text" placeholder="" class="form-control input-height" /> </div>
-											</div>
-											<div class="form-group row">
-												<label class="control-label col-md-3">Password.
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-5">
-													<input name="password" type="text" placeholder="" class="form-control input-height" /> </div>
-											</div>
-										</div>
-										<div class="form-actions">
-											<div class="row">
-												<div class="offset-md-3 col-md-9">
-													<input type="submit" name="submit" class="btn btn-info m-r-20" value="Submit">
-													<button type="button" class="btn btn-default">Cancel</button>
-												</div>
-											</div>
-										</div>
-									</form>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-			<!-- Modal -->
-				</div>
-			</div>
-		</div>
-
-					
-
-			<?php $this->load->view('includes/footer');?>

admin/application/views/project/add_project.php

@@ -87,7 +87,7 @@
 														   {
 															   foreach($semester->result() as $sem)
 															   {
-																   ?> <option value="<?=$sem->id;?>"><?=$sem->name;?></option><?php
+																   ?> <option value="<?=$sem->id;?>"><?=$sem->name.' - '.$sem->year;?></option><?php
 															   }
 														   }
 													?>     
@@ -148,31 +148,32 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<textarea name="description" placeholder=" Enter Designation" data-validation="required"  class="form-control" rows="5"></textarea>
+													<textarea name="description" placeholder=" Enter Description" data-validation="required"  class="form-control" rows="5"></textarea>
 												</div>
 										     
 											</div>
                                             <div class="form-group row">
 												<label class="control-label col-md-3">Video
-													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="vedio" type="text" placeholder="Enter Vedio Link" data-validation="required" class="form-control input-height" /> </div>
+													<input name="vedio" type="text" placeholder="Enter Video Link" class="form-control input-height" /> </div>
 											</div>	
                                             <div class="form-group row">
 												<label class="control-label col-md-3">Drive Link
-													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="drivelink" type="text" placeholder="Enter Drive Link" data-validation="required" class="form-control input-height" /> </div>
+													<input name="drivelink" type="text" placeholder="Enter Drive Link" class="form-control input-height" /> </div>
 											</div>	
                                            <div class="form-group row">
-												<label class="control-label col-md-3">Title & Image
+												<label class="control-label col-md-3">Title, Description & Image
 												</label>
 												
 												<div class="col-md-2 compose-editor">
 													<input name="title[0]" id="projectTitle_0" type="text" class="form-control default">
 												</div>
+												<div class="col-md-2 compose-editor">
+													<textarea name="muldescription[0]" id="projectDescription_0" type="text" class="form-control default"></textarea>
+												</div>
 												<div class="col-md-2 compose-editor">
 													<input name="profileimage[0]" id="projectImage_0" type="file" class="form-control default">
 												</div>
@@ -188,6 +189,9 @@
 												<div class="col-md-2 compose-editor">
 													<input name="titles[]" id="projectTitle" type="text" class="form-control default">
 												</div>
+												<div class="col-md-2 compose-editor">
+													<textarea name="muldescriptions[]" id="projectDescription" type="text" class="form-control default"></textarea>
+												</div>
 												<div class="col-md-2 compose-editor">
 													<input name="profileimages[]" id="projectImage" type="file" class="form-control default">
 												</div>
@@ -238,9 +242,11 @@ var $template = $('#imageTemplate'),
 	$clone
 	.find('[id="projectTitle"]').attr('id', 'projectTitle_'+invIndex).end()
 	.find('[id="projectImage"]').attr('id', 'projectImage_'+invIndex).end()
+	.find('[id="projectDescription"]').attr('id', 'projectDescription_'+invIndex).end()
 	
 	.find('[name="titles[]"]').attr('name', 'title['+invIndex+']').end()
 	.find('[name="profileimages[]"]').attr('name', 'profileimage['+invIndex+']').end()
+	.find('[name="muldescriptions[]"]').attr('name', 'muldescription['+invIndex+']').end()
 	
 })
 

admin/application/views/project/edit_project.php

@@ -165,19 +165,17 @@
 										<span class="required"> * </span>
 									</label>
 									<div class="col-md-5">
-									<textarea name="description" placeholder=" Enter Designation" data-validation="required"  class="form-control" rows="5"><?=$description;?></textarea>
+									<textarea name="description" placeholder=" Enter Description" data-validation="required"  class="form-control" rows="5"><?=$description;?></textarea>
 									</div>
 								</div>
 								<div class="form-group row">
 									<label class="control-label col-md-3">Video
-										<span class="required"> * </span>
 									</label>
 									<div class="col-md-5">
 										<input name="video"  value="<?=$video;?>" type="text" placeholder="Enter Video Link" class="form-control input-height" /> </div>
 								</div>
 								<div class="form-group row">
 									<label class="control-label col-md-3">Drive Link
-										<span class="required"> * </span>
 									</label>
 									<div class="col-md-5">
 										<input name="drivelink"  value="<?=$driveLink;?>" type="text" placeholder="Enter Drive Link" class="form-control" /> </div>
@@ -206,17 +204,21 @@
 									{
 										$id =$list->id ;
 										$title=$list->title;
+										$muldescription=$list->muldescription;
 										$image=$list->image;
 										$projectId=$list->projectId;
 								?>
 								
 								<div class="form-group row duplicate1">
 								<input type="hidden" value="<?=$id;?>" id="projectDetailId_<?=$i;?>" name="projectDetailName[<?=$i;?>]"/>
-								<label class="control-label col-md-3">Title & Image
+								<label class="control-label col-md-3">Title, Description & Image
 								</label>
 								<div class="col-md-2 compose-editor">
 									<input value="<?=$title;?>" data-validation="required" name="title[<?=$i;?>]" id="projectTitle_<?=$i;?>" type="text" class="form-control default">
 								</div>
+								<div class="col-md-2 compose-editor">
+									<textarea data-validation="required" name="muldescription[<?=$i;?>]" id="projectDescription_<?=$i;?>" type="text" class="form-control default"><?=$muldescription;?></textarea>
+								</div>
 								<div class="col-md-2 compose-editor">
 									<input name="profileimage[]" id="projectImage_<?=$i;?>" type="file" class="form-control default">
 									<img src="<?=base_url();?>uploads/project/<?=$image;?>" style="width:75px;height:75px;"/>
@@ -241,6 +243,9 @@
 									<div class="col-md-2 compose-editor">
 										<input name="titles[]" data-validation="required" id="projectTitle" type="text" class="form-control default">
 									</div>
+									<div class="col-md-2 compose-editor">
+										<textarea name="muldescriptions[]" data-validation="required" id="projectDescription" type="text" class="form-control default"></textarea>
+									</div>
 									<div class="col-md-2 compose-editor">
 										<input name="profileimages[]" data-validation="required" id="projectImage" type="file" class="form-control default">
 									</div>
@@ -288,10 +293,12 @@ $clone    = $template
 // Update the name attributes  
 $clone
 .find('[id="projectTitle"]').attr('id', 'projectTitle_'+invIndex).end()
+.find('[id="projectDescription"]').attr('id', 'projectDescription_'+invIndex).end()
 .find('[id="projectImage"]').attr('id', 'projectImage_'+invIndex).end()
 .find('[id="projectDetailId"]').attr('id', 'projectDetailId_'+invIndex).end()
 
 .find('[name="titles[]"]').attr('name', 'title['+invIndex+']').end()
+.find('[name="muldescriptions[]"]').attr('name', 'muldescription['+invIndex+']').end()
 .find('[name="profileimages[]"]').attr('name', 'profileimage['+invIndex+']').end()
 .find('[name="projectDetailNames[]"]').attr('name', 'projectDetailName['+invIndex+']').end()
 

admin/application/views/roles/role_list.php

@@ -60,14 +60,17 @@
 												  
 													<td><?=$i;?></td>
 													<td><?=$rolename;?></td>
+													
 													<td>
+													<?php if($id != 1 && $id != 2 && $id != 3 && $id != 4)
+													{ ?>
 														<a href="javascript:;"  data-id="<?=$id;?>" data-name="<?=$rolename;?>" class="editroleclass btn btn-primary btn-xs ">
 															<i class="fa fa-pencil"></i>
 														</a>
 														<a href="javascript:;"  data-id="<?=$id;?>"  class="deleteroleclass btn btn-danger btn-xs ">
 															<i class="fa fa-trash-o"></i>
 														</a>
-														
+													<?php } ?>
 													</td>
 												</tr>
 												<?php $i=$i+1;} }?>

admin/application/views/semester/view_semester.php

@@ -38,9 +38,8 @@ $CI->load->model('Semester_model');?>
 								$name=$view->name;
 								$year=$view->year;
 								$get_degree=$CI->Semester_model->getDegree($id);
-								
+								//echo $this->db->last_query();exit;
 							}
-										
 							?>
 							<!-- BEGIN PROFILE SIDEBAR -->
 								<div class="card card-topline-aqua">
@@ -57,7 +56,6 @@ $CI->load->model('Semester_model');?>
 										if($get_degree->num_rows()>0){
 										foreach($get_degree->result() as $d)
 										{
-											$id=$d->id;
 											$degId=$d->degId;
 											$degName=$d->degName;
 											$subjectId=$d->subjectId;

admin/application/views/subject/add_subject.php

@@ -34,14 +34,20 @@
 							<form class="form-horizontal" action="<?=base_url();?>add-subject" enctype="multipart/form-data" method="post">
 								<div class="form-body">
 									<div class="form-group row">
-										<label class="control-label col-md-3">Name of the Subject.
+										<label class="control-label col-md-3">Studio Title
 											<span class="required"> * </span>
 										</label>
 										<div class="col-md-5">
-											<input name="subject" type="text" data-validation="required" placeholder="Enter Subject Name" class="form-control input-height" /> </div>
+											<input name="subject" type="text" data-validation="required" placeholder="Enter Studio Title" class="form-control input-height" /> </div>
 									</div>
 									<div class="form-group row">
-										<label class="control-label col-md-3">Subject Code
+										<label class="control-label col-md-3">Studio Focus
+										</label>
+										<div class="col-md-5">
+											<input name="subtitle" type="text" placeholder="Enter Studio Focus" class="form-control input-height" /> </div>
+									</div>									
+									<div class="form-group row">
+										<label class="control-label col-md-3">Studio Code
 											<span class="required"> * </span>
 										</label>
 										<div class="col-md-5">											
@@ -68,6 +74,7 @@
 											</select>													
 										</div>
 									</div>
+									
 									<div class="form-group row">
 										<label class="control-label col-md-3">Faculty
 											<span class="required"> * </span>
@@ -87,7 +94,24 @@
 										</select>													
 										</div>
 									</div>
-									
+									<div class="form-group row">
+										<label class="control-label col-md-3">Teaching Assistant
+										</label>
+										<div class="col-md-5">
+											<select name="assistant[]" class="form-control default select2-multiple" multiple data-validation="required">
+											<option value="">Select..</option>
+												<?php
+												   if(isset($faculty) && $faculty->num_rows()>0)
+												   {
+													   foreach($faculty->result() as $list1)
+													   {
+														   ?> <option value="<?=$list1->id;?>"><?=$list1->name;?></option><?php
+													   }
+												   }
+											?>     
+										</select>
+										</div>
+									</div>
 									<div class="form-group row">
 										<label class="control-label col-md-3">Profile Images
 										</label>

admin/application/views/subject/edit_subject.php

@@ -53,11 +53,14 @@
 							$id=$s->id;
 							$degreeId=$s->degreeId;
 							$name=$s->name;
+							$subtitle=$s->subtitle;
 							$code=$s->code;
 							$facultyId=$s->facultyId;
+							$teachingAssistant=$s->teachingAssistant;
 							$image=$s->image;
 							$description=$s->description;
 							$facIdd = explode(",", $facultyId);
+							$teachingAssistantId = explode(",", $teachingAssistant);
 							//print_r ($facIdd);
 							
 					} ?>
@@ -85,6 +88,12 @@
 												<div class="col-md-5">
 													<input name="subject" value="<?=$name;?>" type="text"data-validation="required" placeholder="Enter subject" class="form-control input-height" /> </div>
 											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">Studio Focus
+												</label>
+												<div class="col-md-5">
+													<input value="<?=$subtitle;?>" name="subtitle" type="text" placeholder="Enter Studio Focus" class="form-control input-height" /> </div>
+											</div>	
 											<div class="form-group row">
 												<label class="control-label col-md-3">Degree
 													<span class="required"> * </span>
@@ -124,7 +133,24 @@
                                                 </select>															
 												</div>
 											</div>
-											
+											<div class="form-group row">
+												<label class="control-label col-md-3">Teaching Assistant
+												</label>
+												<div class="col-md-5">
+													<select name="assistant[]" class="form-control default select2-multiple" multiple data-validation="required">
+                                                    <option value="">Select..</option>
+                                                        <?php
+														   if(isset($faculty) && $faculty->num_rows()>0)
+														   {
+															   foreach($faculty->result() as $list1)
+															   {
+																   ?> <option value="<?=$list1->id;?>" <?php if (in_array($list1->id, $teachingAssistantId)){ echo "selected";}?>><?=$list1->name;?></option><?php
+															   }
+														   }
+													?>     
+                                                </select>
+												</div>
+											</div>
 											<div class="form-group row">
 												<label class="control-label col-md-3">Upload Picture
 												</label>

admin/application/views/subject/view_subject.php

@@ -36,13 +36,16 @@ $CI->load->model('Subject_model');?>
 								
 								$id=$view->id;
 								$degName=$view->degName;
+								$subtitle=$view->subtitle;
 								$facultyId=$view->facultyId;
 								$facName=$view->facName;
+								$teachingAssistant=$view->teachingAssistant;
 								$name=$view->name;
 								$code=$view->code;
 								$image=$view->image;
 								$description=$view->description;
 								$facIdd = explode(",", $facultyId);
+								$taId = explode(",", $teachingAssistant);
 								//print_r ($facIdd);
 								
 							}
@@ -58,6 +61,9 @@ $CI->load->model('Subject_model');?>
 										<div class="profile-usertitle">
 											<div class="profile-usertitle-name"><?=$name;?></div>
 										</div>
+										<div class="profile-usertitle">
+											<div class="profile-usertitle-name"><?=$subtitle;?></div>
+										</div>
 										<hr>
 										<div class="row">
 											<div class="col-md-4 col-xs-6 b-r"> <strong>Code</strong>
@@ -68,7 +74,29 @@ $CI->load->model('Subject_model');?>
 												<br>
 												<p class="text-muted"><?=$degName;?></p>
 											</div>
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Teaching Assistant</strong>
+												<br>
+												<p class="text-muted">
+												<?php 
 												
+												$i=0;
+												foreach($taId as $faculty)
+												{
+												$getFac=$CI->Subject_model->get_faculty($faculty);
+												
+												if($getFac->num_rows()>0)
+												{ 
+													$list=$getFac->row(); 
+													$facName=$list->name;
+												}  
+												?>
+												<?=$facName.','?>
+												
+												<?php 
+												} 
+												$i++;
+												?></p>
+											</div>
 											<div class="col-md-4 col-xs-6 b-r"> <strong>Faculty</strong>
 												<br>
 												<p class="text-muted">

admin/css/theme_style.css

@@ -1559,7 +1559,7 @@ form.search-form-opened .btn.submit {
     display: table
 }
 .page-header-fixed .page-container {
-    margin-top: 50px
+    margin-top: 30px
 }
 .page-full-width.page-header-fixed .page-container {
     margin-top: 110px

application/controllers/Welcome.php

@@ -83,5 +83,83 @@ class Welcome extends CI_Controller {
 		
 		$this->load->view('contact',$data);
 	}
+	function getDepartment()
+	{
+		$defaultId=$_POST['defaultId']; 
+		$data=$_POST['data']; 
+		$hidd=$_POST['hidd']; 
 		
+		$this->session->set_userdata('dateYear',$data);		
+		$this->session->set_userdata('dataId',$hidd);	
+		
+		$getDepartment=$this->WelcomeModel->getDepartment($defaultId);
+		//echo $this->db->last_query();
+		if(isset($getDepartment) && $getDepartment->num_rows()>0)
+		{
+			foreach($getDepartment->result() as $list)
+			{
+				$depId=$list->depId;
+				$depName=$list->depName;
+				$depCode=$list->depCode;
+				$depImage=$list->depImage;
+				?> 
+				<a href="<?=base_url();?>subject-list/<?=$depId?>">
+					 <div class="box-item" style="margin-bottom:15px;">
+						<?php if($depImage!=""){
+						?>
+						<img  src="<?=base_url();?>admin/uploads/department/<?=$depImage;?>"  class="respimg" alt="">
+						<?php
+						}else{?>
+						<img  src="https://ui-avatars.com/api/?name=<?=$depCode?>?background=random&color=random"  class="respimg" alt="">
+						<?php }?>
+						<div class="overlay">
+						<h3 style="color: white;font-size: 20px; position: inherit;top: 50%;left: 50%;-webkit-transform: translate(-50%, -50%);-ms-transform: translate(-50%, -50%);transform: translate(-50%, -50%);text-align: center;">
+						<?=$depCode;?>
+						</h3>
+						</div>
+					</div>
+					<h1 style="font-size:20px;padding-top:5px"><?=$depName?></h1>
+				</div>
+				</a>
+				<?php
+			}
+		}
+	}
+	function getDepartmentClick()
+	{
+		$data=$_POST['data']; 
+		$dataId=$_POST['dataId']; 
+		
+		$this->session->set_userdata('dateYear',$data);		
+		$this->session->set_userdata('dataId',$dataId);		
+		
+		$getDepartment=$this->WelcomeModel->getDepartment($dataId);
+		//echo $this->db->last_query();
+		if(isset($getDepartment) && $getDepartment->num_rows()>0)
+		{
+			foreach($getDepartment->result() as $list)
+			{
+				$depId=$list->depId;
+				$depName=$list->depName;
+				$depCode=$list->depCode;
+				$depImage=$list->depImage;
+				?> 
+				<a href="<?=base_url();?>subject-list/<?=$depId?>">
+					 <div class="box-item" style="margin-bottom:15px;">
+						<?php if($depImage!=""){
+						?>
+						<img  src="<?=base_url();?>admin/uploads/department/<?=$depImage;?>"  class="respimg" alt="">
+						<?php
+						}else{?>
+						<img  src="https://ui-avatars.com/api/?name=<?=$depCode?>?background=random&color=random"  class="respimg" alt="">
+						<?php }?>
+						<div class="overlay"></div>
+					</div>
+					<h1 style="font-size:20px;padding-top:5px"><?=$depName?></h1>
+				</div>
+				</a>
+				<?php
+			}
+		}
+	}
 }

application/models/WelcomeModel.php

@@ -30,6 +30,7 @@ class WelcomeModel extends CI_Model {
 	{
 		$this->db->select('*');
 		$this->db->from('semester');
+		$this->db->order_by('id', 'desc');
 		$this->db->where(array('status'=>1));
 		$query = $this->db->get();
 		//echo $this->db->last_query();exit;
@@ -67,7 +68,7 @@ class WelcomeModel extends CI_Model {
 	} 
 	function subject_Detail($id)
 	{
-		$this->db->select('id,code,name,facultyId,description');
+		$this->db->select('id,code,name,facultyId,description,subtitle,teachingAssistant');
 		$this->db->from('subject');
 		//$this->db->join('degree as d','d.id=s.degreeId','INNER');
 		$this->db->where(array('status'=>1,'id'=>$id));
@@ -106,7 +107,7 @@ class WelcomeModel extends CI_Model {
 	} 
 	function projectDetail($projectId)
 	{
-		$this->db->select('p.id,p.projectName,p.description,s.name as studentName');
+		$this->db->select('p.id,p.projectName,p.description,s.name as studentName,p.vedio,p.drivelink');
 		$this->db->from('project as p');
 		$this->db->join('student as s','s.id=p.studentId','INNER');
 		$this->db->where(array('p.status'=>1,'p.id'=>$projectId));
@@ -116,7 +117,7 @@ class WelcomeModel extends CI_Model {
 	}
 	function getGalleryList($projectId)
 	{
-		$this->db->select('id,title,image');
+		$this->db->select('id,title,image,description');
 		$this->db->from('projectdetail');
 		$this->db->where(array('status'=>1,'projectId'=>$projectId));
 		$query = $this->db->get();
@@ -135,5 +136,17 @@ class WelcomeModel extends CI_Model {
 		//echo $this->db->last_query();exit;
 		return $query;
 	}
+	function getDepartment($id)
+	{
+		$this->db->select('SD.id,dep.id as depId,dep.name as depName,dep.code as depCode,dep.image as depImage');
+		$this->db->from('semesterdetail as SD');
+		$this->db->join('degree as d','d.id=SD.degreeId','INNER');
+		$this->db->join('department as dep','dep.id=d.departmentId','INNER');
+		$this->db->where(array('SD.status'=>1,'SD.semesterId'=>$id));
+		$this->db->group_by('dep.name'); 
+		$query = $this->db->get();
+		//echo $this->db->last_query();exit;
+		return $query;
+	}
 	
 }

application/views/include/footer.php

@@ -1,6 +1,4 @@
 <!-- wrapper end -->
-
-<!-- Share container  -->
 <div class="share-wrapper isShare">
 <div class="share-container"></div>
 </div>
@@ -23,11 +21,4 @@
 <script type="text/javascript" src="<?=base_url();?>js/jquery.min.js"></script>
 <script type="text/javascript" src="<?=base_url();?>js/plugins.js"></script>
 <script type="text/javascript" src="<?=base_url();?>js/scripts.js"></script>
-<script>
+<script type="text/javascript" src="<?=base_url();?>admin/assets/jquery.cookie.min.js"></script>
-var base_path=$('body').attr('data-path');
-$(".semesterEvent").on('click', function() {
-  window.location.href = base_path;
-  var semesterId=$(this).attr('data-id');
-  //alert(semesterId);
-});
-</script>

application/views/include/header.php

@@ -1,4 +1,7 @@
-
+<?php 
+$dateYear=$this->session->userdata('dateYear');
+$dataId=$this->session->userdata('dataId');
+?>
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
@@ -34,13 +37,14 @@
 <!--================= header ================-->
 <header class="main-header">
 	<!-- logo -->
-	<a class="logo-holder" href="<?=base_url();?>"><img src="<?=base_url();?>images/hlogo.png" alt=""></a>
+	<a class="logo-holder" href="<?=base_url();?>"><img src="<?=base_url();?>images/hlogo.png" alt=""><?=$dateYear.'---'.$dataId;?></a>
 	<!-- logo end -->  
 	<!--  navigation --> 
 	<div class="sb-menu-button-wrap">
 		<div class="sb-menu-button vis-m"><span></span><span></span><span></span></div>
 	</div>
 	<div class="nav-holder">
+		<input class="hidden" type="hidden" data-session="<?=$dateYear;?>" data-hid="<?=$dataId;?>"/>
 		<nav>
 			<ul>
 				<li>
@@ -50,12 +54,14 @@
 						$view=$lastId->row();
 						
 						$id=$view->id;
-						$name=$view->name;
+						$dName=$view->name;
-						$year=$view->year;
+						$dYear=$view->year;
+						if($dateYear==""){$new=$dName.' - '.$dYear;}else{$new=$dateYear;}
 					}
 					
 					?>	
-					<a><?=$name.'-'.$year;?></a>
+					<a class="setValue" data-defaltId="<?=$id;?>" data-defaltName="<?=$dName;?>" data-defaltYear="<?=$dYear;?>"><?=$new;?></a>
+					
 					<!--second level end-->
 				   <ul>
 					<?php
@@ -66,9 +72,8 @@
 							   $id=$list->id;
 							   $name=$list->name;
 							   $year=$list->year;
-							   $departmentId=$list->departmentId;
 							   
-							   ?>  <li id="<?=$id;?>"><a class="semesterEvent" data-id="<?=$year;?>" data-id="<?=$id;?>" href="javascript:"><?=$name." - ".$year?></a></li><?php
+							   ?>  <li id="<?=$id;?>"><a class="semesterEvent" data-name="<?=$name;?>" data-year="<?=$year;?>" data-id="<?=$id;?>" href="javascript:"><?=$name." - ".$year?></a></li><?php
 						   }
 					   }
 					?>
@@ -104,7 +109,7 @@
 <div class="sb-overlay"></div>
 <div class="sidebar-menu fl-wrap">
 	<div class="hid-men-wrap">
-		<a class="sb-logo" href="index.html"><img src="<?=base_url();?>images/hlogo.png" alt=""></a>
+		<a class="sb-logo" href="<?=base_url();?>"><img src="<?=base_url();?>images/hlogo.png" alt=""></a>
 		<div class="clearfix"></div>
 		<div id="hid-men2" class="menusb">
 			<ul class="menu">

application/views/index.php

@@ -1,4 +1,6 @@
-<?php $this->load->view('include/header.php')?> 
+<?php include 'include/header.php';?>
+
+
 <!-- sidebar-menu end-->
 <!--=============== wrapper ===============-->
 <div id="wrapper">
@@ -16,40 +18,12 @@
 						<h5 id="semesterEvent" class="bold-title">Department</h5>
 						<span class="bold-separator"></span>
 						<div class="clearfix"></div>
+					</div>
+					</div>
+						<div class="col-md-3 getDepartment">
 						
 						</div>
 					</div>
-						<?php
-						   if(isset($dep) && $dep->num_rows()>0)
-						   {
-							   foreach($dep->result() as $deparment)
-								$id=$deparment->id;
-								$code=$deparment->code;
-								$name=$deparment->name;
-								$image=$deparment->image;
-							   {
-						?>  
-						<div class="col-md-3">
-						<a href="<?=base_url();?>subject-list/<?=$id?>">
-							 <div class="box-item" style="margin-bottom:15px;">
-								<?php if($image!=""){
-								?>
-								<img  src="<?=base_url();?>admin/uploads/department/<?=$image;?>"  class="respimg" alt="">
-								<?php
-								}else{?>
-								<img  src="https://ui-avatars.com/api/?name=<?=$code?>?background=random&color=random"  class="respimg" alt="">
-								<?php }?>
-								<div class="overlay"></div>
-							</div>
-							<h1 style="font-size:20px;padding-top:5px"><?=$name?></h1>
-						</div>
-						</a>
-						<?php
-						   }
-					   }
-						?>
-					   
-					</div>
 			   
 				   
 			</div>
@@ -64,3 +38,49 @@
 </div>
 <!-- wrapper end -->
 <?php include 'include/footer.php';?>
+<script>
+var base_path=$('body').attr('data-path');
+$(document).ready(function() 
+{
+	var defaultId=$('.setValue').attr('data-defaltId');
+	var hidd=$('.hidden').attr('data-hid');
+	console.log("hiddenId",hidd);
+	var defaultName=$('.setValue').attr('data-defaltName');
+	var defaultYear=$('.setValue').attr('data-defaltYear');
+	var data=defaultName+' - '+defaultYear;
+	
+	
+	var url=base_path+"Welcome/getDepartment";
+	$.post(url,{hidd:hidd,data:data,defaultId:defaultId,csrf_test_name:$.cookie('csrf_cookie_name')},function(departmentResult)
+	{
+		console.log(departmentResult)
+		var result=departmentResult;
+		$('.getDepartment').html(result);
+		
+	});
+});
+</script>
+<script>
+$(".semesterEvent").on('click', function() {
+
+	var semesterId=$(this).attr('data-id');
+	var semesterName=$(this).attr('data-name');
+	var semesterYear=$(this).attr('data-year');
+	//var dataSession=$('.setValue').attr('data-session');
+
+	var data=semesterName+" - "+semesterYear;
+	var dataId=semesterId;
+	var url=base_path+"Welcome/getDepartmentClick";
+
+	$.post(url,{data:data,dataId:dataId,csrf_test_name:$.cookie('csrf_cookie_name')},function(departmentResult)
+	{
+		var result=departmentResult;
+		alert(result)
+		$('.getDepartment').html(result);
+		$('.setValue').html(data);
+		$('.setValue').attr('data-defaltId' ,dataId );
+		$('.setValue').attr('data-defaltName' ,semesterName );
+		$('.setValue').attr('data-defaltYear' ,semesterYear );
+	});
+});
+</script>

application/views/project_details.php

@@ -3,6 +3,9 @@
 .row{
 margin-top: 58px;
 }
+.pr-title:before{
+	background:#fff;
+}
 </style>
 <?php 
 $CI=& get_instance();
@@ -20,54 +23,29 @@ $CI->load->model('WelcomeModel');?>
 			$projectName=$view->projectName;
 			$studentName=$view->studentName;
 			$description=$view->description;
+			$video=$view->vedio;
+			$drivelink=$view->drivelink;
 			
 		}
 		
 	?>	
-	<!--  content --> 
-	<div class="content">
-		<!--  sroll-nav-wrap --> 
-		<div class="sroll-nav-wrap">
-			<div class="sroll-nav-container">
-				<nav class="scroll-nav scroll-init fl-wrap">
-					<ul>
-						<li>
-						<?php 
-						//$projectId = $this->uri->segment(2);
-						$getGallery=$CI->WelcomeModel->getGalleryList($pid);
-						//$numRows=$getFac->num_rows();	
 	
-						if(isset($getGallery) && $getGallery->num_rows()>0)
-						   {
-							   $i=1;
-							   foreach($getGallery->result() as $list)
-							   {
-									$id=$list->id;
-									$title=$list->title;
-									//$image=$list->image;
-						?>
-						<a class="scroll-link act-scrlink" href="#sec1"><?=$i;?><span><?=$title;?></span></a></li>
-						<?php 
-							$i++;
-							} }?>
-						</li>
-					</ul>
-				</nav>
-			</div>
-		</div>
 		<section   data-scrollax-parent="true" >
 			
 			<div class="container">
 				<div class="">
-					<h3 class="bold-title" style="font-size: 22px;font-weight:600;"><?=$projectName;?></h3>
+					<h3 class="bold-title" style="font-size: 29px;font-weight:600;"><?=$projectName;?></h3>
-					<div class="pr-tags" style="width:30%;border:none;background:none;padding-right:0px;padding-left:0px;">
+					<div class="pr-tags" style="font-size: 20px;width:30%;border:none;background:none;padding-right:0px;padding-left:0px;">
-						<span style="font-size: 16px;">Student Name : </span>
+						<span style="font-size: 20px;">Student Name : </span>
 						<ul>
 							<li><?=$studentName;?></li>
 						</ul>
 					</div>
 					<br>
-					<p><?=$description;?></p>
+					<br>
+					<p style="font-size: 18px;"><?=$description;?></p>
+					<p><b>Video Link :</b> <a style="font-size: 15px;font-weight: 500;" href="<?=$drivelink;?>" traget="-blank"><?=$drivelink;?></a></p>
+					<p> <b>Drive Link : </b><a style="margin-top:50px;font-size: 15px;font-weight: 500;" href="<?=$video;?>" traget="-blank"><?=$video;?></a></p>
 				   
 					<br><br>
 					
@@ -86,14 +64,18 @@ $CI->load->model('WelcomeModel');?>
 							   {
 									$id=$list->id;
 									$title=$list->title;
+									$mdescription=$list->description;
 									$image=$list->image;
 						?>
 						<div class="serv-item fl-wrap" id="serv2">
 						<div class="row">
 							<div class="col-md-4">
-								<div class="pr-title">
+								<div class="pr-title" style="padding-bottom: 20px;padding-left: 0px;">
 									<?=$title;?>
 								</div>
+								<p style="width:100%;font-size:17px;text-align: justify;font-weight: 200;text-transform: lowercase;" class="bold-title">
+									<?=$mdescription;?>
+								</p>
 							</div>
 							<div class="col-md-8">
 								<div class="">

application/views/subject.php

@@ -25,9 +25,12 @@ $CI->load->model('WelcomeModel');?>
 							$id=$list->id;
 							$code=$list->code;
 							$name=$list->name;
+							$subtitle=$list->subtitle;
 							$facultyId=$list->facultyId;
+							$teachingAssistant=$list->teachingAssistant;
 							$description=$list->description;
 							$facultyIds = explode(',', $facultyId);
+							$taId = explode(',', $teachingAssistant);
 							
 						}
 							
@@ -50,8 +53,8 @@ $CI->load->model('WelcomeModel');?>
 										
 							?>
 							<div>
-								<img style="width:750px;height:auto;" src="<?=base_url();?>admin/uploads/subject/<?=$iimage;?>"/>
+								<img style="width:750px;height:auto;margin-bottom:100px;" src="<?=base_url();?>admin/uploads/subject/<?=$iimage;?>"/>
-								<h2 style="font-size:18px;"><?=$imagetitle;?></h2>
+								<h2 style="font-size:25px;margin-bottom:100px;"><?=$imagetitle;?></h2>
 							</div>
 							<?php 
 							   }}
@@ -100,7 +103,8 @@ $CI->load->model('WelcomeModel');?>
 								<div class="pr-tags fl-wrap">
 									<span style="font-size: 15px;">Faculty : </span>
 									<div>
-										
+										<ul>
+										<li>
 										<a style="font-size: 15px;" href="#">
 										<?php 
 											//$numRows=$getFac->num_rows();	
@@ -120,22 +124,46 @@ $CI->load->model('WelcomeModel');?>
 											} $i++
 										?>
 										</a>
+										</li>
+										</ul>
+										
 										
 									</div>
 								</div>
-								<h3 class="pr-subtitle"> <?=$name;?></h3>
+								<div class="pr-tags fl-wrap">
-								<p style="font-size:16px;text-align:justify"><?=$description;?></p>
+									<span style="font-size: 15px;">TA : </span>
-								<!--<p>  If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. </p>
+									<div>
-								<div class="clearfix"></div>
+										<ul>
-								<span class="bold-separator"></span>
+										<li>
-								<ul class="pr-list">
+										<a style="font-size: 15px;" href="#">
-									<li><span>Date :</span> 26.05.2014 </li>
+										<?php 
-									<li><span>Client :</span>  House Big </li>
+											//$numRows=$getFac->num_rows();	
-									<li><span>Status :</span> Completed </li>
+											$i=0;
-									<li><span>Location : </span>  <a href="https://goo.gl/maps/UzN5m" target="_blank"> Kharkiv Ukraine  </a></li>
+											foreach($taId as $faculty){
+											$getFac=$CI->WelcomeModel->get_faculty($faculty);
+											//echo $facultyIds[$faculty];
+											
+											if($getFac->num_rows()>0)
+											{ 
+												$list=$getFac->row(); 
+												$facName=$list->name;
+											}  ?>
+											<?=$facName?>
+											
+										<?php 
+											} $i++
+										?>
+										</a>
+										</li>
 										</ul>
-								<span class="dec-border fl-wrap"></span>
+										
-								<a href="#" class="btn float-btn flat-btn" target="_blank">View project</a>-->
+									</div>
+								</div>
+								<h3 style="padding-bottom:0px;" class="pr-subtitle"> <?=$name;?> 
+								
+								</h3>
+								<p style="font-size:17px;padding-bottom:10px;"><?=$subtitle;?></p>
+								<p style="font-size:16px;text-align:justify"><?=$description;?></p>
 							</div>
 						</div>
 					</div>

application/views/subject_list.php

@@ -1,10 +1,9 @@
 <?php $this->load->view('include/header.php')?>
 
-
 <?php 
 $CI=& get_instance();
-									
+$CI->load->model('WelcomeModel');
-$CI->load->model('WelcomeModel');?>
+?>
 <!-- sidebar-menu end-->
 <!--=============== wrapper ===============-->
 <div id="wrapper">
@@ -105,3 +104,45 @@ $CI->load->model('WelcomeModel');?>
 </div>
 <!-- wrapper end -->
 <?php include 'include/footer.php';?>
+<script>
+var base_path=$('body').attr('data-path');
+$( document ).ready(function() {
+	
+    var semesterId1=$('.setValue').attr('data-id');
+    var semesterId=$('.setValue').attr('data-id1');
+	var semesterName=$('.setValue').attr('data-name1');
+	var semesterYear=$('.setValue').attr('data-year1');
+	var dataSession=$('.setValue').attr('data-session');
+	
+	var sessionData=semesterName+"-"+semesterYear;
+	
+	if(dataSession==""){$('.setValue').html(sessionData);}else{$('.setValue').html(dataSession);
+	
+	}
+
+	
+
+	var url=base_path+"Welcome/getDepartment";
+	$.post(url,{sessionData:sessionData,semesterId:semesterId,csrf_test_name:$.cookie('csrf_cookie_name')},function(departmentResult)
+	{
+		var result=departmentResult;
+		$(".getDepartment").show();
+		$('.getDepartment').html(result);
+		
+		
+		
+	});
+	
+});
+
+</script>
+<script>
+var base_path=$('body').attr('data-path');
+$(".semesterEvent").on('click', function() {
+	var currentPage=window.location.href;
+	if(currentPage!=base_path){
+	window.location.href=base_path;
+	}
+	
+});
+</script>

mcgans.sql

@@ -3,7 +3,7 @@
 -- https://www.phpmyadmin.net/
 --
 -- Host: 127.0.0.1
--- Generation Time: Jan 25, 2023 at 01:46 PM
+-- Generation Time: Feb 07, 2023 at 02:10 PM
 -- Server version: 10.4.24-MariaDB
 -- PHP Version: 7.4.29
 
@@ -43,8 +43,8 @@ CREATE TABLE `degree` (
 --
 
 INSERT INTO `degree` (`id`, `departmentId`, `name`, `createdBy`, `createdOn`, `upadatedOn`, `updatedBy`, `status`) VALUES
-(1, 1, 'Bachelor’s in Architecture', 1, '2023-01-23', '0000-00-00', 0, 1),
+(1, 1, 'Bachelor’s in Architecture', 1, '2023-02-06', '0000-00-00', 0, 1),
-(2, 1, 'Test', 1, '2023-01-25', '0000-00-00', 0, 1);
+(2, 1, 'Master of Architecture', 1, '2023-02-06', '0000-00-00', 0, 1);
 
 -- --------------------------------------------------------
 
@@ -70,7 +70,7 @@ CREATE TABLE `department` (
 --
 
 INSERT INTO `department` (`id`, `name`, `code`, `image`, `year`, `createdBy`, `updatedBy`, `createdOn`, `updatedOn`, `status`) VALUES
-(1, 'Architecture', 'AR001', '230123053918.webp', 4, 1, 0, '2023-01-23', '0000-00-00', 1);
+(1, 'Architecture', 'AR001', '230206081440.webp', 4, 1, 0, '2023-02-06', '0000-00-00', 1);
 
 -- --------------------------------------------------------
 
@@ -81,12 +81,12 @@ INSERT INTO `department` (`id`, `name`, `code`, `image`, `year`, `createdBy`, `u
 CREATE TABLE `employee` (
   `id` int(11) NOT NULL,
   `roleId` int(11) NOT NULL,
+  `typeId` int(11) NOT NULL COMMENT 'typeId= faculty id and student Id',
   `name` varchar(120) NOT NULL,
   `mobileNumber` varchar(225) NOT NULL,
   `address` text NOT NULL,
   `email` varchar(225) NOT NULL,
   `image` varchar(225) NOT NULL,
-  `pincode` int(11) NOT NULL,
   `username` varchar(225) NOT NULL,
   `password` varchar(225) NOT NULL,
   `createdOn` date NOT NULL,
@@ -100,8 +100,12 @@ CREATE TABLE `employee` (
 -- Dumping data for table `employee`
 --
 
-INSERT INTO `employee` (`id`, `roleId`, `name`, `mobileNumber`, `address`, `email`, `image`, `pincode`, `username`, `password`, `createdOn`, `updatedOn`, `createdBy`, `updatedBy`, `status`) VALUES
+INSERT INTO `employee` (`id`, `roleId`, `typeId`, `name`, `mobileNumber`, `address`, `email`, `image`, `username`, `password`, `createdOn`, `updatedOn`, `createdBy`, `updatedBy`, `status`) VALUES
-(1, 1, 'mcgans', '9344511168', 'Perar, Kotagiri Road, Ooty, Tamil Nadu 643002', 'ootyarchitecture@gmail.com', 'image.png', 643002, 'demo@mcgans.com', '2d1c52a7d892a6f0a189392152584268', '0000-00-00', '0000-00-00', 0, 0, 1);
+(1, 1, 0, 'mcgans', '9344511168', 'Perar, Kotagiri Road, Ooty, Tamil Nadu 643002', 'ootyarchitecture@gmail.com', 'image.png', 'demo@mcgans.com', '2d1c52a7d892a6f0a189392152584268', '0000-00-00', '0000-00-00', 0, 1, 1),
+(2, 1, 0, 'Suriya Kannan', '9876543210', 'Ooty', 'suriyakannan@gmail.com', '2301250205.png', 'test', '202cb962ac59075b964b07152d234b70', '2023-01-25', '2023-01-25', 1, 1, 1),
+(3, 3, 3, 'tes', '9876546432', 'test', 'tes@gmamil.com', '2302070807.png', 'tes', '9876546432', '2023-02-07', '0000-00-00', 1, 0, 1),
+(4, 3, 4, 'tes', '07402411774', 'Vkr strret', 'tes@gmamil.com', '2302070809.png', 'tes', '384305a654a1f7121c31e631ace0452a', '2023-02-07', '0000-00-00', 1, 0, 1),
+(5, 3, 5, 'test', '07402411774', 'Vkr strret', 'tes@gmamil.com', '2302070811.png', 'test', '384305a654a1f7121c31e631ace0452a', '2023-02-07', '0000-00-00', 1, 0, 1);
 
 -- --------------------------------------------------------
 
@@ -132,11 +136,11 @@ CREATE TABLE `faculty` (
 --
 
 INSERT INTO `faculty` (`id`, `facultyId`, `name`, `email`, `dob`, `address`, `gender`, `mobileNumber`, `designation`, `image`, `createdBy`, `createdOn`, `updatedOn`, `updatedBy`, `status`) VALUES
-(1, 'MCGANS0001', 'Saranya SK', 'mcgans@gmail.com', '2023-01-23', 'Ooty', 2, '7904257993', 'Staff', '2301230548.webp', 1, '2023-01-23', '0000-00-00', 0, 1),
+(1, 'MCGANS0001', 'Saranya SK ', 'mcgans@gmail.com', '2023-02-06', 'Ooty', 2, '7904257993', 'Staff', '2302060915.webp', 1, '2023-02-06', '0000-00-00', 0, 1),
-(2, 'MCGANS0002', 'Kshirabdhi Tanaya P Sahu', 'mcgans@gmail.com', '2023-01-23', 'Ooty', 2, '7904257993', 'Staff', '2301230551.webp', 1, '2023-01-23', '0000-00-00', 0, 1),
+(2, 'MCGANS0002', 'Kshirabdhi Tanaya P Sahu', 'mcgans@gmail.com', '2023-02-06', 'Ooty', 2, '7904257993', 'Staff', '2302061153.webp', 1, '2023-02-06', '0000-00-00', 0, 1),
-(3, 'MCGANS0003', 'Lokeshwar', 'mcgans@gmail.com', '2023-01-23', 'Ooty', 1, '7904257993', 'Staff', '2301230553.webp', 1, '2023-01-23', '0000-00-00', 0, 1),
+(3, 'test', 'tes', 'tes@gmamil.com', '2023-02-07', 'test', 2, '9876546432', 'tes', '2302070807.png', 1, '2023-02-07', '0000-00-00', 0, 1),
-(4, 'MCGANS0004', 'Srinath', 'mcgans@gmail.com', '2023-01-23', 'Ooty', 1, '7904257993', 'Staff', '2301230555.webp', 1, '2023-01-23', '0000-00-00', 0, 1),
+(4, 'test', 'tes', 'tes@gmamil.com', '2023-02-07', 'Vkr strret', 2, '07402411774', 'fds', '2302070809.png', 1, '2023-02-07', '0000-00-00', 0, 1),
-(5, 'MCGANS0005', 'Shahzad Ahmed Malik', 'mcgans@gmail.com', '2023-01-23', 'Ooty', 1, '7904257993', 'Staff', '2301230603.webp', 1, '2023-01-23', '0000-00-00', 0, 1);
+(5, 'test', 'test', 'tes@gmamil.com', '2023-02-07', 'Vkr strret', 2, '07402411774', 'tes', '2302070811.png', 1, '2023-02-07', '0000-00-00', 0, 1);
 
 -- --------------------------------------------------------
 
@@ -169,7 +173,8 @@ CREATE TABLE `project` (
 --
 
 INSERT INTO `project` (`id`, `projectName`, `date`, `studentId`, `code`, `semesterId`, `departmentId`, `description`, `subjectId`, `image`, `vedio`, `driveLink`, `createdBy`, `createdOn`, `updatedBy`, `updatedOn`, `status`) VALUES
-(1, 'Testtt', '2023-01-25', 1, 'P001tt', 3, 1, 'testttttt', 1, 'title230124102722.jpg', 'testtt', 'testtt', 1, '2023-01-24', 1, '2023-01-24', 1);
+(1, 'test', '2023-02-06', 1, 'di77456', 2, 1, 'asdfg', 1, 'title230206093459.jpg', 'dfgh', 'sdfg', 1, '2023-02-06', 1, '2023-02-06', 0),
+(2, 'Dotwings ', '2023-02-06', 1, 'POR001', 2, 1, 'The Bhasha Linguistic Institute functions as a forum to safeguard, protect and propagate regional languages, dialects and Literatures. The institute celebrates the diversity of linguistic cultures and dives deep into them with the help common people with similar interests.', 1, 'title230206103736.jpg', 'https://www.pexels.com/videos/', 'https://www.youtube.com/watch?v=oyA7Ucnmje4', 1, '2023-02-06', 1, '2023-02-06', 1);
 
 -- --------------------------------------------------------
 
@@ -181,6 +186,7 @@ CREATE TABLE `projectdetail` (
   `id` int(11) NOT NULL,
   `projectId` int(11) NOT NULL,
   `title` varchar(225) NOT NULL,
+  `description` text NOT NULL,
   `image` varchar(225) NOT NULL,
   `status` int(11) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -189,10 +195,9 @@ CREATE TABLE `projectdetail` (
 -- Dumping data for table `projectdetail`
 --
 
-INSERT INTO `projectdetail` (`id`, `projectId`, `title`, `image`, `status`) VALUES
+INSERT INTO `projectdetail` (`id`, `projectId`, `title`, `description`, `image`, `status`) VALUES
-(1, 1, 'test12', '1.5.jpg', 1),
+(1, 1, 'sdw', 'test', '1.4.4.jpg', 0),
-(2, 1, 'test112', '1.4.jpg', 1),
+(2, 2, 'Terrain and Architecture', 'The Bhasha Linguistic Institute functions as a forum to safeguard, protect and propagate regional languages, dialects and Literatures. The institute celebrates the diversity of linguistic cultures and dives deep into them with the help common people with similar interests.', '2.5.5.jpg', 1);
-(3, 1, 'test3', '1.1.jpg', 0);
 
 -- --------------------------------------------------------
 
@@ -215,7 +220,11 @@ CREATE TABLE `role` (
 --
 
 INSERT INTO `role` (`id`, `name`, `status`, `createdBy`, `createdOn`, `updatedBy`, `updatedOn`) VALUES
-(1, 'admin', 1, 1, '2023-01-23', 0, '0000-00-00');
+(1, 'Super Admin', 1, 1, '2023-01-23', 0, '0000-00-00'),
+(2, 'Admin', 1, 2, '2023-01-26', 0, '0000-00-00'),
+(3, 'Faculty', 1, 2, '2023-01-26', 0, '0000-00-00'),
+(4, 'Student', 1, 2, '2023-01-26', 0, '0000-00-00'),
+(5, 'Test', 1, 1, '2023-02-07', 0, '0000-00-00');
 
 -- --------------------------------------------------------
 
@@ -239,7 +248,8 @@ CREATE TABLE `semester` (
 --
 
 INSERT INTO `semester` (`id`, `name`, `year`, `createdBy`, `createdOn`, `updatedOn`, `updatedBy`, `status`) VALUES
-(1, 'ODD', 2024, 1, '2023-01-25', '2023-01-25', 1, 1);
+(1, 'EVEN', 2023, 1, '2023-02-06', '0000-00-00', 0, 1),
+(2, 'ODD', 2023, 1, '2023-02-06', '0000-00-00', 0, 1);
 
 -- --------------------------------------------------------
 
@@ -260,11 +270,7 @@ CREATE TABLE `semesterdetail` (
 --
 
 INSERT INTO `semesterdetail` (`id`, `semesterId`, `degreeId`, `subjectId`, `status`) VALUES
-(1, 1, 1, '1,2', 1),
+(1, 1, 1, '1', 1);
-(2, 1, 2, '1,2,3,4,5', 0),
-(3, 1, 2, '1', 0),
-(4, 1, 2, '2', 0),
-(5, 1, 2, '1', 1);
 
 -- --------------------------------------------------------
 
@@ -295,7 +301,7 @@ CREATE TABLE `student` (
 --
 
 INSERT INTO `student` (`id`, `studentId`, `name`, `gender`, `email`, `address`, `department`, `mobileNumber`, `dob`, `image`, `updatedOn`, `updatedBy`, `createdBy`, `createdOn`, `status`) VALUES
-(1, '0001', 'test', 1, 'test@gmail.com', 'test', '1', '9876543210', '2023-01-03', '2301240937.png', '0000-00-00', 0, 1, '2023-01-24', 1);
+(1, '712120251001', 'ABDUL QAYOOM A', 1, 'phanikashyar@gmail.com', 'MCGANS OOTY SCHOOL OF ARCHITECTURE, PERAR, OOTY.', '1', '9894934786', '2023-02-06', '2302060923.png', '0000-00-00', 0, 1, '2023-02-06', 1);
 
 -- --------------------------------------------------------
 
@@ -307,8 +313,10 @@ CREATE TABLE `subject` (
   `id` int(11) NOT NULL,
   `degreeId` int(11) NOT NULL,
   `name` varchar(225) NOT NULL,
+  `subtitle` varchar(225) NOT NULL,
   `code` varchar(225) NOT NULL,
   `facultyId` varchar(225) NOT NULL,
+  `teachingAssistant` varchar(225) NOT NULL,
   `image` varchar(225) NOT NULL,
   `description` longtext NOT NULL,
   `createdBy` int(11) NOT NULL,
@@ -322,12 +330,10 @@ CREATE TABLE `subject` (
 -- Dumping data for table `subject`
 --
 
-INSERT INTO `subject` (`id`, `degreeId`, `name`, `code`, `facultyId`, `image`, `description`, `createdBy`, `updatedBy`, `createdOn`, `updatedOn`, `status`) VALUES
+INSERT INTO `subject` (`id`, `degreeId`, `name`, `subtitle`, `code`, `facultyId`, `teachingAssistant`, `image`, `description`, `createdBy`, `updatedBy`, `createdOn`, `updatedOn`, `status`) VALUES
-(1, 1, ' Terrain and Architecture', 'MCL2001', '1', '230123064458.webp', 'The Anthropogenic Activities which require Space Making on any parcel of land, in terms \r\nof Open & Built Volumes has an interference with the existing natural landscape and the \r\necology connected therewith. Also in the current day context, the Virtue of a Terrain and \r\nits primary role of sustaining an ecosystem in order is often ignored while designing, \r\norganizing and constructing a Building.\r\nCritical Re-thinking on the Spatial Planning & Organization in any given Terrain is \r\nessential, today. Therefore, standard practice of Grading and Sitting Buildings on a \r\nLandscape by considering it to be an independent entity, needs to be recast to create a \r\nmeaningful articulation of Spaces with respect to a Terrain.\r\nIn this project we will deal with two Sites in the context of The Nilgiris District which are \r\ndifferent from one another primarily in terms of Altitude & Gradient and other related \r\naspects of Climate & Geography. Thus, comparing and demonstrating how planning \r\nstrategies vary.', 1, 1, '2023-01-23', '2023-01-24', 1),
+(1, 1, 'Planning and Organizing', 'Terrain and Architecture', 'MCL2001', '1', 'test', '230206092017.webp', 'The Anthropogenic Activities which require Space Making on any parcel of land, in terms of Open & Built Volumes has an interference with the existing natural landscape and the ecology connected therewith. Also in the current day context, the Virtue of a Terrain and its primary role of sustaining an ecosystem in order is often ignored while designing, organizing and constructing a Building. Critical Re-thinking on the Spatial Planning & Organization in any given Terrain is essential, today. Therefore, standard practice of Grading and Sitting Buildings on a Landscape by considering it to be an independent entity, needs to be recast to create a meaningful articulation of Spaces with respect to a Terrain. In this project we will deal with two Sites in the context of The Nilgiris District which are different from one another primarily in terms of Altitude & Gradient and other related aspects of Climate & Geography. Thus, comparing and demonstrating how planning strategies vary.', 1, 1, '2023-02-06', '2023-02-06', 1),
-(2, 1, 'Planning and Organizing Spatial organization in Architecture', 'MCL2002', '2', '230123064624.webp', 'Spatial Organization is a way to tie the spaces together to create a collective and \r\norganized whole. This can be done both on the micro-level with the floor plan zoning and \r\nat the macro level on the site.\r\nIn the period of 14 weeks, the first 3 weeks the student will work on design thinking \r\nmodule and remaining weeks develop continuously their design project. The design \r\nprocess make use of 5 steps design process (problem analysis, idea generation, idea \r\nevaluation and selection and the realization of ideas). The design studio aims to create a \r\nplan with these 5 steps to address concrete spatial issues on different scales and layouts \r\nin a predefined project site.\r\nFor every building, there are specific needs that need to be fulfilled. Spatial organization \r\ncan aid in problem-solving to come up with effective design solutions in terms of:\r\n• Zoning based on the needs of the site.\r\n• Functional segregation of spaces in the design.\r\n• Dimensional requirements of each space.\r\n• Organization based on the significance of each space.', 1, 0, '2023-01-23', '0000-00-00', 1),
+(2, 1, 'Planning and Organizing ', 'Spatial organization in Architecture', 'MCL2002', '2', 'Kshirabdhi Tanaya P Sahu', '230206115740.webp', 'Spatial Organization is a way to tie the spaces together to create a collective and organized whole. This can be done both on the micro-level with the floor plan zoning and at the macro level on the site. In the period of 14 weeks, the first 3 weeks the student will work on design thinking module and remaining weeks develop continuously their design project. The design process make use of 5 steps design process (problem analysis, idea generation, idea evaluation and selection and the realization of ideas). The design studio aims to create a plan with these 5 steps to address concrete spatial issues on different scales and layouts in a predefined project site. For every building, there are specific needs that need to be fulfilled. Spatial organization can aid in problem-solving to come up with effective design solutions in terms of: • Zoning based on the needs of the site. • Functional segregation of spaces in the design. • Dimensional requirements of each space. • Organization based on the significance of each space.', 1, 0, '2023-02-06', '0000-00-00', 1),
-(3, 1, 'Planning and Organizing The clash of the weathers', 'MCL2003', '3', '230123064720.webp', '“Mother art is Architecture. Without an architecture of our own we have no soul of our \r\nown civilization” – Frank Lloyd Wright.\r\nIn early times when humans started to settle, they needed a dwelling to cope up with the \r\nchanging weather of the location (climate), this is the time architecture started in them in \r\norder to resist the climate. Later civilizations happened where buildings were evolving to \r\nbe stronger and additional details were added to it to make it more responsive to climate. \r\nNow we can come to an understanding that humans started the concept of architecture \r\nin order to respond to the climate, but now days that priority is lacking in the majority \r\nof the population and they are forced to go against the nature. By building structures \r\nin a climate responsive manner, we can make the best use of the natural and renewable \r\nresources and reduce our dependency on non-renewable resources. \r\nIn this studio the students will be focusing on gaining an understanding in climate \r\nresponsive architecture by starting to design from a basic temporary structure parallelly \r\nlearn climatology concepts and go further to design a building typologyby exploring \r\nvarious forms, building elements, spatial planning and materials.', 1, 0, '2023-01-23', '0000-00-00', 1),
+(3, 1, 'test', 'test', 'test0001', '1,2', '3', '230207110552.png', 'test', 1, 1, '2023-02-07', '2023-02-07', 1);
-(4, 1, 'Constructing and Specifying Express it Industrially', 'MCL2004', '4', '230123064826.webp', 'Why a place that was once recognized and considered proud should be left useless? \r\nCities are already experiencing the shortage of lands for developments. Recycling has \r\nevolved to its ultimate level of converting most of the wastes generated today. Why \r\nnot a building could be recycled or renewed to serve its purpose or used for a different \r\npurpose? Cities of today have such buildings that could have lost its cultural, economic \r\nand social values over time. It is our duty to payback respects and restore their values \r\nthrough Adaptive Reuse. Here to make it more interesting, the students will be exposed \r\nto Industrial Architecture for adopting them into their designing. \r\nThe studio invites students for Re-imagining abandoned buildings in the vicinity, into a \r\npublic space. Throughout the Design Development process, students will be put into the \r\ncircumstances of questioning themselves on how to bridge the gap between the new \r\nneeds and wants while decoding unique structural elements into designing. The Studio \r\nbrings students, an expertise on professional 3D Modelling techniques that paves way for \r\ndetailed / logical exploration of various structural elements. Since focusing on Industrial \r\nstyle of designing, Steel forms the major material for design explorations along with \r\nother materials. In the Pre - Design Development process, the designer will be exposed to \r\ntechniques of construction with steel and inspiring works of various Industrial Architects. \r\nAftermost, the students will be able to technically approach any given adaptive \r\nreuse projects, considering the available resources; contextual constraints; tangible \r\nand intangible values of the structure to-be renovated. To their level, they could \r\nappreciate and critically review works of any Architects. Besides these, on the aspects \r\nof professionalism, they will also be able to technically produce working drawings with \r\nmaterial specifications.', 1, 0, '2023-01-23', '0000-00-00', 1),
-(5, 1, 'Planning and Organizing Understanding Micro-spaces', 'MCL2005', '5', '230123064913.webp', 'India is home to more than a billion people and keeps adding. The land has become a \r\nprime asset for urban development and housing is a prime necessity for Indians. The \r\narchitecture of micro-spaces encourages user-architect dialogue concerning functionality, \r\nadaptability, and flexibility. Micro Architecture is based on the space-dimensions-functions matrix. Micro Architecture is connected with space confinement and affects the \r\npeople with fewer resources to build houses. Micro Architecture becomes the answer and \r\nhitherto choice for the people with lower incomes working in daily wage occupations and \r\nunorganized sectors. India has 581 million people working in the unorganized sector with \r\nTamil Nadu having more than 7.7 million workers as per eSharm data of the government \r\nof India. \r\nThe studio is focused on providing a learning opportunity to the student to learn about \r\nthe existing informality in the housing sector mainly for the unorganized sector people \r\nsuch as construction workers, tea plantation workers, and migrants working in the \r\napparel industry. The studio is an attempt to reflect on the type of workers’ housing \r\nand assess the space-functions constraints within the purview of flexibility, adaptability, \r\nand innovation. The design of urban housing of mid-to-low rise with low density is \r\naimed to impact students’ knowledge of dealing with the housing industry, associated \r\nchallenges in the design, and practical demand-supply along with paying attention to \r\narchitectural services and universal design principles. The understanding of micro spaces \r\nin architectural design will reorient architecture students towards developing innovative \r\ndesign schemes of residential architecture, which means pushing the creative boundaries \r\nof students.', 1, 1, '2023-01-23', '2023-01-24', 1);
 
 -- --------------------------------------------------------
 
@@ -348,11 +354,9 @@ CREATE TABLE `subjectdetail` (
 --
 
 INSERT INTO `subjectdetail` (`id`, `subjectId`, `title`, `image`, `status`) VALUES
-(1, 1, 'Terrain and Architecture', '1.1.jpg', 1),
+(1, 1, 'Terrain and Architecture', '1..1.jpg', 1),
-(2, 2, 'Planning and Organizing Spatial organization in architecture', '2.2.jpg', 1),
+(2, 2, ' ORGANIZATION IN ARCHITECTURE', '2.4.4.jpg', 1),
-(3, 3, 'Planning and Organizing The clash of the weathers', '3.3.jpg', 1),
+(3, 3, 'test', '3.logo.png', 1);
-(4, 4, 'Constructing and Specifying Express it Industrially', '4.4.jpg', 1),
-(5, 5, 'Planning and Organizing Understanding Micro-spaces', '5.5.jpg', 1);
 
 --
 -- Indexes for dumped tables
@@ -438,7 +442,7 @@ ALTER TABLE `subjectdetail`
 -- AUTO_INCREMENT for table `degree`
 --
 ALTER TABLE `degree`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=3;
 
 --
 -- AUTO_INCREMENT for table `department`
@@ -450,7 +454,7 @@ ALTER TABLE `department`
 -- AUTO_INCREMENT for table `employee`
 --
 ALTER TABLE `employee`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6;
 
 --
 -- AUTO_INCREMENT for table `faculty`
@@ -462,31 +466,31 @@ ALTER TABLE `faculty`
 -- AUTO_INCREMENT for table `project`
 --
 ALTER TABLE `project`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=3;
 
 --
 -- AUTO_INCREMENT for table `projectdetail`
 --
 ALTER TABLE `projectdetail`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=3;
 
 --
 -- AUTO_INCREMENT for table `role`
 --
 ALTER TABLE `role`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6;
 
 --
 -- AUTO_INCREMENT for table `semester`
 --
 ALTER TABLE `semester`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6;
 
 --
 -- AUTO_INCREMENT for table `semesterdetail`
 --
 ALTER TABLE `semesterdetail`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2;
 
 --
 -- AUTO_INCREMENT for table `student`
@@ -498,13 +502,13 @@ ALTER TABLE `student`
 -- AUTO_INCREMENT for table `subject`
 --
 ALTER TABLE `subject`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
 
 --
 -- AUTO_INCREMENT for table `subjectdetail`
 --
 ALTER TABLE `subjectdetail`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=8;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
 COMMIT;
 
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;