diff --git a/admin/application/config/autoload.php b/admin/application/config/autoload.php
index b960eab..3291ed4 100644
--- a/admin/application/config/autoload.php
+++ b/admin/application/config/autoload.php
@@ -132,4 +132,4 @@ $autoload['language'] = array();
 |
 |	$autoload['model'] = array('first_model' => 'first');
 */
-$autoload['model'] = array();
+$autoload['model'] = array('');
diff --git a/admin/application/config/routes.php b/admin/application/config/routes.php
index 5ee8a33..ba431a0 100644
--- a/admin/application/config/routes.php
+++ b/admin/application/config/routes.php
@@ -52,6 +52,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 $route['default_controller'] = 'welcome';
 $route['404_override'] = '';
 $route['translate_uri_dashes'] = FALSE;
+$route['login'] = 'welcome/login';
 $route['dashboard'] = 'welcome/dashboard';
 $route['logout'] = 'welcome/logout';
 
@@ -65,47 +66,42 @@ $route['delete_role'] = 'role/deleterole';
 //emplayee//
 $route['employee'] = 'employee/employee_list';
 $route['add-employee'] = 'employee/add_employee';
-$route['edit_employees/(:num)'] = 'employee/editemployee/$1';
-$route['deleted_employee'] = 'employee/deleted_employee';
+$route['view-employee/(:num)'] = 'employee/viewEmployee/$1';
+$route['edit-employee/(:num)'] = 'employee/editEmployee/$1';
+
 
 //Department//
 $route['department'] = 'department/department_list';
 $route['add_department'] = 'department/add_department';
-$route['edit_department/(:num)'] = 'department/edit_department/$1';
-$route['deleted_department'] = 'department/deleted_department';
+$route['edit-department/(:num)'] = 'department/editDepartment/$1';
 
 //Degree//
 $route['degree'] = 'degree/degree_list';
 $route['add_degree'] = 'degree/add_degree';
-$route['edit_degree/(:num)'] = 'department/edit_department/$1';
-$route['deleted_department'] = 'department/deleted_department';
-
+$route['edit-degree/(:num)'] = 'degree/editDegree/$1';
 
 //Semester//
 $route['semester'] = 'semester/semester_list';
-$route['add_semester'] = 'semester/add_semester';
-$route['edit_semester'] = 'semester/edit_semester';
-$route['deleted_semester'] = 'semester/deleted_semester';
-
+$route['add-semester'] = 'semester/add_semester';
+$route['edit-semester/(:num)'] = 'semester/editSemester/$1';
 
 
 //subject//
 $route['subject'] = 'subject/subject_list';
-$route['add_subject'] = 'subject/add_subject';
-$route['edit_subject/(:num)'] = 'subject/edit_subject/$1';
-$route['deleted_subject'] = 'subject/deleted_subject';
-
+$route['add-subject'] = 'subject/add_subject';
+$route['view-subject/(:num)'] = 'subject/viewSubject/$1';
+$route['edit-subject/(:num)'] = 'subject/editSubject/$1';
 
 //faculty//
 $route['faculty'] = 'faculty/faculty_list';
 $route['add_faculty'] = 'faculty/add_faculty';
-$route['edit_faculty/(:num)'] = 'faculty/edit_faculty/$1';
-$route['deleted_faculty'] = 'faculty/deleted_faculty';
-
+$route['view-faculty/(:num)'] = 'faculty/viewFaculty/$1';
+$route['edit-faculty/(:num)'] = 'faculty/editFaculty/$1';
 
 //student//
 $route['student'] = 'student/student_list';
 $route['add_student'] = 'student/add_student';
+$route['view-student/(:num)'] = 'student/viewStudent/$1';
 $route['edit_student/(:num)'] = 'student/edit_student/$1';
 $route['deleted_student'] = 'student/deleted_student';
 
@@ -113,5 +109,6 @@ $route['deleted_student'] = 'student/deleted_student';
 //project//
 $route['project'] = 'project/project_list';
 $route['add_project'] = 'project/add_project';
+$route['view-project/(:num)'] = 'project/viewProject/$1';
 $route['edit_project/(:num)'] = 'project/edit_project/$1';
 $route['deleted_project'] = 'project/deleted_project';
\ No newline at end of file
diff --git a/admin/application/controllers/Degree.php b/admin/application/controllers/Degree.php
index 1135d4c..410da0b 100644
--- a/admin/application/controllers/Degree.php
+++ b/admin/application/controllers/Degree.php
@@ -28,15 +28,14 @@ class Degree extends CI_Controller {
 	 */
 	public function degree_list()
 	{
-		if($this->session->userdata('id')==""){redirect('');}
 		$data['deg']=$this->Degree_model->deg_list();
-		 $this->load->view('degree/degree_list',$data);
+		$data['dep']=$this->Degree_model->get_dep();
+		$this->load->view('degree/degree_list',$data);
 	}
 	
-	
-	
-		function add_degree()
+	function add_degree()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
 		$data['dep']=$this->Degree_model->get_dep();
 		$this->load->view('degree/add_degree',$data);
 		if($this->input->post('submit'))
@@ -68,32 +67,36 @@ class Degree extends CI_Controller {
 		}
 	}
 	
