Updated Profile to have jquery update for interests

.gitignore

@@ -6,3 +6,4 @@
 /.project
 /.settings
 /RFID_Checkin_Project_mods.zip
+/Citizen J

API/.gitignore

@@ -1 +1,2 @@
 /view_list_distinctusercheckins_all_play.php
+/view_citizenj_list_equipmentcheckouts.php

database/.gitignore

@@ -0,0 +1,27 @@
+/hack_rfid_checkin_system.sql
+/.directory
+/hack_rfid_checkin_empty.sql
+/checkin_db_8_views_statements.txt
+/checkin_db_8_views_statements.txt~
+/checkin_db_v8_data.sql
+/create_view_checkins.sql
+/create_view_checkins.sql~
+/create_views.sql.firstcut
+/create_views.sql~
+/hack_rfid_checkin_system_11092012_1106.sql
+/hack_rfid_checkin_system_11092012_1212_V10_prepare.sql
+/hack_rfid_checkin_system_11092012_1219_V10_prep.sql
+/identification_media.sql
+/locations_table.sql
+/meetmee_checkin_10082012.sql
+/meetmee_checkin_17102012_2158.sql
+/meetmee_checkin_17102012_2200.sql
+/meetmee_checkin_18092012_1346.sql
+/meetmee_checkin_v8_20082012_1234.sql
+/meetmee_checkin_v8_with_data_20082012_1233.sql
+/meetmee_checkin_v9_11092012_1305.sql
+/meetmee_checkin_v9_20082012_1417.sql
+/meetmee_checkin_v9_20082012_1454.sql
+/meetmee_checkin_v9_20082012_1529.sql
+/sql_statements.txt~
+/view_checkins.sql~

userprofile/codeigniter_application/.gitignore

@@ -0,0 +1,2 @@
+/config.geekboy
+/config.theedge

userprofile/codeigniter_application/config/routes.php

@@ -37,26 +37,25 @@
 | in the URL cannot be matched to a valid route.
 |
 */
-
-$route['json_access/rfid_list'] = 'json_access/rfid_list';
-$route['json_access'] = 'json_access';
-$route['admin/rfid'] = 'edge_administration/rfid';
+$route['admin/create_user'] = 'edge_user/create';
+$route['admin/list_users'] = 'edge_user/list_users';
+$route['admin/list_rfids'] = 'edge_administration/list_rfids';
 $route['admin'] = 'edge_administration';
 $route['admin/(:any)'] = 'edge_administration/index';
 $route['edge_user/feedback'] = 'edge_user/feedback';
 $route['edge_user/deactivate_user'] = 'edge_user/deactivate_user';
 $route['edge_user/change_password'] = 'edge_user/change_password';
 $route['edge_user/forgot_password'] = 'edge_user/forgot_password';
 $route['edge_user/reset_password'] = 'edge_user/reset_password';
-//$route['edge_user/signup'] = 'edge_user/signup';
 $route['edge_user/logout'] = 'edge_user/logout';
 $route['edge_user/update/(:num)'] = 'edge_user/update/$1';
 $route['edge_user/update'] = 'edge_user/update';
 $route['edge_user/list'] = 'edge_user/list_users';
 $route['edge_user/create'] = 'edge_user/create';
 $route['edge_user/profile/(:num)'] = 'edge_user/profile/$1';
 $route['edge_user/profile'] = 'edge_user/profile';
-$route['edge_user'] = 'edge_user/index';
+$route['edge_user/logout'] = 'edge_user/logout';
+$route['edge_user'] = 'edge_user';
 $route['project/create'] = 'project/create';
 $route['project/profile/(:num)'] = 'project/profile/$1';
 $route['project/profile'] = 'project';

userprofile/codeigniter_application/controllers/edge_administration.php

@@ -6,33 +6,32 @@ class Edge_Administration extends CI_Controller {
 	public function __construct()
 	{
 		parent::__construct();
-		$this->load->model('edge_base_model');
-		$this->load->model('edge_administration_model');
-		$this->load->library('ion_auth');
-		$this->load->library('session');
-		$this->load->helper('url');		
+		$this->load->model('edge_administration_model');
+		$this->load->driver('edge_common');
 	}
 
 	/*
 	 * List All Administration Options
 	*/
 	public function index()
 	{
-		if($this->ion_auth->logged_in()) {
+		if($this->edge_common->ion_auth->logged_in()) {
 			$action=null;
 			if(preg_match('/admin\/(.+)/', uri_string(),$matches)) {
 				$action=$matches[1];
 			}
 
 			switch ($action) {
-				case 'create_user':
-					redirect('edge_user/create', 'refresh');
+				/*case 'create_user':
+					$this->edge_common->render_page('edge_administration/index', $data);
+					//redirect('edge_user/create', 'refresh');
 					return;
 
 				case 'list_users':
 					redirect('edge_user/list', 'refresh');
 					return;
-
+					*/
+
 				case 'create_project':
 					redirect('project/create', 'refresh');
 					return;
@@ -47,7 +46,7 @@ public function index()
 
 				default:
 					$data['title'] = "Administration";
-					$this->edge_base_model->render_page('edge_administration/index', $data);
+					$this->edge_common->render_page('edge_administration/index', $data);
 			}
 		} else {
 			redirect('edge_user', 'refresh');
@@ -82,7 +81,7 @@ function list_rfids() {
 			$this->data['rfids'][$k]->groups = $this->ion_auth->get_users_groups($user->id)->result();
 		}
  */
-		$this->edge_base_model->render_page('edge_administration/rfid', $data);
+		$this->edge_common->render_page('edge_administration/rfid', $data);
 	}
 
 }