diff --git a/application/config/routes.php b/application/config/routes.php
index 3071db0..8fb530e 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -100,4 +100,11 @@ $route['deleted_faculty'] = 'faculty/deleted_faculty';
 $route['student'] = 'student/student_list';
 $route['add_student'] = 'student/add_student';
 $route['edit_student/(:num)'] = 'student/edit_student/$1';
-$route['deleted_student'] = 'student/deleted_student';
\ No newline at end of file
+$route['deleted_student'] = 'student/deleted_student';
+
+
+//project//
+$route['project'] = 'project/project_list';
+$route['add_project'] = 'project/add_project';
+$route['edit_project/(:num)'] = 'project/edit_project/$1';
+$route['deleted_project'] = 'project/deleted_project';
\ No newline at end of file
diff --git a/application/controllers/Department.php b/application/controllers/Department.php
index 1e54d3e..8e5c84d 100644
--- a/application/controllers/Department.php
+++ b/application/controllers/Department.php
@@ -40,17 +40,17 @@ class Department extends CI_Controller {
 		$this->load->view('department/add_department');
 		if($this->input->post('submit'))
 		{
-			$depname=$this->input->post('depname');
-			$depcode=$this->input->post('depcode');
+			$name=$this->input->post('name');
+			$code=$this->input->post('code');
 			$year=$this->input->post('year');
 			
 			$table="department";
 
-			$values=array('name'=>$depname,
-			              'code'=>$depcode,
+			$values=array('name'=>$name,
+			              'code'=>$code,
 			              'year'=>$year,
 						 //'created_on'=>date('Y-m-d'),
-						 'created_by'=>1,
+						 'createdBy'=>1,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->insert_table($table,$values);
@@ -74,16 +74,18 @@ class Department extends CI_Controller {
 		if($this->input->post('submit'))
 		{
 	         
-			$depname=$this->input->post('depname');
-			$depcode=$this->input->post('depcode');
+			$name=$this->input->post('name');
+			$code=$this->input->post('code');
+			$year=$this->input->post('year');
 			$primaryid=$this->input->post('hiddendepid');
 			
 			$table="department";
 			$where=array("dep_id"=>$primaryid);
-			$values=array('name'=>$depname,
-			             'code'=>$depcode,
+			$values=array('name'=>$name,
+			             'code'=>$code,
+			             'year'=>$year,
 						 //'updated_on'=>date('Y-m-d'),
-						 'update_by'=>1,
+						 'updatedBy'=>1,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
diff --git a/application/controllers/Employee.php b/application/controllers/Employee.php
index c4f1f5c..ea7a7c0 100644
--- a/application/controllers/Employee.php
+++ b/application/controllers/Employee.php
@@ -31,7 +31,7 @@ public function __construct()
 		if($this->input->post('submit'))
 		{
 			$employeename=$this->input->post('employeename');
-			$mobile_Number=$this->input->post('mobile_Number');
+			$mobileNumber=$this->input->post('mobileNumber');
 			$address=$this->input->post('address');
 			$email=$this->input->post('email');
 			$code=$this->input->post('code');
@@ -42,15 +42,15 @@ public function __construct()
 			
 			$table="employee";
 			$values=array('name'=>$employeename,
-			             'mobile_Number'=>$mobile_Number,
+			             'mobileNumber'=>$mobileNumber,
 						 'address'=>$address,
 						 'email'=>$email,
 						 'pincode'=>$code,
 						 'image'=>$img,
 						 'username'=>$user,
 						 'password'=>$password,
-						 'created_on'=>date('Y-m-d'),
-						 'created_by'=>1,
+						 'createdOn'=>date('Y-m-d'),
+						 'createdBy'=>1,
 						 'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
 			if($result)
@@ -72,7 +72,7 @@ public function __construct()
 		if($this->input->post('submit'))
 		{
 			$employeename=$this->input->post('employeename');
-			$mobile_Number=$this->input->post('mobile_Number');
+			$mobileNumber=$this->input->post('mobileNumber');
 			$address=$this->input->post('address');
 			$email=$this->input->post('email');
 			$code=$this->input->post('code');
@@ -91,15 +91,15 @@ public function __construct()
 			$table="employee";
 			$where=array("id"=>$empid);
 			$values=array('name'=>$employeename,
-			             'mobile_Number'=>$mobile_Number,
+			             'mobileNumber'=>$mobileNumber,
 						 'address'=>$address,
 						 'email'=>$email,
 						 'pincode'=>$code,
 						 'username'=>$user,
 						 'image'=>$img,
 						 'password'=>$newpassword,
-						 'update_on'=>date('Y-m-d'),
-						 'update_by'=>1,
+						 'updatedOn'=>date('Y-m-d'),
+						 'updatedBy'=>1,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
diff --git a/application/controllers/Faculty.php b/application/controllers/Faculty.php
index 313ab63..e607f54 100644
--- a/application/controllers/Faculty.php
+++ b/application/controllers/Faculty.php
@@ -61,8 +61,8 @@ class Faculty extends CI_Controller {
 						 'address'=>$address,
 						 'designation'=>$desi,
 						 'image'=>$f_img,
-						 'created_on'=>date('Y-m-d'),
-						 'created_by'=>1,
+						 'createdOn'=>date('Y-m-d'),
+						 'createdBy'=>1,
 						 'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
 			if($result)
@@ -111,8 +111,8 @@ class Faculty extends CI_Controller {
 						 'address'=>$address,
 						 'designation'=>$desi,
 						 'image'=>$f_img,
-						 'updated_on'=>date('Y-m-d'),
-						 'updated_by'=>1,
+						 'updatedOn'=>date('Y-m-d'),
+						 'updatedBy'=>1,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
diff --git a/application/controllers/Project.php b/application/controllers/Project.php
new file mode 100644
index 0000000..597aa7c
--- /dev/null
+++ b/application/controllers/Project.php
@@ -0,0 +1,172 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class Project extends CI_Controller {
+	
+	public function __construct()
+	{
+		parent::__construct();
+		$this->load->model('Project_model'); 
+		$this->load->model('Commonsql_model'); 
+	
+	}
+
+	/**
+	 * Index Page for this controller.
+	 *
+	 * Maps to the following URL
+	 * 		http://example.com/index.php/welcome
+	 *	- or -
+	 * 		http://example.com/index.php/welcome/index
+	 *	- or -
+	 * Since this controller is set as the default controller in
+	 * config/routes.php, it's displayed at http://example.com/
+	 *
+	 * So any other public methods not prefixed with an underscore will
+	 * map to /index.php/welcome/<method_name>
+	 * @see https://codeigniter.com/user_guide/general/urls.html
+	 */
+	public function project_list()
+	{
+		$data['pro']=$this->Project_model->list_pro();
+		 $this->load->view('project/project_list',$data);
+	}
+	
+
+	function add_project()
+	{
+		 $data['dep']=$this->Project_model->get_dep();
+		 $data['stu']=$this->Project_model->get_stu();
+		 $data['fac']=$this->Project_model->get_fac();
+		$this->load->view('project/add_project',$data);
+		
+		
+		if($this->input->post('submit'))
+		{
+			$name=$this->input->post('projectName');
+			$date=$this->input->post('date');
+			$student=$this->input->post('student');
+			$semester=$this->input->post('semester');
+			$gender=$this->input->post('gender');
+			$department=$this->input->post('department');
+			$designation=$this->input->post('designation');
+			$faculty=$this->input->post('faculty');
+			$drivelink=$this->input->post('drive');
+			$vedio=$this->input->post('vedio');
+			$image=$this->input->post('image');
+			
+			$table="project";
+			$values=array('projectName'=>$name,
+			             'date'=>$date,
+						 'student'=>$student,
+						 'semester'=>$semester,
+						 'department'=>$department,
+						 'gender'=>$gender,
+						 'designation'=>$designation,
+						 'faculty'=>$faculty,
+						 'drivelink'=>$drivelink,
+						 'vedio'=>$vedio,
+						 'image'=>$image,
+						 'createdOn'=>date('Y-m-d'),
+						 'createdBy'=>1,
+						 'status'=>1);
+			$result=$this->Commonsql_model->insert_table($table,$values);
+			if($result)
+						{
+							$this->session->set_userdata('suc','successfully added');
+							redirect('project');
+							
+						}
+						else
+						{
+							$this->session->set_userdata('err','Please try again');
+							redirect('project');
+						}
+			
+		}
+	}
+	
+	
+	function edit_project($id)
+	{		
+	    $data['pro']=$this->Project_model->get_pro($id);
+        $this->load->view('project/edit_project',$data);
+		
+		if($this->input->post('submit'))
+		{
+			$name=$this->input->post('projectName');
+			$date=$this->input->post('date');
+			$student=$this->input->post('student');
+			$semester=$this->input->post('semester');
+			$gender=$this->input->post('gender');
+			$department=$this->input->post('department');
+			$designation=$this->input->post('designation');
+			$faculty=$this->input->post('faculty');
+			$drivelink=$this->input->post('drive');
+			$vedio=$this->input->post('vedio');
+			$image=$this->input->post('image');
+			
+		
+			$table="project";
+			$where=array("id"=>$id);
+			$values=array('projectName'=>$name,
+			             'date'=>$date,
+						 'student'=>$student,
+						 'semester'=>$semester,
+						 'department'=>$department,
+						 'gender'=>$gender,
+						 'designation'=>$designation,
+						 'faculty'=>$faculty,
+						 'drivelink'=>$drivelink,
+						 'vedio'=>$vedio,
+						 'image'=>$image,
+						 'updatedOn'=>date('Y-m-d'),
+						 'updatedBy'=>1,
+						 'status'=>1);
+						 
+			$result=$this->Commonsql_model->updateTable($table,$where,$values);
+			if($result)
+						{
+							$this->session->set_userdata('suc','successfully Updated');
+							redirect('project');
+							
+						}
+						else
+						{
+							$this->session->set_userdata('err','Please try again');
+							redirect('project');
+						}
+			
+		}
+		
+	}
+	
+	function deleted_project()
+	{
+		if($this->input->post('submit'))
+		{
+			$id=$this->input->post('hiddenpass');
+			
+			$table="project";
+			$where=array("id"=>$id);
+			$values=array(
+						 'status'=>0);
+						 
+			$result=$this->Commonsql_model->updateTable($table,$where,$values);
+			if($result)
+						{
+							$this->session->set_userdata('suc','successfully deleted');
+							redirect('project');
+							
+						}
+						else
+						{
+							$this->session->set_userdata('err','Please try again');
+							redirect('project');
+						}
+		}	
+	}
+	
+	
+	
+}
diff --git a/application/controllers/Role.php b/application/controllers/Role.php
index aa86c64..7016110 100644
--- a/application/controllers/Role.php
+++ b/application/controllers/Role.php
@@ -24,8 +24,8 @@ public function __construct()
 			$table="role";
 
 			$values=array('name'=>$role,
-						 'created_on'=>date('Y-m-d'),
-						 'created_by'=>1,
+						 'createdOn'=>date('Y-m-d'),
+						 'createdBy'=>1,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->insert_table($table,$values);
@@ -52,8 +52,8 @@ public function __construct()
 			$table="role";
 			$where=array("id"=>$primaryid);
 			$values=array('name'=>$rolename,
-						 'updated_on'=>date('Y-m-d'),
-						 'updated_by'=>1,
+						 'updatedOn'=>date('Y-m-d'),
+						 'updatedBy'=>1,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
diff --git a/application/controllers/Semester.php b/application/controllers/Semester.php
index a5228dd..c0bd604 100644
--- a/application/controllers/Semester.php
+++ b/application/controllers/Semester.php
@@ -46,8 +46,8 @@ class Semester extends CI_Controller {
 			$table="semester";
 			$values=array('name'=>$name,
 			             
-						 'created_on'=>date('Y-m-d'),
-						 'created_by'=>1,
+						 'createdOn'=>date('Y-m-d'),
+						 'createdBy'=>1,
 						 'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
 			if($result)
@@ -79,8 +79,8 @@ class Semester extends CI_Controller {
 			$where=array("id"=>$id);
 			$values=array('name'=>$name,
 			             
-						 //'update_on'=>date('Y-m-d'),
-						// 'update_by'=>1,
+						 'updatedOn'=>date('Y-m-d'),
+						 'updatedby'=>1,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
diff --git a/application/controllers/Student.php b/application/controllers/Student.php
index 03606a8..9fe744c 100644
--- a/application/controllers/Student.php
+++ b/application/controllers/Student.php
@@ -35,8 +35,9 @@ class Student extends CI_Controller {
 
 	function add_student()
 	{
+		 $data['dep']=$this->Student_model->get_dep();
+		 $this->load->view('student/add_student',$data);
 		
-		$this->load->view('student/add_student');
 		
 		if($this->input->post('submit'))
 		{
@@ -54,8 +55,8 @@ class Student extends CI_Controller {
 						 'department'=>$department,
 						 'gender'=>$gender,
 						 'image'=>$s_img,
-						 'created_on'=>date('Y-m-d'),
-						 'created_by'=>1,
+						 'createdOn'=>date('Y-m-d'),
+						 'createdBy'=>1,
 						 'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
 			if($result)
diff --git a/application/controllers/Subject.php b/application/controllers/Subject.php
index 150eac3..710f327 100644
--- a/application/controllers/Subject.php
+++ b/application/controllers/Subject.php
@@ -49,8 +49,8 @@ function add_subject()
 			             'subject'=>$sub,
 						 'department'=>$dep,
 						 'semester'=>$semester,
-						 'created_on'=>date('Y-m-d'),
-						 'created_by'=>1,
+						 'createdOn'=>date('Y-m-d'),
+						 'createdBy'=>1,
 						 'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
 			if($result)
@@ -91,8 +91,8 @@ function add_subject()
 			             'subject'=>$sub,
 			             'department'=>$dep,
 			             'semester'=>$semester,
-						 'updated_on'=>date('Y-m-d'),
-						 //'update_by'=>1,
+						 'updatedOn'=>date('Y-m-d'),
+						 'updatedBy'=>1,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
diff --git a/application/models/Project_model.php b/application/models/Project_model.php
new file mode 100644
index 0000000..8d39234
--- /dev/null
+++ b/application/models/Project_model.php
@@ -0,0 +1,63 @@
+<?php
+if (!defined('BASEPATH'))
+    exit('No direct script access allowed');
+
+class Project_model extends CI_Model {
+
+    public function __construct() {
+        parent::__construct();
+    }
+	 
+		function list_pro()
+	{
+		$this->db->select('p.*,d.name as deptname,s.name as studentName,f.name as facultyName');
+		$this->db->from('project as p');
+		$this->db->join('department as d','d.id=p.department','left' );
+		$this->db->join('student as s','s.id=p.student','left' );
+		$this->db->join('faculty as f','f.id=p.faculty','left' );
+		$this->db->where(array('p.status'=>1));
+		$query = $this->db->get();
+	//echo $this->db->last_query();exit;
+		return $query;
+	}
+	 
+	 function get_pro($id)
+	{
+		$this->db->select('*');
+		$this->db->from('project');
+		$this->db->where(array('status'=>1,'id'=>$id));
+		$query = $this->db->get();
+	//echo $this->db->last_query();exit;
+		return $query;
+	} 
+	
+	 function get_dep()
+	{
+		$this->db->select('*');
+		$this->db->from('department');
+		$this->db->where(array('status'=>1));
+		$query = $this->db->get();
+	//echo $this->db->last_query();exit;
+		return $query;
+	} 
+	
+	 function get_stu()
+	{
+		$this->db->select('*');
+		$this->db->from('student');
+		$this->db->where(array('status'=>1));
+		$query = $this->db->get();
+	//echo $this->db->last_query();exit;
+		return $query;
+	} 
+	function get_fac()
+	{
+		$this->db->select('*');
+		$this->db->from('faculty');
+		$this->db->where(array('status'=>1));
+		$query = $this->db->get();
+	//echo $this->db->last_query();exit;
+		return $query;
+	} 
+	 
+}
diff --git a/application/models/Student_model.php b/application/models/Student_model.php
index 080c0e3..ad6ebff 100644
--- a/application/models/Student_model.php
+++ b/application/models/Student_model.php
@@ -10,9 +10,10 @@ class Student_model extends CI_Model {
 	 
 	function list_stu()
 	{
-		$this->db->select('*');
-		$this->db->from('student');
-		$this->db->where(array('status'=>1));
+		$this->db->select('s.*,d.name as deptname');
+		$this->db->from('student as s');
+		$this->db->join('department as d','d.id=s.department','left' );
+		$this->db->where(array('s.status'=>1));
 		$query = $this->db->get();
 	//echo $this->db->last_query();exit;
 		return $query;
@@ -27,5 +28,15 @@ class Student_model extends CI_Model {
 	//echo $this->db->last_query();exit;
 		return $query;
 	} 
+	
+	 function get_dep()
+	{
+		$this->db->select('*');
+		$this->db->from('department');
+		$this->db->where(array('status'=>1));
+		$query = $this->db->get();
+	//echo $this->db->last_query();exit;
+		return $query;
+	} 
 	 
 }
diff --git a/application/views/add_emplayee/add.php b/application/views/add_emplayee/add.php
index 66c3e4e..eb27514 100644
--- a/application/views/add_emplayee/add.php
+++ b/application/views/add_emplayee/add.php
@@ -41,7 +41,8 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="mobile_Number" type="text" placeholder="Enter mobile number" class="form-control input-height" /> </div>
+													<input name="mobileNumber" type="text" data-required="1" placeholder="Enter Mobile Number" class="form-control input-height" />
+													</div>
 											</div>
 											<div class="form-group row">
 												<label class="control-label col-md-3">Address
@@ -98,7 +99,7 @@
 												<div class="col-md-5">
 													<input name="Password" type="text" placeholder="Enter Password" class="form-control input-height" /> </div>
 											    </div>
-										</div>
+										
 										
 											<div class="form-group row">
 												<label class="control-label col-md-3">Profile Image
@@ -107,6 +108,7 @@
 													<input name="img" type="file" placeholder="Enter Your Image"class="form-control default" multiple>
 												</div>
 											</div>
+											</div>
 										<div class="form-actions">
 											<div class="row">
 												<div class="offset-md-3 col-md-9">
diff --git a/application/views/add_emplayee/edit.php b/application/views/add_emplayee/edit.php
index 05be06b..8a1e6f9 100644
--- a/application/views/add_emplayee/edit.php
+++ b/application/views/add_emplayee/edit.php
@@ -48,7 +48,7 @@
 							$e=$emp->row();
 							$eid=$e->id;
 							$name=$e->name;
-							$mobile_Number=$e->mobile_Number;
+							$mobileNumber=$e->mobileNumber;
 							$email=$e->email;
 							$image=$e->image;
 							$address=$e->address;
@@ -79,7 +79,7 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="mobile_Number" value="<?=$mobile_Number;?>" type="number" placeholder="Enter mobile number" class="form-control input-height" /> </div>
+													<input type="text" name="mobileNumber" value="<?=$mobileNumber;?>" data-required="1" placeholder="Enter mobile number" class="form-control input-height" /> </div>
 											</div>
 											<div class="form-group row">
 												<label class="control-label col-md-3">Address
@@ -103,25 +103,15 @@
 													</div>	
 												</div>
 											</div>
-											
-                                              <!--<div class="form-group row">
-												<label class="control-label col-md-3">Profile.
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-5">
-													<input type="file" name="img" value="<?=$img;?>" type="text" placeholder="Enter img" class="form-control error" /> 
-													</div>
-													
-											</div>-->
-											
+
 											<div class="form-group row">
-												<label class="control-label col-md-3">Upload Picture
+												<label class="control-label col-md-3">Profile Image
 												</label>
 												<div class="col-md-5 compose-editor">
-													<input type="file"  name="img" value="<?=$img;?>" placeholder="Enter img" class="default" multiple>
+													<input name="img" type="file" placeholder="Enter Your Image"class="form-control default" multiple>
 												</div>
 											</div>
-
+                                            
 											<div class="form-group row">
 												<label class="control-label col-md-3">Pincode.
 													<span class="required"> * </span>
diff --git a/application/views/department/add_department.php b/application/views/department/add_department.php
index ed59e8a..0708bb7 100644
--- a/application/views/department/add_department.php
+++ b/application/views/department/add_department.php
@@ -1,4 +1,41 @@
 <link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<style>
+* {
+  box-sizing: border-box;
+}
+
+#myInput {
+  background-image: url('/css/searchicon.png');
+  background-position: 10px 10px;
+  background-repeat: no-repeat;
+  width: 100%;
+  font-size: 16px;
+  padding: 12px 20px 12px 40px;
+  border: 1px solid #ddd;
+  margin-bottom: 12px;
+}
+
+#myTable {
+  border-collapse: collapse;
+  width: 100%;
+  border: 1px solid #ddd;
+  font-size: 18px;
+}
+
+#myTable th, #myTable td {
+  text-align: left;
+  padding: 12px;
+}
+
+#myTable tr {
+  border-bottom: 1px solid #ddd;
+}
+
+#myTable tr.header, #myTable tr:hover {
+  background-color: #f1f1f1;
+}
+</style>
+
 <?php $this->load->view('includes/header');?>
        <div class="page-container">
 			<!-- start sidebar menu -->
@@ -36,6 +73,7 @@
 													<input type="text" name="name" data-required="1" placeholder="EnterYour Name" class="form-control input-height">
 												</div>
 											</div>
+											
 											<div class="form-group row">
 												<label class="control-label col-md-3">Code
 													<span class="required"> * </span>
@@ -43,79 +81,427 @@
 												<div class="col-md-5">
 													<input name="code" type="text" placeholder="Enter Your Code" class="form-control input-height" /> </div>
 											</div>
-											<div class="form-group row">
-												<label class="control-label col-md-3">No Of The Year
+											<div  class="form-group row">
+												<label for="txtNum"class="control-label col-md-3">No Of The Year
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5 search">												
-													<input id="recherche"  name="search" type="search" placeholder="Enter Your Year" class="form-control input-height search" />	</div>											
+	
+													<input  type="text" id="myInput" onkeyup="myFunction()" placeholder="Search for names.." title="Type in a name">
+													</div>	
+													
 												</div>
+												<div id="numrows">
+
+													</div>
 											</div>
 											
-											
-												<div id="resultat" id="resultat" style="display: none;" class=" form-group row resultat ">
-												<label class="control-label col-md-5">
+									
+<table id="myTable" style="display: none;">
+ 
+  <tr class="odd gradeX">
+  <td>1</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+  <tr class="odd gradeX">
+  <td>2</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+   <tr class="odd gradeX">
+  <td>2</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+  <tr class="odd gradeX">
+  <td>3</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+  
+  <tr class="odd gradeX">
+  <td>3</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+ <tr class="odd gradeX">
+  <td>3</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+  <tr class="odd gradeX">
+  <td>4</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+   <tr class="odd gradeX">
+  <td>4</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+  <tr class="odd gradeX">
+  <td>4</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+  <tr class="odd gradeX">
+  <td>4</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+  <tr class="odd gradeX">
+  <td>5</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+  <tr class="odd gradeX">
+  <td>5</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+  <tr class="odd gradeX">
+  <td>5</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Odd</td>
+<td>
+<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+	<input type="checkbox" class="checkboxes" value="" />
+	<span></span>
+</label>
+</td>
+<td>Event</td>
+  </tr>
+  
+</table>
+
+									
+												<div style="display: none;" class=" form-group row resultat ">
+												<label class="control-label col-md-3">
 												</label>
-												<div class="col-md-5">
+												<div class="col-md-3">
 												 <div class="table-responsive">
-													<table class="table table-striped table-bordered table-hover table-checkable order-column" id="example4">
-														<thead>
-															<tr>
-																<th>
-																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
-																		<input type="checkbox" class="group-checkable" data-set="#sample_1 .checkboxes" />
-																		<span></span>
-																	</label>
-																</th>
-																<th>Odd</th>
-																<th>
-																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
-																		<input type="checkbox" class="group-checkable" data-set="#sample_1 .checkboxes" />
-																		<span></span>
-																	</label>
-																</th>
-																<th>Event</th>
-																
-															</tr>
-														</thead>
-														
+													<table id="myTable" class=" table table-striped table-bordered table-hover" >	
 														<tbody>
-																<tr class="odd gradeX">
+																<tr class="header odd gradeX" >
+																
 																<td>
 																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
-																		<input type="checkbox" class="checkboxes" value="1" />
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>ODD</td>
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>EVENT</td>
+															</tr>
+															<tr class="odd gradeX">
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
 																		<span></span>
 																	</label>
 																</td>
 																<td>Odd</td>
 																<td>
 																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
-																		<input type="checkbox" class="checkboxes" value="1" />
+																		<input type="checkbox" class="checkboxes" value="" />
 																		<span></span>
 																	</label>
 																</td>
 																<td>Event</td>
 															</tr>
-															
-																<tr class="odd gradeX">
+															<tr class="odd gradeX">
 																<td>
 																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
-																		<input type="checkbox" class="checkboxes" value="1" />
+																		<input type="checkbox" class="checkboxes" value="" />
 																		<span></span>
 																	</label>
 																</td>
 																<td>Odd</td>
 																<td>
 																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
-																		<input type="checkbox" class="checkboxes" value="1" />
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Event</td>
+															</tr>
+																<tr class="odd gradeX">
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Odd</td>
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Event</td>
+															</tr>
+															<tr class="odd gradeX">
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Odd</td>
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Event</td>
+															</tr>
+																<tr class="odd gradeX">
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Odd</td>
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Event</td>
+															</tr>
+																<tr class="odd gradeX">
+																<td>
+																	2
+																</td>
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Odd</td>
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Event</td>
+															</tr>
+															<tr class="odd gradeX">
+															<td>
+																	2
+																</td>
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Odd</td>
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Event</td>
+															</tr>
+															<tr class="odd gradeX">
+															     <td>
+																	1
+																</td>
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Odd</td>
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Event</td>
+															</tr>
+															<tr class="odd gradeX">
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
+																		<span></span>
+																	</label>
+																</td>
+																<td>Odd</td>
+																<td>
+																	<label class="rt-chkbox rt-chkbox-single rt-chkbox-outline">
+																		<input type="checkbox" class="checkboxes" value="" />
 																		<span></span>
 																	</label>
 																</td>
 																<td>Event</td>
 															</tr>
-															
-														
-															
 														</tbody>
 													</table>
 													</div>
@@ -152,26 +538,48 @@
 	 $('#hiddenid').val(id);
      });
 	 </script>
-	 <script>
-	 var A = 10;
-$('#getyear').keyup(function () {
-    var nyear=$(this).val();
-	//alert(nyear);
-	//var div = document.getElementById('resultat');
+	<script type="text/javascript">
+$(document).ready(function() {
+	
+	 var myPara = document.getElementById("example4");
+	
+   $('#txtNum').on('keyup', function(e) {
+	  // console.log("work")
+    //var #txtNum = (e.numrows ? e.numrows : e.which);
+    var myPara = document.getElementById("example4");
+	//console.log(myPara);
+        $('#numrows').append(myPara);
+        //console.log(#numrows);
+        //var rowcount = $('#numrows tr').length;
+		//console.log(rowcount);
+       // $('#numrows').html(rowcount);
+       // $('#numrows').html($(this).val());
+       // $(this).focus().select();
+       // rowcount++;
+	
+	
+   });
 });
-	 </script>
-	 <script>
-	 var input = document.getElementById('recherche');
-var div = document.getElementById('resultat');
-
-// When the user type, we show the results
-input.addEventListener('keypress', function() {
-  div.style.display = "block";
-});
-
-// To hide the div when the cursor isn't in the input
-input.addEventListener('focusout', function() {
-  div.style.display = "none";
-});
-	 </script>
+</script>
+<script>
+function myFunction() {
+  var input, filter, table, tr, td, i, txtValue;
+  input = document.getElementById("myInput");
+  filter = input.value.toUpperCase();
+  table = document.getElementById("myTable");
+  tr = table.getElementsByTagName("tr");
+  for (i = 0; i < tr.length; i++) {
+    td = tr[i].getElementsByTagName("td")[0];
+    if (td) {
+      txtValue = td.textContent || td.innerText;
+      if (txtValue.toUpperCase().indexOf(filter) > -1) {
+        tr[i].style.display = "block";
+      } else {
+        tr[i].style.display = "none";
+      }
+    }       
+  }
+}
+</script>
+	 
 	 
\ No newline at end of file
diff --git a/application/views/employee/employee.php b/application/views/employee/employee.php
index 6b25f2d..61047a0 100644
--- a/application/views/employee/employee.php
+++ b/application/views/employee/employee.php
@@ -41,8 +41,7 @@
 													<th> S. No</th>
 													<th> Name </th>
 													<th> Mobile Number </th>
-													<th> Email </th>
-													
+													<th> Email </th>	
 													<th> Address </th>
 													<th> Action </th>
 												</tr>
@@ -56,7 +55,7 @@
 														{
 															$eid=$e->id;
 															$name=$e->name;
-															$mobile_Number=$e->mobile_Number;
+															$mobileNumber=$e->mobileNumber;
 															$email=$e->email;
 															$image=$e->image;
 															$address=$e->address;
@@ -64,7 +63,7 @@
 												<tr class="odd gradeX">
 													<td><?=$i;?></td>
 													<td><?=$name;?></td>
-													<td><?=$mobile_Number;?></td>
+													<td><?=$mobileNumber;?></td>
 													<td><?=$email;?></td>
 												
 													<td><?=$address;?></td>
diff --git a/application/views/faculty/faculty_list.php b/application/views/faculty/faculty_list.php
index e9d230a..edc6026 100644
--- a/application/views/faculty/faculty_list.php
+++ b/application/views/faculty/faculty_list.php
@@ -108,7 +108,7 @@
 									</button>
 								</div>
 								<div class="modal-body">
-									<form action="<?=base_url();?>deleted_subject" method="post">
+									<form action="<?=base_url();?>deleted_faculty" method="post">
 										<div class="form-body">
 											
 											<div class="form-group row">
diff --git a/application/views/includes/sidebar.php b/application/views/includes/sidebar.php
index fd264f5..2206132 100644
--- a/application/views/includes/sidebar.php
+++ b/application/views/includes/sidebar.php
@@ -77,11 +77,15 @@
 									<span class="title">Faculty</span></a>
 								
 							</li>
-							<li class="nav-item  ">
+							<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>
 							
 							
diff --git a/application/views/login.php b/application/views/login.php
index 85e5e61..a1196d5 100644
--- a/application/views/login.php
+++ b/application/views/login.php
@@ -31,7 +31,7 @@
 	<meta content="width=device-width, initial-scale=1" name="viewport" />
 	<meta name="description" content="Responsive Admin Template" />
 	<meta name="author" content="RedstarHospital" />
-	<title>Student</title>
+	<title>Mcgans</title>
 	<!-- google font -->
 	<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700&amp;subset=all" rel="stylesheet" type="text/css" />
 	<!-- icons -->
diff --git a/application/views/project/add_project.php b/application/views/project/add_project.php
new file mode 100644
index 0000000..8e20093
--- /dev/null
+++ b/application/views/project/add_project.php
@@ -0,0 +1,179 @@
+<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">Add Project</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">Project</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>Project</header>	
+								</div>
+								<div class="card-body" id="bar-parent">
+									<form action="<?=base_url();?>add_project" method="post">
+										<div class="form-body">
+											<div class="form-group row">
+												<label class="control-label col-md-3"> Project Date
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">											
+													<input type="date" name="date" data-required="1"  class="form-control input-height formDatePicker">
+												</div>
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">Name
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">
+													<input name="projectName" type="text" placeholder="Enter Project Name" class="form-control input-height" /> </div>
+											</div>
+									       <div class="form-group row">
+												<label class="control-label col-md-3">Faculty Name
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">
+													<select class="form-control input-height"  name="faculty">
+													<option value="" selected="selected">Select</option>
+													<?php
+														   if(isset($fac) && $fac->num_rows()>0)
+														   {
+															   foreach($fac->result() as $faculty)
+															   {
+																   ?> <option value="<?=$faculty->id;?>"><?=$faculty->name;?></option><?php
+															   }
+														   }
+													?>     
+														
+													</select>
+													</div>
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">Student
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">
+													<select class="form-control input-height"  name="student">
+													<option value="" selected="selected">Select</option>
+													<?php
+														   if(isset($stu) && $stu->num_rows()>0)
+														   {
+															   foreach($stu->result() as $student)
+															   {
+																   ?> <option value="<?=$student->id;?>"><?=$student->name;?></option><?php
+															   }
+														   }
+													?>     
+														
+													</select>	
+											</div>
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">Semester
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">
+													<input name="semester" type="text" placeholder="Enter semester" class="form-control input-height" /> </div>
+											</div>
+											
+											<div class="form-group row">
+												<label class="control-label col-md-3">Gender
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">												
+													<select class="form-control input-height" name="gender">
+														<option value="">Select...</option>
+														<option value="Male">Male</option>
+														<option value="Female">Female</option>
+													</select>													
+												</div>
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">Designation
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">
+													<textarea name="designation" placeholder=" Enter Designation" class="form-control" rows="5"></textarea>
+												</div>
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">Department.
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">												
+													<select class="form-control input-height" id="departmentId" name="department">
+													<option value="" selected="selected">Select</option>
+													<?php
+														   if(isset($dep) && $dep->num_rows()>0)
+														   {
+															   foreach($dep->result() as $depart)
+															   {
+																   ?> <option value="<?=$depart->id;?>"><?=$depart->name;?></option><?php
+															   }
+														   }
+													?>     
+														
+													</select>													
+												</div>
+											</div>											
+											</div>	
+                                            <div class="form-group row">
+												<label class="control-label col-md-3">Vedio
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">
+													<input name="vedio" type="text" placeholder="Enter Vedio 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="drive" 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">Profile Img
+												</label>
+												<div class="col-md-5 compose-editor">
+													<input name="image" type="file" class="form-control default" multiple>
+												</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');?>
\ No newline at end of file
diff --git a/application/views/project/edit_project.php b/application/views/project/edit_project.php
new file mode 100644
index 0000000..efc8526
--- /dev/null
+++ b/application/views/project/edit_project.php
@@ -0,0 +1,154 @@
+<link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<?php $this->load->view('includes/header');?>
+<!--<style>
+.input-group .input-group-addon {
+	border-radius: 0;
+    border-color: #d2d6de;
+    background-color: #fff;
+    border: 1px solid #d2d6de;
+	padding: 6px 12px;
+}
+.form-control{
+	    width: 100%;
+    height: 34px;
+    padding: 6px 12px;
+    background-color: #fff;
+    border: 1px solid #c2cad8;
+	box-shadow: none!important;
+	outline: 0!important;
+	transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+	font-size: 14px;
+    line-height: 1.42857;
+    color: #555;
+}
+.fa{
+	padding-top:8px;
+}
+</style>-->
+       <div class="page-container">
+			<?php $this->load->view('includes/sidebar');?>
+			<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">Edit Project</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">Edit Project</li>
+							</ol>
+						</div>
+					</div>
+					<!-- Midium Model -->
+					<?php
+					if(isset($pro) && $pro->num_rows()>0)
+					{
+							$p=$pro->row();
+							$id=$p->id;
+							$date=$p->date;
+							$name=$p->projectName;
+							$student=$p->student;
+							$semester=$p->semester;
+							$department=$p->department;
+							$faculty=$p->faculty;
+							$image=$p->image;
+							
+					} ?>
+					<div class="row">
+						<div class="col-md-12 col-sm-12">
+							<div class="card card-box">
+								<div class="card-head">
+									<header>Edit Project</header>	
+								</div>
+								<div class="card-body" id="bar-parent">
+									<form action="<?=base_url();?>edit_project/<?=$id;?>" method="post" >
+										<div class="form-body">
+										<div class="form-group row">
+												<label class="control-label col-md-3">Date
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">											
+													<input type="text" value="<?=$date;?>" name="date" data-required="1" placeholder="Enter  name" class="form-control input-height">
+												</div>
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">Name
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">											
+													<input type="text" value="<?=$name;?>" name="projectName" data-required="1" placeholder="Enter  name" class="form-control input-height">
+												</div>
+											</div>
+											 <div class="form-group row">
+												<label class="control-label col-md-3">Student
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">
+													<input name="student" value="<?=$student;?>" type="text" placeholder="Enter hod" class="form-control error" /> 
+													</div>		
+											</div>
+                                              <div class="form-group row">
+												<label class="control-label col-md-3">Semester
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">
+													<input name="semester" value="<?=$semester;?>" type="text" placeholder="Enter hod" class="form-control error" /> 
+													</div>		
+											</div>
+											 <div class="form-group row">
+												<label class="control-label col-md-3">Faculty
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">
+													<input name="faculty" value="<?=$faculty;?>" type="text" placeholder="Enter hod" class="form-control error" /> 
+													</div>		
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">Department.
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">
+													<input name="department"  value="<?=$department;?>" type="text" placeholder="Enter hod" class="form-control input-height" /> </div>
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">Gender
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">												
+													<select class="form-control input-height" name="gender">
+														<option value="">Select...</option>
+														<option value="Male">Male</option>
+														<option value="Female">Female</option>
+													</select>													
+												</div>
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">Profile Img
+												</label>
+												<div class="compose-editor">
+													<input name="image" value="<?=$image;?>" type="file" class="form-control" >
+												</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');?>
\ No newline at end of file
diff --git a/application/views/project/project_list.php b/application/views/project/project_list.php
new file mode 100644
index 0000000..ad10e31
--- /dev/null
+++ b/application/views/project/project_list.php
@@ -0,0 +1,150 @@
+<!-- data tables -->
+<link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<?php $this->load->view('includes/header');?>
+		<!-- start page container -->
+		<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">Project List</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">Project</li>
+							</ol>
+						</div>
+					</div>
+					<?php $this->load->view('includes/msg');?>
+					<div class="row">
+						<div class="col-md-12">
+							<div class="card card-topline-red">
+								<div class="card-body ">
+									<div class="row">
+										<div class="col-md-6 col-sm-6 col-xs-6">
+											<div class="btn-group">
+												<button  type="button" class="btn btn-info"
+										 data-toggle="modal" data-target="#mediumModel" ><a style="color:#fff;"href="<?=base_url();?>add_project">add <i class="fa fa-plus"></i></a> </button>
+											</div>
+										</div>
+										
+									</div>
+									<div class="table-scrollable">
+										<table class="table table-hover table-checkable order-column full-width" id="example4">
+											<thead>
+												<tr>
+													<th> S.No </th>
+													<th> Date </th>
+													<th> Project Name </th>
+													<th> Student </th>
+													<th> Semester </th>
+													<th> Department </th>
+													<th> Faculty </th>	
+													<th> Action </th>
+												</tr>
+											</thead>
+											<tbody>
+											<?php
+													if(isset($pro) && $pro->num_rows()>0)
+													{
+													$i=1;
+														foreach($pro->result() as $p)
+														{
+															$id=$p->id;
+															$date=$p->date;
+															$name=$p->projectName;
+															$student=$p->studentName;
+															$semester=$p->semester;
+															$department=$p->deptname;
+															$faculty=$p->facultyName;
+															$image=$p->image;
+															?>
+												<tr class="odd gradeX">
+													<td><?=$i;?></td>
+													<td><?=$date;?></td>
+													<td><?=$name;?></td>
+													<td><?=$student;?></td>
+													<td><?=$semester;?></td>
+													<td><?=$department;?></td>
+													<td><?=$faculty;?></td>
+													
+													<td>
+														
+														<a href="<?=base_url();?>edit_project/<?=$id;?>" class="btn btn-primary btn-xs">
+															<i class="fa fa-pencil"></i>
+														</a>
+														<a data-id="<?=$id;?>"  class="editsemesterclass btn btn-danger btn-xs">
+															<i class="fa fa-trash-o"></i>
+														</a>
+														
+													</td>
+												</tr>
+													<?php 
+													$i++;
+													} }?>
+												
+											</tbody>
+										</table>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+	</div>
+	<!-- end page content -->
+			<div class="modal fade" id="editmediumModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+					 aria-hidden="true">
+						<div class="modal-dialog" role="document">
+							<div class="modal-content">
+								<div class="modal-header">
+									<h4 class="modal-title" id="exampleModalLabel">delete Role</h4>
+									<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+										<span aria-hidden="true">&times;</span>
+									</button>
+								</div>
+								<div class="modal-body">
+									<form action="<?=base_url();?>deleted_project" method="post">
+										<div class="form-body">
+											
+											<div class="form-group row">
+												<p style="margin-left: 19px;">Do You Wante Delete?</p>
+
+												<input type="hidden" name="hiddenpass" id="hiddenid">
+												</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="Yes">
+													<button type="button" class="btn btn-default">No</button>
+												</div>
+											</div>
+										</div>
+										</div>
+									</form>
+								</div>
+								
+							</div>
+						</div>
+					</div>
+				 
+			<?php $this->load->view('includes/footer');?>
+			<!-- data tables -->
+	<script src="<?=base_url();?>/assets/datatables/jquery.dataTables.min.js"></script>
+	<script src="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.js"></script>
+	<script src="<?=base_url();?>/assets/table_data.js"></script>
+		<script>
+	$(".editsemesterclass").click(function(){
+    $('#editmediumModel').modal('show');
+	var id=$(this).attr('data-id');
+	 //alert(id);
+	 $('#hiddenid').val(id);
+     });
+	 </script>
\ No newline at end of file
diff --git a/application/views/student/add_student.php b/application/views/student/add_student.php
index 9cbf8e0..0d1cc1d 100644
--- a/application/views/student/add_student.php
+++ b/application/views/student/add_student.php
@@ -29,7 +29,7 @@
 									<form action="<?=base_url();?>add_student" method="post">
 										<div class="form-body">
 											<div class="form-group row">
-												<label class="control-label col-md-3"> Student Id.
+												<label class="control-label col-md-3"> Student Id
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">											
@@ -37,7 +37,7 @@
 												</div>
 											</div>
 											<div class="form-group row">
-												<label class="control-label col-md-3">Name.
+												<label class="control-label col-md-3">Name
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
@@ -45,7 +45,7 @@
 											</div>
 									
 											<div class="form-group row">
-												<label class="control-label col-md-3">Mobile No.
+												<label class="control-label col-md-3">Mobile No
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
@@ -86,8 +86,21 @@
 												<label class="control-label col-md-3">Department.
 													<span class="required"> * </span>
 												</label>
-												<div class="col-md-5">
-													<input name="department" type="text" placeholder="Enter department" class="form-control input-height" /> </div>
+												<div class="col-md-5">												
+													<select class="form-control input-height" id="departmentId" name="department">
+													<option value="" selected="selected">Select</option>
+													<?php
+														   if(isset($dep) && $dep->num_rows()>0)
+														   {
+															   foreach($dep->result() as $depart)
+															   {
+																   ?> <option value="<?=$depart->id;?>"><?=$depart->name;?></option><?php
+															   }
+														   }
+													?>     
+														
+													</select>													
+												</div>
 											</div>
 											<div class="form-group row">
 												<label class="control-label col-md-3">Profile Img
diff --git a/application/views/student/edit_student.php b/application/views/student/edit_student.php
index 93cd6b5..5d823d4 100644
--- a/application/views/student/edit_student.php
+++ b/application/views/student/edit_student.php
@@ -112,9 +112,10 @@
 												<label class="control-label col-md-3">Profile Img
 												</label>
 												<div class="compose-editor">
-													<input name="image" value="<?=$s_img;?>" type="file" class="default" multiple>
+													<input name="image" value="<?=$s_img;?>" type="file" class="form-control" >
 												</div>
 											</div>
+											
 										<div class="form-actions">
 											<div class="row">
 												<div class="offset-md-3 col-md-9">
diff --git a/application/views/student/student_list.php b/application/views/student/student_list.php
index d24e7a5..1a7885e 100644
--- a/application/views/student/student_list.php
+++ b/application/views/student/student_list.php
@@ -57,7 +57,7 @@
 															$name=$s->name;
 															$number=$s->number;
 															$address=$s->address;
-															$department=$s->department;
+															$department=$s->deptname;
 															$gender=$s->gender;
 															$s_img=$s->image;
 															?>
diff --git a/application/views/subject/subject_list.php b/application/views/subject/subject_list.php
index af4c8a7..a62bae5 100644
--- a/application/views/subject/subject_list.php
+++ b/application/views/subject/subject_list.php
@@ -11,12 +11,12 @@
 					<div class="page-bar">
 						<div class="page-title-breadcrumb">
 							<div class=" pull-left">
-								<div class="page-title">Suject List</div>
+								<div class="page-title">Subject List</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">Suject</li>
+								<li class="active">Subject</li>
 							</ol>
 						</div>
 					</div>