-	
-		function edit_department($id)
+	function getDegree()
+	{
+		if($this->session->userdata('id')==""){redirect('');}
+		$id=$_POST['id'];
+ 		$tableName="degree";
+		$select=array('id','name','departmentId'); 
+		$where=array('id'=>$id);
+		$degree=$this->Commonsql_model->selectTable($tableName,$where,$select);
+		if($degree->num_rows()>0){
+			$list1=$degree->row(); 
+			$id=$list1->id;
+			$name=$list1->name;
+			$departmentId=$list1->departmentId;
+		}
+		echo $id.'-'.$name.'-'.$departmentId;
+	}
+	function editDegree($id)
 	{
-		
-		$data['dep']=$this->Department_model->get_dep($id);
-		//echo $this->db->last_query();exit;
-		$this->load->view('department/edit_department',$data);
-		
 		
 		if($this->input->post('submit'))
 		{
-			$name=$this->input->post('name');
-			$code=$this->input->post('code');
-			$year=$this->input->post('year');
-			$image=$this->input->post('image');
-			//$primaryid=$this->input->post('hiddendepid');
+			$degName=$this->input->post('degreeName');
+			$depId=$this->input->post('depId');
 			
-			$table="department";
+			$table="degree";
 			$where=array("id"=>$id);
-			$values=array('name'=>$name,
-			             'code'=>$code,
-			             'year'=>$year,
-			             'image'=>$image,
-						 'updatedOn'=>date('Y-m-d'),
-						 'updatedBy'=>1,
-						 'status'=>1);
+			$values=array('name'=>$degName,
+			             'departmentId'=>$depId,
+			             'upadatedOn'=>date('Y-m-d'),
+						 'updatedBy'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			//echo $this->db->last_query();exit;
@@ -101,12 +104,12 @@ class Degree extends CI_Controller {
 					
 						{
 							$this->session->set_userdata('suc','successfully Updated');
-							redirect('department');
+							redirect('degree');
 						}
 						else
 						{
 							$this->session->set_userdata('err','Please try again');
-							redirect('department');
+							redirect('degree');
 						}
         
 		}
@@ -114,28 +117,29 @@ class Degree extends CI_Controller {
 	}
 	
 	
-		function deleted_department()
+	function deleteDegree()
 	{
 		if($this->input->post('submit'))
 		{
-			$id=$this->input->post('hiddenpass');
-			//echo $id ; exit;
-			$table="department";
-			$where=array("id"=>$id);
+			
+			$degreeId=$this->input->post('degreeId');
+			//echo $degreeId;exit;
+			$table="degree";
+			$where=array("id"=>$degreeId);
 			$values=array('status'=>0);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			if($result)
-						{
-							$this->session->set_userdata('suc','successfully deleted');
-							redirect('department');
-							
-						}
-						else
-						{
-							$this->session->set_userdata('err','Please try again');
-							redirect('department');
-						}
+			{
+				$this->session->set_userdata('suc','successfully deleted');
+				redirect('degree');
+				
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('degree');
+			}
 			
 		}
 	}
diff --git a/admin/application/controllers/Department.php b/admin/application/controllers/Department.php
index 7d1be4d..72477d9 100644
--- a/admin/application/controllers/Department.php
+++ b/admin/application/controllers/Department.php
@@ -28,6 +28,7 @@ class Department extends CI_Controller {
 	 */
 	public function department_list()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
 		$data['dep']=$this->Department_model->dep_list();
 		 $this->load->view('department/department_list',$data);
 	}
@@ -36,20 +37,37 @@ class Department extends CI_Controller {
 	
 		function add_department()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
 		$this->load->view('department/add_department');
 		if($this->input->post('submit'))
 		{
 			$name=$this->input->post('name');
 			$code=$this->input->post('code');
 			$year=$this->input->post('year');
-			$image=$this->input->post('image');
+			
+			if (!is_dir('uploads/department')) {
+				mkdir('./uploads/department', 0777, TRUE);
+			}
+			
+			
+			if(file_exists($_FILES['depImage']['tmp_name']))
+			{
+			$temp_user_img=$_FILES['depImage']['tmp_name'];
+			$user_img=str_replace(' ', '_', $_FILES["depImage"]["name"]);
+			$allowed =  array('png,jpeg,jpg');
+			$extension1 = pathinfo($user_img, PATHINFO_EXTENSION);
+			$user_img=date('ymdhis').'.'.$extension1;
+			$targetPath='./uploads/department/';
+			$targetFile=$targetPath.$user_img;
+			move_uploaded_file($temp_user_img, $targetFile);
+			}
 			
 			$table="department";
 
 			$values=array('name'=>$name,
 			              'code'=>$code,
 			              'year'=>$year,
-			              'image'=>$image,
+			              'image'=>$user_img,
 						 'createdOn'=>date('Y-m-d'),
 						 'createdBy'=>1,
 						 'status'=>1);
@@ -70,28 +88,38 @@ class Department extends CI_Controller {
 	}
 	
 	
-		function edit_department($id)
+	function editDepartment($id)
 	{
-		
-		$data['dep']=$this->Department_model->get_dep($id);
-		//echo $this->db->last_query();exit;
-		$this->load->view('department/edit_department',$data);
-		
-		
 		if($this->input->post('submit'))
 		{
 			$name=$this->input->post('name');
 			$code=$this->input->post('code');
 			$year=$this->input->post('year');
 			$image=$this->input->post('image');
+			$hiddenImage=$this->input->post('hiddenImage');
 			//$primaryid=$this->input->post('hiddendepid');
+			if($image=="")
+			{
+				$newImage=$hiddenImage;
+			}
 			
+			if(file_exists($_FILES['image']['tmp_name']))
+			{
+			$temp_user_img=$_FILES['image']['tmp_name'];
+			$newImage=str_replace(' ', '_', $_FILES["image"]["name"]);
+			$allowed =  array('png,jpeg,jpg');
+			$extension1 = pathinfo($newImage, PATHINFO_EXTENSION);
+			$newImage=date('ymdhis').'.'.$extension1;
+			$targetPath='./uploads/department/';
+			$targetFile=$targetPath.$newImage;
+			move_uploaded_file($temp_user_img, $targetFile);
+			}
 			$table="department";
 			$where=array("id"=>$id);
 			$values=array('name'=>$name,
 			             'code'=>$code,
 			             'year'=>$year,
-			             'image'=>$image,
+			             'image'=>$newImage,
 						 'updatedOn'=>date('Y-m-d'),
 						 'updatedBy'=>1,
 						 'status'=>1);
@@ -111,18 +139,20 @@ class Department extends CI_Controller {
 						}
         
 		}
-		
+		$data['dep']=$this->Department_model->get_dep($id);
+		//echo $this->db->last_query();exit;
+		$this->load->view('department/edit_department',$data);
 	}
 	
 	
-		function deleted_department()
+	function deleteDepartment()
 	{
 		if($this->input->post('submit'))
 		{
-			$id=$this->input->post('hiddenpass');
+			$departmentId=$this->input->post('departmentId');
 			//echo $id ; exit;
 			$table="department";
-			$where=array("id"=>$id);
+			$where=array("id"=>$departmentId);
 			$values=array('status'=>0);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
diff --git a/admin/application/controllers/Employee.php b/admin/application/controllers/Employee.php
index b82a7db..7c1b6a6 100644
--- a/admin/application/controllers/Employee.php
+++ b/admin/application/controllers/Employee.php
@@ -13,28 +13,53 @@ public function __construct()
 	
 	public function employee_list()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
 		
 		$data['emp']=$this->Employee_model->list_emp();
 	
 		$this->load->view('employee/list',$data);
 	}
-	
+	public function viewEmployee($id)
+	{
+		if($this->session->userdata('id')==""){redirect('');}
+		
+		$data['viewEmployee']=$this->Employee_model->viewEmployee($id);
+		//echo $this->db->last_query();exit;
+		$this->load->view('employee/viewemployee',$data);
+	}
 	function add_employee()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		
 		$data['role']=$this->Employee_model->list_role();
+		
 		if($this->input->post('submit'))
 		{
+			//echo "dsdsd";exit;
 			$employeename=$this->input->post('employeename');
 			$mobileNumber=$this->input->post('mobileNumber');
 			$roleId=$this->input->post('roleId');
 			$address=$this->input->post('address');
 			$email=$this->input->post('email');
 			$code=$this->input->post('code');
-			$img=$this->input->post('img');
 			$user=$this->input->post('User');
 			$password=$this->input->post('Password');
 			
-			
+			if (!is_dir('uploads/employee')) {
+				mkdir('./uploads/employee', 0777, TRUE);
+
+			}
+			if(file_exists($_FILES['employeeImg']['tmp_name']))
+			{
+			$temp_user_img=$_FILES['employeeImg']['tmp_name'];
+			$eImage=str_replace(' ', '_', $_FILES["employeeImg"]["name"]);
+			$allowed =  array('png,jpeg,jpg');
+			$extension1 = pathinfo($eImage, PATHINFO_EXTENSION);
+			$eImage=date('ymdhi').'.'.$extension1;
+			$targetPath='./uploads/employee/';
+			$targetFile=$targetPath.$eImage;
+			move_uploaded_file($temp_user_img, $targetFile);
+			}
 			$table="employee";
 			$values=array('name'=>$employeename,
 			             'mobileNumber'=>$mobileNumber,
@@ -42,13 +67,14 @@ public function __construct()
 						 'address'=>$address,
 						 'email'=>$email,
 						 'pincode'=>$code,
-						 'image'=>$img,
+						 'image'=>$eImage,
 						 'username'=>$user,
-						 'password'=>$password,
+						 'password'=>md5($password),
 						 'createdOn'=>date('Y-m-d'),
 						 'createdBy'=>1,
 						 'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
+			//echo $this->db->last_query();exit;
 			if($result)
 			{
 				$this->session->set_userdata('suc','successfully added');
@@ -64,84 +90,104 @@ public function __construct()
 		}
 		$this->load->view('employee/add',$data);
 	}
-	function editemployee($empid)
+	function editEmployee($empid)
 	{
+		if($this->session->userdata('id')==""){redirect('');}
 		if($this->input->post('submit'))
 		{
 			$employeename=$this->input->post('employeename');
+			$roleId=$this->input->post('roleId');
 			$mobileNumber=$this->input->post('mobileNumber');
 			$address=$this->input->post('address');
 			$email=$this->input->post('email');
 			$code=$this->input->post('code');
-			$img=$this->input->post('img');
-			$user=$this->input->post('User');
-			$password=$this->input->post('Password');
-			$hiddenpass=$this->input->post('hiddenpass');
+			$image=$this->input->post('image');
+			$hiddenImage=$this->input->post('hiddenImage');
+			$username=$this->input->post('username');
+			$password=$this->input->post('password');
+			$hiddenPassword=$this->input->post('hiddenPassword');
 			if($password=="")
 			{
-				$newpassword=$hiddenpass;
+				$newpassword=$hiddenPassword;
 			}
 			else
 			{
 				$newpassword=md5($password);
 			}
+			if($image==""){
+				$newImage=$hiddenImage;
+			}
+			
+			if(file_exists($_FILES['image']['tmp_name']))
+			{
+			$temp_user_img=$_FILES['image']['tmp_name'];
+			$newImage=str_replace(' ', '_', $_FILES["image"]["name"]);
+			$allowed =  array('png,jpeg,jpg');
+			$extension1 = pathinfo($newImage, PATHINFO_EXTENSION);
+			$newImage=date('ymdhi').'.'.$extension1;
+			$targetPath='./uploads/employee/';
+			$targetFile=$targetPath.$newImage;
+			move_uploaded_file($temp_user_img, $targetFile);
+			}
 			$table="employee";
 			$where=array("id"=>$empid);
 			$values=array('name'=>$employeename,
+			             'roleId'=>$roleId,
 			             'mobileNumber'=>$mobileNumber,
 						 'address'=>$address,
 						 'email'=>$email,
 						 'pincode'=>$code,
-						 'username'=>$user,
-						 'image'=>$img,
+						 'username'=>$username,
+						 'image'=>$newImage,
 						 'password'=>$newpassword,
 						 'updatedOn'=>date('Y-m-d'),
 						 'updatedBy'=>1,
 						 'status'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
+			//echo $this->db->last_query();exit;
 			if($result)
-						{
-							$this->session->set_userdata('suc','successfully Updated');
-							redirect('employee');
-							
-						}
-						else
-						{
-							$this->session->set_userdata('err','Please try again');
-							redirect('employee');
-						}
+			{
+				$this->session->set_userdata('suc','successfully Updated');
+				redirect('employee');
+				
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('employee');
+			}
 			
 		}
-		//echo "sdsd";exit;
-		$data['emp']=$this->Employee_model->get_emp($empid);
-		//echo $this->db->last_query();exit;
-		$this->load->view('add_emplayee/edit',$data);
+		$data['role']=$this->Employee_model->list_role();
+		$data['emp']=$this->Employee_model->viewEmployee($empid);
+		$this->load->view('employee/edit',$data);
 	}
 	
-	function deleted_employee()
+	function deleteEmployee()
 	{
+		if($this->session->userdata('id')==""){redirect('');}
 		if($this->input->post('submit'))
 		{
-			$empid=$this->input->post('hiddenid');
-			
+			//echo "test";exit;
+			$employeeId=$this->input->post('employeeId');
+			//echo $employeeId;exit;
 			$table="employee";
-			$where=array("id"=>$empid);
-			$values=array(
-						 'status'=>0);
-						 
+			$where=array("id"=>$employeeId);
+			$values=array('status'=>0);
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
+			
 			if($result)
-						{
-							$this->session->set_userdata('suc','successfully deleted');
-							redirect('employee');
-							
-						}
-						else
-						{
-							$this->session->set_userdata('err','Please try again');
-							redirect('employee');
-						}
+			{
+				$this->session->set_userdata('suc','successfully deleted');
+				redirect('employee');
+				
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('employee');
+			}
 		}	
 	}
 }
diff --git a/admin/application/controllers/Faculty.php b/admin/application/controllers/Faculty.php
index e607f54..75e697e 100644
--- a/admin/application/controllers/Faculty.php
+++ b/admin/application/controllers/Faculty.php
@@ -32,7 +32,14 @@ class Faculty extends CI_Controller {
 		 $this->load->view('faculty/faculty_list',$data);
 		 		 
 	}
-	
+	public function viewFaculty($id)
+	{
+		if($this->session->userdata('id')==""){redirect('');}
+		
+		$data['viewFaculty']=$this->Faculty_model->viewFaculty($id);
+		//echo $this->db->last_query();exit;
+		$this->load->view('faculty/view_faculty',$data);
+	}
 
 	function add_faculty()
 	{
@@ -41,23 +48,43 @@ class Faculty extends CI_Controller {
 		
 		if($this->input->post('submit'))
 		{
-			$faculty=$this->input->post('code');
+			$faculty=$this->input->post('facultyId');
 			$name=$this->input->post('name');
 			$email=$this->input->post('email');
-			//$dob=$this->input->post('dob');
+			$date=$this->input->post('date');
 			$gender=$this->input->post('gender');
-			$number=$this->input->post('mobile');
+			$number=$this->input->post('mobileNumber');
 			$address=$this->input->post('address');
 			$desi=$this->input->post('designation');
 			$f_img=$this->input->post('image');
 			
+			//echo $date.'-------'.$dateofbirth;exit;
+			//$banner_image=$this->input->post('banner_image');
+			
+			
+			if (!is_dir('uploads/faculty')) {
+				mkdir('./uploads/faculty', 0777, TRUE);
+
+			}
+			if(file_exists($_FILES['image']['tmp_name']))
+			{
+			$temp_user_img=$_FILES['image']['tmp_name'];
+			$f_img=str_replace(' ', '_', $_FILES["image"]["name"]);
+			$allowed =  array('png,jpeg,jpg');
+			$extension1 = pathinfo($f_img, PATHINFO_EXTENSION);
+			$f_img=date('ymdhi').'.'.$extension1;
+			$targetPath='./uploads/faculty/';
+			$targetFile=$targetPath.$f_img;
+			move_uploaded_file($temp_user_img, $targetFile);
+			}
+			
 			$table="faculty";
-			$values=array('code'=>$faculty,
+			$values=array('facultyId'=>$faculty,
 			             'name'=>$name,
 			             'email'=>$email,
-						 //'dob'=>$dob,
+						 'dob'=>$date,
 						 'gender'=>$gender,
-						 'mobile'=>$number,
+						 'mobileNumber'=>$number,
 						 'address'=>$address,
 						 'designation'=>$desi,
 						 'image'=>$f_img,
@@ -81,7 +108,7 @@ class Faculty extends CI_Controller {
 	}
 	
 	
-	function edit_faculty($id)
+	function editFaculty($id)
 	{
 		
 	    $data['fac']=$this->Faculty_model->get_fac($id);
@@ -89,44 +116,59 @@ class Faculty extends CI_Controller {
 		
 		if($this->input->post('submit'))
 		{
-			$faculty=$this->input->post('code');
+			$facultyId=$this->input->post('facultyId');
 			$name=$this->input->post('name');
 			$email=$this->input->post('email');
-			//$dob=$this->input->post('dob');
 			$gender=$this->input->post('gender');
-			$number=$this->input->post('number');
+			$number=$this->input->post('mobileNumber');
+			$dob=$this->input->post('dob');
 			$address=$this->input->post('address');
 			$desi=$this->input->post('designation');
-			$f_img=$this->input->post('image');
+			$image=$this->input->post('image');
+			$hiddenImage=$this->input->post('hiddenImage');
 			
-		
+			if($image==""){$newImage=$hiddenImage;}
+			
+			if(file_exists($_FILES['image']['tmp_name']))
+			{
+			$temp_user_img=$_FILES['image']['tmp_name'];
+			$newImage=str_replace(' ', '_', $_FILES["image"]["name"]);
+			$allowed =  array('png,jpeg,jpg');
+			$extension1 = pathinfo($newImage, PATHINFO_EXTENSION);
+			$newImage=date('ymdhi').'.'.$extension1;
+			$targetPath='./uploads/faculty/';
+			$targetFile=$targetPath.$newImage;
+			move_uploaded_file($temp_user_img, $targetFile);
+			}
+
+
 			$table="faculty";
 			$where=array("id"=>$id);
-			$values=array('code'=>$faculty,
+			$values=array('facultyId'=>$facultyId,
 			             'name'=>$name,
 			             'email'=>$email,
-						 //'dob'=>$dob,
+						 'dob'=>$dob,
 						 'gender'=>$gender,
-						 'mobile'=>$number,
+						 'mobileNumber'=>$number,
 						 'address'=>$address,
 						 'designation'=>$desi,
-						 'image'=>$f_img,
+						 'image'=>$newImage,
 						 'updatedOn'=>date('Y-m-d'),
-						 'updatedBy'=>1,
-						 'status'=>1);
+						 'updatedBy'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
+			//echo $this->last_query();exit;
 			if($result)
-						{
-							$this->session->set_userdata('suc','successfully Updated');
-							redirect('faculty');
-							
-						}
-						else
-						{
-							$this->session->set_userdata('err','Please try again');
-							redirect('faculty');
-						}
+			{
+				$this->session->set_userdata('suc','successfully Updated');
+				redirect('faculty');
+				
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('faculty');
+			}
 			
 		}
 		//echo "sdsd";exit;
@@ -135,29 +177,28 @@ class Faculty extends CI_Controller {
 		
 	}
 	
-	function deleted_faculty()
+	function deleteFaculty()
 	{
 		if($this->input->post('submit'))
 		{
-			$id=$this->input->post('hiddenpass');
+			$facultyId=$this->input->post('facultyId');
 			
 			$table="faculty";
-			$where=array("id"=>$id);
-			$values=array(
-						 'status'=>0);
+			$where=array("id"=>$facultyId);
+			$values=array('status'=>0);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			if($result)
-						{
-							$this->session->set_userdata('suc','successfully deleted');
-							redirect('faculty');
-							
-						}
-						else
-						{
-							$this->session->set_userdata('err','Please try again');
-							redirect('faculty');
-						}
+			{
+				$this->session->set_userdata('suc','successfully deleted');
+				redirect('faculty');
+				
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('faculty');
+			}
 		}	
 	}
 	
diff --git a/admin/application/controllers/Project.php b/admin/application/controllers/Project.php
index 911d3aa..a4f4696 100644
--- a/admin/application/controllers/Project.php
+++ b/admin/application/controllers/Project.php
@@ -29,64 +29,122 @@ class Project extends CI_Controller {
 	public function project_list()
 	{
 		$data['pro']=$this->Project_model->list_pro();
-		 $this->load->view('project/project_list',$data);
+		$this->load->view('project/project_list',$data);
+	}
+	public function viewProject($id)
+	{
+		if($this->session->userdata('id')==""){redirect('');}
+		
+		$data['viewProject']=$this->Project_model->viewProject($id);
+		//echo $this->db->last_query();exit;
+		$this->load->view('project/view_project',$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();
-		 $data['sub']=$this->Project_model->get_sub();
-		$this->load->view('project/add_project',$data);
-		
+		$data['dep']=$this->Project_model->get_dep();
+		$data['stu']=$this->Project_model->get_stu();
+		$data['sub']=$this->Project_model->get_sub();
+		$data['semester']=$this->Project_model->get_semester();
 		
 		if($this->input->post('submit'))
 		{
+			
 			$name=$this->input->post('projectName');
 			$date=$this->input->post('date');
+			//$pDate= implode("-", array_reverse(explode("-", $date)));
 			$student=$this->input->post('student');
-			$semester=$this->input->post('semester');
+			$code=$this->input->post('code');
+			$semesterId=$this->input->post('semesterId');
 			$subject=$this->input->post('subject');
-			//$gender=$this->input->post('gender');
 			$department=$this->input->post('department');
 			$description=$this->input->post('description');
-			$faculty=$this->input->post('faculty');
 			$drivelink=$this->input->post('drivelink');
 			$video=$this->input->post('vedio');
-			$image=$this->input->post('image');
+		
+		
+			if (!is_dir('uploads/project')) {
+				mkdir('./uploads/project', 0777, TRUE);
+			}
+			
+			
+			if(file_exists($_FILES['titleImage']['tmp_name']))
+			{
+			$temp_user_img=$_FILES['titleImage']['tmp_name'];
+			$user_img=str_replace(' ', '_', $_FILES["titleImage"]["name"]);
+			$allowed =  array('png,jpeg,jpg');
+			$extension1 = pathinfo($user_img, PATHINFO_EXTENSION);
+			$user_img='title'.date('ymdhis').'.'.$extension1;
+			$targetPath='./uploads/project/';
+			$targetFile=$targetPath.$user_img;
+			move_uploaded_file($temp_user_img, $targetFile);
+			}
 			
 			$table="project";
 			$values=array('projectName'=>$name,
 			             'date'=>$date,
-						 'student'=>$student,
-						 'semester'=>$semester,
-						 'department'=>$department,
-						 'subject'=>$subject,
-						 //'gender'=>$gender,
+						 'studentId'=>$student,
+						 'semesterId'=>$semesterId,
+						 'departmentId'=>$department,
+						 'subjectId'=>$subject,
+						 'code'=>$code,
+						 'image'=>$user_img,
 						 'description'=>$description,
-						 'faculty'=>$faculty,
+						 //'faculty'=>$faculty,
 						 'drivelink'=>$drivelink,
 						 'vedio'=>$video,
-						 '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');
-						}
 			
+			$projectId=$this->db->insert_id();
+			//Image table insert
+			$title		 	= $this->input->post('title');	
+			
+			foreach($title as $key=>$value)
+			{
+				if($_FILES['profileimage']['tmp_name'])
+				{
+					if (!is_dir('uploads/project')) {
+					mkdir('./uploads/project', 0777, TRUE);
+					}
+					$temp_vehicle_doc=$_FILES['profileimage']['tmp_name'][$key];
+					$projectImage=str_replace(' ', '_', $_FILES["profileimage"]["name"][$key]);
+					$extension1 = pathinfo($projectImage, PATHINFO_EXTENSION);
+					$pImage=$projectId.'.'.$projectImage;
+					$document='uploads/project/'.$pImage;
+					 
+					$targetPath = './uploads/project/'; 
+					$targetFile=$targetPath.$pImage;
+					
+									
+					if(move_uploaded_file($temp_vehicle_doc, $targetFile))
+					{ 
+						$tablename='projectdetail';
+						$data=array('projectId'=>$projectId,
+									'title'=>$title[$key],
+									'image'=>$pImage,
+									'status'=>1);
+							
+						$product=$this->Commonsql_model->insert_table($tablename,$data);
+					//echo $this->db->last_query();
+
+					}		 
+				}		
+			}
+			//exit;	
+			if($result)
+			{
+				$this->session->set_userdata('suc','successfully added');
+				redirect('project');
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('project');
+			}
 		}
+		$this->load->view('project/add_project',$data);
 	}
 	
 	
@@ -105,7 +163,7 @@ class Project extends CI_Controller {
 			//$gender=$this->input->post('gender');
 			$department=$this->input->post('department');
 			$description=$this->input->post('description');
-			$faculty=$this->input->post('faculty');
+			//$faculty=$this->input->post('faculty');
 			$drivelink=$this->input->post('drivelink');
 			$video=$this->input->post('vedio');
 			$image=$this->input->post('image');
@@ -115,13 +173,13 @@ class Project extends CI_Controller {
 			$where=array("id"=>$id);
 			$values=array('projectName'=>$name,
 			             'date'=>$date,
-						 'student'=>$student,
-						 'semester'=>$semester,
-						 'subject'=>$subject,
-						 'department'=>$department,
+						 'studentId'=>$student,
+						 'semesterId'=>$semester,
+						 'subjectId'=>$subject,
+						 'departmentId'=>$department,
 						// 'gender'=>$gender,
 						 'description'=>$description,
-						 'faculty'=>$faculty,
+						 //'faculty'=>$faculty,
 						 'drivelink'=>$drivelink,
 						 'vedio'=>$video,
 						 'image'=>$image,
@@ -146,29 +204,35 @@ class Project extends CI_Controller {
 		
 	}
 	
-	function deleted_project()
+	function deleteProject()
 	{
 		if($this->input->post('submit'))
 		{
-			$id=$this->input->post('hiddenpass');
+			$projectId=$this->input->post('projectId');
 			
 			$table="project";
-			$where=array("id"=>$id);
-			$values=array(
-						 'status'=>0);
+			$where=array("id"=>$projectId);
+			$values=array('status'=>0);
 						 
+			$dTable="projectdetail";
+			$dWhere=array("projectId"=>$projectId);
+			$dValue=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');
-						}
+			
+			$dResult=$this->Commonsql_model->updateTable($dTable,$dWhere,$dValue);
+			//echo $this->db->last_query();exit;
+			if($result && $dResult)
+			{
+				$this->session->set_userdata('suc','successfully deleted');
+				redirect('project');
+				
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('project');
+			}
 		}	
 	}
 	
diff --git a/admin/application/controllers/Role.php b/admin/application/controllers/Role.php
index bf88459..7d1bb96 100644
--- a/admin/application/controllers/Role.php
+++ b/admin/application/controllers/Role.php
@@ -12,13 +12,13 @@ public function __construct()
 
 	public function listrole()
 	{
-		//if($this->session->userdata('id')==""){redirect('');}
+		if($this->session->userdata('id')==""){redirect('');}
 		$data['rol']=$this->Role_model->list_rol();
 		$this->load->view('roles/role_list',$data);
 	}
 	function addrole()
 	{
-		//if($this->session->userdata('id')==""){redirect('');}
+		if($this->session->userdata('id')==""){redirect('');}
 		if($this->input->post('submit'))
 		{
 			$role=$this->input->post('rolename');
diff --git a/admin/application/controllers/Semester.php b/admin/application/controllers/Semester.php
index c0bd604..18c35e0 100644
--- a/admin/application/controllers/Semester.php
+++ b/admin/application/controllers/Semester.php
@@ -28,28 +28,39 @@ class Semester extends CI_Controller {
 	 */
 	public function semester_list()
 	{
-		$data['sem']=$this->Semester_model->list_sem();
-		 $this->load->view('semester/semester_list',$data);
+		$data['semester']=$this->Semester_model->list_semester();
+		$this->load->view('semester/semester_list',$data);
 	}
 	
 
 	function add_semester()
 	{
+		$data['subject']=$this->Semester_model->listSubject();
+		$data['department']=$this->Semester_model->listDepartment();
+		$data['degree']=$this->Semester_model->listDegree();
 		
 		//$this->load->view('semester/add_semester');
 		
 		if($this->input->post('submit'))
 		{
 			$name=$this->input->post('name');
-			
-			
+			$year=$this->input->post('year');
+			$subjectId=$this->input->post('subjectId');
+			$departmentId=$this->input->post('departmentId');
+			$degreeId=$this->input->post('degreeId');
+			///echo $departmentId;
+			//echo $degreeId;
 			$table="semester";
 			$values=array('name'=>$name,
-			             
-						 'createdOn'=>date('Y-m-d'),
+						'year'=>$year,
+						'subjectId'=>$subjectId,
+			             'departmentId'=>$departmentId,
+			             'degreeId'=>$degreeId,
+			             'createdOn'=>date('Y-m-d'),
 						 'createdBy'=>1,
 						 'status'=>1);
 			$result=$this->Commonsql_model->insert_table($table,$values);
+			//echo $this->db->last_query();exit;
 			if($result)
 						{
 							$this->session->set_userdata('suc','successfully added');
@@ -62,70 +73,75 @@ class Semester extends CI_Controller {
 							redirect('semester');
 						}
 			
-		}
+		} 
+		$this->load->view('semester/add_semester',$data);
 	}
 	
 	
-	function edit_semester()
+	function editSemester($id)
 	{
 		if($this->input->post('submit'))
 		{
 			$name=$this->input->post('name');
-			$id=$this->input->post('hiddendepid');
+			$year=$this->input->post('year');
+			$subjectId=$this->input->post('subjectId');
+			$departmentId=$this->input->post('departmentId');
+			$degreeId=$this->input->post('degreeId');
 			
-			
-		
 			$table="semester";
 			$where=array("id"=>$id);
-			$values=array('name'=>$name,
-			             
-						 'updatedOn'=>date('Y-m-d'),
-						 'updatedby'=>1,
-						 'status'=>1);
+			$values=array(	'name'=>$name,
+							'year'=>$year,
+							'subjectId'=>$subjectId,
+							'departmentId'=>$departmentId,
+							'degreeId'=>$degreeId,
+							'updatedOn'=>date('Y-m-d'),
+							'updatedby'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
+			//echo $this->db->last_query();exit;
 			if($result)
-						{
-							$this->session->set_userdata('suc','successfully Updated');
-							redirect('semester');
-							
-						}
-						else
-						{
-							$this->session->set_userdata('err','Please try again');
-							redirect('semester');
-						}
+			{
+				$this->session->set_userdata('suc','successfully Updated');
+				redirect('semester');
+				
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('semester');
+			}
 			
 		}
-		//echo "sdsd";exit;
-	
-		//echo $this->db->last_query();exit;
-		
+		$data['subject']=$this->Semester_model->listSubject();
+		$data['department']=$this->Semester_model->listDepartment();
+		$data['degree']=$this->Semester_model->listDegree();
+		$data['getData']=$this->Semester_model->getSemester($id);
+		$this->load->view('semester/edit_semester',$data);
 	}
 	
-	function deleted_semester()
+	function deleteSemester()
 	{
 		if($this->input->post('submit'))
 		{
-			$id=$this->input->post('hiddengffgdtpid');
+			$semesterId=$this->input->post('semesterId');
 			
 			$table="semester";
-			$where=array("id"=>$id);
-			$values=array(
-						 'status'=>0);
+			$where=array("id"=>$semesterId);
+			$values=array('status'=>0);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			if($result)
-						{
-							$this->session->set_userdata('suc','successfully deleted');
-							redirect('semester');
-							
-						}
-						else
-						{
-							$this->session->set_userdata('err','Please try again');
-							redirect('semester');
-						}
+			{
+				$this->session->set_userdata('suc','successfully deleted');
+				redirect('semester');
+				
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('semester');
+			}
 		}	
 	}
 	
diff --git a/admin/application/controllers/Student.php b/admin/application/controllers/Student.php
index 9fe744c..331c9c5 100644
--- a/admin/application/controllers/Student.php
+++ b/admin/application/controllers/Student.php
@@ -29,10 +29,17 @@ class Student extends CI_Controller {
 	public function Student_list()
 	{
 		$data['stu']=$this->Student_model->list_stu();
-		 $this->load->view('student/Student_list',$data);
+		 $this->load->view('student/student_list',$data);
 	}
 	
-
+	public function viewStudent($id)
+	{
+		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()
 	{
 		 $data['dep']=$this->Student_model->get_dep();
@@ -42,19 +49,42 @@ class Student extends CI_Controller {
 		if($this->input->post('submit'))
 		{
 			$name=$this->input->post('name');
-			$number=$this->input->post('number');
+			$email=$this->input->post('email');
+			$number=$this->input->post('mobileNumber');
 			$address=$this->input->post('address');
 			$department=$this->input->post('department');
+			$student=$this->input->post('student');
 			$gender=$this->input->post('gender');
 			$s_img=$this->input->post('image');
+			$date=$this->input->post('date');
+			//$dob= implode("-", array_reverse(explode("-", $date)));
+			if (!is_dir('uploads/student')) {
+				mkdir('./uploads/student', 0777, TRUE);
+
+			}
+			if(file_exists($_FILES['image']['tmp_name']))
+			{
+			$temp_user_img=$_FILES['image']['tmp_name'];
+			$s_img=str_replace(' ', '_', $_FILES["image"]["name"]);
+			$allowed =  array('png,jpeg,jpg');
+			$extension1 = pathinfo($s_img, PATHINFO_EXTENSION);
+			$s_img=date('ymdhi').'.'.$extension1;
+			$targetPath='./uploads/student/';
+			$targetFile=$targetPath.$s_img;
+			move_uploaded_file($temp_user_img, $targetFile);
+			}
+			
 			
 			$table="student";
 			$values=array('name'=>$name,
-			             'number'=>$number,
+			             'mobileNumber'=>$number,
+			             'email'=>$email,
 						 'address'=>$address,
 						 'department'=>$department,
+						 'studentId'=>$student,
 						 'gender'=>$gender,
 						 'image'=>$s_img,
+						 'dob'=>$date,
 						 'createdOn'=>date('Y-m-d'),
 						 'createdBy'=>1,
 						 'status'=>1);
@@ -84,9 +114,10 @@ class Student extends CI_Controller {
 		if($this->input->post('submit'))
 		{
 			$name=$this->input->post('name');
-			$number=$this->input->post('number');
+			$number=$this->input->post('mobileNumber');
 			$address=$this->input->post('address');
 			$department=$this->input->post('department');
+			$student=$this->input->post('student');
 			$gender=$this->input->post('gender');
 			$s_img=$this->input->post('image');
 			
@@ -94,7 +125,8 @@ class Student extends CI_Controller {
 			$table="student";
 			$where=array("id"=>$id);
 			$values=array('name'=>$name,
-			             'number'=>$number,
+			             'mobileNumber'=>$number,
+			             'studentId'=>$student,
 						 'address'=>$address,
 						 'department'=>$department,
 						 'gender'=>$gender,
@@ -123,29 +155,28 @@ class Student extends CI_Controller {
 		
 	}
 	
-	function deleted_student()
+	function deleteStudent()
 	{
 		if($this->input->post('submit'))
 		{
-			$id=$this->input->post('hiddenpass');
+			$studentId=$this->input->post('studentId');
 			
 			$table="student";
-			$where=array("id"=>$id);
-			$values=array(
-						 'status'=>0);
+			$where=array("id"=>$studentId);
+			$values=array('status'=>0);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			if($result)
-						{
-							$this->session->set_userdata('suc','successfully deleted');
-							redirect('student');
-							
-						}
-						else
-						{
-							$this->session->set_userdata('err','Please try again');
-							redirect('student');
-						}
+			{
+				$this->session->set_userdata('suc','successfully deleted');
+				redirect('student');
+				
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('student');
+			}
 		}	
 	}
 	
diff --git a/admin/application/controllers/Subject.php b/admin/application/controllers/Subject.php
index 710f327..00c7b6a 100644
--- a/admin/application/controllers/Subject.php
+++ b/admin/application/controllers/Subject.php
@@ -28,27 +28,60 @@ class Subject extends CI_Controller {
 	 */
 	public function subject_list()
 	{
-		$data['sub']=$this->Subject_model->list_sub();
-		 $this->load->view('subject/subject_list',$data);
+		$data['subject']=$this->Subject_model->list_subject();
+		$this->load->view('subject/subject_list',$data);
 	}
 	
-function add_subject()
+	public function viewSubject($id)
 	{
+		if($this->session->userdata('id')==""){redirect('');}
+		
+		$data['viewSubject']=$this->Subject_model->viewSubject($id);
+		//echo $this->db->last_query();exit;
+		$this->load->view('subject/view_subject',$data);
+	}
+	
+	function add_subject()
+	{
+		$data['degree']=$this->Subject_model->degreeList();
+		$data['faculty']=$this->Subject_model->facultyList();
 		
-		$this->load->view('subject/add_subject');
 		
 		if($this->input->post('submit'))
 		{
-			$code=$this->input->post('code');
-			$sub=$this->input->post('subject');
-		    $dep=$this->input->post('department');
-		    $semester=$this->input->post('semester');
+			$code=$this->input->post('subjectCode');
+			$subject=$this->input->post('subject');
+		    $degree=$this->input->post('degree');
+			//$target['tar'] = $this->input->post('tar');
+		    $faculty=$this->input->post('faculty');
+		    $description=$this->input->post('description');
+			
+			$faculties = implode(",", (array)$faculty);
+			//echo $faculties;exit;
+			if (!is_dir('uploads/subject')) {
+				mkdir('./uploads/subject', 0777, TRUE);
+			}
+			
+			if(file_exists($_FILES['profileImage']['tmp_name']))
+			{
+			$temp_user_img=$_FILES['profileImage']['tmp_name'];
+			$user_img=str_replace(' ', '_', $_FILES["profileImage"]["name"]);
+			$allowed =  array('png,jpeg,jpg');
+			$extension1 = pathinfo($user_img, PATHINFO_EXTENSION);
+			$user_img=date('ymdhis').'.'.$extension1;
+			$targetPath='./uploads/subject/';
+			$targetFile=$targetPath.$user_img;
+			move_uploaded_file($temp_user_img, $targetFile);
+			}
+			
 			
 			$table="subject";
 			$values=array('code'=>$code,
-			             'subject'=>$sub,
-						 'department'=>$dep,
-						 'semester'=>$semester,
+			             'name'=>$subject,
+						 'degreeId'=>$degree,
+						 'facultyId'=>$faculties,
+						 'image'=>$user_img,
+						 'description'=>$description,
 						 'createdOn'=>date('Y-m-d'),
 						 'createdBy'=>1,
 						 'status'=>1);
@@ -66,78 +99,104 @@ function add_subject()
 						}
 			
 		}
+		$this->load->view('subject/add_subject',$data);
 	}
 	
 	
 	
-		function edit_subject($id)
+	function editSubject($id)
 	{
-		
 		$data['sub']=$this->Subject_model->get_sub($id);
-		//echo $this->db->last_query();exit;
-		$this->load->view('subject/edit_subject',$data);
+		$data['degree']=$this->Subject_model->degreeList();
+		$data['faculty']=$this->Subject_model->facultyList();
 		
+
 		if($this->input->post('submit'))
 		{
 	         
 			$code=$this->input->post('code');
 			$sub=$this->input->post('subject');
-		    $dep=$this->input->post('department');
+		    $degreeId=$this->input->post('degree');
 			$semester=$this->input->post('semester');
+			$faculty=$this->input->post('faculty');
+			$description=$this->input->post('description');
+			$image=$this->input->post('image');
+			$hiddenImage=$this->input->post('hiddenImage');
+
+			//print_r ($faculty);
+			$faculties = implode(",", (array)$faculty);
+			//echo $faculties;exit;
+
+			if($image==""){$newImage=$hiddenImage;}
+			
+
+			if(file_exists($_FILES['image']['tmp_name']))
+			{
+			$temp_user_img=$_FILES['image']['tmp_name'];
+			$newImage=str_replace(' ', '_', $_FILES["image"]["name"]);
+			$allowed =  array('png,jpeg,jpg');
+			$extension1 = pathinfo($newImage, PATHINFO_EXTENSION);
+			$newImage=date('ymdhis').'.'.$extension1;
+			$targetPath='./uploads/subject/';
+			$targetFile=$targetPath.$newImage;
+			move_uploaded_file($temp_user_img, $targetFile);
+			}
 			
 			$table="subject";
 			$where=array("id"=>$id);
 			$values=array('code'=>$code,
-			             'subject'=>$sub,
-			             'department'=>$dep,
-			             'semester'=>$semester,
+			             'name'=>$sub,
+			             'degreeId'=>$degreeId,
+			             'facultyId'=>$faculties,
+			             'description'=>$description,
+			             'image'=>$newImage,
 						 'updatedOn'=>date('Y-m-d'),
-						 'updatedBy'=>1,
-						 'status'=>1);
+						 'updatedBy'=>1);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			//echo $this->db->last_query();exit;
 			if($result)
 					
-						{
-							$this->session->set_userdata('suc','successfully Updated');
-							redirect('subject');
-						}
-						else
-						{
-							$this->session->set_userdata('err','Please try again');
-							redirect('subject');
-						}
+			{
+				$this->session->set_userdata('suc','successfully Updated');
+				redirect('subject');
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('subject');
+			}
           
 		}
+		
+		$this->load->view('subject/edit_subject',$data);
 	
 	}
 	
 	
 	
-	function deleted_subject()
+	function deleteSubject()
 	{
 		if($this->input->post('submit'))
 		{
-			$id=$this->input->post('hiddenpass');
+			$subjectId=$this->input->post('subjectId');
 			
 			$table="subject";
-			$where=array("id"=>$id);
-			$values=array(
-						 'status'=>0);
+			$where=array("id"=>$subjectId);
+			$values=array('status'=>0);
 						 
 			$result=$this->Commonsql_model->updateTable($table,$where,$values);
 			if($result)
-						{
-							$this->session->set_userdata('suc','successfully deleted');
-							redirect('subject');
-							
-						}
-						else
-						{
-							$this->session->set_userdata('err','Please try again');
-							redirect('subject');
-						}
+			{
+				$this->session->set_userdata('suc','successfully deleted');
+				redirect('subject');
+				
+			}
+			else
+			{
+				$this->session->set_userdata('err','Please try again');
+				redirect('subject');
+			}
 		}	
 	}
 	
diff --git a/admin/application/controllers/Welcome.php b/admin/application/controllers/Welcome.php
index eaec606..f207aed 100644
--- a/admin/application/controllers/Welcome.php
+++ b/admin/application/controllers/Welcome.php
@@ -7,6 +7,7 @@ class Welcome extends CI_Controller {
 	{
 		parent::__construct();
 		$this->load->model('Common_model');
+		$this->load->model('Project_model');
 	}
 
 	public function index()
@@ -17,32 +18,35 @@ class Welcome extends CI_Controller {
 	public function dashboard()
 	{
 		
-		$this->load->view('dashboard');
+		$data['project']=$this->Project_model->totalProjects();
+		$data['student']=$this->Project_model->totalStudents();
+		$data['subject']=$this->Project_model->totalSubject();
+		$data['faculty']=$this->Project_model->totalFaculties();
+		$data['projectList']=$this->Project_model->recentlyAddedProject();
+		$this->load->view('dashboard',$data);
 	}
 	
-	public function admin_login()
+	public function login()
 	{
-		
+	//echo "dsds";exit;
 		$username=$this->input->post('username');
 		$password=$this->input->post('password');
 	 
 		$check=$this->Common_model->get_login_detail($username,$password);
-	 
+		//echo $this->db->last_query();exit;
 		if($check->num_rows()>0)
 		{
-			$ch	=$check->row();
-			$this->session->set_userdata('username',$ch->username);
-			$this->session->set_userdata('id',$ch->id);
-			$this->session->set_userdata('suc',' Successfully Logged in..!');
-			if($usertype!=2){
-				redirect('dashboard');}
-			else{
-				redirect('dashboard');}
+		 $ch	=$check->row();
+		$this->session->set_userdata('username',$ch->username);
+		$this->session->set_userdata('id',$ch->id);
+		$this->session->set_userdata('suc',' Successfully Logged in..!');
+		redirect('dashboard');
+		
 		}
 		else
 		{
-			$this->session->set_userdata('err','The username or password is incorrect.');
-			redirect('dashboard');
+		$this->session->set_userdata('err','The username or password is incorrect.');
+		redirect('');
 		}
 		
 	}
@@ -55,5 +59,5 @@ class Welcome extends CI_Controller {
         $this->session->sess_destroy();
 		redirect('');
 	}
-	 
+	
 }
diff --git a/admin/application/models/Common_model.php b/admin/application/models/Common_model.php
index 0ddf672..d654672 100644
--- a/admin/application/models/Common_model.php
+++ b/admin/application/models/Common_model.php
@@ -103,8 +103,8 @@ class Common_model extends CI_Model {
 
 public function get_login_detail($username,$password)
 {
-	$this->db->select('*');
-		$this->db->from('user');
+		$this->db->select('*');
+		$this->db->from('employee');
 		$this->db->where('username',$username);
 		$this->db->where(array('password'=>md5($password),'status'=>1));
 		$query = $this->db->get();
diff --git a/admin/application/models/Degree_model.php b/admin/application/models/Degree_model.php
index 3763f64..0fe7c0c 100644
--- a/admin/application/models/Degree_model.php
+++ b/admin/application/models/Degree_model.php
@@ -10,9 +10,10 @@ class Degree_model extends CI_Model {
 	 
 	function deg_list()
 	{
-		$this->db->select('*');
-		$this->db->from('degree');
-		$this->db->where(array('status'=>1));
+		$this->db->select('deg.*,d.id as departmentId,d.name as departmentName');
+		$this->db->from('degree as deg');
+		$this->db->join('department as d','d.id=deg.departmentId','INNER');
+		$this->db->where(array('deg.status'=>1));
 		$query = $this->db->get();
 	//echo $this->db->last_query();exit;
 		return $query;
diff --git a/admin/application/models/Employee_model.php b/admin/application/models/Employee_model.php
index 66a30d0..05168f2 100644
--- a/admin/application/models/Employee_model.php
+++ b/admin/application/models/Employee_model.php
@@ -24,6 +24,16 @@ class Employee_model extends CI_Model {
 	//echo $this->db->last_query();exit;
 		return $query;
 	}
+	function viewEmployee($id)
+	{
+		$this->db->select('e.*,r.id as roleId,r.name as roleName');
+		$this->db->from('employee as e');
+		$this->db->join('role as r','r.id=e.roleId','INNER');
+		$this->db->where(array('e.status'=>1,'e.id'=>$id));
+		$query = $this->db->get();
+		//echo $this->db->last_query();exit;
+		return $query;
+	}
 	function get_emp($id)
 	{
 		$this->db->select('*');
diff --git a/admin/application/models/Faculty_model.php b/admin/application/models/Faculty_model.php
index 1de75b8..14420b8 100644
--- a/admin/application/models/Faculty_model.php
+++ b/admin/application/models/Faculty_model.php
@@ -18,7 +18,7 @@ class Faculty_model extends CI_Model {
 		return $query;
 	}
 	 
-	 function get_fac($id)
+	function get_fac($id)
 	{
 		$this->db->select('*');
 		$this->db->from('faculty');
@@ -27,5 +27,15 @@ class Faculty_model extends CI_Model {
 	//echo $this->db->last_query();exit;
 		return $query;
 	}
+	
+	function viewFaculty($id)
+	{
+		$this->db->select('*');
+		$this->db->from('faculty');
+		$this->db->where(array('status'=>1,'id'=>$id));
+		$query = $this->db->get();
+		//echo $this->db->last_query();exit;
+		return $query;
+	}
 	 
 }
diff --git a/admin/application/models/Project_model.php b/admin/application/models/Project_model.php
index 4ac672d..5367984 100644
--- a/admin/application/models/Project_model.php
+++ b/admin/application/models/Project_model.php
@@ -10,12 +10,12 @@ class Project_model extends CI_Model {
 	 
 		function list_pro()
 	{
-		$this->db->select('p.*,d.name as deptname,s.name as studentName,f.name as facultyName');
+		$this->db->select('p.*,d.name as depName,s.name as studentName,sem.name as semName,sub.name as subName');
 		$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->join('subject as b','b.id=p.subject','left' );
+		$this->db->join('student as s','s.id=p.studentId','INNER');
+		$this->db->join('semester as sem','sem.id=p.semesterId','INNER');
+		$this->db->join('department as d','d.id=p.departmentId','INNER');
+		$this->db->join('subject as sub','sub.id=p.subjectId','INNER');
 		$this->db->where(array('p.status'=>1));
 		$query = $this->db->get();
 	//echo $this->db->last_query();exit;
@@ -62,12 +62,88 @@ class Project_model extends CI_Model {
 	} 
 	function get_sub()
 	{
-		$this->db->select('*');
+		$this->db->select('id,name');
 		$this->db->from('subject');
 		$this->db->where(array('status'=>1));
 		$query = $this->db->get();
 	//echo $this->db->last_query();exit;
 		return $query;
 	} 
-	 
+	 function get_semester()
+	{
+		$this->db->select('id,name');
+		$this->db->from('semester');
+		$this->db->where(array('status'=>1));
+		$query = $this->db->get();
+	//echo $this->db->last_query();exit;
+		return $query;
+	} 
+	function viewProject($id)
+	{
+		$this->db->select('p.projectName,p.date as pDate,p.studentId,p.code,p.description,p.image,
+		p.vedio,p.driveLink,s.name as studentName,sem.name as semName,d.name as depName,sub.name as subName');
+		$this->db->from('project as p');
+		$this->db->join('student as s','s.id=p.studentId','INNER');
+		$this->db->join('semester as sem','sem.id=p.semesterId','INNER');
+		$this->db->join('department as d','d.id=p.departmentId','INNER');
+		$this->db->join('subject as sub','sub.id=p.subjectId','INNER');
+		$this->db->where(array('p.status'=>1,'p.id'=>$id));
+		$query = $this->db->get();
+		return $query;
+	}
+		function recentlyAddedProject()
+	{
+		$this->db->select('p.*,d.name as depName,s.name as studentName,sem.name as semName,sub.name as subName');
+		$this->db->from('project as p');
+		$this->db->order_by("p.id", "desc");
+		$this->db->limit(10);
+		$this->db->join('student as s','s.id=p.studentId','INNER');
+		$this->db->join('semester as sem','sem.id=p.semesterId','INNER');
+		$this->db->join('department as d','d.id=p.departmentId','INNER');
+		$this->db->join('subject as sub','sub.id=p.subjectId','INNER');
+		$this->db->where(array('p.status'=>1));
+		$query = $this->db->get();
+	//echo $this->db->last_query();exit;
+		return $query;
+	}
+	function totalProjects()
+	{
+		//orders
+		$this->db->select('count(id) as tProjects');
+		$this->db->from('project');
+		$this->db->where(array('status'=>1));
+		$result = $this->db->get();
+		//echo $this->db->last_query(); exit;
+		return $result;
+	}
+	function totalStudents()
+	{
+		//orders
+		$this->db->select('count(id) as tStudents');
+		$this->db->from('student');
+		$this->db->where(array('status'=>1));
+		$result = $this->db->get();
+		//echo $this->db->last_query(); exit;
+		return $result;
+	}
+	function totalSubject()
+	{
+		//orders
+		$this->db->select('count(id) as tSubjects');
+		$this->db->from('subject');
+		$this->db->where(array('status'=>1));
+		$result = $this->db->get();
+		//echo $this->db->last_query(); exit;
+		return $result;
+	}
+	function totalFaculties()
+	{
+		//orders
+		$this->db->select('count(id) as tFaculties');
+		$this->db->from('faculty');
+		$this->db->where(array('status'=>1));
+		$result = $this->db->get();
+		//echo $this->db->last_query(); exit;
+		return $result;
+	}
 }
diff --git a/admin/application/models/Semester_model.php b/admin/application/models/Semester_model.php
index 4e548ef..0116fda 100644
--- a/admin/application/models/Semester_model.php
+++ b/admin/application/models/Semester_model.php
@@ -8,24 +8,54 @@ class Semester_model extends CI_Model {
         parent::__construct();
     }
 	 
-	function list_sem()
+	function list_semester()
 	{
-		$this->db->select('*');
-		$this->db->from('Semester');
+		$this->db->select('s.id,s.name,s.year,sub.id as subId,sub.name as subName,dep.id as depId,dep.name as depName,deg.id as degId,deg.name as degName');
+		$this->db->from('Semester as s');
+		$this->db->join('subject as sub','sub.id=s.subjectId','INNER');
+		$this->db->join('department as dep','dep.id=s.departmentId','INNER');
+		$this->db->join('degree as deg','deg.id=s.degreeId','INNER');
+		$this->db->where(array('s.status'=>1,));
+		$query = $this->db->get();
+		//'sub.status'=>1,'dep.status'=>1,'deg.status'=>1
+	//echo $this->db->last_query();exit;
+		return $query;
+	}
+	 
+	  function listSubject()
+	{
+		$this->db->select('id,name');
+		$this->db->from('subject');
 		$this->db->where(array('status'=>1));
 		$query = $this->db->get();
 	//echo $this->db->last_query();exit;
 		return $query;
 	}
-	 
-	 function get_sem($id)
+	 function listDepartment()
 	{
-		$this->db->select('*');
-		$this->db->from('semester');
-		$this->db->where(array('status'=>1,'id'=>$id));
+		$this->db->select('id,name');
+		$this->db->from('department');
+		$this->db->where(array('status'=>1));
+		$query = $this->db->get();
+	//echo $this->db->last_query();exit;
+		return $query;
+	} function listDegree()
+	{
+		$this->db->select('id,name');
+		$this->db->from('degree');
+		$this->db->where(array('status'=>1));
 		$query = $this->db->get();
 	//echo $this->db->last_query();exit;
 		return $query;
 	}
+	 function getSemester($id)
+	{
+		$this->db->select('*');
+		$this->db->from('semester');
+		$this->db->where(array('status'=>1,'id'=>$id));	
+		$query = $this->db->get();
+		//echo $this->db->last_query();exit;
+		return $query;
+	}
 	 
 }
diff --git a/admin/application/models/Student_model.php b/admin/application/models/Student_model.php
index ad6ebff..b0b4e75 100644
--- a/admin/application/models/Student_model.php
+++ b/admin/application/models/Student_model.php
@@ -37,6 +37,16 @@ class Student_model extends CI_Model {
 		$query = $this->db->get();
 	//echo $this->db->last_query();exit;
 		return $query;
+		
 	} 
-	 
+	 function viewStudent($id)
+	{
+		$this->db->select('s.*,d.name as depName');
+		$this->db->from('student as s');
+		$this->db->join('department as d','d.id=s.department','INNER');
+		$this->db->where(array('s.status'=>1,'s.id'=>$id));
+		$query = $this->db->get();
+		//echo $this->db->last_query();exit;
+		return $query;
+	}
 }
diff --git a/admin/application/models/Subject_model.php b/admin/application/models/Subject_model.php
index 55c8d63..fe78a4f 100644
--- a/admin/application/models/Subject_model.php
+++ b/admin/application/models/Subject_model.php
@@ -7,16 +7,33 @@ class Subject_model extends CI_Model {
     public function __construct() {
         parent::__construct();
     }
-	 
-	function list_sub()
+	function degreeList()
 	{
-		$this->db->select('*');
-		$this->db->from('subject');
+		$this->db->select('id, name');
+		$this->db->from('degree');
 		$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');
+		$this->db->from('faculty');
+		$this->db->where(array('status'=>1));
+		$query = $this->db->get();
+	//echo $this->db->last_query();exit;
+		return $query;
+	}
+	function list_subject()
+	{
+		$this->db->select('s.id ,s.name,s.code,d.name as depName');
+		$this->db->from('subject as s');
+		$this->db->join('degree as d','d.id=s.degreeId','INNER');
+		$this->db->where(array('s.status'=>1,'d.status'=>1));
+		$query = $this->db->get();
+		return $query;
+	}
 	 
 	 function get_sub($id)
 	{
@@ -27,5 +44,24 @@ class Subject_model extends CI_Model {
 	//echo $this->db->last_query();exit;
 		return $query;
 	} 
-	 
+	 function viewSubject($id)
+	{
+		$this->db->select('sub.*,deg.name as degName,f.id as facId,f.name as facName');
+		$this->db->from('subject as sub');
+		$this->db->join('degree as deg','deg.id=sub.degreeId','INNER');
+		$this->db->join('faculty as f','f.id=sub.facultyId','INNER');
+		$this->db->where(array('sub.status'=>1,'sub.id'=>$id));
+		$query = $this->db->get();
+		//echo $this->db->last_query();exit;
+		return $query;
+	}
+	function get_faculty($id)
+	{
+		$this->db->select('*');
+		$this->db->from('faculty');
+		$this->db->where(array('id'=>$id));
+		$query = $this->db->get();
+	//echo $this->db->last_query();
+		return $query;
+	} 
 }
diff --git a/admin/application/views/dashboard.php b/admin/application/views/dashboard.php
index c8b2900..604278c 100644
--- a/admin/application/views/dashboard.php
+++ b/admin/application/views/dashboard.php
@@ -25,9 +25,15 @@
 							<div class="col-xl-3 col-md-6 col-12">
 								<div class="info-box bg-blue">
 									<span class="info-box-icon push-bottom"><i class="material-icons">group</i></span>
+									<?php 
+									if(isset($project) && $project->num_rows()>0){
+									$b=$project->row();	
+									$tProjects=$b->tProjects;
+									}
+									?>
 									<div class="info-box-content">
-										<span class="info-box-text">Total Students</span>
-										<span class="info-box-number">450</span>
+										<span class="info-box-text">Total Project</span>
+										<span class="info-box-number"><?=$tProjects;?></span>
 										
 									</div>
 									<!-- /.info-box-content -->
@@ -38,9 +44,15 @@
 							<div class="col-xl-3 col-md-6 col-12">
 								<div class="info-box bg-orange">
 									<span class="info-box-icon push-bottom"><i class="material-icons">person</i></span>
+									<?php 
+									if(isset($student) && $student->num_rows()>0){
+									$b=$student->row();	
+									$tStudents=$b->tStudents;
+									}
+									?>
 									<div class="info-box-content">
-										<span class="info-box-text">Total Faculties</span>
-										<span class="info-box-number">90</span>
+										<span class="info-box-text">Total Students</span>
+										<span class="info-box-number"><?=$tStudents;?></span>
 									</div>
 									<!-- /.info-box-content -->
 								</div>
@@ -50,9 +62,16 @@
 							<div class="col-xl-3 col-md-6 col-12">
 								<div class="info-box bg-purple">
 									<span class="info-box-icon push-bottom"><i class="material-icons">local_library</i></span>
+									
+									<?php 
+									if(isset($subject) && $subject->num_rows()>0){
+									$b=$subject->row();	
+									$tSubjects=$b->tSubjects;
+									}
+									?>
 									<div class="info-box-content">
 										<span class="info-box-text">Total Subjects</span>
-										<span class="info-box-number">52</span>
+										<span class="info-box-number"><?=$tSubjects;?></span>
 									</div>
 									<!-- /.info-box-content -->
 								</div>
@@ -62,9 +81,15 @@
 							<div class="col-xl-3 col-md-6 col-12">
 								<div class="info-box bg-success">
 									<span class="info-box-icon push-bottom"><i class="material-icons">school</i></span>
+									<?php 
+									if(isset($faculty) && $faculty->num_rows()>0){
+									$b=$faculty->row();	
+									$tFaculties=$b->tFaculties;
+									}
+									?>
 									<div class="info-box-content">
-										<span class="info-box-text">Total Courses</span>
-										<span class="info-box-number">5</span>
+										<span class="info-box-text">Total Faculties</span>
+										<span class="info-box-number"><?=$tFaculties;?></span>
 									</div>
 									<!-- /.info-box-content -->
 								</div>
@@ -74,28 +99,7 @@
 						</div>
 					</div>
 					<!-- end widget -->
-					<!-- chart start -->
-					<div class="row">
-						<div class="col-md-12">
-							<div class="card card-box">
-								<div class="card-head">
-									<header>Projects</header>
-									<div class="tools">
-										<a class="fa fa-repeat btn-color box-refresh" href="javascript:;"></a>
-										<a class="t-collapse btn-color fa fa-chevron-down" href="javascript:;"></a>
-										<a class="t-close btn-color fa fa-times" href="javascript:;"></a>
-									</div>
-								</div>
-								<div class="card-body no-padding height-9">
-									<div class="row">
-										<canvas id="chartjs_line"></canvas>
-									</div>
-								</div>
-							</div>
-						</div>
-						
-					</div>
-					<!-- Chart end -->
+					
 					<div class="row">
 						<div class="col-md-12 col-sm-12">
 							<div class="card  card-box">
@@ -134,143 +138,51 @@
 										<table class="table table-striped table-bordered table-hover table-checkable order-column" id="example4">
 											<thead>
 												<tr>
-													<th>S.No</th>
-													<th>Date</th>
-													<th>Project Name</th>
-													<th>Subject</th>
-													<th>Student Name</th>
-													<th>Actions </th>
+													<th> S.No </th>
+													<th> Date </th>
+													<th> Project Code </th>
+													<th> Student </th>
+													<th> Semester </th>
+													<th> Subject </th>
+													<th> Department </th>
+													<th> Action </th>
 												</tr>
 											</thead>
 											<tbody>
+												<?php if(isset($projectList) && $projectList->num_rows()>0)
+													{
+													$i=1;
+													foreach($projectList->result() as $p)
+													{
+													$id=$p->id;
+													$date=$p->date;
+													$name=$p->projectName;
+													$code=$p->code;
+													$studentName=$p->studentName;
+													$semName=$p->semName;
+													$subName=$p->subName;
+													$depName=$p->depName;
+													//$faculty=$p->facultyName;
+													$image=$p->image;
+												?>
 												<tr class="odd gradeX">
-													<td>
-														1
-													</td>
-													<td class=""> 12/05/2016 </td>
-													<td>
-														 Test 1 
-													</td>
-													<td class=""> English </td>
-													<td>
-														<a href="mailto:shuxer@gmail.com"> Dr.Rajesh </a>
-													</td>
+													<td><?=$i;?></td>
+													<td><?=$date;?></td>
+													<td><?=$code;?></td>
+													<td><?=$studentName;?></td>
+													<td><?=$semName;?></td>
+													<td><?=$subName;?></td>
+													<td><?=$depName;?></td>
 													<td class="center">
 														<div class="btn-group">
-															<button class="btn btn-xs btn-info dropdown-toggle no-margin" type="button" data-toggle="dropdown"
-															 aria-expanded="false"> View
-															 <i class="fa fa-eye" aria-hidden="true" ></i>
-															</button>
-															
-														</div>
-													</td>
-												</tr>
-												<tr class="odd gradeX">
-													<td>
-														2
-													</td>
-
-													<td class=""> 12/05/2016 </td>
-													<td class=""> Test 2 </td>
-													<td class=""> English </td>
-													<td>
-														<a href="mailto:looper90@gmail.com"> Dr.Sarah Smith </a>
-													</td>
-													<td class="center">
-														<div class="btn-group">
-															<button class="btn btn-xs btn-info dropdown-toggle no-margin" type="button" data-toggle="dropdown"
-															 aria-expanded="false"> View
-															 <i class="fa fa-eye" aria-hidden="true" ></i>
-															</button>
-															
-														</div>
-													</td>
-												</tr>
-												<tr class="odd gradeX">
-													<td>
-														3
-													</td>
-
-													<td class=""> 12/05/2016 </td>
-													<td class=""> Test 3</td>
-													
-													<td class=""> English </td>
-													<td>
-														<a href="mailto:userwow@yahoo.com"> Dr.Rajesh </a>
-													</td>
-													<td class="center">
-														<div class="btn-group">
-															<button class="btn btn-xs btn-info dropdown-toggle no-margin" type="button" data-toggle="dropdown"
-															 aria-expanded="false"> View
-															 <i class="fa fa-eye" aria-hidden="true" ></i>
-															</button>
-															
-														</div>
-													</td>
-												</tr>
-												<tr class="odd gradeX">
-													<td>
-														4
-													</td>
-													<td class=""> 12/05/2016 </td>
-													
-													<td class=""> Test 3 </td>
-													<td class=""> English </td>
-													<td>
-														<a href="mailto:doctormail@gmail.com"> Dr.Megha Trivedi </a>
-													</td>
-													<td class="center">
-														<div class="btn-group">
-															<button class="btn btn-xs btn-info dropdown-toggle no-margin" type="button" data-toggle="dropdown"
-															 aria-expanded="false"> View
-															 <i class="fa fa-eye" aria-hidden="true" ></i>
-															</button>
-															
-														</div>
-													</td>
-												</tr>
-												<tr class="odd gradeX">
-													<td>
-														5
-													</td>
-													<td class=""> 12/05/2016 </td>
-													<td class=""> Test 4 </td>
-													
-													<td class=""> English </td>
-													<td>
-														<a href="mailto:doctormail@gmail.com"> Dr.Sarah Smith </a>
-													</td>
-													<td class="center">
-														<div class="btn-group">
-															<button class="btn btn-xs btn-info dropdown-toggle no-margin" type="button" data-toggle="dropdown"
-															 aria-expanded="false"> View
-															 <i class="fa fa-eye" aria-hidden="true" ></i>
-															</button>
-															
-														</div>
-													</td>
-												</tr>
-												<tr class="odd gradeX ">
-													<td>
-														6
-													</td>
-													<td class=""> 12/05/2016 </td>
-													
-													<td class=""> Test 5 </td>
-													<td class=""> English </td>
-													<td>
-														<a href="mailto:doctormail@gmail.com"> Dr.Megha Trivedi </a>
-													</td>
-													<td class="center">
-														<div class="btn-group">
-															<button class="btn btn-xs btn-info dropdown-toggle no-margin" type="button" data-toggle="dropdown"
-															 aria-expanded="false"> View
-															 <i class="fa fa-eye" aria-hidden="true" ></i>
-															</button>
-															
+															<a href="<?=base_url();?>view-project/<?=$id;?>" class="btn btn-info btn-xs">
+															View <i class="fa fa-eye"></i>
+														</a>
 														</div>
 													</td>
 												</tr>
+													<?php $i++;}}?>
+											
 											</tbody>
 										</table>
 									</div>
diff --git a/admin/application/views/degree/add_degree.php b/admin/application/views/degree/add_degree.php
index 82569c2..0cac160 100644
--- a/admin/application/views/degree/add_degree.php
+++ b/admin/application/views/degree/add_degree.php
@@ -1,4 +1,6 @@
 <link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
 <?php $this->load->view('includes/header');?>
        <div class="page-container">
 			<!-- start sidebar menu -->
@@ -26,14 +28,14 @@
 									<header>Degree</header>	
 								</div>
 								<div class="card-body" id="bar-parent">
-									<form action="<?=base_url();?>add_degree" method="post">
+									<form class="form-horizontal" action="<?=base_url();?>add_degree" method="post">
 										<div class="form-body">
 											<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" name="depId">
+													<select class="form-control select2" name="depId" data-validation="required">
 													<option value="" selected="selected" id="departentId" >Select</option>
 													<?php
 														   if(isset($dep) && $dep->num_rows()>0)
@@ -53,7 +55,7 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="name" type="text" placeholder="Enter Degree Name" class="form-control input-height" /> </div>
+													<input name="name" type="text" data-validation="required" placeholder="Enter Degree Name" class="form-control input-height" /> </div>
 											</div>
 											</div>								
 										</div>
@@ -76,7 +78,8 @@
 				</div>
 			</div>
 		</div>
+<?php $this->load->view('includes/footer');?>
+<script src="<?=base_url();?>assets/select2/js/select2.js"></script>
+<script src="<?=base_url();?>assets/select2/js/select2-init.js"></script>
+<script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
 
-					
-
-			<?php $this->load->view('includes/footer');?>
\ No newline at end of file
diff --git a/admin/application/views/degree/degree_list.php b/admin/application/views/degree/degree_list.php
index fb7ffda..a6ae030 100644
--- a/admin/application/views/degree/degree_list.php
+++ b/admin/application/views/degree/degree_list.php
@@ -1,136 +1,219 @@
 <!-- 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">Degree 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">Degree</li>
-							</ol>
-						</div>
-					</div>
-					<?php $this->load->view('includes/msg');?>
-					<div class="row">
-						<div class="col-md-6">
-							<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_degree">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> Department</th>
-													<th> Name </th>
-													<th> Action </th>
-												</tr>
-											</thead>
-											<tbody>
-											<?php
-													if(isset($deg) && $deg->num_rows()>0)
-													{
-													$i=1;
-														foreach($deg->result() as $d)
-														{
-															$id=$d->id;
-															$depId=$d->departmentId;
-															$name=$d->name;
-															?>
-												<tr class="odd gradeX">
-													<td><?=$i;?></td>
-													<td><?=$depId;?></td>
-													<td><?=$name;?></td>
-													<td>
-														
-														<a href="<?=base_url();?>edit_degree/<?=$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>
+<!-- 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">Degree 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">Degree</li>
+				</ol>
+			</div>
+		</div>
+		<?php $this->load->view('includes/msg');?>
+		<div class="row">
+			<div class="col-md-6">
+				<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">
+								<a style="color:#fff;"href="<?=base_url();?>add_degree">
+									<button  type="button" class="btn btn-info"
+							 data-toggle="modal" data-target="#mediumModel" >add <i class="fa fa-plus"></i></button>
+							 </a> 
 								</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> Department</th>
+										<th> Name </th>
+										<th> Action </th>
+									</tr>
+								</thead>
+								<tbody>
+								<?php
+										if(isset($deg) && $deg->num_rows()>0)
+										{
+										$i=1;
+											foreach($deg->result() as $d)
+											{
+												$id=$d->id;
+												$name=$d->name;
+												$departmentId=$d->departmentId;
+												$departmentName=$d->departmentName;
+												?>
+									<tr class="odd gradeX">
+										<td><?=$i;?></td>
+										<td><?=$departmentName;?></td>
+										<td><?=$name;?></td>
+										<td>
+											<a href="javascript:;" data-id="<?=$id;?>" class="editDegreeClass btn btn-primary btn-xs">
+												<i class="fa fa-pencil"></i>
+											</a>
+											<a data-id="<?=$id;?>"  class="degreeClass 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>
-	<!-- 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_department" 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 class="modal fade" id="editModal" 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">Edit Degree</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();?>Degree/editDegree/<?=$id;?>" method="post">
+					<div class="form-body">
+						
+						<div class="form-group row">
+							<div class="col-md-12">
+							<label class="control-label">Degree Name
+								<span class="required"> * </span>
+							</label>
+								<input type="text" id="degName" value="" data-validation="required" name="degreeName" placeholder="Enter Degree Name" class="form-control">
+							</div>
+						</div>
+						<div class="form-group row">
+							<div class="col-md-12">
+							<label class="control-label">Department
+								<span class="required"> * </span>
+							</label>
+							
+								<select class="form-control select2" id="departmenttId" name="depId" data-validation="required">
+								<option value="" selected="selected">Select</option>
+								<?php
+									   if(isset($dep) && $dep->num_rows()>0)
+									   {
+										   foreach($dep->result() as $department)
+										   {
+											   ?> <option value="<?=$department->id;?>"><?=$department->name;?></option><?php
+										   }
+									   }
+								?>     
+									
+								</select>
+							</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" data-dismiss="modal">Cancel</button>
 							</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');
+					</div>
+				</form>
+			</div>
+			
+		</div>
+	</div>
+</div>
+<!-- end page content -->
+<div class="modal fade" id="deleteRole" 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();?>Degree/deleteDegree" 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="degreeId" value="<?=$id;?>">
+									</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 type="text/javascript" src="<?=base_url();?>assets/jquery.cookie.min.js"></script>
+
+	<script>
+	var base_path=$('body').attr('data-path');
+	$(".degreeClass").click(function(){
+    $('#deleteRole').modal('show');
 	var id=$(this).attr('data-id');
 	 //alert(id);
 	 $('#hiddenid').val(id);
      });
-	 </script>
\ No newline at end of file
+	 </script>
+<script>
+var base_path=$('body').attr('data-path');
+$(".editDegreeClass").click(function(){
+   $('#editModal').modal('show');
+	var id=$(this).attr('data-id');
+	var url22=base_path+"Degree/getDegree";
+	$.post(url22,{id:id,csrf_test_name:$.cookie('csrf_cookie_name')},function(result){
+	
+	var fields=result.split("-");
+	var id = fields[0];
+	var name = fields[1];
+	var departmentValue = fields[2];
+	//alert (name)
+	$('#degName').val(name);
+	$("select#departmenttId").val(departmentValue)
+	//$("#departmenttId option : selected").val(departmentValue)
+	});
+	 });
+</script>
diff --git a/admin/application/views/department/add_department.php b/admin/application/views/department/add_department.php
index 697820d..558f4b8 100644
--- a/admin/application/views/department/add_department.php
+++ b/admin/application/views/department/add_department.php
@@ -63,14 +63,14 @@
 									<header>Department</header>	
 								</div>
 								<div class="card-body" id="bar-parent">
-									<form action="<?=base_url();?>add_department" method="post">
+									<form action="<?=base_url();?>add_department" method="post" enctype="multipart/form-data">
 										<div class="form-body">
 											<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" name="name" data-required="1" placeholder="Enter Your Name" class="form-control input-height">
+													<input type="text" name="name" data-validation="required" placeholder="Enter Your Name" class="form-control input-height">
 												</div>
 											</div>
 											
@@ -79,25 +79,23 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="code" type="text" placeholder="Enter Your Code" class="form-control input-height" /> </div>
+													<input name="code" type="text" data-validation="required" placeholder="Enter Your Code" class="form-control input-height" /> </div>
 											</div>
 											<div class="form-group row">
 												<label class="control-label col-md-3">Total Year
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="year" type="text" placeholder="Enter Your Year" class="form-control input-height" /> </div>
+													<input name="year" type="text" data-validation="required" placeholder="Enter Your Year" class="form-control input-height" /> </div>
 											</div>
 											<div class="form-group row">
 												<label class="control-label col-md-3">Images
 												</label>
 												<div class="col-md-5 compose-editor">
-													<input type="file"  name="image"  placeholder="Enter img" class="form-control default" >
+													<input type="file"  name="depImage" data-validation="required" placeholder="Enter img" class="form-control default" >
 												</div>
 											</div>
 										</div>
-										</div>								
-										</div>
 										<div class="form-actions">
 											<div class="row">
 												<div class="offset-md-3 col-md-9">
@@ -106,6 +104,9 @@
 												</div>
 											</div>
 										</div>
+										</div>								
+										</div>
+										
 									</form>
 								</div>
 							</div>
@@ -118,6 +119,7 @@
 			</div>
 		</div>
 			<?php $this->load->view('includes/footer');?>
+			<script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
 			<script>
 	$(".departmentclass").click(function(){
     $('#Model').modal('show');
diff --git a/admin/application/views/department/department_list.php b/admin/application/views/department/department_list.php
index 226d385..eff08bb 100644
--- a/admin/application/views/department/department_list.php
+++ b/admin/application/views/department/department_list.php
@@ -28,8 +28,10 @@
 									<div class="row">
 										<div class="col-md-6 col-sm-6 col-xs-6">
 											<div class="btn-group">
+											<a style="color:#fff;"href="<?=base_url();?>add_department">
 												<button  type="button" class="btn btn-info"
-										 data-toggle="modal" data-target="#mediumModel" ><a style="color:#fff;"href="<?=base_url();?>add_department">add <i class="fa fa-plus"></i></a> </button>
+										 data-toggle="modal" data-target="#mediumModel" >add <i class="fa fa-plus"></i> </button>
+										 </a>
 											</div>
 										</div>
 										
@@ -42,6 +44,7 @@
 													<th> Name </th>
 													<th> Code </th>
 													<th> Total Year </th>
+													<th> Image</th>
 													<th> Action </th>
 												</tr>
 											</thead>
@@ -63,11 +66,10 @@
 													<td><?=$name;?></td>
 													<td><?=$code;?></td>
 													<td><?=$year;?></td>
-													
-													
+													<td><img src="<?=base_url();?>uploads/department/<?=$image;?>" style="width:75px;height:75px;"/></td>
 													<td>
 														
-														<a href="<?=base_url();?>edit_department/<?=$id;?>" class="btn btn-primary btn-xs">
+														<a href="<?=base_url();?>edit-department/<?=$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">
@@ -91,7 +93,7 @@
 			</div>
 	</div>
 	<!-- end page content -->
-			<div class="modal fade" id="editmediumModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+			<div class="modal fade" id="deleteRole" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
 					 aria-hidden="true">
 						<div class="modal-dialog" role="document">
 							<div class="modal-content">
@@ -102,13 +104,13 @@
 									</button>
 								</div>
 								<div class="modal-body">
-									<form action="<?=base_url();?>delete_department" method="post">
+									<form action="<?=base_url();?>Department/deleteDepartment" 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">
+												<input type="hidden" name="departmentId" value="<?=$id;?>">
 												</div>
 											
 										<div class="form-actions">
@@ -134,7 +136,7 @@
 	<script src="<?=base_url();?>/assets/table_data.js"></script>
 		<script>
 	$(".editsemesterclass").click(function(){
-    $('#editmediumModel').modal('show');
+    $('#deleteRole').modal('show');
 	var id=$(this).attr('data-id');
 	 //alert(id);
 	 $('#hiddenid').val(id);
diff --git a/admin/application/views/department/edit_department.php b/admin/application/views/department/edit_department.php
index 23b4217..a87fb32 100644
--- a/admin/application/views/department/edit_department.php
+++ b/admin/application/views/department/edit_department.php
@@ -37,6 +37,8 @@
 							<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>&nbsp;<a class="parent-item" href="<?=base_url();?>/department">Department</a>&nbsp;<i class="fa fa-angle-right"></i>
+								</li>
 								<li class="active">Edit Department</li>
 							</ol>
 						</div>
@@ -61,7 +63,7 @@
 									<header>Edit department</header>	
 								</div>
 								<div class="card-body" id="bar-parent">
-									<form action="<?=base_url();?>edit_department/<?=$id;?>" method="post" >
+									<form action="<?=base_url();?>edit-department/<?=$id;?>" method="post" enctype="multipart/form-data">
 										<div class="form-body">
 											<div class="form-group row">
 												<label class="control-label col-md-3">Name
@@ -93,10 +95,17 @@
 												<label class="control-label col-md-3">Image
 												</label>
 												<div class="compose-editor">
-													<input name="image" value="<?=$image;?>" type="file" class="form-control" >
+													<input name="image" value="" type="file" class="form-control" >
+													<input name="hiddenImage" value="<?=$image;?>" type="hidden" class="form-control" >
+												</div>
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">
+												</label>
+												<div class="compose-editor">
+													<img src="<?=base_url();?>/uploads/department/<?=$image;?>" style="width:75px;height:75px;"/>
 												</div>
 											</div>
-											
 										<div class="form-actions">
 											<div class="row">
 												<div class="offset-md-3 col-md-9">
diff --git a/admin/application/views/employee/add.php b/admin/application/views/employee/add.php
index c29571a..0006a86 100644
--- a/admin/application/views/employee/add.php
+++ b/admin/application/views/employee/add.php
@@ -1,143 +1,150 @@
 <link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<!--select2-->
+<link href="<?=base_url();?>assets/select2/css/select2.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2-bootstrap.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 Employee</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">Employee</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>Employee</header>	
-								</div>
-								<div class="card-body" id="bar-parent">
-									<form action="<?=base_url();?>add_employee" method="post">
-										<div class="form-body">
-											<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" name="employeename" data-validation="required" placeholder="Enter name" class="form-control input-height">
-												</div>
-											</div>
-											<div class="form-group row">
-												<label class="control-label col-md-3">Role
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-5">											
-													<select class="form-control input-height" name="roleId" data-validation="required">
-													<option value="" selected="selected" id="departentId" >Select</option>
-													<?php
-														   if(isset($role) && $role->num_rows()>0)
-														   {
-															   foreach($role->result() as $roles)
-															   {
-																   ?> <option value="<?=$roles->id;?>"><?=$roles->name;?></option><?php
-															   }
-														   }
-													?>     
-														
-													</select>
-												</div>
-											</div>
-											<div class="form-group row">
-												<label class="control-label col-md-3">Mobile No.
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-5">
-													<input name="mobileNumber" type="text" data-validation="required"  placeholder="Enter Mobile Number" class="form-control input-height" />
-													</div>
-											</div>
-											<div class="form-group row">
-												<label class="control-label col-md-3">Address
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-5">
-													<textarea name="address" data-validation="required" placeholder="Enter address" class="form-control" rows="5"></textarea>
-												</div>
-											</div>
-											
-											
-											<div class="form-group row">
-												<label class="control-label col-md-3">Email
-												</label>
-												<div class="col-md-5">
-													<div class="input-group">
-														
-														<input type="email" data-validation="required" class="form-control input-height" name="email" placeholder="Email Address"> 
-													</div>	
-												</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>
-												</label>
-												<div class="col-md-5">
-													<input name="User" type="text" data-validation="required" placeholder="Enter username" 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" data-validation="required" placeholder="Enter Password" 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 compose-editor">
-													<input name="img" type="file" data-validation="required" placeholder="Enter Your Image"class="form-control default">
-												</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" data-dismiss="">Cancel</button>
-												</div>
-											</div>
-										</div>
-									</form>
-								</div>
-							</div>
-						</div>
+<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 Employee</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>&nbsp;<a class="parent-item" href="<?=base_url();?>/employee">Employee</a>&nbsp;<i class="fa fa-angle-right"></i>
+						</li>
+						<li class="active">Add Employee</li>
+					</ol>
 				</div>
 			</div>
-			<!-- Modal -->
+			<!-- Midium Model -->
+			<div class="row">
+				<div class="col-md-12 col-sm-12">
+					<div class="card card-box">
+						<div class="card-head">
+							<header>Employee</header>	
+						</div>
+						<div class="card-body" id="bar-parent">
+							<form action="<?=base_url();?>add-employee" method="post" enctype="multipart/form-data">
+								<div class="form-body">
+									<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" name="employeename" data-validation="required" placeholder="Enter name" class="form-control input-height">
+										</div>
+									</div>
+									<div class="form-group row">
+										<label class="control-label col-md-3">Role
+											<span class="required"> * </span>
+										</label>
+										<div class="col-md-5">											
+											<select class="form-control select2" name="roleId" data-validation="required">
+											<option value="" selected="selected" id="departentId" >Select</option>
+											<?php
+												   if(isset($role) && $role->num_rows()>0)
+												   {
+													   foreach($role->result() as $roles)
+													   {
+														   ?> <option value="<?=$roles->id;?>"><?=$roles->name;?></option><?php
+													   }
+												   }
+											?>     
+												
+											</select>
+										</div>
+									</div>
+									<div class="form-group row">
+										<label class="control-label col-md-3">Mobile No.
+											<span class="required"> * </span>
+										</label>
+										<div class="col-md-5">
+											<input name="mobileNumber" type="text" data-validation="required"  placeholder="Enter Mobile Number" class="form-control input-height" />
+											</div>
+									</div>
+									<div class="form-group row">
+										<label class="control-label col-md-3">Address
+											<span class="required"> * </span>
+										</label>
+										<div class="col-md-5">
+											<textarea name="address" data-validation="required" placeholder="Enter address" class="form-control" rows="5"></textarea>
+										</div>
+									</div>
+									
+									
+									<div class="form-group row">
+										<label class="control-label col-md-3">Email
+										</label>
+										<div class="col-md-5">
+											<div class="input-group">
+												
+												<input type="email" data-validation="required" class="form-control input-height" name="email" placeholder="Email Address"> 
+											</div>	
+										</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>
+										</label>
+										<div class="col-md-5">
+											<input name="User" type="text" data-validation="required" placeholder="Enter username" 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" data-validation="required" placeholder="Enter Password" 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 compose-editor">
+											<input name="employeeImg" type="file" data-validation="required" placeholder="Enter Your Image"class="form-control default">
+										</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" data-dismiss="">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>
\ No newline at end of file
+<?php $this->load->view('includes/footer');?>
+<script src="<?=base_url();?>assets/select2/js/select2.js"></script>
+<script src="<?=base_url();?>assets/select2/js/select2-init.js"></script>
+<script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
\ No newline at end of file
diff --git a/admin/application/views/employee/edit.php b/admin/application/views/employee/edit.php
index d48b0f8..30d4a54 100644
--- a/admin/application/views/employee/edit.php
+++ b/admin/application/views/employee/edit.php
@@ -1,158 +1,194 @@
 <link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
 <?php $this->load->view('includes/header');?>
+<link href="<?=base_url();?>assets/select2/css/select2.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
+
 <style>
 .input-group .input-group-addon {
-	border-radius: 0;
-    border-color: #d2d6de;
-    background-color: #fff;
-    border: 1px solid #d2d6de;
-	padding: 6px 12px;
+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;
+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;
+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 Employee</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 Employee</li>
-							</ol>
-						</div>
-					</div>
-					<!-- Midium Model -->
-					<?php
-					if(isset($emp) && $emp->num_rows()>0)
-					{
-							$e=$emp->row();
-							$eid=$e->id;
-							$name=$e->name;
-							$mobileNumber=$e->mobileNumber;
-							$email=$e->email;
-							$image=$e->image;
-							$address=$e->address;
-							$pincode=$e->pincode;
-							$username=$e->username;
-							$password=$e->password;
-					} ?>
-					
-					<div class="row">
-						<div class="col-md-12 col-sm-12">
-							<div class="card card-box">
-								<div class="card-head">
-									<header>Edit Employee</header>	
-								</div>
-								<div class="card-body" id="bar-parent">
-									<form action="<?=base_url();?>edit_employees/<?=$eid;?>" method="post" >
-										<div class="form-body">
-											<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="employeename" data-required="1" placeholder="Enter patient name" class="form-control input-height">
-												</div>
-											</div>
-											<div class="form-group row">
-												<label class="control-label col-md-3">Mobile No.
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-5">
-													<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
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-5">
-													<textarea name="address"  placeholder="address" class="form-control-textarea" rows="5"><?=$address;?></textarea>
-												</div>
-											</div>
-											
-											
-											<div class="form-group row">
-												<label class="control-label col-md-3">Email
-												</label>
-												<div class="col-md-5">
-													<div class="input-group">
-														<span class="input-group-addon">
-															<i class="fa fa-envelope"></i>
-														</span>
-														<input type="email" value="<?=$email;?>" class="form-control input-height" name="email" placeholder="Enter Email Address"> 
-													</div>	
-												</div>
-											</div>
-
-											<div class="form-group row">
-												<label class="control-label col-md-3">Profile Image
-												</label>
-												<div class="col-md-5 compose-editor">
-													<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>
-												</label>
-												<div class="col-md-5">
-													<input name="code" value="<?=$pincode;?>" 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>
-												</label>
-												<div class="col-md-5">
-													<input name="User" value="<?=$username;?>" type="text" placeholder="Enter mobile number" 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="Enter Password" class="form-control input-height" /> </div>
-											    <input type="hidden" name="hiddenpass" value="<?=$password;?>">
-												</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" data-dismiss="">Cancel</button>
-												</div>
-											</div>
-										</div>
-									</form>
-								</div>
-							</div>
-						</div>
-					</div>
+<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 Employee</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>&nbsp;<a class="parent-item" href="<?=base_url();?>/employee">Employee</a>&nbsp;<i class="fa fa-angle-right"></i>
+					</li>
+					<li class="active">Edit Employee</li>
+				</ol>
 			</div>
-			<!-- Modal -->
+		</div>
+		<!-- Midium Model -->
+		<?php
+		if(isset($emp) && $emp->num_rows()>0)
+		{
+				$e=$emp->row();
+				$eid=$e->id;
+				$name=$e->name;
+				$mobileNumber=$e->mobileNumber;
+				$address=$e->address;
+				$email=$e->email;
+				$image	=$e->image;
+				$pincode=$e->pincode;
+				$username=$e->username;
+				$password=$e->password;
+				$roleId=$e->roleId;
+				$roleName=$e->roleName;
+		} ?>
+		
+		<div class="row">
+			<div class="col-md-12 col-sm-12">
+				<div class="card card-box">
+					<div class="card-head">
+						<header>Edit Employee</header>	
+					</div>
+					<div class="card-body" id="bar-parent">
+						<form action="<?=base_url();?>edit-employee/<?=$eid;?>" method="post" enctype="multipart/form-data">
+							<div class="form-body">
+								<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="employeename" data-validation="required" placeholder="Enter patient name" class="form-control input-height">
+									</div>
+								</div>
+								<div class="form-group row">
+									<label class="control-label col-md-3">Role
+										<span class="required"> * </span>
+									</label>
+									<div class="col-md-5">											
+										<select class="form-control select2" name="roleId" data-validation="required">
+										<option value="" selected="selected" id="departentId" >Select</option>
+										<?php
+											   if(isset($role) && $role->num_rows()>0)
+											   {
+												   foreach($role->result() as $roles)
+												   {
+													   ?> <option value="<?=$roles->id;?>" <?php if($roles->id==$roleId){ echo "selected";}?>><?=$roles->name;?></option><?php
+												   }
+											   }
+										?>     
+											
+										</select>
+									</div>
+								</div>
+								<div class="form-group row">
+									<label class="control-label col-md-3">Mobile No.
+										<span class="required"> * </span>
+									</label>
+									<div class="col-md-5">
+										<input type="text" name="mobileNumber" value="<?=$mobileNumber;?>" data-validation="required" placeholder="Enter mobile number" class="form-control input-height" /> </div>
+								</div>
+								<div class="form-group row">
+									<label class="control-label col-md-3">Address
+										<span class="required"> * </span>
+									</label>
+									<div class="col-md-5">
+										<textarea name="address" data-validation="required" placeholder="address" class="form-control-textarea" rows="5"><?=$address;?></textarea>
+									</div>
+								</div>
+								
+								
+								<div class="form-group row">
+									<label class="control-label col-md-3">Email
+									</label>
+									<div class="col-md-5">
+										<div class="input-group">
+											<input type="email" data-validation="required" value="<?=$email;?>" class="form-control input-height" name="email" placeholder="Enter Email Address"> 
+										</div>	
+									</div>
+								</div>
+
+								<div class="form-group row">
+									<label class="control-label col-md-3">Profile Image
+									</label>
+									<div class="col-md-5 compose-editor">
+										<input name="image" type="file" placeholder="Enter Your Image"class="form-control default" multiple>
+										<input type="hidden" name="hiddenImage" value="<?=$image;?>">
+									</div>
+									
+								</div>
+								<div class="form-group row">
+									<label class="control-label col-md-3">
+										<span class="required"> * </span>
+									</label>
+									<div class="col-md-5">
+										<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>
+									</label>
+									<div class="col-md-5">
+										<input name="username" data-validation="required" value="<?=$username;?>" type="text" placeholder="Enter Username" 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="password" placeholder="Enter Password" class="form-control input-height" /> </div>
+										<input type="hidden" name="hiddenPassword" value="<?=$password;?>">
+									</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" data-dismiss="">Cancel</button>
+									</div>
+								</div>
+							</div>
+						</form>
+					</div>
 				</div>
 			</div>
 		</div>
-			<?php $this->load->view('includes/footer');?>
\ No newline at end of file
+	</div>
+</div>
+<!-- Modal -->
+	</div>
+</div>
+</div>
+<?php $this->load->view('includes/footer');?>
+<script src="<?=base_url();?>assets/select2/js/select2.js"></script>
+<script src="<?=base_url();?>assets/select2/js/select2-init.js"></script>
+<script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
\ No newline at end of file
diff --git a/admin/application/views/employee/list.php b/admin/application/views/employee/list.php
index 0b7306a..58d8881 100644
--- a/admin/application/views/employee/list.php
+++ b/admin/application/views/employee/list.php
@@ -28,8 +28,10 @@
 									<div class="row">
 										<div class="col-md-6 col-sm-6 col-xs-6">
 											<div class="btn-group">
+											<a style="color:#fff;"href="<?=base_url();?>add-employee">
 												<button  type="button" class="btn btn-info"
-										 data-toggle="modal" data-target="#mediumModel" ><a style="color:#fff;"href="<?=base_url();?>add-employee">add <i class="fa fa-plus"></i></a> </button>
+										 data-toggle="modal" data-target="#mediumModel" >add <i class="fa fa-plus"></i> </button>
+										 </a>
 											</div>
 										</div>
 										
@@ -68,8 +70,10 @@
 												
 													<td><?=$address;?></td>
 													<td>
-														
-														<a href="<?=base_url();?>edit_employees/<?=$eid;?>" class="btn btn-primary btn-xs">
+														<a href="<?=base_url();?>view-employee/<?=$eid;?>" class="btn btn-success btn-xs">
+															<i class="fa fa-eye"></i>
+														</a>
+														<a href="<?=base_url();?>edit-employee/<?=$eid;?>" class="btn btn-primary btn-xs">
 															<i class="fa fa-pencil"></i>
 														</a>
 														<a data-id="<?=$eid;?>"  class="editemployeeclass btn btn-danger btn-xs">
@@ -105,13 +109,13 @@
 									</button>
 								</div>
 								<div class="modal-body">
-									<form action="<?=base_url();?>deleted_employee" method="post">
+									<form action="<?=base_url();?>Employee/deleteEmployee" 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">
+												<input type="hidden" name="employeeId" value="<?=$eid;?>">
 												</div>
 											
 										<div class="form-actions">
diff --git a/admin/application/views/employee/viewemployee.php b/admin/application/views/employee/viewemployee.php
new file mode 100644
index 0000000..1ede00d
--- /dev/null
+++ b/admin/application/views/employee/viewemployee.php
@@ -0,0 +1,103 @@
+<!-- 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 col-md-9" style="margin:0px auto;padding:0">
+						<div class="page-title-breadcrumb">
+							<div class=" pull-left">
+								<div class="page-title">Employee View</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>&nbsp;<a class="parent-item" href="<?=base_url();?>/employee">Employee</a>&nbsp;<i class="fa fa-angle-right"></i>
+								</li>
+								<li class="active">View Employee</li>
+							</ol>
+						</div>
+					</div>
+					<?php $this->load->view('includes/msg');?>
+					<div class="row">
+						<div class="col-md-9" style="margin:0px auto;">
+							<?php
+							if(isset($viewEmployee)&& $viewEmployee->num_rows()>0)
+							{
+								$view=$viewEmployee->row();
+								
+								$name=$view->name;
+								$roleName=$view->roleName;
+								$mobileNumber=$view->mobileNumber;
+								$address=$view->address;
+								$email=$view->email;
+								$image=$view->image;
+								$pincode=$view->pincode;
+								$username=$view->username;
+								
+							}
+										
+							?>
+							<!-- BEGIN PROFILE SIDEBAR -->
+								<div class="card card-topline-aqua">
+									<div class="card-body no-padding height-9">
+										<div class="row">
+											<div class="profile-userpic">
+												<img src="<?=base_url();?>uploads/employee/<?=$image;?>" class="img-responsive" alt=""> </div>
+										</div>
+										<div class="profile-usertitle">
+											<div class="profile-usertitle-name"><?=$name;?></div>
+											<div class="profile-usertitle-job"> <?=$roleName;?> </div>
+										</div>
+										<hr>
+										<div class="row">
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Mobile Number</strong>
+												<br>
+												<p class="text-muted"><?=$mobileNumber;?></p>
+											</div>
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Address</strong>
+												<br>
+												<p class="text-muted"><?=$address;?></p>
+											</div>
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Email</strong>
+												<br>
+												<p class="text-muted"><?=$email;?></p>
+											</div>
+										</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>
+											</div>
+										</div>
+										
+										<!-- END SIDEBAR USER TITLE -->
+										<!-- SIDEBAR BUTTONS -->
+										
+										<!-- END SIDEBAR BUTTONS -->
+									</div>
+								</div>
+								
+							<!-- END PROFILE CONTENT -->
+							<!-- END BEGIN PROFILE SIDEBAR -->
+						</div>
+					</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>
+		
\ No newline at end of file
diff --git a/admin/application/views/faculty/add_faculty.php b/admin/application/views/faculty/add_faculty.php
index dc19a00..479d8c4 100644
--- a/admin/application/views/faculty/add_faculty.php
+++ b/admin/application/views/faculty/add_faculty.php
@@ -1,5 +1,8 @@
 <link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2-bootstrap.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');?>
@@ -14,7 +17,9 @@
 							<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">Faculty</li>
+								<li>&nbsp;<a class="parent-item" href="<?=base_url();?>/faculty">Faculty</a>&nbsp;<i class="fa fa-angle-right"></i>
+								</li>
+								<li class="active">Add Faculty</li>
 							</ol>
 						</div>
 					</div>
@@ -26,14 +31,14 @@
 									<header>Faculty</header>	
 								</div>
 								<div class="card-body" id="bar-parent">
-									<form action="<?=base_url();?>add_faculty" method="post">
+									<form action="<?=base_url();?>add_faculty" method="post" enctype="multipart/form-data">
 										<div class="form-body">
 											<div class="form-group row">
-												<label class="control-label col-md-3">Faculty Id
+												<label class="control-label col-md-3">Faculty 
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">											
-													<input type="text" name="code" data-required="1" placeholder="Enter Your Id" class="form-control input-height">
+													<input type="text" name="facultyId" data-required="1" placeholder="Enter Your Id" class="form-control input-height" data-validation="required"/>
 												</div>
 											</div>
 											<div class="form-group row">
@@ -41,7 +46,7 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="name" type="text" placeholder="Enter Your Name" class="form-control input-height" /> </div>
+													<input name="name" type="text" placeholder="Enter Your Name" class="form-control input-height" data-validation="required" /> </div>
 											</div>
 											<div class="form-group row">
 												<label class="control-label col-md-3">Email
@@ -59,7 +64,7 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="mobile" type="text" placeholder="Enter Your Mobile Number" class="form-control input-height" /> </div>
+													<input name="mobileNumber" type="text" placeholder="Enter Your Mobile Number" class="form-control input-height" data-validation="required"/> </div>
 											</div>
 											<div class="form-group row">
 												<label class="control-label col-md-3">Date Of Birth
@@ -67,7 +72,7 @@
 												</label>
                                                   <div class="col-md-5">
 												<div class="input-append date" id="dp3">
-													<input type="date" name="date" class=" form-control input-height formDatePicker" placeholder="Date Of Birth" size="44" type="text"  data-validation="required">
+													<input type="date" name="date" data-required="1" data-validation="required" class="form-control input-height formDatePicker valid">
 													<!--<span class="add-on"><i class="fa fa-calendar"></i></span>-->
 												</div>
 												</div>
@@ -77,10 +82,10 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">												
-													<select class="form-control input-height" name="gender">
+													<select class="form-control select2" name="gender" data-validation="required">
 														<option value="">Select...</option>
-														<option value="Category 1">Male</option>
-														<option value="Category 2">Female</option>
+														<option value="1">Male</option>
+														<option value="2">Female</option>
 													</select>													
 												</div>
 											</div>
@@ -89,7 +94,7 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<textarea name="address" placeholder="address" class="form-control" rows="5"></textarea>
+													<textarea name="address" placeholder="address" class="form-control" rows="5" data-validation="required"></textarea>
 												</div>
 											</div>
 											<div class="form-group row">
@@ -97,13 +102,13 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="designation" type="text" placeholder="Enter Your Designation" class="form-control input-height" /> </div>
+													<input name="designation" type="text" placeholder="Enter Your Designation" data-validation="required" class="form-control input-height" /> </div>
 											</div>
 											<div class="form-group row">
 												<label class="control-label col-md-3">Profile Image
 												</label>
 												<div class="col-md-5 compose-editor">
-													<input name="image" type="file" class="form-control default" multiple>
+													<input name="image" type="file" class="form-control default" data-validation="required" multiple>
 												</div>
 											</div>
 											</div>								
@@ -130,4 +135,7 @@
 
 					
 
-			<?php $this->load->view('includes/footer');?>
\ No newline at end of file
+			<?php $this->load->view('includes/footer');?>
+			<script src="<?=base_url();?>assets/select2/js/select2.js"></script>
+<script src="<?=base_url();?>assets/select2/js/select2-init.js"></script>
+<script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
\ No newline at end of file
diff --git a/admin/application/views/faculty/edit_faculty.php b/admin/application/views/faculty/edit_faculty.php
index 248670d..4aec9cb 100644
--- a/admin/application/views/faculty/edit_faculty.php
+++ b/admin/application/views/faculty/edit_faculty.php
@@ -1,4 +1,6 @@
 <link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
 <?php $this->load->view('includes/header');?>
 <!--<style>
 .input-group .input-group-addon {
@@ -47,16 +49,16 @@
 					{
 							$f=$fac->row();
 							$id=$f->id;
-							$faculty=$f->code;
+							$facultyId=$f->facultyId;
 			                $name=$f->name;
 							$email=$f->email;
-							$number=$f->mobile;
 							$dob=$f->dob;
-							$gender=$f->gender;
 							$address=$f->address;
-							$desi=$f->designation;
-							$f_img=$f->image;																																																																									
-							
+							$gender=$f->gender;
+							$mobileNumber=$f->mobileNumber;
+							$designation=$f->designation;
+							$image=$f->image;	
+							if($gender==1){$genType="Male";}else{$genType="Female";}
 					} ?>
 					<div class="row">
 						<div class="col-md-12 col-sm-12">
@@ -65,14 +67,14 @@
 									<header>Edit Faculty</header>	
 								</div>
 								<div class="card-body" id="bar-parent">
-									<form action="<?=base_url();?>edit_faculty/<?=$id;?>" method="post" >
+									<form action="<?=base_url();?>edit-faculty/<?=$id;?>" method="post" enctype="multipart/form-data">
 										<div class="form-body">
 										<div class="form-group row">
-												<label class="control-label col-md-3">Faculty
+												<label class="control-label col-md-3">Faculty Id
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">											
-													<input type="text" value="<?=$faculty;?>" name="code" data-required="1" placeholder="Enter  name" class="form-control input-height">
+													<input type="text" value="<?=$facultyId;?>" name="facultyId" data-required="1" placeholder="Enter  name" class="form-control input-height">
 												</div>
 											</div>
 											<div class="form-group row">
@@ -89,9 +91,7 @@
 												</label>
 												<div class="col-md-5">
 													<div class="input-group">
-														<span style="border-radius: 0;border-color: #d2d6de;background-color: #fff;    border: 1px solid #d2d6de;padding: 6px 12px; "class="input-group-addon">
-															<i class="fa fa-envelope"></i>
-														</span>
+														
 														<input type="email" value="<?=$email;?>"class="form-control input-height" name="email" placeholder="Email Address"  data-validation="required"> 
 													</div>	
 												</div>
@@ -101,7 +101,7 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="number" value="<?=$number;?>" type="text" placeholder="Enter Staff" class="form-control error" /> 
+													<input name="mobileNumber" value="<?=$mobileNumber;?>" type="text" placeholder="Enter Staff" class="form-control error" /> 
 													</div>		
 											</div>
 											<div class="form-group row">
@@ -109,7 +109,7 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="designation" value="<?=$desi;?>" type="text" placeholder="Enter Staff" class="form-control error" /> 
+													<input name="designation" value="<?=$designation;?>" type="text" placeholder="Enter Staff" class="form-control error" /> 
 													</div>		
 											</div>
 											<div class="form-group row">
@@ -128,10 +128,10 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<select class="form-control input-height" name="gender">
-														<option value="">Select...</option>
-														<option value="Category 1">Male</option>
-														<option value="Category 2">Female</option>
+													<select class="form-control select2" name="gender">
+														<option value="<?=$gender;?>"><?=$genType;?></option>
+														<option value="1">Male</option>
+														<option value="2">Female</option>
 													</select>
 												</div>
 											</div>
@@ -140,7 +140,7 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<textarea name="address" value="<?=$address;?>" placeholder="address" class="form-control-textarea" rows="5"></textarea>
+													<textarea name="address" placeholder="address" class="form-control-textarea"><?=$address;?></textarea>
 												</div>
 											</div>
 											
@@ -148,9 +148,17 @@
 												<label class="control-label col-md-3">Profile Img
 												</label>
 												<div class="compose-editor">
-													<input type="file" name="image" value="<?=$f_img;?>" placeholder="Enter img" class="form-control error">
+													<input type="file" name="image"  placeholder="Enter img" class="form-control error">
+													<input type="hidden" value="<?=$image;?>" name="hiddenImage" >
 												</div>
 											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">
+												</label>
+												<div class="col-md-5">
+													<img src="<?=base_url()?>uploads/faculty/<?=$image;?>" style="width:75px;height:75px;" /> 
+													</div>		
+											</div>
 										<div class="form-actions">
 											<div class="row">
 												<div class="offset-md-3 col-md-9">
@@ -170,4 +178,7 @@
 				</div>
 			</div>
 		</div>
-			<?php $this->load->view('includes/footer');?>
\ No newline at end of file
+			<?php $this->load->view('includes/footer');?>
+	<script src="<?=base_url();?>assets/select2/js/select2.js"></script>
+<script src="<?=base_url();?>assets/select2/js/select2-init.js"></script>
+<script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
\ No newline at end of file
diff --git a/admin/application/views/faculty/faculty_list.php b/admin/application/views/faculty/faculty_list.php
index edc6026..c3d0838 100644
--- a/admin/application/views/faculty/faculty_list.php
+++ b/admin/application/views/faculty/faculty_list.php
@@ -28,8 +28,10 @@
 									<div class="row">
 										<div class="col-md-6 col-sm-6 col-xs-6">
 											<div class="btn-group">
+											<a style="color:#fff;"href="<?=base_url();?>add_faculty">
 												<button  type="button" class="btn btn-info"
-										 data-toggle="modal" data-target="#mediumModel" ><a style="color:#fff;"href="<?=base_url();?>add_faculty">add <i class="fa fa-plus"></i></a> </button>
+										 data-toggle="modal" data-target="#mediumModel" >add <i class="fa fa-plus"></i> </button>
+										 </a>
 											</div>
 										</div>
 										
@@ -39,7 +41,7 @@
 											<thead>
 												<tr>
 													<th> S.No</th>
-													<th>  ID </th>
+													<th> Faculty </th>
 													<th> Name </th>
 													<th> Email</th>
 													<th> Designation </th>
@@ -54,29 +56,30 @@
 														foreach($fac->result() as $f)
 														{
 															$id=$f->id;
-															$faculty=$f->code;
+															$faculty=$f->facultyId;
 															$name=$f->name;
 															$email=$f->email;
-															//$number=$f->number;
-															//$dob=$f->dob;
-															//$gender=$f->gender;
-															//$address=$f->address;
+															$number=$f->mobileNumber;
+															$dob=$f->dob;
+															$gender=$f->gender;
+															$address=$f->address;
 															$desi=$f->designation;
-															//$f_img=$f->f_img;
+															$image=$f->image;
 															?>
 												<tr class="odd gradeX">
 													<td><?=$i;?></td>
 													<td><?=$faculty;?></td>
 													<td><?=$name;?></td>
-													<td><?=$email;?></td>
-													
+													<td><?=$email;?></td>													
 													<td><?=$desi;?></td>
 													<td>
-														
-														<a href="<?=base_url();?>edit_faculty/<?=$id;?>" class="btn btn-primary btn-xs">
+														<a href="<?=base_url();?>view-faculty/<?=$id;?>" class="btn btn-success btn-xs">
+															<i class="fa fa-eye"></i>
+														</a>
+														<a href="<?=base_url();?>edit-faculty/<?=$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">
+														<a data-id="<?=$id;?>"  class="deleteFaculty btn btn-danger btn-xs">
 															<i class="fa fa-trash-o"></i>
 														</a>
 														
@@ -97,7 +100,7 @@
 			</div>
 	</div>
 	<!-- end page content -->
-			<div class="modal fade" id="editmediumModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+			<div class="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
 					 aria-hidden="true">
 						<div class="modal-dialog" role="document">
 							<div class="modal-content">
@@ -108,13 +111,13 @@
 									</button>
 								</div>
 								<div class="modal-body">
-									<form action="<?=base_url();?>deleted_faculty" method="post">
+									<form action="<?=base_url();?>Faculty/deleteFaculty" 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">
+												<input type="hidden" name="facultyId" value="<?=$id;?>">
 												</div>
 											
 										<div class="form-actions">
@@ -139,10 +142,8 @@
 	<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);
+	$(".deleteFaculty").click(function(){
+    $('#deleteModal').modal('show');
+	
      });
 	 </script>
\ No newline at end of file
diff --git a/admin/application/views/faculty/view_faculty.php b/admin/application/views/faculty/view_faculty.php
new file mode 100644
index 0000000..5494ddb
--- /dev/null
+++ b/admin/application/views/faculty/view_faculty.php
@@ -0,0 +1,107 @@
+<!-- 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 col-md-9" style="margin:0px auto;padding:0">
+						<div class="page-title-breadcrumb">
+							<div class=" pull-left">
+								<div class="page-title">Faculty View</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>&nbsp;<a class="parent-item" href="<?=base_url();?>/faculty">Faculty</a>&nbsp;<i class="fa fa-angle-right"></i>
+								</li>
+								<li class="active">View Faculty</li>
+							</ol>
+						</div>
+					</div>
+					<?php $this->load->view('includes/msg');?>
+					<div class="row">
+						<div class="col-md-9" style="margin:0px auto;">
+							<?php
+							if(isset($viewFaculty)&& $viewFaculty->num_rows()>0)
+							{
+								$view=$viewFaculty->row();
+								
+								$id=$view->id;
+								$facultyId=$view->facultyId;
+								$name=$view->name;
+								$dob=$view->dob;
+								$email=$view->email;
+								$address=$view->address;
+								$gender=$view->gender;
+								$mobileNumber=$view->mobileNumber;
+								$designation=$view->designation;
+								$image=$view->image;
+								if($gender==1){$gen="Male";}else{$gen="Female";}
+							}
+										
+							?>
+							<!-- BEGIN PROFILE SIDEBAR -->
+								<div class="card card-topline-aqua">
+									<div class="card-body no-padding height-9">
+										<div class="row">
+											<div class="profile-userpic">
+												<img src="<?=base_url();?>uploads/faculty/<?=$image;?>" class="img-responsive" alt=""> </div>
+										</div>
+										<div class="profile-usertitle">
+											<div class="profile-usertitle-name"><?=$name.' - '.$gen;?></div>
+											<div class="profile-usertitle-job"> <?=$facultyId;?> </div>
+											
+										</div>
+										<hr>
+										<div class="row">
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Date of Birth</strong>
+												<br>
+												<p class="text-muted"><?=$dob;?></p>
+											</div>
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Mobile Number</strong>
+												<br>
+												<p class="text-muted"><?=$mobileNumber;?></p>
+											</div>
+											
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Email</strong>
+												<br>
+												<p class="text-muted"><?=$email;?></p>
+											</div>
+										</div>
+										<hr>
+										<div class="row">
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Address</strong>
+												<br>
+												<p class="text-muted"><?=$address;?></p>
+											</div>
+											<div class="col-md-4 col-xs-6"> <strong>designation</strong>
+												<br>
+												<p class="text-muted"><?=$designation;?></p>
+											</div>
+										</div>
+										
+										<!-- END SIDEBAR USER TITLE -->
+										<!-- SIDEBAR BUTTONS -->
+										
+										<!-- END SIDEBAR BUTTONS -->
+									</div>
+								</div>
+								
+							<!-- END PROFILE CONTENT -->
+							<!-- END BEGIN PROFILE SIDEBAR -->
+						</div>
+					</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>
+		
\ No newline at end of file
diff --git a/admin/application/views/includes/header.php b/admin/application/views/includes/header.php
index 30cf30b..d7c01fa 100644
--- a/admin/application/views/includes/header.php
+++ b/admin/application/views/includes/header.php
@@ -34,7 +34,7 @@
 </head>
 <!-- END HEAD -->
 
-<body class="page-header-fixed sidemenu-closed-hidelogo page-content-white page-md header-white white-sidebar-color logo-indigo">
+<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 -->
 		<div class="page-header navbar navbar-fixed-top">
diff --git a/admin/application/views/login.php b/admin/application/views/login.php
index a1196d5..452ae5b 100644
--- a/admin/application/views/login.php
+++ b/admin/application/views/login.php
@@ -22,6 +22,19 @@
     line-height: 1.42857;
     color: #555;
 }
+.alert-dismissible .close {
+	position: absolute;
+    right: 0;
+    padding: 0px 15px !important;
+    color: inherit;
+}
+.alertClass{
+	width:100%
+}
+.alert.alert-danger.alert-dismissible {
+    width: 29% !important;
+    margin: 0px auto !important;
+}
 </style>
 
 <!-- Mirrored from radixtouch.in/templates/admin/redstar/source/light/login.html by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 28 Aug 2019 14:06:07 GMT -->
@@ -29,8 +42,8 @@
 	<meta charset="utf-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta content="width=device-width, initial-scale=1" name="viewport" />
-	<meta name="description" content="Responsive Admin Template" />
-	<meta name="author" content="RedstarHospital" />
+	<meta name="description" content="McGan's Architecture" />
+	<meta name="author" content="McGan's Architecture" />
 	<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" />
@@ -46,58 +59,39 @@
 </head>
 
 <body>
+	
 	<div class="limiter">
+		
 		<div class="container-login100 page-background">
+			<div class="alertClass">
+			<?php $this->load->view('includes/msg');?>
+			</div>
 			<div class="wrap-login100">
-				<form class="login100-form validate-form" action="<?=base_url()?>welcome/dashboard" method="post">
+			
+				<form class="login100-form validate-form" action="<?=base_url()?>login" method="post">
+				
 					<span class="login100-form-logo">
 						<img alt="" src="<?=base_url();?>assets/img/login.png">
 					</span>
+					
 					<span class="login100-form-title p-b-34 p-t-27">
-						Log in
+						Sign In
 					</span>
 					<div class="wrap-input100 validate-input" data-validate="Enter username">
-						<input class="input100" type="text" name="username" placeholder="Username">
+						<input style="padding:0px;" class="input100" type="text" name="username" placeholder="Username">
 						<span class="focus-input100" data-placeholder=""></span>
 					</div>
 					<div class="wrap-input100 validate-input" data-validate="Enter password">
-						<input class="input100" type="password" name="pass" placeholder="Password">
+						<input style="padding:0px;" class="input100" type="password" name="password" placeholder="Password">
 						<span class="focus-input100" ></span>
 					</div>
-					<!--<div class="form-group row">		
-							<div class="col-md-5">
-							<div class="input-group">
-							<span class="input-group-addon">
-								<i class="fa fa-user-circle"></i>
-							</span>							
-						       <input  class="form-control input-height" name="mail" placeholder=""> </div>
-					         </div>
-					</div>
-					<div class="form-group row">		
-							<div class="col-md-5">
-							<div class="input-group">
-							<span class="input-group-addon">
-								<i class="fa fa-key"></i>
-							</span>							
-						       <input  class="form-control input-height" name="mail" placeholder=""> </div>
-					         </div>
-					</div>-->
-					<div class="contact100-form-checkbox">
-						<input class="input-checkbox100" id="ckb1" type="checkbox" name="remember-me" value="1">
-						<label class="label-checkbox100" for="ckb1">
-							Remember me
-						</label>
-					</div>
+					
 					<div class="container-login100-form-btn">
 						<button type="submit" class="login100-form-btn">
-							Login
+							Submit
 						</button>
 					</div>
-					<div class="text-center p-t-30">
-						<a class="txt1" href="forgot_password.html">
-							Forgot Password?
-						</a>
-					</div>
+					
 				</form>
 			</div>
 		</div>
diff --git a/admin/application/views/project/add_project.php b/admin/application/views/project/add_project.php
index e9ae1b5..d8bdcc1 100644
--- a/admin/application/views/project/add_project.php
+++ b/admin/application/views/project/add_project.php
@@ -1,5 +1,7 @@
 <link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
 <?php $this->load->view('includes/header');?>
+<link href="<?=base_url();?>assets/select2/css/select2.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
        <div class="page-container">
 			<!-- start sidebar menu -->
 			<?php $this->load->view('includes/sidebar');?>
@@ -14,7 +16,9 @@
 							<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>
+								<li>&nbsp;<a class="parent-item" href="<?=base_url();?>/project">Project</a>&nbsp;<i class="fa fa-angle-right"></i>
+								</li>
+								<li class="active">Add Project</li>
 							</ol>
 						</div>
 					</div>
@@ -26,14 +30,14 @@
 									<header>Project</header>	
 								</div>
 								<div class="card-body" id="bar-parent">
-									<form action="<?=base_url();?>add_project" method="post">
+									<form action="<?=base_url();?>add_project" method="post" class="form-horizontal" enctype="multipart/form-data" >
 										<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 class="col-md-5" >											
+													<input type="date" name="date" data-required="1"  data-validation="required" class="form-control input-height formDatePicker">
 												</div>
 											</div>
 											<div class="form-group row">
@@ -41,34 +45,22 @@
 													<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>
+													<input name="projectName" type="text" placeholder="Enter Project Name" data-validation="required" class="form-control input-height" /> </div>
 											</div>
 									       <div class="form-group row">
-												<label class="control-label col-md-3">Faculty Name
+												<label class="control-label col-md-3">Code
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<select class="form-control input-height" name="faculty">
-													<option value="" selected="selected" id="faculty_id" >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>
+													<input name="code" type="text" placeholder="Enter Project Code" data-validation="required" 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">
-													<select class="form-control input-height"  id="sudent_id" name="student">
+													<select class="form-control select2"  id="sudent_id" name="student" data-validation="required">
 													<option value="" selected="selected">Select</option>
 													<?php
 														   if(isset($stu) && $stu->num_rows()>0)
@@ -88,21 +80,34 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="semester" type="text" placeholder="Enter semester" class="form-control input-height" /> </div>
+													<select class="form-control select2"  name="semesterId" data-validation="required">
+													<option value="" selected="selected">Select</option>
+													<?php
+														   if(isset($semester) && $semester->num_rows()>0)
+														   {
+															   foreach($semester->result() as $sem)
+															   {
+																   ?> <option value="<?=$sem->id;?>"><?=$sem->name;?></option><?php
+															   }
+														   }
+													?>     
+														
+													</select>	 
+											</div>
 											</div>
                                                <div class="form-group row">
-												<label class="control-label col-md-3">Subject Code
+												<label class="control-label col-md-3">Subject 
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<select class="form-control input-height"  name="subject">
+													<select class="form-control select2"  name="subject" data-validation="required">
 													<option value="" selected="selected">Select</option>
 													<?php
 														   if(isset($sub) && $sub->num_rows()>0)
 														   {
 															   foreach($sub->result() as $subject)
 															   {
-																   ?> <option value="<?=$subject->id;?>"><?=$subject->code;?></option><?php
+																   ?> <option value="<?=$subject->id;?>"><?=$subject->name;?></option><?php
 															   }
 														   }
 													?>     
@@ -115,7 +120,7 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">												
-													<select class="form-control input-height" id="departmentId" name="department">
+													<select class="form-control select2" id="departmentId" name="department" data-validation="required">
 													<option value="" selected="selected">Select</option>
 													<?php
 														   if(isset($dep) && $dep->num_rows()>0)
@@ -131,35 +136,66 @@
 												</div>
 											</div>											
 											</div>	
+											<div class="form-group row">
+												<label class="control-label col-md-3">Title Image
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">
+													<input name="titleImage" type="file" data-validation="required" class="form-control input-height" /> </div>
+											</div>
 											<div class="form-group row">
 												<label class="control-label col-md-3">Description
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<textarea name="description" placeholder=" Enter Designation" class="form-control" rows="5"></textarea>
+													<textarea name="description" placeholder=" Enter Designation" 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" class="form-control input-height" /> </div>
+													<input name="vedio" type="text" placeholder="Enter Vedio Link" data-validation="required" 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" class="form-control input-height" /> </div>
+													<input name="drivelink" type="text" placeholder="Enter Drive Link" data-validation="required" class="form-control input-height" /> </div>
 											</div>	
                                            <div class="form-group row">
-												<label class="control-label col-md-3">Project Image
+												<label class="control-label col-md-3">Title & Image
 												</label>
-												<div class="col-md-5 compose-editor">
-													<input name="image" type="file" class="form-control default" multiple>
+												
+												<div class="col-md-2 compose-editor">
+													<input name="title[0]" id="projectTitle_0" type="text" class="form-control default">
 												</div>
-											</div>											
+												<div class="col-md-2 compose-editor">
+													<input name="profileimage[0]" id="projectImage_0" type="file" class="form-control default">
+												</div>
+												<div class="col-md-1">
+											<div class="add-new-button-blue addMore"><span class="btn btn-primary">Add <i class="fa fa-plus"></i></span></div>
+									        </div>
+											</div>		
+											<!---Duplicate ---->
+											<input type="hidden" value="0" id="view"/>
+											<div class="form-group duplicate1 row hide" id="imageTemplate" > 
+												<label class="control-label col-md-3">
+												</label>	
+												<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">
+													<input name="profileimages[]" id="projectImage" type="file" class="form-control default">
+												</div>
+												<div class="col-md-1">
+											<div class="add-new-button-blue removeButton"  id="cat_add_id"><span class="btn btn-danger">Remove <i class="fa fa-minus"></i></span></div>
+									        </div>
+											</div>		
+											<!---Duplicate ---->
 										</div>
 										<div class="form-actions">
 											<div class="row">
@@ -180,22 +216,41 @@
 				</div>
 			</div>
 		</div>
+<?php $this->load->view('includes/footer');?>
+<script src="<?=base_url();?>assets/select2/js/select2.js"></script>
+<script src="<?=base_url();?>assets/select2/js/select2-init.js"></script>
+<script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
+<script>
+//multiple add more
+invIndex = 0;
+$('body').on('click','.addMore', function() {
 
-					
+invIndex++;
+var $template = $('#imageTemplate'),
+	$clone    = $template
+	.clone(true)
+	.removeClass('hide')
+	.removeAttr('id')
+	.attr('data-book-index', invIndex)
+	.insertBefore($template);
 
-			<?php $this->load->view('includes/footer');?>
-			<script>
-
-$(document).ready(function() {
-	function initializeSelect2(selectElementObj) {
-	selectElementObj.select2({
-	  width: "100%",
-	  tags: true
-	});
-	}
-	$("#faculty").each(function() {
-	initializeSelect2($(this));
-	});
+	// Update the name attributes  
+	$clone
+	.find('[id="projectTitle"]').attr('id', 'projectTitle_'+invIndex).end()
+	.find('[id="projectImage"]').attr('id', 'projectImage_'+invIndex).end()
+	
+	.find('[name="titles[]"]').attr('name', 'title['+invIndex+']').end()
+	.find('[name="profileimages[]"]').attr('name', 'profileimage['+invIndex+']').end()
+	
+})
 
+.on('click', '.removeButton', function(){
+	var $row  = $(this).parents('.duplicate1'),
+	index = $row.attr('data-book-index');
+	$row.remove();
+	 
+   
 });
-</script>
\ No newline at end of file
+</script>				
+
+
diff --git a/admin/application/views/project/edit_project.php b/admin/application/views/project/edit_project.php
index e633644..474acc2 100644
--- a/admin/application/views/project/edit_project.php
+++ b/admin/application/views/project/edit_project.php
@@ -1,30 +1,5 @@
 <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">
@@ -49,11 +24,12 @@
 							$id=$p->id;
 							$date=$p->date;
 							$name=$p->projectName;
-							$faculty=$p->faculty;
-							$student=$p->student;
-							$semester=$p->semester;
-							$subject=$p->subject;
-							$department=$p->department;
+							//$code=$p->faculty;
+							$student=$p->studentId;
+							$semester=$p->semesterId;
+							$subject=$p->subjectId;
+							$code=$p->code;
+							$department=$p->departmentId;
 							$description=$p->description;
 							$video=$p->vedio;
 							//$drivelink=$p->drivelink;
@@ -67,7 +43,7 @@
 									<header>Edit Project</header>	
 								</div>
 								<div class="card-body" id="bar-parent">
-									<form action="<?=base_url();?>edit_project/<?=$id;?>" method="post" >
+									<form action="<?=base_url();?>edit_project/<?=$id;?>" method="post" class="form-horizontal" >
 										<div class="form-body">
 										<div class="form-group row">
 												<label class="control-label col-md-3">Project Date
@@ -86,11 +62,11 @@
 												</div>
 											</div>
 											<div class="form-group row">
-												<label class="control-label col-md-3">Faculty Name
+												<label class="control-label col-md-3">Code
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">											
-													<input type="text" value="<?=$faculty;?>" name="faculty" data-required="1" placeholder="Enter Faculty" class="form-control input-height">
+													<input type="code" value="<?=$code;?>" name="code" data-required="1" placeholder="Enter Faculty" class="form-control input-height">
 												</div>
 											</div>
 											 <div class="form-group row">
@@ -110,7 +86,7 @@
 													</div>		
 											</div>
 											<div class="form-group row">
-												<label class="control-label col-md-3">Subject Code
+												<label class="control-label col-md-3">Subject 
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
@@ -118,14 +94,14 @@
 													</div>		
 											</div>
 											<div class="form-group row">
-												<label class="control-label col-md-3">Department.
+												<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 Department" class="form-control input-height" /> </div>
 											</div>
 											<div class="form-group row">
-												<label class="control-label col-md-3">Description.
+												<label class="control-label col-md-3">Description
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
diff --git a/admin/application/views/project/project_list.php b/admin/application/views/project/project_list.php
index 9b1c7ae..8ce37a8 100644
--- a/admin/application/views/project/project_list.php
+++ b/admin/application/views/project/project_list.php
@@ -28,8 +28,10 @@
 									<div class="row">
 										<div class="col-md-6 col-sm-6 col-xs-6">
 											<div class="btn-group">
+											<a style="color:#fff;"href="<?=base_url();?>add_project">
 												<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>
+										 data-toggle="modal" data-target="#mediumModel" >add <i class="fa fa-plus"></i></button>
+											</a> 
 											</div>
 										</div>
 										
@@ -40,11 +42,11 @@
 												<tr>
 													<th> S.No </th>
 													<th> Date </th>
-													<th> Project Name </th>
+													<th> Project Code </th>
 													<th> Student </th>
 													<th> Semester </th>
+													<th> Subject </th>
 													<th> Department </th>
-													<th> Faculty </th>	
 													<th> Action </th>
 												</tr>
 											</thead>
@@ -58,24 +60,28 @@
 															$id=$p->id;
 															$date=$p->date;
 															$name=$p->projectName;
-															$student=$p->studentName;
-															$semester=$p->semester;
-															//$subject=$p->subjectCode;
-															$department=$p->deptname;
-															$faculty=$p->facultyName;
+															$code=$p->code;
+															$studentName=$p->studentName;
+															$semName=$p->semName;
+															$subName=$p->subName;
+															$depName=$p->depName;
+															//$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><?=$code;?></td>
+													<td><?=$studentName;?></td>
+													<td><?=$semName;?></td>
+													<td><?=$subName;?></td>
+													<td><?=$depName;?></td>
+													
 													
 													<td>
-														
+														<a href="<?=base_url();?>view-project/<?=$id;?>" class="btn btn-success btn-xs">
+															<i class="fa fa-eye"></i>
+														</a>
 														<a href="<?=base_url();?>edit_project/<?=$id;?>" class="btn btn-primary btn-xs">
 															<i class="fa fa-pencil"></i>
 														</a>
@@ -111,13 +117,13 @@
 									</button>
 								</div>
 								<div class="modal-body">
-									<form action="<?=base_url();?>deleted_project" method="post">
+									<form action="<?=base_url();?>project/deleteProject" 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">
+												<input type="hidden" name="projectId" value="<?=$id;?>">
 												</div>
 											
 										<div class="form-actions">
diff --git a/admin/application/views/project/view_project.php b/admin/application/views/project/view_project.php
new file mode 100644
index 0000000..1868b29
--- /dev/null
+++ b/admin/application/views/project/view_project.php
@@ -0,0 +1,116 @@
+<!-- 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 col-md-9" style="margin:0px auto;padding:0">
+						<div class="page-title-breadcrumb">
+							<div class=" pull-left">
+								<div class="page-title">Project View</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>&nbsp;<a class="parent-item" href="<?=base_url();?>/project">Project</a>&nbsp;<i class="fa fa-angle-right"></i>
+								</li>
+								<li class="active">View Project</li>
+							</ol>
+						</div>
+					</div>
+					<?php $this->load->view('includes/msg');?>
+					<div class="row">
+						<div class="col-md-9" style="margin:0px auto;">
+							<?php
+							if(isset($viewProject)&& $viewProject->num_rows()>0)
+							{
+								$view=$viewProject->row();
+								
+								$studentName=$view->studentName;
+								$semName=$view->semName;
+								$depName=$view->depName;
+								$projectName=$view->projectName;
+								$pDate=$view->pDate;
+								$code=$view->code;
+								$description=$view->description;
+								$image=$view->image;
+								$vedio=$view->vedio;
+								$driveLink=$view->driveLink;
+								$subName=$view->subName;
+								
+							}
+										
+							?>
+							<!-- BEGIN PROFILE SIDEBAR -->
+								<div class="card card-topline-aqua">
+									<div class="card-body no-padding height-9">
+										<div class="row">
+											<div class="profile-userpic">
+												<img src="<?=base_url();?>uploads/project/<?=$image;?>" class="img-responsive" alt=""> </div>
+										</div>
+										<div class="profile-usertitle">
+											<div class="profile-usertitle-name"><?=$projectName.' - '.$pDate;?></div>
+											<div class="profile-usertitle-job"> <?=$code;?> </div>
+										</div>
+										<hr>
+										<div class="row">
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Student Name</strong>
+												<br>
+												<p class="text-muted"><?=$studentName;?></p>
+											</div>
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Semester</strong>
+												<br>
+												<p class="text-muted"><?=$semName;?></p>
+											</div>
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Department</strong>
+												<br>
+												<p class="text-muted"><?=$depName;?></p>
+											</div>
+										</div>
+										<hr>
+										<div class="row">
+											<div class="col-md-4 col-xs-6"> <strong>Subject</strong>
+												<br>
+												<p class="text-muted"><?=$subName;?></p>
+											</div>
+											<div class="col-md-4 col-xs-6"> <strong>Video</strong>
+												<br>
+												<p class="text-muted"><?=$vedio;?></p>
+											</div>
+											<div class="col-md-4 col-xs-6"> <strong>Username</strong>
+												<br>
+												<p class="text-muted"><?=$driveLink;?></p>
+											</div>
+										</div>
+										<div class="row">
+											
+											<div class="col-md-12 col-xs-6"> <strong>Description</strong>
+												<br>
+												<p class="text-muted"><?=$description;?></p>
+											</div>
+										</div>
+										<!-- END SIDEBAR USER TITLE -->
+										<!-- SIDEBAR BUTTONS -->
+										
+										<!-- END SIDEBAR BUTTONS -->
+									</div>
+								</div>
+								
+							<!-- END PROFILE CONTENT -->
+							<!-- END BEGIN PROFILE SIDEBAR -->
+						</div>
+					</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>
+		
\ No newline at end of file
diff --git a/admin/application/views/semester/add_semester.php b/admin/application/views/semester/add_semester.php
new file mode 100644
index 0000000..d7fec9d
--- /dev/null
+++ b/admin/application/views/semester/add_semester.php
@@ -0,0 +1,135 @@
+<?php $this->load->view('includes/header');?>
+<link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<!--select2-->
+<link href="<?=base_url();?>assets/select2/css/select2.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
+<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 Semester</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>&nbsp;<a class="parent-item" href="<?=base_url();?>/semester">Semester</a>&nbsp;<i class="fa fa-angle-right"></i>
+						</li>
+						<li class="active">Add Semester</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>Semester</header>	
+						</div>
+						<div class="card-body" id="bar-parent">
+							<form class="form-horizontal" action="<?=base_url();?>add-semester" method="post">
+								<div class="form-body">
+									<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="name" type="text" data-validation="required" placeholder="Enter Degree Name" class="form-control input-height" /> </div>
+									</div>
+									<div class="form-group row">
+										<label class="control-label col-md-3">Year
+											<span class="required"> * </span>
+										</label>
+										<div class="col-md-5">
+											<input name="year" type="number" data-validation="required" placeholder="Enter Semester Year" class="form-control input-height" />
+										</div>
+									</div>
+									<div class="form-group row">
+										<label class="control-label col-md-3">Subject
+											<span class="required"> * </span>
+										</label>
+										<div class="col-md-5">											
+											<select class="form-control select2" name="subjectId" data-validation="required">
+											<option value="" selected="selected" id="subjectId" >Select</option>
+											<?php
+												   if(isset($subject) && $subject->num_rows()>0)
+												   {
+													   foreach($subject->result() as $list)
+													   {
+														   ?> <option value="<?=$list->id;?>"><?=$list->name;?></option><?php
+													   }
+												   }
+											?>     
+												
+											</select>
+										</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 select2" name="departmentId" data-validation="required">
+											<option value="" selected="selected" id="departentId" >Select</option>
+											<?php
+												   if(isset($department) && $department->num_rows()>0)
+												   {
+													   foreach($department->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">Degree
+											<span class="required"> * </span>
+										</label>
+										<div class="col-md-5">											
+											<select class="form-control select2" name="degreeId" data-validation="required">
+											<option value="" selected="selected" id="degreeId" >Select</option>
+											<?php
+												   if(isset($degree) && $degree->num_rows()>0)
+												   {
+													   foreach($degree->result() as $list)
+													   {
+														   ?> <option value="<?=$list->id;?>"><?=$list->name;?></option><?php
+													   }
+												   }
+											?>     
+												
+											</select>
+										</div>
+									</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/select2/js/select2.js"></script>
+<script src="<?=base_url();?>assets/select2/js/select2-init.js"></script>
+<script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
diff --git a/admin/application/views/semester/edit_semester.php b/admin/application/views/semester/edit_semester.php
new file mode 100644
index 0000000..0f15398
--- /dev/null
+++ b/admin/application/views/semester/edit_semester.php
@@ -0,0 +1,147 @@
+	<?php $this->load->view('includes/header');?>
+<link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<!--select2-->
+<link href="<?=base_url();?>assets/select2/css/select2.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
+<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">Edit Semester</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>&nbsp;<a class="parent-item" href="<?=base_url();?>/semester">Semester</a>&nbsp;<i class="fa fa-angle-right"></i>
+						</li>
+						<li class="active">Edit Semester</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>Edit Semester</header>	
+						</div>
+						<?php
+						if(isset($getData) && $getData->num_rows()>0)
+						{
+								$e=$getData->row();
+								$id =$e->id;
+								$name=$e->name;
+								$year=$e->year;
+								$subjectId=$e->subjectId;
+								$departmentId=$e->departmentId;
+								$degreeId	=$e->degreeId;
+								
+						} ?>
+						<div class="card-body" id="bar-parent">
+							<form class="form-horizontal" action="<?=base_url();?>edit-semester/<?=$id;?>" method="post">
+								<div class="form-body">
+									<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="name" value="<?=$name;?>" type="text" data-validation="required" placeholder="Enter Degree Name" class="form-control input-height" /> </div>
+									</div>
+									<div class="form-group row">
+										<label class="control-label col-md-3">Year
+											<span class="required"> * </span>
+										</label>
+										<div class="col-md-5">
+											<input name="year" value="<?=$year;?>" type="number" data-validation="required" placeholder="Enter Semester Year" class="form-control input-height" />
+										</div>
+									</div>
+									<div class="form-group row">
+										<label class="control-label col-md-3">Subject
+											<span class="required"> * </span>
+										</label>
+										<div class="col-md-5">											
+											<select class="form-control select2" name="subjectId" data-validation="required">
+											<option value="" selected="selected" id="subjectId" >Select</option>
+											<?php
+												   if(isset($subject) && $subject->num_rows()>0)
+												   {
+													   foreach($subject->result() as $list)
+													   {
+														   ?> <option value="<?=$list->id;?>" <?php if($list->id==$subjectId){ echo "selected";}?>><?=$list->name;?></option><?php
+													   }
+												   }
+											?>     
+												
+											</select>
+										</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 select2" name="departmentId" data-validation="required">
+											<option value="" selected="selected" id="departentId" >Select</option>
+											<?php
+												   if(isset($department) && $department->num_rows()>0)
+												   {
+													   foreach($department->result() as $list1)
+													   {
+														   ?> <option value="<?=$list1->id;?>" <?php if($list1->id==$departmentId){ echo "selected";}?>><?=$list1->name;?></option><?php
+													   }
+												   }
+											?>     
+												
+											</select>
+										</div>
+									</div>
+									<div class="form-group row">
+										<label class="control-label col-md-3">Degree
+											<span class="required"> * </span>
+										</label>
+										<div class="col-md-5">											
+											<select class="form-control select2" name="degreeId" data-validation="required">
+											<option value="" selected="selected" id="degreeId" >Select</option>
+											<?php
+												   if(isset($degree) && $degree->num_rows()>0)
+												   {
+													   foreach($degree->result() as $list)
+													   {
+														   ?> <option value="<?=$list->id;?>" <?php if($list->id==$degreeId){ echo "selected";}?>><?=$list->name;?></option><?php
+													   }
+												   }
+											?>     
+												
+											</select>
+										</div>
+									</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/select2/js/select2.js"></script>
+<script src="<?=base_url();?>assets/select2/js/select2-init.js"></script>
+<script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
diff --git a/admin/application/views/semester/semester_list.php b/admin/application/views/semester/semester_list.php
index b8f771b..52456bd 100644
--- a/admin/application/views/semester/semester_list.php
+++ b/admin/application/views/semester/semester_list.php
@@ -22,47 +22,62 @@
 					</div>
 					<?php $this->load->view('includes/msg');?>
 					<div class="row">
-						<div class="col-md-8">
+						<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">Add <i class="fa fa-plus"></i></button>
+											<a style="color:#fff;"href="<?=base_url();?>add-semester">
+												<button  type="button" class="btn btn-info"
+										 data-toggle="modal" data-target="#mediumModel" >add <i class="fa fa-plus"></i></button></a> 
 											</div>
 										</div>
 										
 									</div>
 									<div class="table-scrollable">
-										<table class="table table-hover table-checkable order-column full-width" id="example4" >
+										<table class="table table-hover table-checkable order-column full-width" id="example4">
 											<thead>
 												<tr>
-													<th> S.No </th>
-													<th> Name </th>
+													<th> S.No</th>
+													<th> Name</th>
+													<th> Year </th>
+													<th> Subject </th>
+													<th> Department </th>
+													<th> Degree </th>
 													<th> Action </th>
 												</tr>
 											</thead>
+											<tbody>
 											<?php
-													if(isset($sem) && $sem->num_rows()>0)
+													if(isset($semester) && $semester->num_rows()>0)
 													{
 													$i=1;
-														foreach($sem->result() as $s)
+														foreach($semester->result() as $d)
 														{
-															$id=$s->id;
-															$name=$s->name;
+															$id=$d->id;
+															$name=$d->name;
+															$year=$d->year;
+															$depId=$d->depId;
+															$depName=$d->depName;
+															$subId=$d->subId;
+															$subName=$d->subName;
+															$degId=$d->degId;
+															$degName=$d->degName;
 															?>
 												<tr class="odd gradeX">
 													<td><?=$i;?></td>
 													<td><?=$name;?></td>
-													
-													
+													<td><?=$year;?></td>
+													<td><?=$depName;?></td>
+													<td><?=$subName;?></td>
+													<td><?=$degName;?></td>
 													<td>
-														<a href="javascript:;"  data-id="<?=$id;?>" data-name="<?=$name;?>" class="editdepclass btn btn-primary btn-xs ">
+														
+														<a href="<?=base_url();?>edit-semester/<?=$id;?>" class="btn btn-primary btn-xs">
 															<i class="fa fa-pencil"></i>
 														</a>
-														
-														<a  href="javascript:;"  data-id="<?=$id;?>"  class="deletedpeclass btn btn-danger btn-xs">
+														<a data-id="<?=$id;?>"  class="deleteSemester btn btn-danger btn-xs">
 															<i class="fa fa-trash-o"></i>
 														</a>
 														
@@ -75,116 +90,32 @@
 											</tbody>
 										</table>
 									</div>
-									
 								</div>
 							</div>
 						</div>
 					</div>
-					
 				</div>
 			</div>
-	   </div>
-			<!-- end page content -->
-			<!-- Midium Model -->
-					<div class="modal fade" id="mediumModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+	</div>
+	<!-- end page content -->
+			<div class="modal fade" id="deleteModal" 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">Add Semester</h4>
+									<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();?>add_semester" method="post">
-										<div class="form-body">
-											
-											<div class="form-group row">
-												<label class="control-label col-md-4">Name
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-7">
-													<input type="text" name="name" data-required="1" placeholder="Enter Your Name" class="form-control input-height">
-												</div>
-											</div>
-											
-											
-											
-										<div class="form-actions">
-											<div class="row">
-												<div class="offset-md-3 col-md-9">
-													<input type="submit" id="add_department" name="submit" class="btn btn-info m-r-20" value="Submit">
-													<button type="button" class="btn btn-default">Cancel</button>
-												</div>
-											</div>
-										</div>
-										</div>
-									</form>
-								</div>
-								
-							</div>
-						</div>
-					</div>
-			<!-- Modal -->
-		
-                <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">Edit Semester</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();?>edit_semester" method="post">
-										<div class="form-body">
-											
-											<div class="form-group row">
-												<label class="control-label col-md-4">Name
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-7">
-													<input type="text" name="name" data-required="1" id="editdepid" placeholder="Enter Your Name" class="form-control input-height">
-												<input type="hidden" name="hiddendepid" id="hiddendepid">
-												</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>
-										</div>
-									</form>
-								</div>
-								
-							</div>
-						</div>
-					</div>
-					    <div class="modal fade" id="delete1" 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">deleted 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_semester" method="post">
+									<form action="<?=base_url();?>semester/deleteSemester" 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="hiddengffgdtpid" id="hiddenid">
+
+												<input type="hidden" name="semesterId" value="<?=$id;?>">
 												</div>
 											
 										<div class="form-actions">
@@ -202,28 +133,15 @@
 							</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>
-	$(".editdepclass").click(function(){
-    $('#editmediumModel').modal('show');
-	var name=$(this).attr('data-name');
-	var code=$(this).attr('data-code');
-	var id=$(this).attr('data-id');
-	 $('#editdepid').val(name);
-	 $('#editdepcode').val(code);
-	 $('#hiddendepid').val(id);
-     });
-	 $(".deletedpeclass").click(function(){
-    $('#delete1').modal('show');
+		<script>
+	$(".deleteSemester").click(function(){
+    $('#deleteModal').modal('show');
 	
-	var id=$(this).attr('data-id');
-	//alert(id);
-	 $('#hiddenid').val(id);
      });
-	 
-	</script>
-	
\ No newline at end of file
+	 </script>
\ No newline at end of file
diff --git a/admin/application/views/student/add_student.php b/admin/application/views/student/add_student.php
index 0d1cc1d..e52d757 100644
--- a/admin/application/views/student/add_student.php
+++ b/admin/application/views/student/add_student.php
@@ -1,136 +1,150 @@
 <link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" /><link href="<?=base_url();?>assets/select2/css/select2.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2-bootstrap.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 Student</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">Student</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>Student</header>	
-								</div>
-								<div class="card-body" id="bar-parent">
-									<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
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-5">											
-													<input type="text" name="faculty" data-required="1" placeholder="Enter Student Id" 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 name="name" type="text" placeholder="Enter Student Name" class="form-control input-height" /> </div>
-											</div>
-									
-											<div class="form-group row">
-												<label class="control-label col-md-3">Mobile No
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-5">
-													<input name="number" type="text" placeholder="Mobile Number" class="form-control input-height" /> </div>
-											</div>
-											<div class="form-group row">
-												<label class="control-label col-md-3">Date Of Birth
-													<span class="required"> * </span>
-												</label>
-                                                  <div class="col-md-5">
-												<div class="input-append date" id="dp3">
-													<input type="date" name="date" class=" form-control input-height formDatePicker" placeholder="Date Of Birth" size="44" type="text"  data-validation="required">
-													<!--<span class="add-on"><i class="fa fa-calendar"></i></span>-->
-												</div>
-												</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">Address
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-5">
-													<textarea name="address" placeholder=" Enter Address" 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 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>
-										<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 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 Student</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>&nbsp;<a class="parent-item" href="<?=base_url();?>/student">Student</a>&nbsp;<i class="fa fa-angle-right"></i>
+					</li>
+					<li class="active">Add Student</li>
+				</ol>
 			</div>
-			<!-- Modal -->
+		</div>
+		<!-- Midium Model -->
+		<div class="row">
+			<div class="col-md-12 col-sm-12">
+				<div class="card card-box">
+					<div class="card-head">
+						<header>Student</header>	
+					</div>
+					<div class="card-body" id="bar-parent">
+						<form action="<?=base_url();?>add_student" method="post" class="form-horizontal" enctype="multipart/form-data">
+							<div class="form-body">
+								<div class="form-group row">
+									<label class="control-label col-md-3"> Student
+										<span class="required"> * </span>
+									</label>
+									<div class="col-md-5">											
+										<input type="text" name="student"  placeholder="Enter Student Id" data-validation="required" 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 name="name" type="text"  placeholder="Enter Student Name" data-validation="required" class="form-control input-height" /> </div>
+								</div>
+								<div class="form-group row">
+									<label class="control-label col-md-3">Email
+										<span class="required"> * </span>
+									</label>
+									<div class="col-md-5">
+										<input name="email" type="email"  placeholder="Enter Student Email" data-validation="required" class="form-control input-height" /> </div>
+								</div> 
+								<div class="form-group row">
+									<label class="control-label col-md-3">Mobile No
+										<span class="required"> * </span>
+									</label>
+									<div class="col-md-5">
+										<input name="mobileNumber" type="text"  placeholder="Mobile Number" data-validation="required" class="form-control input-height" /> </div>
+								</div>
+								<div class="form-group row">
+									<label class="control-label col-md-3">Date Of Birth
+										<span class="required"> * </span>
+									</label>
+									  <div class="col-md-5">
+									<div class="input-append date" id="dp3">
+										<input type="date" name="date"  class="form-control input-height formDatePicker" placeholder="Date Of Birth" size="44" type="text"  data-validation="required">
+										<!--<span class="add-on"><i class="fa fa-calendar"></i></span>-->
+									</div>
+									</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 select2" data-validation="required" name="gender">
+											<option value="">Select...</option>
+											<option value="1">Male</option>
+											<option value="2">Female</option>
+										</select>													
+									</div>
+								</div>
+								<div class="form-group row">
+									<label class="control-label col-md-3">Address
+										<span class="required"> * </span>
+									</label>
+									<div class="col-md-5">
+										<textarea name="address" placeholder=" Enter Address" data-validation="required" 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 select2" id="departmentId" data-validation="required" 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
+									</label>
+									<div class="col-md-5 compose-editor">
+										<input name="image" type="file" data-validation="required" class="form-control default" multiple>
+									</div>
+								</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
+<?php $this->load->view('includes/footer');?>
+<script src="<?=base_url();?>assets/select2/js/select2.js"></script>
+<script src="<?=base_url();?>assets/select2/js/select2-init.js"></script>
+  <script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
\ No newline at end of file
diff --git a/admin/application/views/student/edit_student.php b/admin/application/views/student/edit_student.php
index 5d823d4..63b41a8 100644
--- a/admin/application/views/student/edit_student.php
+++ b/admin/application/views/student/edit_student.php
@@ -48,8 +48,9 @@
 							$s=$stu->row();
 							$id=$s->id;
 							$name=$s->name;
-							$number=$s->number;
+							$number=$s->mobileNumber;
 							$address=$s->address;
+							$student=$s->studentId;
 							$department=$s->department;
 							$gender=$s->gender;
 							$s_img=$s->image;
@@ -71,13 +72,21 @@
 												<div class="col-md-5">											
 													<input type="text" value="<?=$name;?>" name="name" 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 type="text" value="<?=$student;?>" name="student" 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">Mobile.
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="number" value="<?=$number;?>" type="text" placeholder="Enter hod" class="form-control error" /> 
+													<input name="mobileNumber" value="<?=$number;?>" type="text" placeholder="Enter hod" class="form-control error" /> 
 													</div>		
 											</div>
                                               
diff --git a/admin/application/views/student/student_list.php b/admin/application/views/student/student_list.php
index 1a7885e..416f060 100644
--- a/admin/application/views/student/student_list.php
+++ b/admin/application/views/student/student_list.php
@@ -28,8 +28,11 @@
 									<div class="row">
 										<div class="col-md-6 col-sm-6 col-xs-6">
 											<div class="btn-group">
+											<a style="color:#fff;"href="<?=base_url();?>add_student">
 												<button  type="button" class="btn btn-info"
-										 data-toggle="modal" data-target="#mediumModel" ><a style="color:#fff;"href="<?=base_url();?>add_student">add <i class="fa fa-plus"></i></a> </button>
+													data-toggle="modal" data-target="#mediumModel" >add <i class="fa fa-plus"></i>
+												</button>
+											</a>
 											</div>
 										</div>
 										
@@ -42,6 +45,7 @@
 													<th> Name </th>
 													<th> Mobile Number </th>
 													<th> Department </th>
+													<th> Student </th>
 													<th> Gender </th>
 													<th> Action </th>
 												</tr>
@@ -55,22 +59,30 @@
 														{
 															$id=$s->id;
 															$name=$s->name;
-															$number=$s->number;
+															$number=$s->mobileNumber;
 															$address=$s->address;
 															$department=$s->deptname;
 															$gender=$s->gender;
-															$s_img=$s->image;
+															 if ($gender==1) 
+															 {$gen="Male";}
+														    else {$gen="Female";}
+															$student=$s->studentId;
+															$image=$s->image;
 															?>
 												<tr class="odd gradeX">
 													<td><?=$i;?></td>
 													<td><?=$name;?></td>
 													<td><?=$number;?></td>
-													
 													<td><?=$department;?></td>
-													<td><?=$gender;?></td>
+												    <td><?=$student;?></td>
+													<td><?=$gen;?></td>
+													
 													
 													<td>
 														
+														<a href="<?=base_url();?>view-student/<?=$id;?>" class="btn btn-success btn-xs">
+															<i class="fa fa-eye"></i>
+														</a>
 														<a href="<?=base_url();?>edit_student/<?=$id;?>" class="btn btn-primary btn-xs">
 															<i class="fa fa-pencil"></i>
 														</a>
@@ -106,13 +118,13 @@
 									</button>
 								</div>
 								<div class="modal-body">
-									<form action="<?=base_url();?>deleted_student" method="post">
+									<form action="<?=base_url();?>Student/deleteStudent" 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">
+												<input type="hidden" name="studentId" value="<?=$id;?>">
 												</div>
 											
 										<div class="form-actions">
diff --git a/admin/application/views/student/view_student.php b/admin/application/views/student/view_student.php
new file mode 100644
index 0000000..445d7d5
--- /dev/null
+++ b/admin/application/views/student/view_student.php
@@ -0,0 +1,106 @@
+<!-- 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 col-md-9" style="margin:0px auto;padding:0">
+						<div class="page-title-breadcrumb">
+							<div class=" pull-left">
+								<div class="page-title">Employee View</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>&nbsp;<a class="parent-item" href="<?=base_url();?>/employee">Employee</a>&nbsp;<i class="fa fa-angle-right"></i>
+								</li>
+								<li class="active">View Employee</li>
+							</ol>
+						</div>
+					</div>
+					<?php $this->load->view('includes/msg');?>
+					<div class="row">
+						<div class="col-md-9" style="margin:0px auto;">
+							<?php
+							if(isset($viewStudent)&& $viewStudent->num_rows()>0)
+							{
+								$view=$viewStudent->row();
+								$depName=$view->depName;
+								$studentId=$view->studentId;
+								$name=$view->name;
+								$gender=$view->gender;
+								$email=$view->email;
+								$address=$view->address;
+								$mobileNumber=$view->mobileNumber;
+								$dob=$view->dob;
+								$image=$view->image;
+								if($gender==1){$gen="Male";}else{$gen="Female";}
+							}
+										
+							?>
+							<!-- BEGIN PROFILE SIDEBAR -->
+								<div class="card card-topline-aqua">
+									<div class="card-body no-padding height-9">
+										<div class="row">
+											<div class="profile-userpic">
+												<img src="<?=base_url();?>uploads/student/<?=$image;?>" class="img-responsive" alt=""> </div>
+										</div>
+										<div class="profile-usertitle">
+											<div class="profile-usertitle-name"><?=$name;?></div>
+											<div class="profile-usertitle-job"> <?=$studentId;?> </div>
+										</div>
+										<hr>
+										<div class="row">
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Date of birth</strong>
+												<br>
+												<p class="text-muted"><?=$dob;?></p>
+											</div>
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Department</strong>
+												<br>
+												<p class="text-muted"><?=$depName;?></p>
+											</div>
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Mobile Number</strong>
+												<br>
+												<p class="text-muted"><?=$mobileNumber;?></p>
+											</div>
+											
+											
+										</div>
+										<hr>
+										<div class="row">
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Email</strong>
+												<br>
+												<p class="text-muted"><?=$email;?></p>
+											</div>
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Address</strong>
+												<br>
+												<p class="text-muted"><?=$address;?></p>
+											</div>
+											
+										</div>
+										
+										<!-- END SIDEBAR USER TITLE -->
+										<!-- SIDEBAR BUTTONS -->
+										
+										<!-- END SIDEBAR BUTTONS -->
+									</div>
+								</div>
+								
+							<!-- END PROFILE CONTENT -->
+							<!-- END BEGIN PROFILE SIDEBAR -->
+						</div>
+					</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>
+		
\ No newline at end of file
diff --git a/admin/application/views/subject/add_subject.php b/admin/application/views/subject/add_subject.php
index 7d2975a..3b9f117 100644
--- a/admin/application/views/subject/add_subject.php
+++ b/admin/application/views/subject/add_subject.php
@@ -1,6 +1,9 @@
 <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">
+<!--select2-->
+<link href="<?=base_url();?>assets/select2/css/select2.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
+<div class="page-container">
 			<!-- start sidebar menu -->
 			<?php $this->load->view('includes/sidebar');?>
 			<!-- start page content -->
@@ -14,7 +17,9 @@
 							<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">Subject</li>
+								<li>&nbsp;<a class="parent-item" href="<?=base_url();?>/subject">Subject</a>&nbsp;<i class="fa fa-angle-right"></i>
+								</li>
+								<li class="active">Add Subject</li>
 							</ol>
 						</div>
 					</div>
@@ -26,48 +31,60 @@
 									<header>Subject</header>	
 								</div>
 								<div class="card-body" id="bar-parent">
-									<form action="<?=base_url();?>add_subject" method="post">
+									<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.
+													<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>
+											</div>		
 											<div class="form-group row">
 												<label class="control-label col-md-3">Subject Code
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">											
-													<input type="text" name="code" data-required="1" placeholder="Enter Subject Code" class="form-control input-height">
+													<input type="text" name="subjectCode" data-validation="required" placeholder="Enter Subject Code" class="form-control input-height">
 												</div>
 											</div>
+											
 											<div class="form-group row">
-												<label class="control-label col-md-3">Name of the Subject.
-													<span class="required"> * </span>
-												</label>
-												<div class="col-md-5">
-													<input name="subject" type="text" placeholder="Enter Subject Name" class="form-control input-height" /> </div>
-											</div>
-											<div class="form-group row">
-												<label class="control-label col-md-3">Department
+												<label class="control-label col-md-3">Degree
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">												
-													<select class="form-control input-height" name="department">
-														<option value="">Select...</option>
-														<option value="BCA">BCA</option>
-														<option value="MCA">MCA</option>
-														<option value="B.com">B.com</option>
+													<select class="form-control select2" name="degree" data-validation="required">
+														<option value=""></option>
+														<?php
+														   if(isset($degree) && $degree->num_rows()>0)
+														   {
+															   foreach($degree->result() as $list)
+															   {
+																   ?> <option value="<?=$list->id;?>"><?=$list->name;?></option><?php
+															   }
+														   }
+													?>     
 													</select>													
 												</div>
 											</div>
 											<div class="form-group row">
-												<label class="control-label col-md-3">Semester
+												<label class="control-label col-md-3">Faculty
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">												
-													<select class="form-control input-height" name="semester">
-														<option value="">Select...</option>
-														<option value="1">1</option>
-														<option value="2">2</option>
-														<option value="3">3</option>
-														<option value="4">4</option>
-													</select>													
+													<select id="multiple" name="faculty[]" 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>
 											
@@ -75,10 +92,16 @@
 												<label class="control-label col-md-3">Profile Images
 												</label>
 												<div class="col-md-5 compose-editor">
-													<input type="file"  name="image"  placeholder="Enter img" class="form-control default" >
+													<input type="file"  name="profileImage" class="form-control default" data-validation="required">
+												</div>
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">Description
+												</label>
+												<div class="col-md-5 compose-editor">
+													<textarea type="file"  name="description"  placeholder="Enter Subject Description" class="form-control default" ></textarea>
 												</div>
 											</div>
-											
 											</div>								
 										</div>
 										<div class="form-actions">
@@ -100,7 +123,7 @@
 				</div>
 			</div>
 		</div>
-
-					
-
-			<?php $this->load->view('includes/footer');?>
\ No newline at end of file
+<?php $this->load->view('includes/footer');?>
+ <script src="<?=base_url();?>assets/select2/js/select2.js"></script>
+<script src="<?=base_url();?>assets/select2/js/select2-init.js"></script>
+<script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
\ No newline at end of file
diff --git a/admin/application/views/subject/edit_subject.php b/admin/application/views/subject/edit_subject.php
index 84068b8..2099c53 100644
--- a/admin/application/views/subject/edit_subject.php
+++ b/admin/application/views/subject/edit_subject.php
@@ -1,4 +1,6 @@
 <link href="<?=base_url();?>/assets/datatables/plugins/bootstrap/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2.css" rel="stylesheet" type="text/css" />
+<link href="<?=base_url();?>assets/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
 <?php $this->load->view('includes/header');?>
 <style>
 .input-group .input-group-addon {
@@ -37,6 +39,8 @@
 							<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>&nbsp;<a class="parent-item" href="<?=base_url();?>/subject">Subject</a>&nbsp;<i class="fa fa-angle-right"></i>
+								</li>
 								<li class="active">Edit Subject</li>
 							</ol>
 						</div>
@@ -47,11 +51,14 @@
 					{
 							$s=$sub->row();
 							$id=$s->id;
+							$degreeId=$s->degreeId;
+							$name=$s->name;
 							$code=$s->code;
-							$sub=$s->subject;
-							$dep=$s->department;
-							$semester=$s->semester;
-							$p_img=$s->image;
+							$facultyId=$s->facultyId;
+							$image=$s->image;
+							$description=$s->description;
+							$facIdd = explode(",", $facultyId);
+							//print_r ($facIdd);
 							
 					} ?>
 					<div class="row">
@@ -61,14 +68,14 @@
 									<header>Edit Subject</header>	
 								</div>
 								<div class="card-body" id="bar-parent">
-									<form action="<?=base_url();?>edit_subject/<?=$id;?>" method="post" >
+									<form action="<?=base_url();?>edit-subject/<?=$id;?>" method="post" enctype="multipart/form-data">
 										<div class="form-body">
 											<div class="form-group row">
 												<label class="control-label col-md-3">Code
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">											
-													<input type="text" value="<?=$code;?>" name="code" data-required="1" placeholder="Enter name" class="form-control input-height">
+													<input type="text" value="<?=$code;?>" name="code" data-validation="required" placeholder="Enter name" class="form-control input-height">
 												</div>
 											</div>
 											<div class="form-group row">
@@ -76,34 +83,45 @@
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">
-													<input name="subject" value="<?=$sub;?>" type="text" data-required="1" placeholder="Enter subject" class="form-control input-height" /> </div>
+													<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">Department
+												<label class="control-label col-md-3">Degree
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">												
-													<select class="form-control input-height" value="<?=$dep;?>" name="department">
-														<option value="">Select...</option>
-														<option value="BCA">BCA</option>
-														<option value="MCA">MCA</option>
-														<option value="B.com">B.com</option>
-													</select>													
+													<select class="form-control select2" name="degree" data-validation="required">
+														<option value=""></option>
+														<?php
+														   if(isset($degree) && $degree->num_rows()>0)
+														   {
+															   foreach($degree->result() as $list)
+															   {
+																   ?> <option value="<?=$list->id;?>" <?php if($list->id==$degreeId){echo "selected";}?>><?=$list->name;?></option><?php
+															   }
+														   }
+													?>     
+													</select>														
 												</div>
 											</div>
 											
 											<div class="form-group row">
-												<label class="control-label col-md-3">Semester
+												<label class="control-label col-md-3">Faculty
 													<span class="required"> * </span>
 												</label>
 												<div class="col-md-5">												
-													<select class="form-control input-height" value="<?=$semester;?>" name="semester">
-														<option value="">Select...</option>
-														<option value="1">1</option>
-														<option value="2">2</option>
-														<option value="3">3</option>
-														<option value="4">4</option>
-													</select>													
+													<select id="multiple" name="faculty[]" 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, $facIdd)){ echo "selected";}?>><?=$list1->name;?></option><?php
+															   }
+														   }
+													?>     
+                                                </select>															
 												</div>
 											</div>
 											
@@ -111,10 +129,26 @@
 												<label class="control-label col-md-3">Upload Picture
 												</label>
 												<div class="compose-editor">
-													<input type="file"  name="image" value="<?=$p_img;?>" placeholder="Enter img" class="default" multiple>
+													<input type="file" name="image" placeholder="Enter img" class="default">
+													<input type="hidden" value="<?=$image;?>" name="hiddenImage">
+												</div>
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">
+													
+												</label>
+												<div class="col-md-5">											
+													<img src="<?=base_url();?>uploads/subject/<?=$image;?>" style="width:75px;height:75px;"/>
+												</div>
+											</div>
+											<div class="form-group row">
+												<label class="control-label col-md-3">Description
+													<span class="required"> * </span>
+												</label>
+												<div class="col-md-5">											
+													<textarea type="text"  name="description" data-validation="required" placeholder="Enter Description" class="form-control input-height"><?=$description;?></textarea>
 												</div>
 											</div>
-											
 										</div>
 										<div class="form-actions">
 											<div class="row">
@@ -135,4 +169,7 @@
 				</div>
 			</div>
 		</div>
-			<?php $this->load->view('includes/footer');?>
\ No newline at end of file
+<?php $this->load->view('includes/footer');?>
+<script src="<?=base_url();?>assets/select2/js/select2.js"></script>
+<script src="<?=base_url();?>assets/select2/js/select2-init.js"></script>
+<script src="<?=base_url();?>assets/jquery.form-validator.min.js"></script>
\ No newline at end of file
diff --git a/admin/application/views/subject/subject_list.php b/admin/application/views/subject/subject_list.php
index a62bae5..a8e62ba 100644
--- a/admin/application/views/subject/subject_list.php
+++ b/admin/application/views/subject/subject_list.php
@@ -16,6 +16,7 @@
 							<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">Subject</li>
 							</ol>
 						</div>
@@ -28,8 +29,10 @@
 									<div class="row">
 										<div class="col-md-6 col-sm-6 col-xs-6">
 											<div class="btn-group">
+											<a style="color:#fff;"href="<?=base_url();?>add-subject">
 												<button  type="button" class="btn btn-info"
-										 data-toggle="modal" data-target="#mediumModel" ><a style="color:#fff;"href="<?=base_url();?>add_subject">add <i class="fa fa-plus"></i></a> </button>
+										 data-toggle="modal" data-target="#mediumModel" >add <i class="fa fa-plus"></i></button>
+										 </a> 
 											</div>
 										</div>
 										
@@ -39,37 +42,34 @@
 											<thead>
 												<tr>
 													<th> S.No</th>
-													<th> Subject code </th>
 													<th> Name of the Subject </th>
+													<th> Subject code </th>
 													<th> Department</th>
-													<th> Semester </th>
-													
 													<th> Action </th>
 												</tr>
 											</thead>
 											<tbody>
-											<?php
-													if(isset($sub) && $sub->num_rows()>0)
+												<?php
+													if(isset($subject) && $subject->num_rows()>0)
 													{
 													$i=1;
-														foreach($sub->result() as $s)
+														foreach($subject->result() as $s)
 														{
 															$id=$s->id;
 															$code=$s->code;
-															$sub=$s->subject;
-															$dep=$s->department;
-															$semester=$s->semester;
-															$p_img=$s->image;
-															?>
-												<tr class="odd gradeX">
+															$name=$s->name;
+															$dep=$s->depName;
+													?>
+													<tr class="odd gradeX">
 													<td><?=$i;?></td>
+													<td><?=$name;?></td>
 													<td><?=$code;?></td>
-													<td><?=$sub;?></td>
 													<td><?=$dep;?></td>
-													<td><?=$semester;?></td>
 													<td>
-														
-														<a href="<?=base_url();?>edit_subject/<?=$id;?>" class="btn btn-primary btn-xs">
+														<a href="<?=base_url();?>view-subject/<?=$id;?>" class="btn btn-success btn-xs">
+															<i class="fa fa-eye"></i>
+														</a>
+														<a href="<?=base_url();?>edit-subject/<?=$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">
@@ -78,10 +78,10 @@
 														
 													</td>
 												</tr>
-													<?php 
+													<?php													
 													$i++;
-													} }?>
-												
+												} }
+												?>
 											</tbody>
 										</table>
 									</div>
@@ -104,13 +104,13 @@
 									</button>
 								</div>
 								<div class="modal-body">
-									<form action="<?=base_url();?>deleted_subject" method="post">
+									<form action="<?=base_url();?>Subject/deleteSubject" 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">
+												<input type="hidden" name="subjectId" value="<?=$id;?>">
 												</div>
 											
 										<div class="form-actions">
diff --git a/admin/application/views/subject/view_subject.php b/admin/application/views/subject/view_subject.php
new file mode 100644
index 0000000..cabdb87
--- /dev/null
+++ b/admin/application/views/subject/view_subject.php
@@ -0,0 +1,129 @@
+<!-- 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');?>
+<?php 
+$CI=& get_instance();
+													
+$CI->load->model('Subject_model');?>
+		<!-- 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 col-md-9" style="margin:0px auto;padding:0">
+						<div class="page-title-breadcrumb">
+							<div class=" pull-left">
+								<div class="page-title">Subject View</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>&nbsp;<a class="parent-item" href="<?=base_url();?>/subject">Subject</a>&nbsp;<i class="fa fa-angle-right"></i>
+								</li>
+								<li class="active">View Subject</li>
+							</ol>
+						</div>
+					</div>
+					<?php $this->load->view('includes/msg');?>
+					<div class="row">
+						<div class="col-md-9" style="margin:0px auto;">
+							<?php
+							if(isset($viewSubject)&& $viewSubject->num_rows()>0)
+							{
+								$view=$viewSubject->row();
+								
+								$id=$view->id;
+								$degName=$view->degName;
+								$facultyId=$view->facultyId;
+								$facName=$view->facName;
+								$name=$view->name;
+								$code=$view->code;
+								$image=$view->image;
+								$description=$view->description;
+								$facIdd = explode(",", $facultyId);
+								//print_r ($facIdd);
+								
+							}
+										
+							?>
+							<!-- BEGIN PROFILE SIDEBAR -->
+								<div class="card card-topline-aqua">
+									<div class="card-body no-padding height-9">
+										<div class="row">
+											<div class="profile-userpic">
+												<img src="<?=base_url();?>uploads/subject/<?=$image;?>" class="img-responsive" alt=""> </div>
+										</div>
+										<div class="profile-usertitle">
+											<div class="profile-usertitle-name"><?=$name;?></div>
+										</div>
+										<hr>
+										<div class="row">
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Code</strong>
+												<br>
+												<p class="text-muted"><?=$code;?></p>
+											</div>
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Degree</strong>
+												<br>
+												<p class="text-muted"><?=$degName;?></p>
+											</div>
+											
+											<div class="col-md-4 col-xs-6 b-r"> <strong>Faculty</strong>
+												<br>
+												<p class="text-muted">
+												<?php 
+												
+												$i=0;
+												foreach($facIdd 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>
+										<hr>
+										<div class="row">
+											<div class="col-md-12 col-xs-6" style="text-align:justify;"> <strong>Description</strong>
+											<br>
+											<br>
+												<p class="text-muted"><?=$description;?></p>
+											</div>
+											
+										</div>
+										
+										<!-- END SIDEBAR USER TITLE -->
+										<!-- SIDEBAR BUTTONS -->
+										
+										<!-- END SIDEBAR BUTTONS -->
+									</div>
+								</div>
+								
+							<!-- END PROFILE CONTENT -->
+							<!-- END BEGIN PROFILE SIDEBAR -->
+						</div>
+					</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>
+		
\ No newline at end of file
diff --git a/admin/assets/jquery.cookie.min.js b/admin/assets/jquery.cookie.min.js
new file mode 100644
index 0000000..c0f19d8
--- /dev/null
+++ b/admin/assets/jquery.cookie.min.js
@@ -0,0 +1,2 @@
+/*! jquery.cookie v1.4.1 | MIT */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?a(require("jquery")):a(jQuery)}(function(a){function b(a){return h.raw?a:encodeURIComponent(a)}function c(a){return h.raw?a:decodeURIComponent(a)}function d(a){return b(h.json?JSON.stringify(a):String(a))}function e(a){0===a.indexOf('"')&&(a=a.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return a=decodeURIComponent(a.replace(g," ")),h.json?JSON.parse(a):a}catch(b){}}function f(b,c){var d=h.raw?b:e(b);return a.isFunction(c)?c(d):d}var g=/\+/g,h=a.cookie=function(e,g,i){if(void 0!==g&&!a.isFunction(g)){if(i=a.extend({},h.defaults,i),"number"==typeof i.expires){var j=i.expires,k=i.expires=new Date;k.setTime(+k+864e5*j)}return document.cookie=[b(e),"=",d(g),i.expires?"; expires="+i.expires.toUTCString():"",i.path?"; path="+i.path:"",i.domain?"; domain="+i.domain:"",i.secure?"; secure":""].join("")}for(var l=e?void 0:{},m=document.cookie?document.cookie.split("; "):[],n=0,o=m.length;o>n;n++){var p=m[n].split("="),q=c(p.shift()),r=p.join("=");if(e&&e===q){l=f(r,g);break}e||void 0===(r=f(r))||(l[q]=r)}return l};h.defaults={},a.removeCookie=function(b,c){return void 0===a.cookie(b)?!1:(a.cookie(b,"",a.extend({},c,{expires:-1})),!a.cookie(b))}});
\ No newline at end of file
diff --git a/admin/css/extra_pages.css b/admin/css/extra_pages.css
index a83bb3e..2b0efef 100644
--- a/admin/css/extra_pages.css
+++ b/admin/css/extra_pages.css
@@ -174,7 +174,7 @@ iframe {
   border-radius: 10px;
   overflow: hidden;
   padding: 37px 55px 37px 55px;
-  background: #EF9A9A;
+  background: #ba2121;
   /* //background: -webkit-linear-gradient(top, #007bff, #5992d0); */
 /* //  background: -o-linear-gradient(top, #007bff, #5992d0); */
  /* // background: -moz-linear-gradient(top, #007bff, #5992d0); */
diff --git a/admin/uploads/department/230118083756.jpg b/admin/uploads/department/230118083756.jpg
new file mode 100644
index 0000000..5dd7133
Binary files /dev/null and b/admin/uploads/department/230118083756.jpg differ
diff --git a/admin/uploads/department/230121065959.webp b/admin/uploads/department/230121065959.webp
new file mode 100644
index 0000000..bc421fd
Binary files /dev/null and b/admin/uploads/department/230121065959.webp differ
diff --git a/admin/uploads/department/230121070154.png b/admin/uploads/department/230121070154.png
new file mode 100644
index 0000000..28ebd4c
Binary files /dev/null and b/admin/uploads/department/230121070154.png differ
diff --git a/admin/uploads/department/230121070202.webp b/admin/uploads/department/230121070202.webp
new file mode 100644
index 0000000..bc421fd
Binary files /dev/null and b/admin/uploads/department/230121070202.webp differ
diff --git a/admin/uploads/department/230121070212.webp b/admin/uploads/department/230121070212.webp
new file mode 100644
index 0000000..bc421fd
Binary files /dev/null and b/admin/uploads/department/230121070212.webp differ
diff --git a/admin/uploads/employee/2301191234.png b/admin/uploads/employee/2301191234.png
new file mode 100644
index 0000000..28ebd4c
Binary files /dev/null and b/admin/uploads/employee/2301191234.png differ
diff --git a/admin/uploads/employee/2301210648.png b/admin/uploads/employee/2301210648.png
new file mode 100644
index 0000000..9753a2d
Binary files /dev/null and b/admin/uploads/employee/2301210648.png differ
diff --git a/admin/uploads/faculty/2301180843.png b/admin/uploads/faculty/2301180843.png
new file mode 100644
index 0000000..28ebd4c
Binary files /dev/null and b/admin/uploads/faculty/2301180843.png differ
diff --git a/admin/uploads/faculty/2301180950.png b/admin/uploads/faculty/2301180950.png
new file mode 100644
index 0000000..28ebd4c
Binary files /dev/null and b/admin/uploads/faculty/2301180950.png differ
diff --git a/admin/uploads/faculty/2301181230.png b/admin/uploads/faculty/2301181230.png
new file mode 100644
index 0000000..1abf6ad
Binary files /dev/null and b/admin/uploads/faculty/2301181230.png differ
diff --git a/admin/uploads/faculty/2301181254.png b/admin/uploads/faculty/2301181254.png
new file mode 100644
index 0000000..1abf6ad
Binary files /dev/null and b/admin/uploads/faculty/2301181254.png differ
diff --git a/admin/uploads/faculty/2301201056.png b/admin/uploads/faculty/2301201056.png
new file mode 100644
index 0000000..28ebd4c
Binary files /dev/null and b/admin/uploads/faculty/2301201056.png differ
diff --git a/admin/uploads/faculty/2301201103.png b/admin/uploads/faculty/2301201103.png
new file mode 100644
index 0000000..28ebd4c
Binary files /dev/null and b/admin/uploads/faculty/2301201103.png differ
diff --git a/admin/uploads/faculty/2301210217.png b/admin/uploads/faculty/2301210217.png
new file mode 100644
index 0000000..9753a2d
Binary files /dev/null and b/admin/uploads/faculty/2301210217.png differ
diff --git a/admin/uploads/faculty/2301210221.png b/admin/uploads/faculty/2301210221.png
new file mode 100644
index 0000000..28ebd4c
Binary files /dev/null and b/admin/uploads/faculty/2301210221.png differ
diff --git a/admin/uploads/project/1.GettyImages-117982503-58406ecf5f9b5851e592e20e.jpg b/admin/uploads/project/1.GettyImages-117982503-58406ecf5f9b5851e592e20e.jpg
new file mode 100644
index 0000000..b262b97
Binary files /dev/null and b/admin/uploads/project/1.GettyImages-117982503-58406ecf5f9b5851e592e20e.jpg differ
diff --git a/admin/uploads/project/1.Super-Bowls-3.webp b/admin/uploads/project/1.Super-Bowls-3.webp
new file mode 100644
index 0000000..77dd9fe
Binary files /dev/null and b/admin/uploads/project/1.Super-Bowls-3.webp differ
diff --git a/admin/uploads/project/1.kazuyo-sejima-SAANA-suimei-water-pavilion-tokyo-2021-my-modern-met-6.jpg b/admin/uploads/project/1.kazuyo-sejima-SAANA-suimei-water-pavilion-tokyo-2021-my-modern-met-6.jpg
new file mode 100644
index 0000000..7844c8b
Binary files /dev/null and b/admin/uploads/project/1.kazuyo-sejima-SAANA-suimei-water-pavilion-tokyo-2021-my-modern-met-6.jpg differ
diff --git a/admin/uploads/project/2.bbc8a294ddcd8cf7e63926f5c878417c.jpg b/admin/uploads/project/2.bbc8a294ddcd8cf7e63926f5c878417c.jpg
new file mode 100644
index 0000000..124d31d
Binary files /dev/null and b/admin/uploads/project/2.bbc8a294ddcd8cf7e63926f5c878417c.jpg differ
diff --git a/admin/uploads/project/2.images.jfif b/admin/uploads/project/2.images.jfif
new file mode 100644
index 0000000..22a45e7
Binary files /dev/null and b/admin/uploads/project/2.images.jfif differ
diff --git a/admin/uploads/project/2.programmatic-ecosystem.png b/admin/uploads/project/2.programmatic-ecosystem.png
new file mode 100644
index 0000000..ca4e144
Binary files /dev/null and b/admin/uploads/project/2.programmatic-ecosystem.png differ
diff --git a/admin/uploads/project/research_facilities_02.jpg b/admin/uploads/project/research_facilities_02.jpg
new file mode 100644
index 0000000..2077f2a
Binary files /dev/null and b/admin/uploads/project/research_facilities_02.jpg differ
diff --git a/admin/uploads/project/title230118013642.jpg b/admin/uploads/project/title230118013642.jpg
new file mode 100644
index 0000000..7844c8b
Binary files /dev/null and b/admin/uploads/project/title230118013642.jpg differ
diff --git a/admin/uploads/project/title230118110509.jpg b/admin/uploads/project/title230118110509.jpg
new file mode 100644
index 0000000..7844c8b
Binary files /dev/null and b/admin/uploads/project/title230118110509.jpg differ
diff --git a/admin/uploads/student/2301201104.png b/admin/uploads/student/2301201104.png
new file mode 100644
index 0000000..28ebd4c
Binary files /dev/null and b/admin/uploads/student/2301201104.png differ
diff --git a/admin/uploads/student/2301201105.png b/admin/uploads/student/2301201105.png
new file mode 100644
index 0000000..28ebd4c
Binary files /dev/null and b/admin/uploads/student/2301201105.png differ
diff --git a/admin/uploads/subject/230118084757.jpg b/admin/uploads/subject/230118084757.jpg
new file mode 100644
index 0000000..da75b91
Binary files /dev/null and b/admin/uploads/subject/230118084757.jpg differ
diff --git a/admin/uploads/subject/230118122812.png b/admin/uploads/subject/230118122812.png
new file mode 100644
index 0000000..1abf6ad
Binary files /dev/null and b/admin/uploads/subject/230118122812.png differ
diff --git a/admin/uploads/subject/230118125548.png b/admin/uploads/subject/230118125548.png
new file mode 100644
index 0000000..1abf6ad
Binary files /dev/null and b/admin/uploads/subject/230118125548.png differ
diff --git a/admin/uploads/subject/230119075335.jpg b/admin/uploads/subject/230119075335.jpg
new file mode 100644
index 0000000..5dd7133
Binary files /dev/null and b/admin/uploads/subject/230119075335.jpg differ
diff --git a/admin/uploads/subject/230121015027.webp b/admin/uploads/subject/230121015027.webp
new file mode 100644
index 0000000..bc421fd
Binary files /dev/null and b/admin/uploads/subject/230121015027.webp differ
diff --git a/application/config/routes.php b/application/config/routes.php
index 1f913ae..116823c 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -54,5 +54,8 @@ $route['404_override'] = '';
 $route['translate_uri_dashes'] = FALSE;
 $route['index'] = 'welcome';
 $route['subject-list/(:num)'] = 'Welcome/subjectList/$1';
+$route['subject-detail/(:num)'] = 'Welcome/subjectDetail/$1';
+$route['project-list/(:num)'] = 'Welcome/projectList/$1';
+$route['project-detail/(:num)'] = 'Welcome/projectDetail/$1';
 
 $route['about'] = 'welcome/about';
diff --git a/application/controllers/Welcome.php b/application/controllers/Welcome.php
index 1da36cd..1039aa1 100644
--- a/application/controllers/Welcome.php
+++ b/application/controllers/Welcome.php
@@ -5,7 +5,7 @@ class Welcome extends CI_Controller {
 	public function __construct()
 	{
 		parent::__construct();
-		$this->load->model('Subject_model');
+		$this->load->model('WelcomeModel');
 	}
 
 	/**
@@ -25,16 +25,53 @@ class Welcome extends CI_Controller {
 	 */
 	public function index()
 	{
-		$data['dep']=$this->Department_model->dep_list();
+		$data['lastId']=$this->WelcomeModel->getLastId();
+		$data['dep']=$this->WelcomeModel->dep_list();
+		$data['semester']=$this->WelcomeModel->semesterList();
 		$this->load->view('index',$data);
 	}
 	public function subjectList($id)
 	{
-		$data['subject_list']=$this->Subject_model->subject_list($id);
+		
+		$data['lastId']=$this->WelcomeModel->getLastId();
+		$data['dep']=$this->WelcomeModel->dep_list();
+		$data['semester']=$this->WelcomeModel->semesterList();
+		
+		//echo $this->db->last_query();exit;
+		$data['subject_list']=$this->WelcomeModel->subject_list($id);
+		//echo $this->db->last_query();exit;
 		$this->load->view('subject_list',$data);
 	}
+	public function subjectDetail($id)
+	{
+		
+		$data['lastId']=$this->WelcomeModel->getLastId();
+		$data['dep']=$this->WelcomeModel->dep_list();
+		$data['semester']=$this->WelcomeModel->semesterList();
+		
+		//echo $this->db->last_query();exit;
+		$data['subject_Det']=$this->WelcomeModel->subject_Detail($id);
+		//echo $this->db->last_query();exit;
+		$this->load->view('subject',$data);
+	}
+	
+	public function projectDetail($id)
+	{
+		$data['lastId']=$this->WelcomeModel->getLastId();
+		$data['dep']=$this->WelcomeModel->dep_list();
+		$data['semester']=$this->WelcomeModel->semesterList();
+		
+		//echo $this->db->last_query();exit;
+		$data['projectdetail']=$this->WelcomeModel->projectDetail($id);
+		//echo $this->db->last_query();exit;
+		$this->load->view('project_details',$data);
+	}
 	public function about()
 	{
+		$data['lastId']=$this->WelcomeModel->getLastId();
+		$data['dep']=$this->WelcomeModel->dep_list();
+		$data['semester']=$this->WelcomeModel->semesterList();
+		
 		$this->load->view('about');
 	}
 	 
diff --git a/application/models/Department_model.php b/application/models/Department_model.php
index da3a074..44e3155 100644
--- a/application/models/Department_model.php
+++ b/application/models/Department_model.php
@@ -8,14 +8,6 @@ class Department_model extends CI_Model {
         parent::__construct();
     }
 	 
-	function dep_list()
-	{
-		$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/models/WelcomeModel.php b/application/models/WelcomeModel.php
new file mode 100644
index 0000000..7a82708
--- /dev/null
+++ b/application/models/WelcomeModel.php
@@ -0,0 +1,119 @@
+<?php
+if (!defined('BASEPATH'))
+    exit('No direct script access allowed');
+
+class WelcomeModel extends CI_Model {
+
+    public function __construct() {
+        parent::__construct();
+    }
+	 
+	function dep_list()
+	{
+		$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 getName($depId)
+	{
+		$this->db->select('name');
+		$this->db->from('department');
+		$this->db->where(array('id'=>$depId));
+		$query = $this->db->get();
+		//echo $this->db->last_query();exit;
+		return $query;
+	}
+	function semesterList()
+	{
+		$this->db->select('*');
+		$this->db->from('semester');
+		$this->db->where(array('status'=>1));
+		$query = $this->db->get();
+	//echo $this->db->last_query();exit;
+		return $query;
+	} 
+	function subject_list($id)
+	{
+		$this->db->select('s.code,s.name,s.id,d.name as degName,s.facultyId');
+		$this->db->from('subject as s');
+		$this->db->join('degree as d','d.id=s.degreeId','INNER');
+		$this->db->where(array('s.status'=>1,'degreeId'=>$id));
+		$query = $this->db->get();
+		//echo $this->db->last_query();exit;
+		return $query;
+	} 
+	function subject_Detail($id)
+	{
+		$this->db->select('id,code,name,facultyId,description');
+		$this->db->from('subject');
+		//$this->db->join('degree as d','d.id=s.degreeId','INNER');
+		$this->db->where(array('status'=>1,'id'=>$id));
+		$query = $this->db->get();
+		//echo $this->db->last_query();exit;
+		return $query;
+	} 
+	function get_faculty($id)
+	{
+		$this->db->select('*');
+		$this->db->from('faculty');
+		$this->db->where(array('id'=>$id));
+		$query = $this->db->get();
+	//echo $this->db->last_query();
+		return $query;
+	} 
+	function getProjectList($subjectId)
+	{
+		$this->db->select('p.id,p.projectName,s.name as studentName,p.image');
+		$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.subjectId'=>$subjectId));
+		$query = $this->db->get();
+		///echo $this->db->last_query();
+		return $query;
+	} 
+	function project_details($subjectId)
+	{
+		$this->db->select('p.id,p.projectName,s.name as studentName');
+		$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.subjectId'=>$subjectId));
+		$query = $this->db->get();
+		///echo $this->db->last_query();
+		return $query;
+	} 
+	function projectDetail($projectId)
+	{
+		$this->db->select('p.id,p.projectName,p.description,s.name as studentName');
+		$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));
+		$query = $this->db->get();
+		///echo $this->db->last_query();
+		return $query;
+	}
+	function getGalleryList($projectId)
+	{
+		$this->db->select('id,title,image');
+		$this->db->from('projectdetail');
+		$this->db->where(array('status'=>1,'projectId'=>$projectId));
+		$query = $this->db->get();
+		///echo $this->db->last_query();
+		return $query;
+	}
+	
+	function getLastId()
+	{
+		$this->db->select('id,name,year');
+		$this->db->from('semester');
+		$this->db->order_by('id', 'desc');
+		$this->db->limit(1);
+		$this->db->where(array('status'=>1));
+		$query = $this->db->get();
+		//echo $this->db->last_query();exit;
+		return $query;
+	}
+	
+}
diff --git a/application/views/about.php b/application/views/about.php
index eec0263..7fe2bd0 100644
--- a/application/views/about.php
+++ b/application/views/about.php
@@ -326,6 +326,6 @@
                     </div>
                     </div>
                     <!--  content end--> 
-                     <?php include 'include/footer.php';?> 
+                     <?php $this->load->view('include/footer.php')?> 
     </body>
 </html>
\ No newline at end of file
diff --git a/application/views/blog.php b/application/views/blog.php
deleted file mode 100644
index 65abd90..0000000
--- a/application/views/blog.php
+++ /dev/null
@@ -1,334 +0,0 @@
-       <?php include 'include/header.php';?>  
-            <!--=============== wrapper ===============-->
-            <div id="wrapper">
-                <!-- content-holder  -->
-                <div class="content-holder">
-                    <!--  content --> 
-                    <div class="content">
-                        <!--  section  --> 
-                        <section class="parallax-section header-section" data-scrollax-parent="true">
-                            <div class="bg"  data-bg="images/bg/1.jpg" data-scrollax="properties: { translateY: '200px' }"></div>
-                            <div class="overlay op1"></div>
-                            <div class="container big-container">
-                                <div class="section-title">
-                                    <h3>Our Blog</h3>
-                                    <div class="separator trsp-separator"></div>
-                                    <h2>Our  Journal </h2>
-                                    <p>Curabitur bibendum mi sed rhoncus aliquet. Nulla blandit porttitor justo, at posuere sem accumsan nec.</p>
-                                    <a href="#sec1" class="custom-scroll-link sect-scroll-link"><i class="fa fa-long-arrow-down"></i> <span>scroll down</span></a>
-                                </div>
-                            </div>
-                        </section>
-                        <!--  section end--> 
-                        <!--  section  --> 
-                        <section id="sec1">
-                            <div class="container">
-                                <div class="row">
-                                    <div class="col-md-8">
-                                        <div class="post-container fl-wrap">
-                                            <!-- post -->
-                                            <div class="post fl-wrap fw-post">
-                                                <h2><span>Blog post title</span></h2>
-                                                <ul class="blog-title-opt">
-                                                    <li><a href="#">12 may 2017</a></li>
-                                                    <li> - </li>
-                                                    <li><a href="#">Interviews </a></li>
-                                                    <li><a href="#">Design</a></li>
-                                                </ul>
-                                                <!-- blog media -->
-                                                <div class="blog-media fl-wrap">
-                                                    <div class="single-slider fl-wrap" data-effects="slide">
-                                                        <div class="swiper-container">
-                                                            <div class="swiper-wrapper">
-                                                                <div class="swiper-slide"><img src="images/folio/1.jpg" alt=""></div>
-                                                                <div class="swiper-slide"><img src="images/folio/1.jpg" alt=""></div>
-                                                                <div class="swiper-slide"><img src="images/folio/1.jpg" alt=""></div>
-                                                            </div>
-                                                            <div class="swiper-pagination"></div>
-                                                            <div class="swiper-button-prev"><i class="fa fa-angle-left"></i></div>
-                                                            <div class="swiper-button-next"><i class="fa fa-angle-right"></i></div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <!-- blog media end -->
-                                                <div class="blog-text fl-wrap">
-                                                    <div class="pr-tags fl-wrap">
-                                                        <span>Tags : </span>
-                                                        <ul>
-                                                            <li><a href="#">Architecture</a></li>
-                                                            <li><a href="#">Design</a></li>
-                                                            <li><a href="#">Photography</a></li>
-                                                            <li><a href="#">House</a></li>
-                                                        </ul>
-                                                    </div>
-                                                    <h3><a   href="blog-single.html" >Aliquip pertinax <strong>vix ad </strong></a></h3>
-                                                    <p>
-                                                        Vestibulum orci felis, ullamcorper non condimentum non, ultrices ac nunc. Mauris non ligula suscipit, vulputate mi accumsan, dapibus felis. Nullam sed sapien dui. Nulla auctor sit amet sem non porta. Praesent eu massa vel diam laoreet elementum ac sed felis. Donec suscipit ultricies risus sed mollis. Donec volutpat porta risus posuere imperdiet. Sed viverra dolor sed dolor placerat ornare ut . Integer iaculis tellus nulla, quis imperdiet magna venenatis vitae..
-                                                    </p>
-                                                    <a href="blog-single.html" class="btn float-btn flat-btn">Read more </a>
-                                                    <ul class="post-counter">
-                                                        <li><i class="fa fa-eye"></i><span>687</span></li>
-                                                        <li><i class="fa fa-comment-o"></i><span>10</span></li>
-                                                    </ul>
-                                                </div>
-                                            </div>
-                                            <!-- post end-->
-                                            <!-- post -->
-                                            <div class="post fl-wrap fw-post">
-                                                <h2><span>Blog post title</span></h2>
-                                                <ul class="blog-title-opt">
-                                                    <li><a href="#">12 may 2017</a></li>
-                                                    <li> - </li>
-                                                    <li><a href="#">Interviews </a></li>
-                                                    <li><a href="#">Design</a></li>
-                                                </ul>
-                                                <!-- blog media -->
-                                                <div class="blog-media fl-wrap">
-                                                    <a   href="blog-single.html" ><img src="images/folio/1.jpg" class="respimg" alt=""></a>
-                                                </div>
-                                                <!-- blog media end -->
-                                                <div class="blog-text fl-wrap">
-                                                    <div class="pr-tags fl-wrap">
-                                                        <span>Tags : </span>
-                                                        <ul>
-                                                            <li><a href="#">Architecture</a></li>
-                                                            <li><a href="#">Design</a></li>
-                                                            <li><a href="#">Photography</a></li>
-                                                            <li><a href="#">House</a></li>
-                                                        </ul>
-                                                    </div>
-                                                    <h3><a   href="blog-single.html" >Aliquip pertinax <strong>vix ad </strong></a></h3>
-                                                    <p>
-                                                        Vestibulum orci felis, ullamcorper non condimentum non, ultrices ac nunc. Mauris non ligula suscipit, vulputate mi accumsan, dapibus felis. Nullam sed sapien dui. Nulla auctor sit amet sem non porta. Praesent eu massa vel diam laoreet elementum ac sed felis. Donec suscipit ultricies risus sed mollis. Donec volutpat porta risus posuere imperdiet. Sed viverra dolor sed dolor placerat ornare ut . Integer iaculis tellus nulla, quis imperdiet magna venenatis vitae..
-                                                    </p>
-                                                    <a href="blog-single.html" class="btn float-btn flat-btn">Read more </a>
-                                                    <ul class="post-counter">
-                                                        <li><i class="fa fa-eye"></i><span>687</span></li>
-                                                        <li><i class="fa fa-comment-o"></i><span>10</span></li>
-                                                    </ul>
-                                                </div>
-                                            </div>
-                                            <!-- post end-->                                   
-                                            <!-- post -->
-                                            <div class="post fl-wrap fw-post">
-                                                <h2><span>Blog post title</span></h2>
-                                                <ul class="blog-title-opt">
-                                                    <li><a href="#">12 may 2017</a></li>
-                                                    <li> - </li>
-                                                    <li><a href="#">Interviews </a></li>
-                                                    <li><a href="#">Design</a></li>
-                                                </ul>
-                                                <!-- blog media -->
-                                                <div class="blog-media fl-wrap">
-                                                    <div class="iframe-holder">
-                                                        <div class="resp-video">
-                                                            <iframe src="https://player.vimeo.com/video/24506451" width="640" height="360" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <!-- blog media end -->
-                                                <div class="blog-text fl-wrap">
-                                                    <div class="pr-tags fl-wrap">
-                                                        <span>Tags : </span>
-                                                        <ul>
-                                                            <li><a href="#">Architecture</a></li>
-                                                            <li><a href="#">Design</a></li>
-                                                            <li><a href="#">Photography</a></li>
-                                                            <li><a href="#">House</a></li>
-                                                        </ul>
-                                                    </div>
-                                                    <h3><a   href="blog-single.html" >Aliquip pertinax <strong>vix ad </strong></a></h3>
-                                                    <p>
-                                                        Vestibulum orci felis, ullamcorper non condimentum non, ultrices ac nunc. Mauris non ligula suscipit, vulputate mi accumsan, dapibus felis. Nullam sed sapien dui. Nulla auctor sit amet sem non porta. Praesent eu massa vel diam laoreet elementum ac sed felis. Donec suscipit ultricies risus sed mollis. Donec volutpat porta risus posuere imperdiet. Sed viverra dolor sed dolor placerat ornare ut . Integer iaculis tellus nulla, quis imperdiet magna venenatis vitae..
-                                                    </p>
-                                                    <a href="blog-single.html" class="btn float-btn flat-btn">Read more </a>
-                                                    <ul class="post-counter">
-                                                        <li><i class="fa fa-eye"></i><span>687</span></li>
-                                                        <li><i class="fa fa-comment-o"></i><span>10</span></li>
-                                                    </ul>
-                                                </div>
-                                            </div>
-                                            <!-- post end-->                                      
-                                            <!-- post -->
-                                            <div class="post fl-wrap fw-post">
-                                                <h2><span>Blog post title</span></h2>
-                                                <ul class="blog-title-opt">
-                                                    <li><a href="#">12 may 2017</a></li>
-                                                    <li> - </li>
-                                                    <li><a href="#">Interviews </a></li>
-                                                    <li><a href="#">Design</a></li>
-                                                </ul>
-                                                <!-- blog media -->
-                                                <div class="blog-media fl-wrap">
-                                                    <a   href="blog-single.html" ><img src="images/folio/1.jpg" class="respimg" alt=""></a>
-                                                </div>
-                                                <!-- blog media end -->
-                                                <div class="blog-text fl-wrap">
-                                                    <div class="pr-tags fl-wrap">
-                                                        <span>Tags : </span>
-                                                        <ul>
-                                                            <li><a href="#">Architecture</a></li>
-                                                            <li><a href="#">Design</a></li>
-                                                            <li><a href="#">Photography</a></li>
-                                                            <li><a href="#">House</a></li>
-                                                        </ul>
-                                                    </div>
-                                                    <h3><a   href="blog-single.html" >Aliquip pertinax <strong>vix ad </strong></a></h3>
-                                                    <p>
-                                                        Vestibulum orci felis, ullamcorper non condimentum non, ultrices ac nunc. Mauris non ligula suscipit, vulputate mi accumsan, dapibus felis. Nullam sed sapien dui. Nulla auctor sit amet sem non porta. Praesent eu massa vel diam laoreet elementum ac sed felis. Donec suscipit ultricies risus sed mollis. Donec volutpat porta risus posuere imperdiet. Sed viverra dolor sed dolor placerat ornare ut . Integer iaculis tellus nulla, quis imperdiet magna venenatis vitae..
-                                                    </p>
-                                                    <a href="blog-single.html" class="btn float-btn flat-btn">Read more </a>
-                                                    <ul class="post-counter">
-                                                        <li><i class="fa fa-eye"></i><span>687</span></li>
-                                                        <li><i class="fa fa-comment-o"></i><span>10</span></li>
-                                                    </ul>
-                                                </div>
-                                            </div>
-                                            <!-- post end-->    
-                                        </div>
-                                    </div>
-                                    <!-- blog-sidebar  -->
-                                    <div class="col-md-4">
-                                        <div class="blog-sidebar fl-wrap fixed-bar">
-                                            <!-- widget-wrap -->
-                                            <div class="widget-wrap fl-wrap">
-                                                <h4 class="widget-title"><span>01.</span> Search</h4>
-                                                <div class="widget-container fl-wrap">
-                                                    <div class="searh-holder">
-                                                        <form action="#" class="searh-inner fl-wrap">
-                                                            <input name="se" id="se" type="text" class="search" placeholder="Search.." value="Search..." />
-                                                            <button class="search-submit" id="submit_btn"><i class="fa fa-search transition"></i> </button>
-                                                        </form>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <!-- widget-wrap end  -->
-                                            <!-- widget-wrap -->
-                                            <div class="widget-wrap fl-wrap">
-                                                <h4 class="widget-title"><span>02.</span> About Author</h4>
-                                                <div class="widget-container fl-wrap">
-                                                    <div class="about-widget fl-wrap">
-                                                        <img src="images/team/1.jpg" alt="">
-                                                        <p>Etiam in nulla arcu, ut vehicula velit. Vivamus dapibus rutrum mi ut aliquam. In hac habitasse platea dictumst. Integer sagittis neque a tortor tempor in porta sem vulputate.</p>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <!-- widget-wrap end  -->   
-                                            <!-- widget-wrap -->
-                                            <div class="widget-wrap fl-wrap">
-                                                <h4 class="widget-title"><span>03.</span> Last Posts</h4>
-                                                <div class="widget-container fl-wrap">
-                                                    <div class="widget-posts fl-wrap">
-                                                        <ul>
-                                                            <li class="clearfix">
-                                                                <a href="#"  class="widget-posts-img"><img src="images/folio/1.jpg" class="respimg" alt=""></a>
-                                                                <div class="widget-posts-descr">
-                                                                    <a href="#" title="">Vivamus dapibus rutrum</a>
-                                                                    <span class="widget-posts-date"> 21 Mar 09.05 </span> 
-                                                                </div>
-                                                            </li>
-                                                            <li class="clearfix">
-                                                                <a href="#"  class="widget-posts-img"><img src="images/folio/1.jpg" class="respimg" alt=""></a>
-                                                                <div class="widget-posts-descr">
-                                                                    <a href="#" title=""> In hac habitasse platea</a>
-                                                                    <span class="widget-posts-date"> 7 Mar 18.21 </span> 
-                                                                </div>
-                                                            </li>
-                                                            <li class="clearfix">
-                                                                <a href="#"  class="widget-posts-img"><img src="images/folio/1.jpg" class="respimg" alt=""></a>
-                                                                <div class="widget-posts-descr">
-                                                                    <a href="#" title="">Tortor tempor in porta</a>
-                                                                    <span class="widget-posts-date"> 7 Mar 16.42 </span>
-                                                                </div>
-                                                            </li>
-                                                            <li class="clearfix">
-                                                                <a href="#"  class="widget-posts-img"><img src="images/folio/1.jpg" class="respimg" alt=""></a>
-                                                                <div class="widget-posts-descr">
-                                                                    <a href="#" title="">Praesent aliquet tortor</a>
-                                                                    <span class="widget-posts-date"> 2 Mar 14.42 </span>
-                                                                </div>
-                                                            </li>
-                                                        </ul>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <!-- widget-wrap end  --> 
-                                            <!-- widget-wrap -->
-                                            <div class="widget-wrap fl-wrap">
-                                                <h4 class="widget-title"><span>04.</span> Tags</h4>
-                                                <div class="widget-container fl-wrap">
-                                                    <ul class="tagcloud">
-                                                        <li><a href='#' class="transition link">Portfolio</a></li>
-                                                        <li><a href='#' class="transition link">Tag</a></li>
-                                                        <li><a href='#' class="transition link">Demo</a></li>
-                                                        <li><a href='#' class="transition link">Blog</a></li>
-                                                        <li><a href='#' class="transition link">Photography</a></li>
-                                                        <li><a href='#' class="transition link">Web desighn</a></li>
-                                                    </ul>
-                                                </div>
-                                            </div>
-                                            <!-- widget-wrap end  -->                                                 
-                                            <!-- widget-wrap -->
-                                            <div class="widget-wrap fl-wrap">
-                                                <h4 class="widget-title"><span>05.</span>Our Instagram</h4>
-                                                <div class="widget-container fl-wrap">
-                                                    <div class='jr-insta-thumb'>
-                                                        <ul>
-                                                            <li>
-                                                                <a href="#"><img src="images/instagram/1.jpg" alt=""></a>
-                                                            </li>
-                                                            <li>
-                                                                <a href="#"><img src="images/instagram/1.jpg" alt=""></a>
-                                                            </li>
-                                                            <li>
-                                                                <a href="#"><img src="images/instagram/1.jpg" alt=""></a>
-                                                            </li>
-                                                            <li>
-                                                                <a href="#"><img src="images/instagram/1.jpg" alt=""></a>
-                                                            </li>
-                                                            <li>
-                                                                <a href="#"><img src="images/instagram/1.jpg" alt=""></a>
-                                                            </li>
-                                                            <li>
-                                                                <a href="#"><img src="images/instagram/1.jpg" alt=""></a>
-                                                            </li>
-                                                        </ul>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <!-- widget-wrap end  -->                                            
-                                            <!-- widget-wrap -->
-                                            <div class="widget-wrap fl-wrap">
-                                                <h4 class="widget-title"><span>06.</span> Categories</h4>
-                                                <div class="widget-container fl-wrap">
-                                                    <ul class="cat-item">
-                                                        <li><a href="#">Standard</a> <span>(3)</span></li>
-                                                        <li><a href="#">Video</a> <span>(6) </span></li>
-                                                        <li><a href="#">Gallery</a> <span>(12) </span></li>
-                                                        <li><a href="#">Quotes</a> <span>(4)</span></li>
-                                                    </ul>
-                                                </div>
-                                            </div>
-                                            <!-- widget-wrap end  -->                                                                                                                                          
-                                        </div>
-                                    </div>
-                                    <!-- blog-sidebar end -->
-                                    <div class="limit-box fl-wrap"></div>
-                                </div>
-                                <div class="content-nav blog-nav">
-                                    <ul>
-                                        <li><a href="blog.html" class="ln"><i class="fa fa fa-angle-left"></i><span class="tooltip">Prev - Page 1</span></a></li>
-                                        <li>
-                                            <a href="#" class="cur-page"><span>Page 02. </span></a>
-                                        </li>
-                                        <li><a href="blog.html" class="rn"><i class="fa fa fa-angle-right"></i><span class="tooltip">Next - Page 3 </span></a></li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </section>
-                        <!--  section end--> 
-                    </div>
-                    <!-- content end -->	
-                    <?php include 'include/footer.php';?>  
-    </body>
-</html>
\ No newline at end of file
diff --git a/application/views/contact.php b/application/views/contact.php
deleted file mode 100644
index 2b56423..0000000
--- a/application/views/contact.php
+++ /dev/null
@@ -1,109 +0,0 @@
-  <?php include 'include/header.php';?> 
-            <!--=============== wrapper ===============-->
-            <div id="wrapper">
-                <!-- content-holder  -->
-                <div class="content-holder">
-                    <!--  content --> 
-                    <div class="content">
-                        <!--  section  --> 
-                        <section class="parallax-section header-section" data-scrollax-parent="true">
-                            <div class="bg"  data-bg="images/bg/1.jpg" data-scrollax="properties: { translateY: '200px' }"></div>
-                            <div class="overlay"></div>
-                            <div class="container big-container">
-                                <div class="section-title">
-                                    <h3>Contact Details</h3>
-                                    <div class="separator trsp-separator"></div>
-                                    <h2>Get In Touch <br> with us</h2>
-                                    <p>Curabitur bibendum mi sed rhoncus aliquet. Nulla blandit porttitor justo, at posuere sem accumsan nec.</p>
-                                    <a href="#sec1" class="custom-scroll-link sect-scroll-link"><i class="fa fa-long-arrow-down"></i> <span>scroll down</span></a>
-                                </div>
-                            </div>
-                        </section>
-                        <!--  section  end--> 
-                        <!--  section  --> 
-                        <section >
-                            <div class="container">
-                                <div class="contact-details-wrap fl-wrap" id="sec1">
-                                    <div class="row">
-                                        <div class="col-md-3">
-                                            <div class="small-sec-title">
-                                                <h3>Contact details :</h3>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-9">
-                                            <div class="contact-details fl-wrap">
-                                                <div class="row border-dec">
-                                                    <div class="col-md-6">
-                                                        <h4><span>01.</span>Office in New York</h4>
-                                                        <ul>
-                                                            <li><span>Mail :</span><a href="#" target="_blank">yourmail@domain.com</a></li>
-                                                            <li><span>Adress :</span><a href="#" target="_blank">USA 27TH Brooklyn NY</a></li>
-                                                            <li><span>Phone :</span><a href="#">+7(111)123456789</a></li>
-                                                        </ul>
-                                                    </div>
-                                                    <div class="col-md-6">
-                                                        <h4><span>02.</span>Work Hours</h4>
-                                                        <ul>
-                                                            <li><span>Monday - Friday : </span> 08h.00 - 17h.30</li>
-                                                            <li><span>Saturday: </span> 08h.00 - 12h.00 </li>
-                                                            <li><span>Sunday :</span> Off work </li>
-                                                        </ul>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="map-box">
-                                    <div  id="map-canvas"></div>
-                                </div>
-                                <div class="contact-details-wrap fl-wrap">
-                                    <div class="row">
-                                        <div class="col-md-3">
-                                            <div class="small-sec-title">
-                                                <h3>Get in Touch  : </h3>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-9">
-                                            <!-- contact form -->
-                                            <div class="contact-form-holder fl-wrap">
-                                                <div id="contact-form">
-                                                    <div id="message"></div>
-                                                    <form method="post" action="php/contact.php" name="contactform" id="contactform">
-                                                        <input name="name" type="text" id="name"  onClick="this.select()" value="Name" >
-                                                        <input name="email" type="text" id="email" onClick="this.select()" value="E-mail" >            
-												        <input type="text"  name="phone" id="phone" onClick="this.select()" value="Phone" /> 
-                                                        <textarea name="comments"  id="comments" onClick="this.select()" >Message</textarea>
-                                                        <div class="verify-wrap">
-                                                            <span class="verify-text"> How many gnomes were in the story about the "Snow-white" ?</span> 
-                                                            <input name="verify" type="text" id="verify" onClick="this.select()" value="0" >
-                                                        </div> 
-                                                        <button type="submit"  id="submit"  data-top-bottom="transform: translateY(-50px);" data-bottom-top="transform: translateY(50px);"><span>Send Message </span></button>          										           											
-                                                    </form>
-                                                </div>
-                                            </div>
-                                            <!-- contact form  end--> 
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <!--  partcile-dec  -->                    
-                            <div class="partcile-dec" data-parcount="200"></div>
-                            <!--  partcile-dec  end--> 
-                        </section>
-                        <!--  section  end--> 	
-                        <!--  social-wrap  --> 			  
-                        <div class="social-wrap fl-wrap">
-                            <ul>
-                                <li><a href="#" target="_blank" ><i class="fa fa-facebook"></i></a></li>
-                                <li><a href="#" target="_blank"><i class="fa fa-twitter"></i></a></li>
-                                <li><a href="#" target="_blank" ><i class="fa fa-instagram"></i></a></li>
-                                <li><a href="#" target="_blank" ><i class="fa fa-pinterest"></i></a></li>
-                                <li><a href="#" target="_blank" ><i class="fa fa-tumblr"></i></a></li>
-                            </ul>
-                        </div>
-                        <!--  social-wrap  end--> 	
-                    </div>
-                   <?php include 'include/footer.php';?>  
-    </body>
-</html>
\ No newline at end of file
diff --git a/application/views/errors/cli/error_404.php b/application/views/errors/cli/error_404.php
new file mode 100644
index 0000000..6984b61
--- /dev/null
+++ b/application/views/errors/cli/error_404.php
@@ -0,0 +1,8 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+echo "\nERROR: ",
+	$heading,
+	"\n\n",
+	$message,
+	"\n\n";
\ No newline at end of file
diff --git a/application/views/errors/cli/error_db.php b/application/views/errors/cli/error_db.php
new file mode 100644
index 0000000..2ff43ff
--- /dev/null
+++ b/application/views/errors/cli/error_db.php
@@ -0,0 +1,8 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+echo "\nDatabase error: ",
+	$heading,
+	"\n\n",
+	$message,
+	"\n\n";
\ No newline at end of file
diff --git a/application/views/errors/cli/error_exception.php b/application/views/errors/cli/error_exception.php
new file mode 100644
index 0000000..efa6a66
--- /dev/null
+++ b/application/views/errors/cli/error_exception.php
@@ -0,0 +1,21 @@
+<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
+
+An uncaught Exception was encountered
+
+Type:        <?php echo get_class($exception), "\n"; ?>
+Message:     <?php echo $message, "\n"; ?>
+Filename:    <?php echo $exception->getFile(), "\n"; ?>
+Line Number: <?php echo $exception->getLine(); ?>
+
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+
+Backtrace:
+<?php	foreach ($exception->getTrace() as $error): ?>
+<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+	File: <?php echo $error['file'], "\n"; ?>
+	Line: <?php echo $error['line'], "\n"; ?>
+	Function: <?php echo $error['function'], "\n\n"; ?>
+<?php		endif ?>
+<?php	endforeach ?>
+
+<?php endif ?>
diff --git a/application/views/errors/cli/error_general.php b/application/views/errors/cli/error_general.php
new file mode 100644
index 0000000..6984b61
--- /dev/null
+++ b/application/views/errors/cli/error_general.php
@@ -0,0 +1,8 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+echo "\nERROR: ",
+	$heading,
+	"\n\n",
+	$message,
+	"\n\n";
\ No newline at end of file
diff --git a/application/views/errors/cli/error_php.php b/application/views/errors/cli/error_php.php
new file mode 100644
index 0000000..8a24b64
--- /dev/null
+++ b/application/views/errors/cli/error_php.php
@@ -0,0 +1,21 @@
+<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
+
+A PHP Error was encountered
+
+Severity:    <?php echo $severity, "\n"; ?>
+Message:     <?php echo $message, "\n"; ?>
+Filename:    <?php echo $filepath, "\n"; ?>
+Line Number: <?php echo $line; ?>
+
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+
+Backtrace:
+<?php	foreach (debug_backtrace() as $error): ?>
+<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+	File: <?php echo $error['file'], "\n"; ?>
+	Line: <?php echo $error['line'], "\n"; ?>
+	Function: <?php echo $error['function'], "\n\n"; ?>
+<?php		endif ?>
+<?php	endforeach ?>
+
+<?php endif ?>
diff --git a/application/views/errors/cli/index.html b/application/views/errors/cli/index.html
new file mode 100644
index 0000000..b702fbc
--- /dev/null
+++ b/application/views/errors/cli/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/views/errors/html/error_404.php b/application/views/errors/html/error_404.php
new file mode 100644
index 0000000..756ea9d
--- /dev/null
+++ b/application/views/errors/html/error_404.php
@@ -0,0 +1,64 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+?><!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>404 Page Not Found</title>
+<style type="text/css">
+
+::selection { background-color: #E13300; color: white; }
+::-moz-selection { background-color: #E13300; color: white; }
+
+body {
+	background-color: #fff;
+	margin: 40px;
+	font: 13px/20px normal Helvetica, Arial, sans-serif;
+	color: #4F5155;
+}
+
+a {
+	color: #003399;
+	background-color: transparent;
+	font-weight: normal;
+}
+
+h1 {
+	color: #444;
+	background-color: transparent;
+	border-bottom: 1px solid #D0D0D0;
+	font-size: 19px;
+	font-weight: normal;
+	margin: 0 0 14px 0;
+	padding: 14px 15px 10px 15px;
+}
+
+code {
+	font-family: Consolas, Monaco, Courier New, Courier, monospace;
+	font-size: 12px;
+	background-color: #f9f9f9;
+	border: 1px solid #D0D0D0;
+	color: #002166;
+	display: block;
+	margin: 14px 0 14px 0;
+	padding: 12px 10px 12px 10px;
+}
+
+#container {
+	margin: 10px;
+	border: 1px solid #D0D0D0;
+	box-shadow: 0 0 8px #D0D0D0;
+}
+
+p {
+	margin: 12px 15px 12px 15px;
+}
+</style>
+</head>
+<body>
+	<div id="container">
+		<h1><?php echo $heading; ?></h1>
+		<?php echo $message; ?>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/application/views/errors/html/error_db.php b/application/views/errors/html/error_db.php
new file mode 100644
index 0000000..f5a43f6
--- /dev/null
+++ b/application/views/errors/html/error_db.php
@@ -0,0 +1,64 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+?><!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>Database Error</title>
+<style type="text/css">
+
+::selection { background-color: #E13300; color: white; }
+::-moz-selection { background-color: #E13300; color: white; }
+
+body {
+	background-color: #fff;
+	margin: 40px;
+	font: 13px/20px normal Helvetica, Arial, sans-serif;
+	color: #4F5155;
+}
+
+a {
+	color: #003399;
+	background-color: transparent;
+	font-weight: normal;
+}
+
+h1 {
+	color: #444;
+	background-color: transparent;
+	border-bottom: 1px solid #D0D0D0;
+	font-size: 19px;
+	font-weight: normal;
+	margin: 0 0 14px 0;
+	padding: 14px 15px 10px 15px;
+}
+
+code {
+	font-family: Consolas, Monaco, Courier New, Courier, monospace;
+	font-size: 12px;
+	background-color: #f9f9f9;
+	border: 1px solid #D0D0D0;
+	color: #002166;
+	display: block;
+	margin: 14px 0 14px 0;
+	padding: 12px 10px 12px 10px;
+}
+
+#container {
+	margin: 10px;
+	border: 1px solid #D0D0D0;
+	box-shadow: 0 0 8px #D0D0D0;
+}
+
+p {
+	margin: 12px 15px 12px 15px;
+}
+</style>
+</head>
+<body>
+	<div id="container">
+		<h1><?php echo $heading; ?></h1>
+		<?php echo $message; ?>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/application/views/errors/html/error_exception.php b/application/views/errors/html/error_exception.php
new file mode 100644
index 0000000..8784886
--- /dev/null
+++ b/application/views/errors/html/error_exception.php
@@ -0,0 +1,32 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+?>
+
+<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>An uncaught Exception was encountered</h4>
+
+<p>Type: <?php echo get_class($exception); ?></p>
+<p>Message: <?php echo $message; ?></p>
+<p>Filename: <?php echo $exception->getFile(); ?></p>
+<p>Line Number: <?php echo $exception->getLine(); ?></p>
+
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+
+	<p>Backtrace:</p>
+	<?php foreach ($exception->getTrace() as $error): ?>
+
+		<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+
+			<p style="margin-left:10px">
+			File: <?php echo $error['file']; ?><br />
+			Line: <?php echo $error['line']; ?><br />
+			Function: <?php echo $error['function']; ?>
+			</p>
+		<?php endif ?>
+
+	<?php endforeach ?>
+
+<?php endif ?>
+
+</div>
\ No newline at end of file
diff --git a/application/views/errors/html/error_general.php b/application/views/errors/html/error_general.php
new file mode 100644
index 0000000..fc3b2eb
--- /dev/null
+++ b/application/views/errors/html/error_general.php
@@ -0,0 +1,64 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+?><!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>Error</title>
+<style type="text/css">
+
+::selection { background-color: #E13300; color: white; }
+::-moz-selection { background-color: #E13300; color: white; }
+
+body {
+	background-color: #fff;
+	margin: 40px;
+	font: 13px/20px normal Helvetica, Arial, sans-serif;
+	color: #4F5155;
+}
+
+a {
+	color: #003399;
+	background-color: transparent;
+	font-weight: normal;
+}
+
+h1 {
+	color: #444;
+	background-color: transparent;
+	border-bottom: 1px solid #D0D0D0;
+	font-size: 19px;
+	font-weight: normal;
+	margin: 0 0 14px 0;
+	padding: 14px 15px 10px 15px;
+}
+
+code {
+	font-family: Consolas, Monaco, Courier New, Courier, monospace;
+	font-size: 12px;
+	background-color: #f9f9f9;
+	border: 1px solid #D0D0D0;
+	color: #002166;
+	display: block;
+	margin: 14px 0 14px 0;
+	padding: 12px 10px 12px 10px;
+}
+
+#container {
+	margin: 10px;
+	border: 1px solid #D0D0D0;
+	box-shadow: 0 0 8px #D0D0D0;
+}
+
+p {
+	margin: 12px 15px 12px 15px;
+}
+</style>
+</head>
+<body>
+	<div id="container">
+		<h1><?php echo $heading; ?></h1>
+		<?php echo $message; ?>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/application/views/errors/html/error_php.php b/application/views/errors/html/error_php.php
new file mode 100644
index 0000000..b146f9c
--- /dev/null
+++ b/application/views/errors/html/error_php.php
@@ -0,0 +1,33 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+?>
+
+<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: <?php echo $severity; ?></p>
+<p>Message:  <?php echo $message; ?></p>
+<p>Filename: <?php echo $filepath; ?></p>
+<p>Line Number: <?php echo $line; ?></p>
+
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+
+	<p>Backtrace:</p>
+	<?php foreach (debug_backtrace() as $error): ?>
+
+		<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+
+			<p style="margin-left:10px">
+			File: <?php echo $error['file'] ?><br />
+			Line: <?php echo $error['line'] ?><br />
+			Function: <?php echo $error['function'] ?>
+			</p>
+
+		<?php endif ?>
+
+	<?php endforeach ?>
+
+<?php endif ?>
+
+</div>
\ No newline at end of file
diff --git a/application/views/errors/html/index.html b/application/views/errors/html/index.html
new file mode 100644
index 0000000..b702fbc
--- /dev/null
+++ b/application/views/errors/html/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/views/errors/index.html b/application/views/errors/index.html
new file mode 100644
index 0000000..b702fbc
--- /dev/null
+++ b/application/views/errors/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/views/include/footer.php b/application/views/include/footer.php
index 71914d9..fb01d6f 100644
--- a/application/views/include/footer.php
+++ b/application/views/include/footer.php
@@ -1,65 +1,5 @@
- <!--=============== content-footer   ===============-->
-                    <div class="height-emulator"></div>
-                    <footer class="content-footer">
-                        <div class="footer-inner">
-                            <div class="row">
-                                <div class="col-md-3">
-                                    <a class="footer-logo" href="index.html"><img src="images/logo.png" alt=""></a>
-                                </div>
-                                <div class="col-md-4">
-                                    <div class="footer-header fl-wrap"><span>01.</span> Contacts</div>
-                                    <div class="footer-box fl-wrap">
-                                        <ul>
-                                            <li><span>Mail :</span><a href="#" target="_blank">yourmail@domain.com</a></li>
-                                            <li> <span>Adress :</span><a href="#" target="_blank">USA 27TH Brooklyn NY</a></li>
-                                            <li><span>Phone :</span><a href="#">+7(111)123456789</a></li>
-                                        </ul>
-                                    </div>
-                                </div>
-                                <div class="col-md-5">
-                                    <div class="footer-header fl-wrap"><span>02.</span> Subscribe</div>
-                                    <div class="footer-box fl-wrap">
-                                        <div class="subcribe-form fl-wrap">
-                                            <span>Newsletter</span>
-                                            <form id="subscribe">
-                                                <input class="enteremail" name="email" id="subscribe-email" placeholder="email" spellcheck="false" type="text">
-                                                <button type="submit" id="subscribe-button" class="subscribe-button">Submit</button>
-                                                <label for="subscribe-email" class="subscribe-message"></label>
-                                            </form>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-md-3"></div>
-                                <div class="col-md-9">
-                                    <div class="fl-wrap policy-box">
-                                        <p> &#169; Balkon   2017.  All rights reserved.  </p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="to-top"><i class="fa fa-long-arrow-up"></i></div>
-                        </div>
-                    </footer>
-                    <!-- content-footer end    -->
-                </div>
-                <!-- content-holder end -->
-            </div>
-            <!-- wrapper end -->
-            <!--search-form-holder -->  
-            <div class="search-form-holder fixed-search">
-                <div class="search-form-bg"></div>
-                <div class="search-form-wrap">
-                    <div class="container">
-                        <form class="searchform" method="get"  >
-                            <input type="text" autocomplete="off"   name="s" placeholder="Type and Enter to Search">
-                        </form>
-                        <div class="close-fixed-search"></div>
-                    </div>
-                    <div class="dublicated-text"></div>
-                </div>
-            </div>
-            <!--search-form-holder  end-->  
+ <!-- wrapper end -->
+            
             <!-- Share container  -->
             <div class="share-wrapper isShare">
                 <div class="share-container"></div>
@@ -67,61 +7,14 @@
             <!-- Share container  end-->
             <!-- footer -->
             <footer class="main-footer">
-                <div class="fixed-title"><span>About Me</span></div>
-                 <div class="row">
-                                    <div class="col-md-4">
-                                        <div class="pr-title">
-                                            Our Skills
-                                            <span>Lorem Ipsum generators on the Internet tend to repeat king this the first true generator  </span>
-                                        </div>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <!-- skills  -->
-                                        <div class="piechart-holder animaper" data-skcolor="#000">
-                                            <div class="row">
-                                                <!-- 1  -->
-                                                <div class="piechart col-md-4" >
-                                                    <span class="chart" data-percent="85">
-                                                    <span class="percent"></span>
-                                                    </span>
-                                                    <div class="clearfix"></div>
-                                                    <div class="skills-description">
-                                                        <h4>Design</h4>
-                                                    </div>
-                                                </div>
-                                                <!-- 1 end -->
-                                                <!-- 2  -->
-                                                <div class="piechart col-md-4">
-                                                    <span class="chart" data-percent="95">
-                                                    <span class="percent"></span>
-                                                    </span>
-                                                    <div class="clearfix"></div>
-                                                    <div class="skills-description">
-                                                        <h4>Architecture</h4>
-                                                    </div>
-                                                </div>
-                                                <!-- 2 end  -->
-                                                <!-- 3  -->
-                                                <div class="piechart col-md-4">
-                                                    <span class="chart" data-percent="80">
-                                                    <span class="percent"></span>
-                                                    </span>
-                                                    <div class="clearfix"></div>
-                                                    <div class="skills-description">
-                                                        <h4>Construction</h4>
-                                                    </div>
-                                                </div>
-                                                <!-- 3  end-->																
-                                            </div>
-                                        </div>
-                                        <!-- skills  end-->
-                                    </div>
-                                </div>
+                <div class="fixed-title"><span>Welcome to McGANS</span></div>
+                <div class="footer-social">
+                    <ul>
+                        <li><a href="#" target="_blank" ><i class="fa fa-facebook"></i></a></li>
+                        <li><a href="#" target="_blank"><i class="fa fa-twitter"></i></a></li>
+                        <li><a href="#" target="_blank" ><i class="fa fa-instagram"></i></a></li>
+                        
+                    </ul>
+                </div>
             </footer>
-            <!-- footer end-->
-        </div>
-        <!-- Main end -->
-        <!--=============== scripts  ===============-->        
-        <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>
\ No newline at end of file
+            <!-- footer end-->
\ No newline at end of file
diff --git a/application/views/include/header.php b/application/views/include/header.php
index e6d0efa..6e255ae 100644
--- a/application/views/include/header.php
+++ b/application/views/include/header.php
@@ -16,7 +16,7 @@
         <link type="text/css" rel="stylesheet" href="<?=base_url();?>css/yourstyle.css">
 		<link type="text/css" rel="stylesheet" href="<?=base_url();?>css/shop.css">
         <!--=============== favicons ===============-->
-        <link rel="shortcut icon" href="images/icon.jpg">
+        <link rel="shortcut icon" href="<?=base_url();?>images/icon.jpg">
     </head>
     <body>
         <!-- loader -->
@@ -33,7 +33,7 @@
             <!--================= header ================-->
             <header class="main-header">
                 <!-- logo -->
-                <a class="logo-holder" href="index.html"><img src="images/hlogo.png" alt=""></a>
+                <a class="logo-holder" href="<?=base_url();?>"><img src="<?=base_url();?>images/hlogo.png" alt=""></a>
                 <!-- logo end -->  
                 <!--  navigation --> 
 				<div class="sb-menu-button-wrap">
@@ -42,18 +42,38 @@
                 <div class="nav-holder">
                     <nav>
                         <ul>
-<li>
-                                <a href="about.html"  >Semester Code</a>
+							<li>
+								<?php
+								if(isset($lastId)&& $lastId->num_rows()>0)
+								{
+									$view=$lastId->row();
+									
+									$id=$view->id;
+									$name=$view->name;
+									$year=$view->year;
+								}
+								
+								?>	
+                                <a href="#"  ><?=$name.'-'.$year;?></a>
                                 <!--second level end-->
-                                <ul>
-								<li><a href="about-personal.html">S001</a></li>
-								<li><a href="about-personal.html">S002</a></li>
-								<li><a href="about-personal.html">S003</a></li>
-								<li><a href="about-personal.html">S004</a></li>
+                               <ul>
+								<?php
+								   if(isset($semester) && $semester->num_rows()>0)
+								   {
+									   foreach($semester->result() as $list)
+									   {
+										   $id=$list->id;
+										   $name=$list->name;
+										   $year=$list->year;
+										   
+										   ?>  <li id="<?=$id;?>"><a href="about-personal.html"><?=$name." - ".$year?></a></li><?php
+									   }
+								   }
+								?>
                                 </ul>
                                 <!--second level end-->
                             </li>				
-							<li>
+							<li id="showDepartment">
                                 <a href="about.html"  >Department</a>
                                 <!--second level end-->
                                 <ul>
@@ -82,15 +102,15 @@
             <!-- header  end -->
             <div class="sidebar-menu fl-wrap">
                 <div class="hid-men-wrap">
-                    <a class="sb-logo" href="index.html"><img src="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   class="scroll-init menusb">
                         <ul class="menu">
                             <li>
-                                <a href="#sec1" class="act-scrlink">ABOUT</a>
+                                <a href="#" class="act-scrlink">ABOUT</a>
                             </li>
 						 <li>
-                                <a href="#sec1" class="act-scrlink">CONTACT</a>
+                                <a href="#" class="act-scrlink">CONTACT</a>
                             </li>
                         </ul>
                     </div>
diff --git a/application/views/include/zheader.php b/application/views/include/zheader.php
new file mode 100644
index 0000000..2e13c02
--- /dev/null
+++ b/application/views/include/zheader.php
@@ -0,0 +1,110 @@
+
+<!DOCTYPE HTML>
+<html lang="en">
+    <head>
+        <!--=============== basic  ===============-->
+        <meta charset="UTF-8">
+        <title>Mcgans</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+        <meta name="robots" content="index, follow"/>
+        <meta name="keywords" content=""/>
+        <meta name="description" content=""/>
+        <!--=============== css  ===============-->	
+        <link type="text/css" rel="stylesheet" href="<?=base_url();?>css/reset.css">
+        <link type="text/css" rel="stylesheet" href="<?=base_url();?>css/plugins.css">
+        <link type="text/css" rel="stylesheet" href="<?=base_url();?>css/style.css">
+        <link type="text/css" rel="stylesheet" href="<?=base_url();?>css/yourstyle.css">
+		<link type="text/css" rel="stylesheet" href="<?=base_url();?>css/shop.css">
+        <!--=============== favicons ===============-->
+        <link rel="shortcut icon" href="images/icon.jpg">
+    </head>
+    <body>
+        <!-- loader -->
+        <div class="loader">
+            <div id="movingBallG">
+                <div class="movingBallLineG"></div>
+                <div id="movingBallG_1" class="movingBallG"></div>
+            </div>
+        </div>
+        <!-- loader end -->
+        <!--================= Main   ================-->
+        <div id="main">
+            <!--================= wrapper ================-->
+            <!--================= header ================-->
+            <header class="main-header">
+                <!-- logo -->
+                <a class="logo-holder" href="index.html"><img src="images/hlogo.png" alt=""></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">
+                    <nav>
+                        <ul>
+<li>
+                                <a href="about.html"  >Semester Code</a>
+                                <!--second level end-->
+                               <ul>
+								<?php
+								   if(isset($semester) && $semester->num_rows()>0)
+								   {
+									   foreach($semester->result() as $list)
+									   {
+										   $id=$list->id;
+										   $name=$list->name;
+										   $year=$list->year;
+										   
+										   ?>  <li><a href="about-personal.html"><?=$year." - ".$name?></a></li><?php
+									   }
+								   }
+								?>
+                                </ul>
+                                <!--second level end-->
+                            </li>				
+							<li>
+                                <a href="about.html"  >Department</a>
+                                <!--second level end-->
+                                <ul>
+								<?php
+								   if(isset($dep) && $dep->num_rows()>0)
+								   {
+									   foreach($dep->result() as $deparment)
+									   {
+										   ?>  <li><a href="about-personal.html"><?=$deparment->code?></a></li><?php
+									   }
+								   }
+								?>
+                                </ul>
+                                <!--second level end-->
+                            </li>
+                           
+                            <li></li>
+                        </ul>
+                    </nav>
+                </div>
+				
+                <!-- navigation  end -->
+                <!-- search button end --> 
+               
+            </header>
+            <!-- header  end -->
+            <div class="sidebar-menu fl-wrap">
+                <div class="hid-men-wrap">
+                    <a class="sb-logo" href="index.html"><img src="images/hlogo.png" alt=""></a>
+                    <div class="clearfix"></div>
+                    <div   class="scroll-init menusb">
+                        <ul class="menu">
+                            <li>
+                                <a href="#sec1" class="act-scrlink">ABOUT</a>
+                            </li>
+						 <li>
+                                <a href="#sec1" class="act-scrlink">CONTACT</a>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="fl-wrap sb-menu-footer">
+                        &#169; Mcgan's   <?=$year = date("Y");?>.  All rights reserved.   
+                    </div>
+                </div>
+            </div>
\ No newline at end of file
diff --git a/application/views/index.php b/application/views/index.php
index 064c859..01747b0 100644
--- a/application/views/index.php
+++ b/application/views/index.php
@@ -23,15 +23,25 @@
 										   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/<?=$deparment->id?>">
+										<a href="<?=base_url();?>subject-list/<?=$id?>">
                                              <div class="box-item" style="margin-bottom:15px;">
-												<img  src="https://ui-avatars.com/api/?name=<?=$deparment->code?>?background=random&color=random"  class="respimg" alt="">
+												<?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"><?=$deparment->name?></h1>
+											<h1 style="font-size:20px;padding-top:5px"><?=$name?></h1>
                                         </div>
 										</a>
 										<?php
@@ -52,40 +62,9 @@
                 </div>
                 <!-- content-holder end -->
             </div>
-            <!-- wrapper end -->
-            <!--search-form-holder -->  
-            <div class="search-form-holder fixed-search">
-                <div class="search-form-bg"></div>
-                <div class="search-form-wrap">
-                    <div class="container">
-                        <form class="searchform" method="get"  >
-                            <input type="text" autocomplete="off"   name="s" placeholder="Type and Enter to Search">
-                        </form>
-                        <div class="close-fixed-search"></div>
-                    </div>
-                    <div class="dublicated-text"></div>
-                </div>
-            </div>
-            <!--search-form-holder  end-->  
-            <!-- Share container  -->
-            <div class="share-wrapper isShare">
-                <div class="share-container"></div>
-            </div>
-            <!-- Share container  end-->
-            <!-- footer -->
-            <footer class="main-footer">
-                <div class="fixed-title"><span>Welcome to McGANS</span></div>
-                <div class="footer-social">
-                    <ul>
-                        <li><a href="#" target="_blank" ><i class="fa fa-facebook"></i></a></li>
-                        <li><a href="#" target="_blank"><i class="fa fa-twitter"></i></a></li>
-                        <li><a href="#" target="_blank" ><i class="fa fa-instagram"></i></a></li>
-                        <li><a href="#" target="_blank" ><i class="fa fa-pinterest"></i></a></li>
-                        <li><a href="#" target="_blank" ><i class="fa fa-tumblr"></i></a></li>
-                    </ul>
-                </div>
-            </footer>
-            <!-- footer end-->
+            <?php $this->load->view('include/footer.php')?> 
+		   
+		   
         </div>
         <!-- Main end -->
         <!--=============== scripts  ===============-->
diff --git a/application/views/portfolio.php b/application/views/portfolio.php
deleted file mode 100644
index 916d88f..0000000
--- a/application/views/portfolio.php
+++ /dev/null
@@ -1,198 +0,0 @@
-   <?php include 'include/header.php';?> 
-            <!--=============== wrapper ===============-->
-            <div id="wrapper">
-                <!-- content-holder  -->
-                <div class="content-holder">
-                    <!--Content -->
-                    <div class="content">
-                        <!--section -->
-                        <section class="parallax-section header-section" data-scrollax-parent="true" id="sec1">
-                            <div class="bg"  data-bg="images/bg/2.jpg" data-scrollax="properties: { translateY: '200px' }"></div>
-                            <div class="overlay"></div>
-                            <div class="container big-container">
-                                <div class="section-title">
-                                    <h3>Our Works</h3>
-                                    <div class="separator trsp-separator"></div>
-                                    <h2>Porfolio Boxed</h2>
-                                    <p>Curabitur bibendum mi sed rhoncus aliquet. Nulla blandit porttitor justo, at posuere sem accumsan nec.</p>
-                                    <a href="#sec2" class="custom-scroll-link sect-scroll-link"><i class="fa fa-long-arrow-down"></i> <span>scroll down</span></a>
-                                </div>
-                            </div>
-                        </section>
-                        <!--section end -->
-                        <!--section -->
-                        <section id="sec2">
-                            <div class="container">
-                                <!-- filter -->
-                                <div class="filter-holder inline-filter bold-filter fl-wrap">
-                                    <div class="filter-button"><span>Filter : </span></div>
-                                    <div class="gallery-filters">
-                                        <a href="#" class="gallery-filter gallery-filter-active"  data-filter="*">All Works</a>
-                                        <a href="#" class="gallery-filter " data-filter=".houses">Houses</a>
-                                        <a href="#" class="gallery-filter" data-filter=".apartments">Apartments</a>
-                                        <a href="#" class="gallery-filter" data-filter=".interior">Interior</a>
-                                        <a href="#" class="gallery-filter" data-filter=".design">Design</a>
-                                    </div>
-                                    <div class="count-folio">
-                                        <div class="num-album"></div>
-                                        <div class="all-album"></div>
-                                    </div>
-                                </div>
-                                <!-- filter end-->
-                                <!-- gallery-items   -->
-                                <div class="gallery-items border-folio-conteainer   vis-por-info three-coulms">
-                                    <!-- 1 -->
-                                    <div class="gallery-item houses apartments">
-                                        <div class="grid-item-holder">
-                                            <div class="box-item">
-                                                <img  src="images/folio/1.jpg"   alt="">
-                                                <div class="overlay"></div>
-                                                <a href="images/folio/1.jpg" class="image-popup popup-image"><i class="fa fa-search"  ></i></a>
-                                            </div>
-                                            <div class="grid-item">
-                                                <h3><a href="portfolio-single.html">Trinity River Audubon Centre</a></h3>
-                                                <span>Hoses / Apartments</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- 1 end -->
-                                    <!-- 2 -->
-                                    <div class="gallery-item houses interior">
-                                        <div class="grid-item-holder">
-                                            <div class="box-item">
-                                                <img  src="images/folio/1.jpg"   alt="">
-                                                <div class="overlay"></div>
-                                                <a href="images/folio/1.jpg" class="image-popup popup-image"><i class="fa fa-search"  ></i></a>
-                                            </div>
-                                            <div class="grid-item">
-                                                <h3><a href="portfolio-single.html">Theatre de Stoep</a></h3>
-                                                <span>Hoses  / Interior</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- 2 end -->
-                                    <!-- 4 -->
-                                    <div class="gallery-item  interior design">
-                                        <div class="grid-item-holder">
-                                            <div class="box-item">
-                                                <img  src="images/folio/1.jpg"   alt="">
-                                                <div class="overlay"></div>
-                                                <a href="images/folio/1.jpg" class="image-popup popup-image"><i class="fa fa-search"  ></i></a>
-                                            </div>
-                                            <div class="grid-item">
-                                                <h3><a href="portfolio-single.html">New Acropolis Museum</a></h3>
-                                                <span>Interior / Design</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- 4 end -->
-                                    <!-- 5 -->
-                                    <div class="gallery-item houses design">
-                                        <div class="grid-item-holder">
-                                            <div class="box-item">
-                                                <img  src="images/folio/1.jpg"   alt="">
-                                                <div class="overlay"></div>
-                                                <a href="images/folio/1.jpg" class="image-popup popup-image"><i class="fa fa-search"  ></i></a>
-                                            </div>
-                                            <div class="grid-item">
-                                                <h3><a href="portfolio-single.html">Alesia Museum</a></h3>
-                                                <span>Hoses Design</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- 5 end -->
-                                    <!-- 7 -->
-                                    <div class="gallery-item interior design">
-                                        <div class="grid-item-holder">
-                                            <div class="box-item">
-                                                <img  src="images/folio/1.jpg"   alt="">
-                                                <div class="overlay"></div>
-                                                <a href="images/folio/1.jpg" class="image-popup popup-image"><i class="fa fa-search"  ></i></a>
-                                            </div>
-                                            <div class="grid-item">
-                                                <h3><a href="portfolio-single.html">West 57th Street</a></h3>
-                                                <span>Interior /  Design</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- 7 end -->
-                                    <!-- 8 -->
-                                    <div class="gallery-item apartments interior">
-                                        <div class="grid-item-holder">
-                                            <div class="box-item">
-                                                <img  src="images/folio/1.jpg"   alt="">
-                                                <div class="overlay"></div>
-                                                <a href="images/folio/1.jpg" class="image-popup popup-image"><i class="fa fa-search"  ></i></a>
-                                            </div>
-                                            <div class="grid-item">
-                                                <h3><a href="portfolio-single.html">Petronas Tower</a></h3>
-                                                <span>Apartments / Interior</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- 8 end -->
-                                    <!-- 9 -->
-                                    <div class="gallery-item houses design">
-                                        <div class="grid-item-holder">
-                                            <div class="box-item">
-                                                <img  src="images/folio/1.jpg"   alt="">
-                                                <div class="overlay"></div>
-                                                <a href="images/folio/1.jpg" class="image-popup popup-image"><i class="fa fa-search"  ></i></a>
-                                            </div>
-                                            <div class="grid-item">
-                                                <h3><a href="portfolio-single.html">BOK Centre</a></h3>
-                                                <span>Hoses  / Design</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- 9 end -->
-                                    <!-- 10 -->
-                                    <div class="gallery-item design">
-                                        <div class="grid-item-holder">
-                                            <div class="box-item">
-                                                <img  src="images/folio/1.jpg"   alt="">
-                                                <div class="overlay"></div>
-                                                <a href="images/folio/1.jpg" class="image-popup popup-image"><i class="fa fa-search"  ></i></a>
-                                            </div>
-                                            <div class="grid-item">
-                                                <h3><a href="portfolio-single.html">Art Cultural Centre</a></h3>
-                                                <span>Design / Interior</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- 10 end -->
-                                    <!-- 11 -->
-                                    <div class="gallery-item apartments interior">
-                                        <div class="grid-item-holder">
-                                            <div class="box-item">
-                                                <img  src="images/folio/1.jpg"   alt="">
-                                                <div class="overlay"></div>
-                                                <a href="images/folio/1.jpg" class="image-popup popup-image"><i class="fa fa-search"  ></i></a>
-                                            </div>
-                                            <div class="grid-item">
-                                                <h3><a href="portfolio-single.html">One World Trade Centre</a></h3>
-                                                <span>Apartments / Interior</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- 11 end -->
-                                </div>
-                                <!-- end gallery items --> 
-                                <div class="order-item fl-wrap margin-content">
-                                    <div class="row">
-                                        <div class="col-md-4"></div>
-                                        <div class="col-md-5">
-                                            <h3>Ready to order your project ? </h3>
-                                        </div>
-                                        <div class="col-md-3"><a href="contact.html" class="btn float-btn flat-btn">Get in Touch</a></div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="partcile-dec" data-parcount="200"></div>
-                        </section>
-                        <!--section end -->
-                    </div>
-                    <!-- content end -->	
-                      <?php include 'include/footer.php';?> 
-    </body>
-</html>
\ No newline at end of file
diff --git a/application/views/project_details.php b/application/views/project_details.php
new file mode 100644
index 0000000..b089ff7
--- /dev/null
+++ b/application/views/project_details.php
@@ -0,0 +1,124 @@
+ <?php $this->load->view('include/header.php')?> 
+<style>
+.row{
+	margin-top: 58px;
+}
+</style>
+ <?php 
+$CI=& get_instance();
+													
+$CI->load->model('WelcomeModel');?>
+ <div id="wrapper">
+                <!-- content-holder  -->
+                <div class="content-holder">
+                    <!--  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><a class="scroll-link act-scrlink" href="#serv1">01.<span>Hero</span></a></li>
+                                    </ul>
+                                </nav>
+                            </div>
+                        </div>
+                        <section   data-scrollax-parent="true" >
+							<?php
+								if(isset($projectdetail)&& $projectdetail->num_rows()>0)
+								{
+									$view=$projectdetail->row();
+									
+									$pid=$view->id;
+									$projectName=$view->projectName;
+									$studentName=$view->studentName;
+									$description=$view->description;
+									
+								}
+								
+							?>	
+                            <div class="container">
+								<div class="">
+									<h3 class="bold-title"><?=$projectName;?></h3>
+									<div class="pr-tags" style="width:30%;border:none;background:none;padding-right:0px;padding-left:0px;">
+										<span style="font-size: 16px;">Student Name : </span>
+										<ul>
+											<li><?=$studentName;?></li>
+										</ul>
+									</div>
+									<br>
+									<p><?=$description;?></p>
+								   
+									<br><br>
+									
+									<span class="bold-separator"></span>
+									
+								</div>
+                                <div class="section-container  fl-wrap">
+                                    <!--serv-item end -->
+									<?php 
+										$getGallery=$CI->WelcomeModel->getGalleryList($pid);
+										//$numRows=$getFac->num_rows();	
+										
+										if(isset($getGallery) && $getGallery->num_rows()>0)
+										   {
+											   foreach($getGallery->result() as $list)
+											   {
+													$id=$list->id;
+													$title=$list->title;
+													$image=$list->image;
+										?>
+										<div class="serv-item fl-wrap" id="serv2">
+                                        <div class="row">
+                                            <div class="col-md-4">
+                                                <div class="pr-title">
+                                                    <?=$title;?>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-8">
+                                                <div class="">
+                                                    <div class="blog-media fl-wrap">
+                                                        <div class="box-item">
+                                                            <img  src="<?=base_url();?>admin/uploads/project/<?=$image;?>"  style="height:500px;" class="respimg" alt="">
+                                                            <div class="overlay"></div>
+                                                            <a href="<?=base_url();?>admin/uploads/project/<?=$image;?>" class="image-popup popup-image"><i class="fa fa-search"  ></i></a>
+                                                        </div>
+                                                    </div>
+                                                   <div class="clearfix"></div>
+                                                    <!--<span class="bold-separator"></span>-->
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--serv-item end -->
+									<?php 
+										   }}
+										?>
+                                </div>
+                                
+                            </div>
+                            <div class="limit-box fl-wrap"></div>
+                            <!--  partcile-dec--> 						   
+                            <div class="partcile-dec" data-parcount="200"></div>
+                            <!--  partcile-dec  end--> 
+                        </section>
+                        <!--  section  end--> 
+                    </div>
+                    <!--  content  end--> 
+                    <!--=============== content-footer   ===============-->
+                    <div class="height-emulator"></div>
+                    
+                    <!-- content-footer end    -->
+                </div>
+                <!-- content-holder end -->
+            </div>
+            <!-- wrapper end -->
+             <?php $this->load->view('include/footer.php')?> 
+        </div>
+        <!-- Main end -->
+        <!--=============== scripts  ===============-->        
+        <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>
+    </body>
+</html>
\ No newline at end of file
diff --git a/application/views/subject.php b/application/views/subject.php
new file mode 100644
index 0000000..6d2d872
--- /dev/null
+++ b/application/views/subject.php
@@ -0,0 +1,143 @@
+ <?php $this->load->view('include/header.php')?> 
+
+<style>
+.row{
+	margin-top: 58px;
+}
+</style>
+ <?php 
+$CI=& get_instance();
+													
+$CI->load->model('WelcomeModel');?>
+ <div id="wrapper">
+                <!-- content-holder  -->
+                <div class="content-holder">
+                    <div class="content">
+                        <!-- section --> 
+                        <section class="pr-der-pad">
+                            <!-- container-->  
+                            <div class="container">
+								<?php
+										if(isset($subject_Det)&& $subject_Det->num_rows()>0)
+										{
+											$list=$subject_Det->row();
+											
+											$id=$list->id;
+											$code=$list->code;
+											$name=$list->name;
+											$facultyId=$list->facultyId;
+											$description=$list->description;
+											$facultyIds = explode(',', $facultyId);
+											
+										}
+										
+								?>	
+                                <!-- det-wrap-->  
+                                <div class="fl-wrap det-wrap">
+                                    <div class="row">
+                                        <div class="col-md-8">
+                                        <?php 
+										$getProjectList=$CI->WelcomeModel->getProjectList($id);
+										//$numRows=$getFac->num_rows();	
+										
+										if(isset($getProjectList) && $getProjectList->num_rows()>0)
+										   {
+											   foreach($getProjectList->result() as $list)
+											   {
+													$projectId=$list->id;
+													$projectName=$list->projectName;
+													$studentName=$list->studentName;
+													$image=$list->image;
+										?>
+											
+										<div class="gallery-item" style="width: 50%;">
+											<a href="<?=base_url();?>project-detail/<?=$projectId;?>">
+											<div class="grid-item-holder">
+												<div class="box-item">
+													<img  style="width:400px;height:208px;"src="<?=base_url();?>admin/uploads/project/<?=$image;?>"   alt="">
+													<div class="overlay"></div>
+												</div>
+												<div class="grid-item">
+													<h3><?=$projectName;?></h3>
+													<span><?=$studentName;?></span>
+												</div>
+											</div>
+											</a>
+										</div>
+										<!-- 1 end -->
+										<?php 
+										   }}else {?>
+											<img style="width:500px;height:500px;" src="<?=base_url();?>images/500.png"/>
+										   <h1 style="font-size:30px;margin-top: 3%;">No Projects Found</h1><?php }
+										?>
+											
+                                        </div>
+                                        <div class="col-md-4">
+                                        	<h3 class="bold-title"><?=$code;?></h3>
+                                            <div class="pr-tags fl-wrap">
+                                                <span>Faculty : </span>
+                                                <ul>
+													<li>
+													<?php 
+														//$numRows=$getFac->num_rows();	
+														$i=0;
+														foreach($facultyIds as $faculty)
+														{
+														$getFac=$CI->WelcomeModel->get_faculty($faculty);
+														
+														if($getFac->num_rows()>0)
+														{ 
+															$list=$getFac->row(); 
+															$facName=$list->name;
+														}  
+														?>
+														<?=$facName?>
+														
+														<?php 
+														} 
+														$i++;
+														?>
+													</li>
+                                                    
+                                                </ul>
+                                            </div>
+                                            <h3 class="pr-subtitle"> <?=$name;?></h3>
+                                            <p style="font-size:18px;text-align:justify"><?=$description;?></p>
+                                            <!--<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 class="clearfix"></div>
+                                            <span class="bold-separator"></span>
+                                            <ul class="pr-list">
+                                                <li><span>Date :</span> 26.05.2014 </li>
+                                                <li><span>Client :</span>  House Big </li>
+                                                <li><span>Status :</span> Completed </li>
+                                                <li><span>Location : </span>  <a href="https://goo.gl/maps/UzN5m" target="_blank"> Kharkiv Ukraine  </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>
+                                </div>
+                              
+                            </div>
+                            <!-- container end -->
+                            <div class="partcile-dec" data-parcount="120"></div>
+                        </section>
+                        <!-- section end --> 
+                    </div>
+                    <!-- content  end --> 
+                    <!--=============== content-footer   ===============-->
+                    <div class="height-emulator"></div>
+                  
+                </div>
+                <!-- content-holder end -->
+            </div>
+            <!-- wrapper end -->
+             <?php $this->load->view('include/footer.php')?> 
+            <!-- footer end-->
+        </div>
+        <!-- Main end -->
+        <!--=============== scripts  ===============-->
+        <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>
+    </body>
\ No newline at end of file
diff --git a/application/views/subject_list.php b/application/views/subject_list.php
index aa3000c..864734a 100644
--- a/application/views/subject_list.php
+++ b/application/views/subject_list.php
@@ -1,4 +1,8 @@
   <?php $this->load->view('include/header.php')?>
+<?php 
+$CI=& get_instance();
+													
+$CI->load->model('WelcomeModel');?>
             <!-- sidebar-menu end-->
             <!--=============== wrapper ===============-->
             <div id="wrapper">
@@ -9,41 +13,72 @@
                         <!--section -->
                         <section id="sec2">
                             <div class="container">
-                                <h1 style="font-size:30px;margin-bottom:30px;">ARCHITECTURE</h1>
+								<?php
+								$depId = $this->uri->segment(2);
+								$getNames=$CI->WelcomeModel->getName($depId);
+								if($getNames->num_rows()>0)
+								{ 
+									$list=$getNames->row(); 
+									$depName=$list->name;
+								} 
+							   ?>
+                                <h1 style="font-size:30px;margin-bottom:30px;"><?=$depName?></h1>
                                 <!-- gallery-items   -->
                                 <div class="gallery-items border-folio-conteainer   vis-por-info three-coulms">
-                                    <!-- 1 -->
+                                    
 									<?php
 										   if(isset($subject_list) && $subject_list->num_rows()>0)
 										   {
 											   foreach($subject_list->result() as $subject)
 											   {
-												   $id=$subject->id;
-												   $code=$subject->code;
-												   $subject=$subject->subject;
-												   $image=$subject->image;
+													$id=$subject->id;
+													$degName=$subject->degName;
+													$name=$subject->name;
+													$code=$subject->code;
+													$facultyId=$subject->facultyId;
+													$facultyIds = explode(',', $facultyId);
+													//print_r($facultyIds);
 										?>  
                                     <div class="gallery-item houses apartments">
                                        
 									   <div class="grid-item-holder">
-										<a href="">
+										<a href="<?=base_url();?>subject-detail/<?=$id;?>">
 										
                                             <div class="box-item">
                                                 <img  src="<?=base_url();?>images/folio/2.png"   alt="">
                                                 <div class="overlay"></div>
 												
                                             </div>
-											<h3 class="image-popup popup-image"><?=$subject?></h3>
+											<h3 style="width: 250px;position: fixed;font-size:18px;margin-top:120px;margin-left:87px" class=""><?=$name?></h3>
                                             <div class="grid-item">
-                                                <h3><?=$code?></h3>
-                                                <!--<span>Hoses / Apartments</span>-->
+                                                <h3><a><?=$code;?></a></h3>
+                                              <span>
+												<?php 
+														//$numRows=$getFac->num_rows();	
+														$i=0;
+														foreach($facultyIds 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++
+												?>
+												</span>
+											
+												
                                             </div>
 										</a>
                                         </div>
                                     </div>
 									<?php }}?>	
-                                    <!-- 1 end -->
-                                    
+                                   
                                 </div>
                                 <!-- end gallery items --> 
                                
@@ -53,7 +88,7 @@
                         <!--section end -->
                     </div>
                     <!-- content end -->	
-                    
+                    <div class="height-emulator"></div>
                 </div>
                 <!-- content-holder end -->
             </div>
@@ -71,27 +106,7 @@
                     <div class="dublicated-text"></div>
                 </div>
             </div>
-            <!--search-form-holder  end-->  
-            <!-- Share container  -->
-            <div class="share-wrapper isShare">
-                <div class="share-container"></div>
-            </div>
-            <!-- Share container  end-->
-            <!-- footer -->
-            <footer class="main-footer">
-                <div class="fixed-title"><span>Welcome to McGANS</span></div>
-                <div class="footer-social">
-                    <ul>
-                        <li><a href="#" target="_blank" ><i class="fa fa-facebook"></i></a></li>
-                        <li><a href="#" target="_blank"><i class="fa fa-twitter"></i></a></li>
-                        <li><a href="#" target="_blank" ><i class="fa fa-instagram"></i></a></li>
-                        <li><a href="#" target="_blank" ><i class="fa fa-pinterest"></i></a></li>
-                        <li><a href="#" target="_blank" ><i class="fa fa-tumblr"></i></a></li>
-                    </ul>
-                </div>
-            </footer>
-            <!-- footer end-->
-        </div>
+             <?php $this->load->view('include/footer.php')?> 
         <!-- Main end -->
         <!--=============== scripts  ===============-->
         <script type="text/javascript" src="<?=base_url();?>js/jquery.min.js"></script>
diff --git a/application/views/zindex.php b/application/views/zindex.php
deleted file mode 100644
index f8b19f1..0000000
--- a/application/views/zindex.php
+++ /dev/null
@@ -1,390 +0,0 @@
-<?php include 'include/header.php';?> 
-            <div id="wrapper">
-                <!-- content-holder  -->
-                <div class="content-holder">
-                    <!-- home-slider  -->
-                    <div class="fs-gallery-wrap home-slider fl-wrap full-height" data-autoplayslider="5000">
-                        <div class="slide-progress-container">
-                            <div class="slide-progress-content">
-                                <div class="slide-progress-warp">
-                                    <div class="slide-progress"></div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="swiper-container" data-scrollax-parent="true" >
-                            <div class="swiper-wrapper"  >
-                                <!-- swiper-slide-->
-                                <div class="swiper-slide">
-                                    <div class="bg"  data-bg="images/bg/1.jpg" data-scrollax="properties: { translateY: '250px' }" ></div>
-                                    <a href="images/bg/1.jpg" class="  gallery-popup image-popup"><i class="fa fa-search"  ></i></a>
-                                    <div class="overlay"></div>
-                                    <!-- hero-wrap-->           
-                                    <div class="hero-wrap alt">
-                                        <div class="container">
-                                            <div class="hero-item">
-                                            	<h3>predefined chunks</h3>
-                                                <h2>Balkon Architecture <br> Studio</h2>
-                                                <div class="clearfix"></div>
-                                                <p>All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary .</p>
-                                                <div class="clearfix"></div>
-                                                <a href="portfolio.html" class="btn float-btn flat-btn">Our portfolio</a>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- hero-wrap end-->   
-                                </div>
-                                <!-- swiper-slide end-->
-                                <!-- swiper-slide-->
-                                <div class="swiper-slide">
-                                    <div class="bg"  data-bg="images/bg/1.jpg" data-scrollax="properties: { translateY: '250px' }" ></div>
-                                    <a href="images/bg/1.jpg" class="gallery-popup image-popup"><i class="fa fa-search"  ></i></a>
-                                    <div class="overlay"></div>
-                                    <!-- hero-wrap-->           
-                                    <div class="hero-wrap alt">
-                                        <div class="container">
-                                            <div class="hero-item">
-                                            	<h3>molestie faucibus</h3>                                            
-                                                <h2> Architecture Project<br> Title</h2>
-                                                <div class="clearfix"></div>
-                                                <p>All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary .</p>
-                                                <div class="clearfix"></div>
-                                                <a href="portfolio-single.html" class="btn float-btn flat-btn">View Project</a>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- hero-wrap end-->   
-                                </div>
-                                <!-- swiper-slide end-->
-                                <!-- swiper-slide-->
-                                <div class="swiper-slide">
-                                    <div class="bg"  data-bg="images/bg/1.jpg" data-scrollax="properties: { translateY: '250px' }" ></div>
-                                    <a href="images/bg/1.jpg" class="  gallery-popup image-popup"><i class="fa fa-search"  ></i></a>
-                                    <div class="overlay"></div>
-                                    <!-- hero-wrap-->           
-                                    <div class="hero-wrap alt">
-                                        <div class="container">
-                                            <div class="hero-item">
-                                            	<h3>tend to repeat</h3>                                            
-                                                <h2> Interior <br> Project Title</h2>
-                                                <div class="clearfix"></div>
-                                                <p>All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary .</p>
-                                                <div class="clearfix"></div>
-                                                <a href="portfolio-single.html" class="btn float-btn flat-btn">View Project</a>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- hero-wrap end-->   
-                                </div>
-                                <!-- swiper-slide end-->
-                                <!-- swiper-slide-->
-                                <div class="swiper-slide">
-                                    <div class="bg"  data-bg="images/bg/1.jpg" data-scrollax="properties: { translateY: '250px' }" ></div>
-                                    <a href="images/bg/1.jpg" class="gallery-popup image-popup"><i class="fa fa-search"  ></i></a>
-                                    <div class="overlay"></div>
-                                    <!-- hero-wrap-->           
-                                    <div class="hero-wrap alt">
-                                        <div class="container">
-                                            <div class="hero-item">
-                                            	<h3>Cras lacinia magna</h3>                                              
-                                                <h2> Our services <br> What we do</h2>
-                                                <div class="clearfix"></div>
-                                                <p>All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary .</p>
-                                                <div class="clearfix"></div>
-                                                <a href="services.html" class="btn float-btn flat-btn">Our Services</a>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!-- hero-wrap end-->   
-                                </div>
-                                <!-- swiper-slide end-->
-                            </div>
-                            <div class="sw-button swiper-button-next"><i class="fa fa-angle-right"></i></div>
-                            <div class="sw-button swiper-button-prev"><i class="fa fa-angle-left"></i></div>
-                            <div class="swiper-pagination"></div>
-                        </div>
-                    </div>
-                    <!-- home-slider end-->
-                    <!--content-->	 
-                    <div class="content">
-                        <!--section -->	
-                        <section id="sec2" data-scrollax-parent="true" >
-                            <div class="container">
-                                <div class="section-container fl-wrap">
-                                    <div class="row">
-                                        <div class="col-md-7">
-                                            <div class="content-wrap about-wrap">
-                                                <h3 class="bold-title">Welcome !  We are Balkon .  <br>   Architecture Studio <br> From NY</h3>
-                                                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras lacinia magna vel molestie faucibus. Donec auctor et urnaLorem ipsum dolor sit amet, consectetur adipiscing elit. Cras lacinia magna vel molestie faucibus.  
-                                                    Cras lacinia magna vel molestie faucibus. Donec auctor et urnaLorem ipsum dolor sit amet, consectetur adipiscing elit. Cras lacinia magna vel molestie faucibus.
-                                                </p>
-                                                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras lacinia magna vel molestie faucibus. Donec auctor et urnaLorem ipsum dolor sit amet, consectetur adipiscing elit.  
-                                                </p>
-                                                <br><br>
-                                                <h3 class="bold-title">What we do</h3>
-                                                <div class="pr-tags fl-wrap">
-                                                    <span>Services : </span>
-                                                    <ul>
-                                                        <li><a href="#">Architecture</a></li>
-                                                        <li><a href="#">Design</a></li>
-                                                        <li><a href="#">Photography</a></li>
-                                                    </ul>
-                                                </div>
-                                                <span class="bold-separator"></span>
-                                                <div class="clearfix"></div>
-                                                <a href="portfolio.html" class="btn float-btn flat-btn">Our portfolio</a>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-5">
-                                            <div class="box-item">
-                                                <img  src="images/folio/1.jpg"  class="respimg" alt="">
-                                                <div class="overlay"></div>
-                                                <a href="images/folio/1.jpg" class="image-popup popup-image"><i class="fa fa-search"  ></i></a>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="bg dec-bg left-pos-dec"  data-bg="images/bg/14.jpg"></div>
-                        </section>
-                        <!--section end  -->	
-                        <!--section -->	
-                        <section  >
-                            <div class="bg"  data-bg="images/bg/1.jpg"></div>
-                            <div class="overlay"></div>
-                            <div class="container">
-                                <div class="intro-text fl-wrap">
-                                    <h2>Entrust your project <br>to our team of  <br>professionals</h2>
-                                    <a href="services.html" class="btn float-btn flat-btn">Our Services</a>
-                                    <a href="contact.html" class="btn float-btn flat-btn">Get in Touch</a>
-                                </div>
-                            </div>
-                        </section>
-                        <!--section end  -->	
-                        <!--section -->	                             	 
-                        <section >
-                            <div class="container">
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <div class="pr-title">
-                                            Our Featured Work
-                                            <span>Lorem Ipsum generators on the Internet tend to repeat king this the first true generator . </span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <!--parallax-item -->	
-                                <div class="row">
-                                    <div class="col-md-5"></div>
-                                    <div class="col-md-7">
-                                        <div class="parallax-item fl-wrap" data-scrollax-parent="true">
-                                            <div class="parallax-header fl-wrap">
-                                                <span>01.</span>
-                                                <ul>
-                                                    <li><a href="#">Design</a></li>
-                                                    <li><a href="#">Architecture </a></li>
-                                                </ul>
-                                            </div>
-                                            <img  src="images/folio/2.jpg"   alt="">
-                                            <div class="parallax-text left-pos" data-scrollax="properties: { translateY: '-250px' }">
-                                                <h3><a href="portfolio-single.html">Theatre de Stoep</a></h3>
-                                                <h4>There are many variations of passages of Lorem Ipsum</h4>
-                                                <a href="portfolio-single.html" class="btn float-btn flat-btn">View project</a>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <!--parallax-item end-->	
-                                <!--parallax-item -->	
-                                <div class="row">
-                                    <div class="col-md-7">
-                                        <div class="parallax-item fl-wrap" data-scrollax-parent="true">
-                                            <div class="parallax-header fl-wrap">
-                                                <span>02.</span>
-                                                <ul>
-                                                    <li><a href="#">Design</a></li>
-                                                    <li><a href="#">Architecture </a></li>
-                                                </ul>
-                                            </div>
-                                            <img  src="images/folio/1.jpg"   alt="">
-                                            <div class="parallax-text right-pos" data-scrollax="properties: { translateY: '-250px' }">
-                                                <h3><a href="portfolio-single.html">New Acropolis Museum</a></h3>
-                                                <h4>There are many variations of passages of Lorem Ipsum</h4>
-                                                <a href="portfolio-single.html" class="btn float-btn flat-btn">View project</a>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <!--parallax-item end-->	                    
-                                <!--parallax-item -->	
-                                <div class="row">
-                                    <div class="col-md-5"></div>
-                                    <div class="col-md-7">
-                                        <div class="parallax-item fl-wrap" data-scrollax-parent="true">
-                                            <div class="parallax-header fl-wrap">
-                                                <span>03.</span>
-                                                <ul>
-                                                    <li><a href="#">Design</a></li>
-                                                    <li><a href="#">Architecture </a></li>
-                                                </ul>
-                                            </div>
-                                            <img  src="images/folio/1.jpg"   alt="">
-                                            <div class="parallax-text left-pos" data-scrollax="properties: { translateY: '-250px' }">
-                                                <h3><a href="portfolio-single.html">Theatre de Stoep</a></h3>
-                                                <h4>There are many variations of passages of Lorem Ipsum</h4>
-                                                <a href="portfolio-single.html" class="btn float-btn flat-btn">View project</a>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <!--parallax-item end-->	
-                                <!--parallax-item -->	
-                                <div class="row">
-                                    <div class="col-md-7">
-                                        <div class="parallax-item fl-wrap" data-scrollax-parent="true">
-                                            <div class="parallax-header fl-wrap">
-                                                <span>04.</span>
-                                                <ul>
-                                                    <li><a href="#">Design</a></li>
-                                                    <li><a href="#">Architecture </a></li>
-                                                </ul>
-                                            </div>
-                                            <img  src="images/folio/1.jpg"   alt="">
-                                            <div class="parallax-text right-pos" data-scrollax="properties: { translateY: '-250px' }">
-                                                <h3><a href="portfolio-single.html">New Acropolis Museum</a></h3>
-                                                <h4>There are many variations of passages of Lorem Ipsum</h4>
-                                                <a href="portfolio-single.html" class="btn float-btn flat-btn">View project</a>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <!--parallax-item end-->	                       
-                            </div>
-                            <div class="partcile-dec" data-parcount="250"></div>
-                        </section>
-                        <!--section end  -->	
-                        <!--section -->	
-                        <section class="parallax-section header-section  " data-scrollax-parent="true" id="sec6">
-                            <div class="bg"  data-bg="images/bg/1.jpg" data-scrollax="properties: { translateY: '200px' }"></div>
-                            <div class="overlay"></div>
-                            <div class="container">
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <div class="pr-title">
-                                            Testimonials
-                                        </div>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <div class="single-slider testilider fl-wrap" data-effects="slide">
-                                            <div class="swiper-container">
-                                                <div class="swiper-wrapper">
-                                                    <!-- swiper-slide -->
-                                                    <div class="swiper-slide">
-                                                        <div class="testi-item fl-wrap">
-                                                            <h3>Andy Smith</h3>
-                                                            <p>"All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words"</p>
-                                                            <a href="#" class="btn float-btn flat-btn" target="_blank">Via Twitter</a>
-                                                        </div>
-                                                    </div>
-                                                    <!-- swiper-slide end-->
-                                                    <!-- swiper-slide -->
-                                                    <div class="swiper-slide">
-                                                        <div class="testi-item fl-wrap">
-                                                            <h3>Liza Mirovsky</h3>
-                                                            <p>"Vestibulum orci felis, ullamcorper non condimentum non, ultrices ac nunc. Mauris non ligula suscipit, vulputate mi accumsan, dapibus felis. Nullam sed sapien dui. Nulla auctor sit amet sem non porta. Integer iaculis tellus nulla, quis imperdiet magna venenatis vitae"</p>
-                                                            <a href="#" class="btn float-btn flat-btn" target="_blank">Via Facebook</a>
-                                                        </div>
-                                                    </div>
-                                                    <!-- swiper-slide end-->
-                                                    <!-- swiper-slide -->
-                                                    <div class="swiper-slide">
-                                                        <div class="testi-item fl-wrap">
-                                                            <h3>Gary Trust</h3>
-                                                            <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."</p>
-                                                            <a href="#" class="btn float-btn flat-btn" target="_blank">Via Myspace</a>
-                                                        </div>
-                                                    </div>
-                                                    <!-- swiper-slide end-->
-                                                </div>
-                                                <div class="swiper-pagination"></div>
-                                                <div class="swiper-button-prev"><i class="fa fa-angle-left"></i></div>
-                                                <div class="swiper-button-next"><i class="fa fa-angle-right"></i></div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </section>
-                        <!--section end  -->	
-                        <!--section -->	
-                        <section>
-                            <div class="container">
-                                <div class="clients-list fl-wrap">
-                                    <ul>
-                                        <li><a href="#" target="_blank"> <img src="images/clients/1.jpg" alt=""> </a></li>
-                                        <li><a href="#" target="_blank"> <img src="images/clients/1.jpg" alt=""> </a></li>
-                                        <li><a href="#" target="_blank"> <img src="images/clients/1.jpg" alt=""> </a></li>
-                                        <li><a href="#" target="_blank"> <img src="images/clients/1.jpg" alt=""> </a></li>
-                                        <li><a href="#" target="_blank"> <img src="images/clients/1.jpg" alt=""> </a></li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </section>
-                        <!--section end  -->	
-                        <!--social-wrap -->	  
-                        <div class="social-wrap fl-wrap">
-                            <ul>
-                                <li><a href="#" target="_blank" ><i class="fa fa-facebook"></i></a></li>
-                                <li><a href="#" target="_blank"><i class="fa fa-twitter"></i></a></li>
-                                <li><a href="#" target="_blank" ><i class="fa fa-instagram"></i></a></li>
-                                <li><a href="#" target="_blank" ><i class="fa fa-pinterest"></i></a></li>
-                                <li><a href="#" target="_blank" ><i class="fa fa-tumblr"></i></a></li>
-                            </ul>
-                        </div>
-                        <!--social-wrap end-->	
-                    </div>
-                    <!-- content  end --> 
-                 <?php include 'include/footer.php';?> 
-                </div>
-                <!-- content-holder end -->
-            </div>
-            <!-- wrapper end -->
-            <!--search-form-holder -->  
-            <div class="search-form-holder fixed-search">
-                <div class="search-form-bg"></div>
-                <div class="search-form-wrap">
-                    <div class="container">
-                        <form class="searchform" method="get"  >
-                            <input type="text" autocomplete="off"   name="s" placeholder="Type and Enter to Search">
-                        </form>
-                        <div class="close-fixed-search"></div>
-                    </div>
-                    <div class="dublicated-text"></div>
-                </div>
-            </div>
-            <!--search-form-holder  end-->  
-            <!-- Share container  -->
-            <div class="share-wrapper isShare">
-                <div class="share-container"></div>
-            </div>
-            <!-- Share container  end-->
-            <!-- footer -->
-            <footer class="main-footer">
-                <div class="fixed-title"><span>Home Slider</span></div>
-                <div class="footer-social">
-                    <ul>
-                        <li><a href="#" target="_blank" ><i class="fa fa-facebook"></i></a></li>
-                        <li><a href="#" target="_blank"><i class="fa fa-twitter"></i></a></li>
-                        <li><a href="#" target="_blank" ><i class="fa fa-instagram"></i></a></li>
-                        <li><a href="#" target="_blank" ><i class="fa fa-pinterest"></i></a></li>
-                        <li><a href="#" target="_blank" ><i class="fa fa-tumblr"></i></a></li>
-                    </ul>
-                </div>
-            </footer>
-            <!-- footer end-->
-        </div>
-        <!-- Main end -->
-        <!--=============== scripts  ===============-->
-        <script type="text/javascript" src="js/jquery.min.js"></script>
-        <script type="text/javascript" src="js/plugins.js"></script>
-        <script type="text/javascript" src="js/scripts.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/assets/jquery.cookie.min.js b/assets/jquery.cookie.min.js
new file mode 100644
index 0000000..c0f19d8
--- /dev/null
+++ b/assets/jquery.cookie.min.js
@@ -0,0 +1,2 @@
+/*! jquery.cookie v1.4.1 | MIT */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?a(require("jquery")):a(jQuery)}(function(a){function b(a){return h.raw?a:encodeURIComponent(a)}function c(a){return h.raw?a:decodeURIComponent(a)}function d(a){return b(h.json?JSON.stringify(a):String(a))}function e(a){0===a.indexOf('"')&&(a=a.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return a=decodeURIComponent(a.replace(g," ")),h.json?JSON.parse(a):a}catch(b){}}function f(b,c){var d=h.raw?b:e(b);return a.isFunction(c)?c(d):d}var g=/\+/g,h=a.cookie=function(e,g,i){if(void 0!==g&&!a.isFunction(g)){if(i=a.extend({},h.defaults,i),"number"==typeof i.expires){var j=i.expires,k=i.expires=new Date;k.setTime(+k+864e5*j)}return document.cookie=[b(e),"=",d(g),i.expires?"; expires="+i.expires.toUTCString():"",i.path?"; path="+i.path:"",i.domain?"; domain="+i.domain:"",i.secure?"; secure":""].join("")}for(var l=e?void 0:{},m=document.cookie?document.cookie.split("; "):[],n=0,o=m.length;o>n;n++){var p=m[n].split("="),q=c(p.shift()),r=p.join("=");if(e&&e===q){l=f(r,g);break}e||void 0===(r=f(r))||(l[q]=r)}return l};h.defaults={},a.removeCookie=function(b,c){return void 0===a.cookie(b)?!1:(a.cookie(b,"",a.extend({},c,{expires:-1})),!a.cookie(b))}});
\ No newline at end of file
diff --git a/assets/select2/js/select2-init.js b/assets/select2/js/select2-init.js
index 62000d5..2b4b334 100644
--- a/assets/select2/js/select2-init.js
+++ b/assets/select2/js/select2-init.js
@@ -3,7 +3,7 @@ function format(state) {
     return "<img class='flag' src='img/flags/" + state.id.toLowerCase() + ".png'/> &nbsp;" + state.text;
 }
 
-var placeholder = "Select a State";
+var placeholder = "Select..";
 $('.select2, .select2-multiple').select2({
 	theme: "bootstrap",
     placeholder: placeholder,
diff --git a/css/style.css b/css/style.css
index 0f34df5..f429b88 100644
--- a/css/style.css
+++ b/css/style.css
@@ -79,7 +79,8 @@ body{
 /*--------------Typography--------------------------------------*/
 p {
     text-align: left;
-    font-size: 12px;
+    /* font-size: 12px; */
+    font-size: 16px;
     line-height: 24px;
     padding-bottom: 10px;
 	font-weight:500;
@@ -1189,7 +1190,7 @@ section.parallax-section .section-title h2  , section.parallax-section  .section
 .bold-separator {
 	width:70px;
 	height:6px;
-	background:#000;
+	background:#975557;
 	float:left;
 	/* margin-top:35px; */
 }
@@ -1502,7 +1503,7 @@ section.parallax-section .section-title h2  , section.parallax-section  .section
 }
 /*------ Services------------------------------------------------*/
 .serv-item{
-	margin-bottom:70px;
+	margin-bottom:0px;
 }
 .serv-item  .content-wrap  {
 	border-bottom:1px solid #eee;
@@ -1776,7 +1777,8 @@ section.parallax-section .section-title h2  , section.parallax-section  .section
 	border-bottom:1px solid #f0f0f0;
 }
 .grid-item h3 {
-	font-size:14px;
+	/* font-size:14px; */
+	 font-size:18px; 
 	font-weight: 700;
 	position:relative;
 	float:left;
@@ -1826,9 +1828,11 @@ section.parallax-section .section-title h2  , section.parallax-section  .section
 	width:100%;
 	float:left;
 	text-align:left;
-	font-size:11px;
+	font-weight:600;
+	font-size:17px;
 	margin-top:6px;
-	color:#999;
+	/* color:#999; */
+	color:#5e5e5e;
 }
 .hid-por-info .grid-item  {
 	position:absolute;
diff --git a/error_log b/error_log
new file mode 100644
index 0000000..f0d6236
--- /dev/null
+++ b/error_log
@@ -0,0 +1,43 @@
+[20-Feb-2021 16:20:33 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[20-Feb-2021 16:23:00 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[20-Feb-2021 16:24:25 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/models/service/Serviceman_model.php on line 26
+[20-Feb-2021 16:24:28 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/models/service/Serviceman_model.php on line 26
+[20-Feb-2021 16:27:43 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/models/service/Serviceman_model.php on line 26
+[27-Feb-2021 17:07:28 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::list_serviceman() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 14
+[27-Feb-2021 17:16:41 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::list_serviceman() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 14
+[27-Feb-2021 17:30:20 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::list_serviceman() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 14
+[27-Feb-2021 17:32:27 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::list_serviceman() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 14
+[27-Feb-2021 17:34:28 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::list_serviceman() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 14
+[27-Feb-2021 17:35:51 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[27-Feb-2021 17:36:59 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[27-Feb-2021 17:49:06 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[27-Feb-2021 17:49:13 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[27-Feb-2021 17:49:21 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[27-Feb-2021 17:49:48 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[27-Feb-2021 17:50:27 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[27-Feb-2021 17:51:07 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[27-Feb-2021 17:51:10 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[27-Feb-2021 17:51:53 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[02-Mar-2021 12:30:12 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[02-Mar-2021 12:32:15 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[02-Mar-2021 12:32:22 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[02-Mar-2021 12:33:53 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[02-Mar-2021 12:33:56 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[02-Mar-2021 12:34:02 Asia/Kolkata] PHP Parse error:  syntax error, unexpected 'list' (T_LIST), expecting identifier (T_STRING) in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 12
+[03-Mar-2021 15:46:31 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::getservicelist() in /home/dotdemo/public_html/demo/ecdial/application/views/services/serviceman/list.php on line 121
+[03-Mar-2021 15:54:51 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::getservicelist() in /home/dotdemo/public_html/demo/ecdial/application/views/services/serviceman/list.php on line 121
+[03-Mar-2021 16:13:06 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::getservicelist() in /home/dotdemo/public_html/demo/ecdial/application/views/services/serviceman/list.php on line 121
+[17-Mar-2021 17:19:03 Asia/Kolkata] PHP Fatal error:  Call to undefined method Servicerequest_model::dash_list() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Dashboard.php on line 26
+[17-Mar-2021 17:20:32 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::smdash_list() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Dashboard.php on line 27
+[17-Mar-2021 17:20:36 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::smdash_list() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Dashboard.php on line 27
+[26-Mar-2021 12:38:41 Asia/Kolkata] PHP Fatal error:  Call to undefined method CI_DB_mysqli_driver::num_rows() in /home/dotdemo/public_html/demo/ecdial/application/controllers/serviceapi/User.php on line 89
+[26-Mar-2021 12:38:45 Asia/Kolkata] PHP Fatal error:  Call to undefined method CI_DB_mysqli_driver::num_rows() in /home/dotdemo/public_html/demo/ecdial/application/controllers/serviceapi/User.php on line 89
+[26-Mar-2021 16:12:08 Asia/Kolkata] PHP Fatal error:  Call to a member function result() on null in /home/dotdemo/public_html/demo/ecdial/application/controllers/serviceapi/Userdetail.php on line 70
+[26-Mar-2021 16:43:48 Asia/Kolkata] PHP Parse error:  syntax error, unexpected end of file, expecting function (T_FUNCTION) in /home/dotdemo/public_html/demo/ecdial/application/controllers/serviceapi/Userdetail.php on line 130
+[30-Mar-2021 17:04:52 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::getrecordCount() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 255
+[30-Mar-2021 17:05:08 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::getrecordCount() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 255
+[30-Mar-2021 18:03:43 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::getrecordCount() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 255
+[30-Mar-2021 18:04:05 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::getrecordCount() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 255
+[30-Mar-2021 18:21:01 Asia/Kolkata] PHP Fatal error:  Call to undefined method Serviceman_model::getrecordCount() in /home/dotdemo/public_html/demo/ecdial/application/controllers/Services/Serviceman.php on line 255
+[02-Apr-2021 12:38:24 Asia/Kolkata] PHP Fatal error:  Call to a member function result() on null in /home/dotdemo/public_html/demo/ecdial/application/views/services/service-request/edit_invoice.php on line 89
+[02-Apr-2021 12:38:31 Asia/Kolkata] PHP Fatal error:  Call to a member function result() on null in /home/dotdemo/public_html/demo/ecdial/application/views/services/service-request/edit_invoice.php on line 89
diff --git a/images/500.png b/images/500.png
new file mode 100644
index 0000000..9fec5d9
Binary files /dev/null and b/images/500.png differ