school and school_city class

user edit with parent edit included (ajax)
city and school connected
overview updated

_ajax/get_parent_data.php

@@ -0,0 +1,23 @@
+<?php
+
+ini_set('include_path', '../_class/');
+include('class_sql.php');
+if ($_SERVER['HTTP_HOST'] == 'badmintoncoach.hu') $sql = new sql('localhost','root','','badminton_coach');
+else $sql = new sql('localhost','tollashodos','uprRscU8bGpJ','tollashodos');
+
+if ($_POST['parent_id'] == 'null') {
+	return false;
+}
+
+$parent_query = "SELECT * FROM user_parent WHERE up_id = " . $_POST['parent_id'];
+$parent_assoc_array = $sql->assoc_array($parent_query);
+
+$ret_array = array(
+	$parent_assoc_array[0]['up_email'],
+	$parent_assoc_array[0]['up_phone'],
+	$parent_assoc_array[0]['up_facebook']
+	);
+
+echo json_encode($ret_array);
+
+?>

_class/class_school.php

@@ -0,0 +1,82 @@
+<?php
+
+//ISKOLA OSZTÁLY
+
+
+class school {
+	private $sc_id;
+	private $sc_name;
+	private $sc_school_city_scc_id; //ID
+	private $sc_school_city; //OBJ
+	private $sc_deleted;
+
+	public function set_sc_id($_id) {
+		$this->sc_id = $_id;
+	}
+
+	public function set_sc_name($_name) {
+		$this->sc_name = $_name;
+	}
+
+	public function set_sc_school_city_scc_id($_school_city_scc_id) {
+		$this->sc_school_city_scc_id = $_school_city_scc_id;
+	}
+
+	public function set_sc_school_city($_school_city) {
+		$this->sc_school_city = $_school_city;
+	}
+
+	public function set_sc_deleted($_deleted) {
+		$this->sc_deleted = $_deleted;
+	}
+
+	public function get_sc_id() {
+		return $this->sc_id;
+	}
+
+	public function get_sc_name() {
+		return $this->sc_name;
+	}
+
+	public function get_sc_school_city_scc_id() {
+		return $this->sc_school_city_scc_id;
+	}
+
+	public function get_sc_school_city() {
+		return $this->sc_school_city;
+	}
+
+	public function get_sc_deleted() {
+		return $this->sc_deleted;
+	}
+
+	public function set_school_data_by_id($_sc_id) {
+		global $sql, $school;
+		$school_data_assoc_array = $sql->assoc_array("select * from school where sc_id = " . $_sc_id);
+		$school_data_array = $school_data_assoc_array[0];
+		foreach ($school_data_array as $field => $value) {
+			$function_name = "set_" . $field;
+			$this->$function_name($value); //alapadatok beállítása
+			if ($field == 'sc_school_city_scc_id' && !empty($value)) {
+				$sc_city = new school_city();
+				$sc_city->set_school_city_data_by_id($value);
+				$this->set_sc_school_city($sc_city);
+			}
+		}
+	}
+
+	public static function create_school($_sc_name, $_scc_id) {
+		global $sql;
+		return $sql->insert_into('school', array('sc_name' => $_sc_name, 'sc_school_city_scc_id' => $_scc_id));
+	}
+
+	public static function update_school($_sc_id, $_sc_name, $_scc_id) {
+		global $sql;
+		$sql->update_table('school', array('sc_name' => $_sc_name, 'sc_school_city_scc_id' => $_scc_id), array('sc_id' => $_sc_id));
+	}
+
+
+}
+
+
+?>

_class/class_school_city.php

@@ -0,0 +1,69 @@
+<?php
+
+//ISKOLA-VÁROS OSZTÁLY
+
+
+class school_city {
+	private $scc_id;
+	private $scc_city;
+	private $scc_order;
+	private $scc_deleted;
+
+	public function set_scc_id($_id) {
+		$this->scc_id = $_id;
+	}
+
+	public function set_scc_city($_city) {
+		$this->scc_city = $_city;
+	}
+
+	public function set_scc_order($_order) {
+		$this->scc_order = $_order;
+	}
+
+	public function set_scc_deleted($_deleted) {
+		$this->scc_deleted = $_deleted;
+	}
+
+	public function get_scc_id() {
+		return $this->scc_id;
+	}
+
+	public function get_scc_city() {
+		return $this->scc_city;
+	}
+
+	public function get_scc_order() {
+		return $this->scc_order;
+	}
+
+	public function get_scc_deleted() {
+		return $this->scc_deleted;
+	}
+
+	public static function create_school_city($_scc_city) {
+		global $sql;
+		return $sql->insert_into('school_city', array('scc_city' => $_scc_city));
+	}
+
+	public static function update_school_city($_scc_id, $_scc_city, $_scc_order) {
+		global $sql;
+		$sql->update_table('school_city', array('scc_city' => $_scc_city, 'scc_order' => $_scc_order), array('scc_id' => $_scc_id));
+	}
+
+
+	public function set_school_city_data_by_id($_scc_id) {
+		global $sql, $school_city;
+		$school_city_data_assoc_array = $sql->assoc_array("select * from school_city where scc_id = " . $_scc_id);
+		$school_city_data_array = $school_city_data_assoc_array[0];
+		foreach ($school_city_data_array as $field => $value) {
+			$function_city = "set_" . $field;
+			$this->$function_city($value); //alapadatok beállítása
+		}
+	}
+
+
+}
+
+
+?>

_class/class_user_kid.php

@@ -13,24 +13,25 @@ class user_kid extends user_parent {
 	private $user_email;
 	private $user_last_login;
 	private $user_gender;
-	private $user_address;
+	private $user_address_scc_id;
 	private $user_birth_date;
 	private $user_birth_year;
 	private $user_first_training;
+	private $user_beforehand;
 	private $user_hand;
 	private $user_last_modified;
 	private $logged_in;
 	private $user_type;
 	private $user_shirt_size;
 	private $user_shirt_note;
-	private $user_school_sc_id;
+	private $user_school_sc_id; //SCHOOL ID
-	private $user_school_district;
+	private $user_school; //SCHOOL OBJ
-	private $user_school_city_scc_id;
 	private $user_parent_1;
 	private $user_parent_2;
 	private $user_phone;
 	private $user_facebook;
 	private $user_region;
+	private $user_ago_category;
 	private $user_contact;
 	private $user_other;
 	private $user_deleted;
@@ -68,12 +69,6 @@ class user_kid extends user_parent {
 	public function set_uk_school_sc_id($_school) {
 		$this->user_school_sc_id = $_school;
 	}
-	public function set_uk_school_district($_district) {
-		$this->user_school_district = $_district;
-	}
-	public function set_uk_school_city_scc_id($_city_id) {
-		$this->user_school_city_scc_id = $_city_id;
-	}
 	public function set_uk_parent_1($_uk_parent_1) {
 		$this->user_parent_1 = $_uk_parent_1;
 	}
@@ -137,12 +132,6 @@ class user_kid extends user_parent {
 		if ($this->user_school_sc_id) return $sql->single_variable('select sc_name from school where sc_id = ' . $this->user_school_sc_id);
 		else return null;
 	}
-	public function get_uk_school_district() {
-		return $this->user_school_district;
-	}
-	public function get_uk_school_city_scc_id() {
-		return $this->user_school_city_scc_id;
-	}
 	public function get_uk_school_city() {
 		global $sql;
 		if ($this->user_school_city_scc_id) return $sql->single_variable('select scc_city from school_city where scc_id = ' . $this->user_school_city_scc_id);
@@ -222,11 +211,29 @@ class user_kid extends user_parent {
 	public function get_uk_last_modified() {
 		return $this->user_last_modified;
 	}
-	public function set_uk_address($_address) {
+	public function set_uk_address_scc_id($_address) {
-		$this->user_address = $_address;	
+		$this->user_address_scc_id = $_address;	
 	}
-	public function get_uk_address() {
+	public function get_uk_address_scc_id() {
-		return $this->user_address;
+		return $this->user_address_scc_id;
+	}
+	public function set_uk_beforehand($_beforehand) {
+		$this->user_beforehand = $_beforehand;	
+	}
+	public function get_uk_beforehand() {
+		return $this->user_beforehand;
+	}
+	public function set_uk_age_category($_age_category) {
+		$this->user_age_category = $_age_category;	
+	}
+	public function get_uk_age_category() {
+		return $this->user_age_category;
+	}
+	public function set_uk_school($_school) {
+		$this->user_school = $_school;	
+	}
+	public function get_uk_school() {
+		return $this->user_school;
 	}
 	public function is_logged_in() {
 		//leellenőrzi cookie alapján h be vagyunk-e jelentkezve
@@ -251,15 +258,24 @@ class user_kid extends user_parent {
 		foreach ($user_data_array as $field => $value) {
 			$function_name = "set_" . $field;
 			$this->$function_name($value); //alapadatok beállítása
-			//$this->set_ua_type(2); //kid típus beállítása
+			if ($field == 'uk_school_sc_id' && !empty($value)) {
-			$this->set_login(true);
+				$school = new school();
+				$school->set_school_data_by_id($value);
+				$this->set_uk_school($school);
 			}
+			//$this->set_ua_type(2); //kid típus beállítása
+		}
+		$this->set_login(true);
 	}
 	public static function add_new_parent($_parent_name, $_email, $_facebook, $_phone) {
 		global $sql;
 		//beilleszti AB-ba
 		//visszaadja az ID-t
 
+		if ($_email == '') $_email = 'null'; 
+		if ($_facebook == '') $_facebook = 'null'; 
+		if ($_phone == '') $_phone = 'null'; 
+		
 		return $sql->insert_into('user_parent', 
 			array(
 				'up_name' => $_parent_name,
@@ -273,11 +289,15 @@ class user_kid extends user_parent {
 		global $sql;
 		//SCHOOL_HANDLER
 		if (isset($_user_value_array['add_school']) && $_user_value_array['add_school'] != "") {
-			$new_school_id = $sql->insert_into('school', array('sc_name' => $_user_value_array['add_school']));
+			//megnézzük adott-e az iskolához települést, ha nem, akkor null-ra állítjuk
+			//if (isset($_user_value_array['uk_school_city_scc_id']) && $_user_value_array['uk_school_city_scc_id'] == '') $_user_value_array['uk_school_city_scc_id'] = 'null'; 
+			//$new_school_id = $sql->insert_into('school', array('sc_name' => $_user_value_array['add_school'], 'sc_school_city_scc_id' => $_user_value_array['uk_school_city_scc_id']));
+			$new_school_id = school::create_school($_user_value_array['add_school'], $_user_value_array['uk_school_city_scc_id']);
+			log::register('new_school', $new_school_id);
 			$_user_value_array['uk_school_sc_id'] = $new_school_id;
-			unset($_user_value_array['add_school']);
 		}
-		if (isset($_user_value_array['add_school'])) unset($_user_value_array['add_school']);
+		unset($_user_value_array['add_school']);
+		unset($_user_value_array['uk_school_city_scc_id']);
 		//PARENT_1 HANDLER
 		if (isset($_user_value_array['add_parent_1']) && $_user_value_array['add_parent_1'] != "") {
 			//lehet, hogy csak a neve van megadva, ezért meg kell vizsgálni, hogy a többi létezik-e; ha nem => null
@@ -287,6 +307,7 @@ class user_kid extends user_parent {
 				$_user_value_array['add_parent_1'],
 				$_user_value_array['parent_1_email'],
 				$_user_value_array['parent_1_facebook'], $_user_value_array['parent_1_phone']);
+			log::register('new_parent', $_user_value_array['uk_parent_1']);
 		}
 		if (isset($_user_value_array['add_parent_1'])) unset($_user_value_array['add_parent_1']);
 		if (isset($_user_value_array['parent_1_email'])) unset($_user_value_array['parent_1_email']);
@@ -298,6 +319,7 @@ class user_kid extends user_parent {
 				$_user_value_array['add_parent_2'],
 				$_user_value_array['parent_2_email'], $_user_value_array['parent_2_facebook'],
 				$_user_value_array['parent_2_phone']);
+			log::register('new_parent', $_user_value_array['uk_parent_2']);
 		} 
 		if (isset($_user_value_array['add_parent_2'])) unset($_user_value_array['add_parent_2']);
 		if (isset($_user_value_array['parent_2_email'])) unset($_user_value_array['parent_2_email']);
@@ -327,13 +349,19 @@ class user_kid extends user_parent {
 		$_user_value_array['uk_last_modified'] = date("Y-m-d");
 		//PARENT_1 HANDLER
 		if (isset($_user_value_array['add_parent_1']) && $_user_value_array['add_parent_1'] != "") {
-			//lehet, hogy csak a neve van megadva, ezért meg kell vizsgálni, hogy a többi létezik-e; ha nem => null
-			//var_dump($_user_value_array);
-			//die("hiba");
 			$_user_value_array['uk_parent_1'] = self::add_new_parent(
 				$_user_value_array['add_parent_1'],
 				$_user_value_array['parent_1_email'],
 				$_user_value_array['parent_1_facebook'], $_user_value_array['parent_1_phone']);
+			log::register('new_parent', $_user_value_array['uk_parent_1']); 
+		}
+		else {
+			//meglévő szülő updatelése
+			user_parent::update_parent(array(
+				'up_email' => $_user_value_array['parent_1_email'],
+				'up_facebook' => $_user_value_array['parent_1_facebook'], 
+				'up_phone' => $_user_value_array['parent_1_phone']), $_user_value_array['uk_parent_1']);
+
 		}
 		if (isset($_user_value_array['add_parent_1'])) unset($_user_value_array['add_parent_1']);
 		if (isset($_user_value_array['parent_1_email'])) unset($_user_value_array['parent_1_email']);
@@ -345,6 +373,16 @@ class user_kid extends user_parent {
 				$_user_value_array['add_parent_2'],
 				$_user_value_array['parent_2_email'], $_user_value_array['parent_2_facebook'],
 				$_user_value_array['parent_2_phone']);
+			log::register('new_parent', $_user_value_array['uk_parent_2']);
+		} 
+		else {
+			//meglévő szülő updatelése
+			//var_dump($_user_value_array['uk_parent_2']);
+			user_parent::update_parent(array(
+				'up_email' => $_user_value_array['parent_2_email'],
+				'up_facebook' => $_user_value_array['parent_2_facebook'], 
+				'up_phone' => $_user_value_array['parent_2_phone']), $_user_value_array['uk_parent_2']);
+
 		}
 		if (isset($_user_value_array['add_parent_2'])) unset($_user_value_array['add_parent_2']);
 		if (isset($_user_value_array['parent_2_email'])) unset($_user_value_array['parent_2_email']);
@@ -353,10 +391,14 @@ class user_kid extends user_parent {
 
 		//SCHOOL HANDLER
 		if (isset($_user_value_array['add_school']) && $_user_value_array['add_school'] != "") {
-			$new_school_id = $sql->insert_into('school', array('sc_name' => $_user_value_array['add_school']));
+			//$new_school_id = $sql->insert_into('school', array('sc_name' => $_user_value_array['add_school'], 'sc_school_city_scc_id' => $_user_value_array['uk_school_city_scc_id']));
+			$new_school_id = school::create_school($_user_value_array['add_school'], $_user_value_array['uk_school_city_scc_id']);
+			log::register('new_school', $new_school_id);
 			$_user_value_array['uk_school_sc_id'] = $new_school_id;
 		}
+
 		unset($_user_value_array['add_school']);
+		unset($_user_value_array['uk_school_city_scc_id']);
 
 		//date handler
 		if (!isset($_user_value_array['uk_first_training']) || $_user_value_array['uk_first_training'] == "") {

_css/default.css

@@ -221,6 +221,10 @@ main #main_content {
 	width: 40%;
 }
 
+.wide {
+	width: 80% !important;
+}
+
 .list .list_item, .list .name_tag, .list .name_tag_checked {
 	width: 100%;
 }

_css/form.css

@@ -67,6 +67,8 @@ textarea {
   border-radius: 5px;
 }
 
+
+
 input[type=text]:focus,
 input[type=email]:focus,
 input[type=url]:focus,

_include/include_cities.php

@@ -14,7 +14,7 @@ else {
 	
 	# VÁROS LISTA
 
-	$scc_query = "SELECT * FROM school_city WHERE scc_deleted = 0 ORDER BY scc_city ASC";
+	$scc_query = "SELECT * FROM school_city WHERE scc_deleted = 0 ORDER BY - scc_order DESC, scc_city ASC";
 	$scc_assoc_array = $sql->assoc_array($scc_query);
 
 	$smarty->assign('scc_assoc_array',$scc_assoc_array);

_include/include_create.php

@@ -5,25 +5,37 @@ switch ($this->get_id()) {
 	case 'member':
 		#ÚJ TAG LÉTREHOZÁSA
 		//pólóméret array
-		$shirt_size_query = "SELECT * FROM shirt;";
+		$shirt_size_query = "SELECT * FROM shirt WHERE shirt_deleted = 0;";
 		$shirt_size_assoc_array = $sql->assoc_array($shirt_size_query);
 		//szülő array
-		$parent_query = "SELECT * FROM user_parent;";
+		$parent_query = "SELECT * FROM user_parent WHERE up_deleted = 0 ORDER BY up_name ASC;";
 		$parent_assoc_array = $sql->assoc_array($parent_query);
 		//SCHOOL ARRAY
-		$school_query = "SELECT * FROM school;";
+		$school_query = "SELECT * FROM school WHERE sc_deleted = 0 ORDER BY sc_name ASC;";
 		$school_assoc_array = $sql->assoc_array($school_query);
+		$schools = array();
+		foreach ($school_assoc_array as $key => $value) {
+			$new_school = new school();
+			$new_school->set_school_data_by_id($value['sc_id']);
+			$schools[] = $new_school;
+		}
 		//SCHOOL CITY ARRAY
-		$school_city_query = "SELECT * FROM school_city;";
+		$school_city_query = "SELECT * FROM school_city WHERE scc_deleted = 0 ORDER BY - scc_order DESC, scc_city ASC;";
 		$school_city_assoc_array = $sql->assoc_array($school_city_query);
+		$school_cities = array();
+		foreach ($school_city_assoc_array as $key => $value) {
+			$new_scc = new school_city();
+			$new_scc->set_school_city_data_by_id($value['scc_id']);
+			$school_cities[] = $new_scc;
+		}
 		//REGION ARRAY
-		$region_query = "SELECT * FROM region;";
+		$region_query = "SELECT * FROM region WHERE reg_deleted = 0 ORDER BY reg_name ASC;";
 		$region_assoc_array = $sql->assoc_array($region_query);
 
 		$smarty->assign('region_assoc_array', $region_assoc_array);
 		$smarty->assign('shirt_size_assoc_array', $shirt_size_assoc_array);
-		$smarty->assign('school_assoc_array', $school_assoc_array);
+		$smarty->assign('school_assoc_array', $schools);
-		$smarty->assign('school_city_assoc_array', $school_city_assoc_array);
+		$smarty->assign('school_city_assoc_array', $school_cities);
 		$smarty->assign('parent_assoc_array', $parent_assoc_array);
 		$smarty->assign('today', date("Y-m-d"));
 
@@ -77,6 +89,16 @@ switch ($this->get_id()) {
 		break;
 	case 'school':
 		# SCHOOL létrehozása
+		//SCHOOL CITY ARRAY
+		$school_city_query = "SELECT * FROM school_city WHERE scc_deleted = 0 ORDER BY - scc_order DESC, scc_city ASC;";
+		$school_city_assoc_array = $sql->assoc_array($school_city_query);
+		$school_cities = array();
+		foreach ($school_city_assoc_array as $key => $value) {
+			$new_scc = new school_city();
+			$new_scc->set_school_city_data_by_id($value['scc_id']);
+			$school_cities[] = $new_scc;
+		}
+		$smarty->assign('school_cities',$school_cities);
 		$smarty->display('school_create.tpl');
 		break;
 	default:

_include/include_delete_city.php

@@ -5,10 +5,17 @@ if ($this->is_id()) {
 	//$sql->execute_query($delete_query);
 
 	//akiknek ez a city_id van beállítva, azoknál null-ra állítjuk
-	$school_city_query = "SELECT uk_id FROM user_kid WHERE uk_school_city_scc_id = " . $this->get_id();
+	$school_city_query = "SELECT uk_id FROM user_kid WHERE uk_address_scc_id = " . $this->get_id();
 	$school_city_assoc_array = $sql->assoc_array($school_city_query);
 	foreach ($school_city_assoc_array as $uk_id) {
-		$sql->update_table('user_kid', array('uk_school_city_scc_id' => 'null'), array('uk_id' => $uk_id['uk_id']));
+		$sql->update_table('user_kid', array('uk_address_scc_id' => 'null'), array('uk_id' => $uk_id['uk_id']));
+	}
+
+	//amelyik sulinak ez a city_id van beállítva, azoknál null-ra állítjuk
+	$school_city_query = "SELECT sc_id FROM school WHERE sc_school_city_scc_id = " . $this->get_id();
+	$school_city_assoc_array = $sql->assoc_array($school_city_query);
+	foreach ($school_city_assoc_array as $sc_id) {
+		$sql->update_table('school', array('sc_school_city_scc_id' => 'null'), array('sc_id' => $sc_id['sc_id']));
 	}
 
 	$sql->update_table('school_city', array('scc_deleted' => 1), array('scc_id' => $this->get_id()));

_include/include_members.php

@@ -16,15 +16,27 @@ if ($this->is_id()) {
 	//SCHOOL ARRAY
 	$school_query = "SELECT * FROM school WHERE sc_deleted = 0 ORDER BY sc_name ASC;";
 	$school_assoc_array = $sql->assoc_array($school_query);
+	$schools = array();
+	foreach ($school_assoc_array as $key => $value) {
+		$new_school = new school();
+		$new_school->set_school_data_by_id($value['sc_id']);
+		$schools[] = $new_school;
+	}
 	//SCHOOL CITY ARRAY
-	$school_city_query = "SELECT * FROM school_city WHERE scc_deleted = 0 ORDER BY scc_city ASC;";
+	$school_city_query = "SELECT * FROM school_city WHERE scc_deleted = 0 ORDER BY - scc_order DESC, scc_city ASC;";
 	$school_city_assoc_array = $sql->assoc_array($school_city_query);
+	$school_cities = array();
+	foreach ($school_city_assoc_array as $key => $value) {
+		$new_scc = new school_city();
+		$new_scc->set_school_city_data_by_id($value['scc_id']);
+		$school_cities[] = $new_scc;
+	}
 	//REGION ARRAY
 	$region_query = "SELECT * FROM region WHERE reg_deleted = 0 ORDER BY reg_name ASC;";
 	$region_assoc_array = $sql->assoc_array($region_query);
 	//smarty thingz
-	$smarty->assign('school_assoc_array', $school_assoc_array);
+	$smarty->assign('school_assoc_array', $schools);
-	$smarty->assign('school_city_assoc_array', $school_city_assoc_array);
+	$smarty->assign('school_city_assoc_array', $school_cities);
 	$smarty->assign('region_assoc_array', $region_assoc_array);
 	$smarty->assign('user_data', $user_data_assoc_array[0]);
 	$smarty->assign('shirt_size_assoc_array', $shirt_size_assoc_array);

_include/include_overview.php

@@ -22,6 +22,8 @@ else {
 	}
 
 
+
+
 	//todo: object
 
 	$smarty->display('user_overview.tpl');

_include/include_schools.php

@@ -7,6 +7,24 @@ if ($this->is_id()) {
 
 	# ISKOLA SZERKESZTÉSE
 	
+	$new_school = new school();
+	$new_school->set_school_data_by_id($this->get_id());
+
+	//SCC LIST
+	$school_city_query = "SELECT scc_id FROM school_city WHERE scc_deleted = 0 ORDER BY - scc_order DESC, scc_city ASC;";
+	$school_city_assoc_array = $sql->assoc_array($school_city_query);
+	$school_cities = array();
+	foreach ($school_city_assoc_array as $key => $value) {
+		$new_scc = new school_city();
+		$new_scc->set_school_city_data_by_id($value['scc_id']);
+		$school_cities[] = $new_scc;
+	}
+
+	//var_dump($school_cities);
+
+	$smarty->assign('school', $new_school);
+	$smarty->assign('school_cities', $school_cities);
+	$smarty->display('school_data_edit.tpl');
 
 }
 
@@ -14,10 +32,17 @@ else {
 	
 	# ISKOLA LISTA
 
-	$tr_type_query = "SELECT * FROM school WHERE sc_deleted = 0 ORDER BY sc_name ASC";
+	$school_query = "SELECT * FROM school WHERE sc_deleted = 0 ORDER BY sc_name ASC";
-	$tr_type_assoc_array = $sql->assoc_array($tr_type_query);
+	$school_assoc_array = $sql->assoc_array($school_query);
+	$schools = array();
+	foreach ($school_assoc_array as $school_array) {
+		$new_school = new school();
+		$new_school->set_school_data_by_id($school_array['sc_id']);
+		$schools[] = $new_school;
+	}
 
-	$smarty->assign('school_assoc_array',$tr_type_assoc_array);
+
+	$smarty->assign('schools',$schools);
 	$smarty->display('school_list.tpl');
 
 	

event_handler.php

@@ -188,11 +188,7 @@ if (isset($_POST['action'])) {
 			break;
 		case 'city_create':
 			# település létrehozása
-			//todo: település object
+			$new_city_id = school_city::create_school_city($_POST['scc_city']);
-			$new_city_id = $sql->insert_into('school_city', array(
-				'scc_city' => $_POST['scc_city'], 
-				)
-			);
 			log::register('new_city', $new_city_id);
 			header("Location: /admin/cities");
 			break;
@@ -202,8 +198,13 @@ if (isset($_POST['action'])) {
 			foreach ($_POST as $key => $value) {
 				$key_parts = explode('_', $key);
 				$scc_id = $key_parts[1];
+				if ($key_parts[0] != "order") {
 					$sql->update_table('school_city', array('scc_city' => $value), array('scc_id' => $scc_id));
 				}
+				else {
+					$sql->update_table('school_city', array('scc_order' => ($value==0?'null':$value)), array('scc_id' => $scc_id));
+				}
+			}
 			log::register('update_city', 'update all');
 			header("Location: /admin/cities");
 			break;
@@ -228,25 +229,17 @@ if (isset($_POST['action'])) {
 			log::register('update_region', 'update all');
 			header("Location: /admin/regions");
 			break;
-		case 'school_create':
+		case 'school_data_create':
 			# iskola létrehozása
-			//todo: iskola object
+			$new_school_id = school::create_school($_POST['sc_name'], $_POST['sc_school_city_scc_id']);
-			$new_school_id = $sql->insert_into('school', array(
-				'sc_name' => $_POST['sc_name'], 
-				)
-			);
 			log::register('new_school', $new_school_id);
 			header("Location: /admin/schools");
 			break;
-		case 'school_update':
+		case 'school_data_edit':
-			# school lista updatelése AB-ba
+			# iskola módosítása
 			unset($_POST['action']);
-			foreach ($_POST as $key => $value) {
+			school::update_school($_POST['sc_id'], $_POST['sc_name'], $_POST['sc_school_city_scc_id']);
-				$key_parts = explode('_', $key);
+			log::register('update_school', $_POST['sc_id']);
-				$sc_id = $key_parts[1];
-				$sql->update_table('school', array('sc_name' => $value), array('sc_id' => $sc_id));
-			}
-			log::register('update_school', 'update all');
 			header("Location: /admin/schools");
 			break;
 		default:

template/templates/city_list.tpl

@@ -8,6 +8,7 @@
 			<div>
 				<div style="float: left;">
 					<input type="text" name="scc_{$scc.scc_id}" id="scc_{$scc.scc_id}" value="{$scc.scc_city}">
+					<input type="number" min="0" name="order_{$scc.scc_id}" id="order_{$scc.scc_id}" value="{$scc.scc_order}" size="3"> 
 					<a href="/admin/delete_city/{$scc.scc_id}" class="addbutton delete">Törlés</a>
 				</div>
 			</div>

template/templates/school_create.tpl

@@ -1,12 +1,24 @@
 <div class="form_wrapper">
 	<form method="post">
-		<input type="hidden" name="action" value="school_create">
+		<input type="hidden" name="action" value="school_data_create">
 
 		<div>
 			<label class="desc" id="title1" for="sc_name">Új iskola neve:</label>
 			<div><input type="text" name="sc_name" id="sc_name" required></div>
 		</div>
 
+		<div>
+			<label class="desc" for="sc_school_city_scc_id">Iskola települése:</label>
+			<div>
+				<select name="sc_school_city_scc_id" id="sc_school_city_scc_id">
+					<option value='null'>- nincs beállítva -</option>
+					{foreach $school_cities as $scc}
+					<option value='{$scc->get_scc_id()}'>{$scc->get_scc_city()}</option>
+					{/foreach}
+				</select>
+			</div>
+		</div>
+
 		
 		<div>
 			<div>

template/templates/school_data_edit.tpl

@@ -0,0 +1,46 @@
+<div class="form_wrapper">
+	<form method="post">
+	<div class="buttons">
+		<a href="/admin/delete_school/{$school->get_sc_id()}" class="addbutton delete-big">Iskola törlése</a>
+	</div>
+		<input type="hidden" name="action" value="school_data_edit">
+		<input type="hidden" name="sc_id" value="{$school->get_sc_id()}">
+		
+		<div>
+			<label class="desc" for="sc_name">Név:</label>
+			<div><input type="text" name="sc_name" id="sc_name" value="{$school->get_sc_name()}" required></div>
+		</div>
+
+
+		<div>
+			<label class="desc" for="sc_school_city_scc_id">Iskola települése:</label>
+			<div>
+				<select name="sc_school_city_scc_id" id="sc_school_city_scc_id">
+					<option value='null'>- nincs beállítva -</option>
+					{foreach $school_cities as $scc}
+					<option value='{$scc->get_scc_id()}'{if $scc->get_scc_id() == $school->get_sc_school_city_scc_id()} selected{/if}>{$scc->get_scc_city()}</option>
+					{/foreach}
+				</select>
+			</div>
+		</div>
+
+		<div>
+			<div>
+		  		<input class="button black" type="submit" value="Mentés">
+		    </div>
+		</div>
+
+	</form>
+</div>
+
+
+<script type="text/javascript">
+	$( document ).ready(function() {
+	    if (!$('#ua_can_login').attr('checked')) $("#password").hide();
+	});
+
+	$('#ua_can_login').click(function() {
+	    $("#password").toggle(this.checked);
+	});
+
+</script>

template/templates/school_list.tpl

@@ -1,23 +1,19 @@
-<div class="form_wrapper">
-	<form method="post">
-		<input type="hidden" name="action" value="school_update">
 <div class="buttons">
-			<a href="/admin/create/school" class="addbutton add-big">Új iksola hozzáadása</a>
+
-		</div>
+	<a href="/admin/create/school" class="addbutton add-big">Új iskola hozzáadása</a>
-		{foreach $school_assoc_array as $school}
+
-			<div>
-				<div style="float: left;">
-					<input type="text" name="sc_{$school.sc_id}" id="sc_{$school.sc_id}" value="{$school.sc_name}">
-					<a href="/admin/delete_school/{$school.sc_id}" class="addbutton delete">Törlés</a>
-				</div>
 </div>
 
-			
+<div class="list wide">
+	{foreach $schools as $school}
+	<a href="/admin/schools/{$school->get_sc_id()}">
+		<div class="list_item">
+			<img src="/_image/school.png">
+			{$school->get_sc_name()}
+			{if $school->get_sc_school_city()}
+			({$school->get_sc_school_city()->get_scc_city()})
+			{/if}
+		</div>
+	</a>
 	{/foreach}
-		<div>
-			<div style="float: left;">
-		  		<input class="button black" type="submit" value="Mentés">
-		    </div>
-		</div>
-	</form>
 </div>

template/templates/user_data_create.tpl

@@ -2,28 +2,28 @@
 <form method="post">
 	<input type="hidden" name="action" id="action" value="user_data_create">
 		<div>
-			<label class="desc" id="title1" for="uk_name">Név:</label>
+			<label class="desc" for="uk_name">Név:</label>
 			<div><input type="text" name="uk_name" id="uk_name" size="8" class="field text fn" required></div>
 		</div>
 	
 
 		<div>
-			<label class="desc" id="title1" for="uk_is_active">Aktív:</label>
+			<label class="desc" for="uk_is_active">Aktív:</label>
 			<div><input type="checkbox" name="uk_is_active" id="uk_is_active" value="1" checked></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_last_modified">Utolsó módosítás dátuma:</label>
+			<label class="desc" for="uk_last_modified">Utolsó módosítás dátuma:</label>
 			<div><input type="text" name="uk_last_modified" id="uk_last_modified" value="{$today}"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_password">Jelszó:</label>
+			<label class="desc" for="uk_password">Jelszó:</label>
 			<div><input type="text" name="uk_password" id="uk_password"></div>
 		</div>
 
 		<div>
-			<legend class="desc" id="title1" for="uk_gender">Nem: </legend>
+			<legend class="desc" for="uk_gender">Nem: </legend>
 			<div>
 				<input id="r_01" type="radio" name="uk_gender" value="1" checked>
 				<label class="choice" for="r_01">Fiú</label>
@@ -35,28 +35,42 @@
 		</div>
 		
 		<div>
-			<label class="desc" id="title1" for="uk_birth_date">Születési dátum:</label>
+			<label class="desc" for="uk_birth_date">Születési dátum:</label>
 			<div><input type="text" name="uk_birth_date" id="uk_birth_date"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_birth_year">Születési év:</label>
+			<label class="desc" for="uk_birth_year">Születési év:</label>
 			<div><input type="text" name="uk_birth_year" id="uk_birth_year"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_address">Lakhely (település):</label>
+			<label class="desc" for="uk_address_scc_id">Lakhely (település):</label>
-			<div><input type="text" name="uk_address" id="uk_address"></div>
+			<div>
+				<select name="uk_address_scc_id" id="uk_address_scc_id">
+					<option value="null"> - </option>
+					{foreach $school_city_assoc_array as $school_city_array}
+						<option value="{$school_city_array->get_scc_id()}">
+							{$school_city_array->get_scc_city()}
+						</option>
+					{/foreach}
+				</select>
+			</div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_first_training">Első edzés dátuma:</label>
+			<label class="desc" for="uk_first_training">Első edzés dátuma:</label>
 			<div><input type="text" name="uk_first_training" id="uk_first_training"></div>
 		</div>
 
+		<div>
+			<label class="desc" for="uk_beforehand">Előzmény:</label>
+			<div><input type="text" name="uk_beforehand" id="uk_beforehand"></div>
+		</div>
+
 	
 		<div>
-			<legend class="desc" id="title1" for="uk_hand">Kéz: </legend>
+			<legend class="desc" for="uk_hand">Kéz: </legend>
 			<div>
 				<input id="r_03" type="radio" name="uk_hand" value="1">
 				<label class="choice" for="r_03">Bal</label>
@@ -69,46 +83,47 @@
 		
 		
 		<div>
-			<label class="desc" id="title1" for="uk_email">E-mail cím:</label>
+			<label class="desc" for="uk_email">E-mail cím:</label>
 			<div><input type="email" name="uk_email" id="uk_email"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_phone">Telefonszám:</label>
+			<label class="desc" for="uk_phone">Telefonszám:</label>
 			<div><input type="text" name="uk_phone" id="uk_phone"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_facebook">Facebook:</label>
+			<label class="desc" for="uk_facebook">Facebook:</label>
 			<div><input type="text" name="uk_facebook" id="uk_facebook"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_school_sc_id">Iskola neve:</label>
+			<label class="desc" for="uk_school_sc_id">Iskola neve:</label>
 			<div>
 				<select name="uk_school_sc_id" id="uk_school_sc_id">
 					<option value="null"> - (állítsd erre új iskola felvételéhez)</option>
 					{foreach $school_assoc_array as $school_array}
-						<option value="{$school_array.sc_id}">
+						<option value="{$school_array->get_sc_id()}">
-							{$school_array.sc_name}
+							{$school_array->get_sc_name()}
+							{if $school_array->get_sc_school_city()}({$school_array->get_sc_school_city()->get_scc_city()}){/if}
 						</option>
 					{/foreach}
 				</select>
 			</div>
 		</div>
 		<div class="add_school">
-			<label class="desc" id="title1" for="add_school">Új iskola felvétele:</label>
+			<label class="desc" for="add_school">Új iskola neve:</label>
 			<div><input type="text" name="add_school" id="add_school"></div>
 		</div>
 
-		<div>
+		<div class="add_school">
-			<label class="desc" id="title1" for="uk_school_city_scc_id">Iskola települése:</label>
+			<label class="desc" for="uk_school_city_scc_id">Új iskola települése:</label>
 			<div>
 				<select name="uk_school_city_scc_id" id="uk_school_city_scc_id">
 					<option value="null"> - </option>
 					{foreach $school_city_assoc_array as $school_city_array}
-						<option value="{$school_city_array.scc_id}">
+						<option value="{$school_city_array->get_scc_id()}">
-							{$school_city_array.scc_city}
+							{$school_city_array->get_scc_city()}
 						</option>
 					{/foreach}
 				</select>
@@ -116,14 +131,10 @@
 		</div>
 
 
-		<div>
-			<label class="desc" id="title1" for="uk_school_district">Iskola kerülete:</label>
-			<div><input type="text" name="uk_school_district" id="uk_school_district"></div>
-		</div>
 		
 
 		<div>
-			<label class="desc" id="title1" for="uk_region_reg_id">Diákolimpia körzet:</label>
+			<label class="desc" for="uk_region_reg_id">Diákolimpia körzet:</label>
 			<div>
 				<select name="uk_region_reg_id" id="uk_region_reg_id">
 					<option value="null"> - </option>
@@ -137,7 +148,12 @@
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_shirt_size_ss_id">Pólóméret:</label>
+			<label class="desc" for="uk_age_category">Diákolimpia korcsoport:</label>
+			<div><input type="text" name="uk_age_category" id="uk_age_category"></div>
+		</div>
+
+		<div>
+			<label class="desc" for="uk_shirt_size_ss_id">Pólóméret:</label>
 			<div>
 				<select name="uk_shirt_size_ss_id" id="uk_shirt_size_ss_id">
 					<option value="null"> - </option>
@@ -151,12 +167,12 @@
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_shirt_note">Póló megjegyzés:</label>
+			<label class="desc" for="uk_shirt_note">Póló megjegyzés:</label>
 			<div><input type="text" name="uk_shirt_note" id="uk_shirt_note"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_parent_1">Szülő:</label>
+			<label class="desc" for="uk_parent_1">Szülő:</label>
 			<div>
 				<select name="uk_parent_1" id="uk_parent_1">
 					<option value="null"> - (állítsd erre új szülő felvételéhez)</option>
@@ -170,20 +186,20 @@
 		</div>
 
 		<div class="add_parent_1_block">
-			<label class="desc" id="title1" for="add_parent_1">Új szülő neve:</label>
+			<label class="desc" for="add_parent_1">Új szülő neve:</label>
 			<div><input type="text" name="add_parent_1" id="add_parent_1"></div>
 		</div>
 
 		<div class="add_parent_1_block">
-			<label class="desc" id="title1" for="parent_1_email">E-mail cím:</label>
+			<label class="desc" for="parent_1_email">E-mail cím:</label>
 			<div><input type="text" name="parent_1_email" id="parent_1_email"></div>
 		</div>
 		<div class="add_parent_1_block">
-			<label class="desc" id="title1" for="parent_1_phone">Telefonszám:</label>
+			<label class="desc" for="parent_1_phone">Telefonszám:</label>
 			<div><input type="text" name="parent_1_phone" id="parent_1_phone"></div>
 		</div>
 		<div class="add_parent_1_block">
-			<label class="desc" id="title1" for="parent_1_facebook">Facebook:</label>
+			<label class="desc" for="parent_1_facebook">Facebook:</label>
 			<div><input type="text" name="parent_1_facebook" id="parent_1_facebook"></div>
 		</div>
 

template/templates/user_data_edit.tpl

@@ -8,28 +8,28 @@
 	<input type="hidden" name="uk_id" id="uk_id" value="{$user_data.uk_id}">
 
 		<div>
-			<label class="desc" id="title1" for="uk_name">Név:</label>
+			<label class="desc" for="uk_name">Név:</label>
 			<div><input type="text" name="uk_name" id="uk_name" size="8" class="field text fn" value="{$user_data.uk_name}" required></div>
 		</div>
 	
 
 		<div>
-			<label class="desc" id="title1" for="uk_is_active">Aktív:</label>
+			<label class="desc" for="uk_is_active">Aktív:</label>
 			<div><input type="checkbox" name="uk_is_active" id="uk_is_active" value="1" {if 1==$user_data.uk_is_active}checked{/if}></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_last_modified">Utolsó módosítás dátuma:</label>
+			<label class="desc" for="uk_last_modified">Utolsó módosítás dátuma:</label>
 			<div><input type="text" name="uk_last_modified" id="uk_last_modified" value="{$user_data.uk_last_modified}"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_password">Jelszó:</label>
+			<label class="desc" for="uk_password">Jelszó:</label>
 			<div><input type="text" name="uk_password" id="uk_password" value="{$user_data.uk_password}"></div>
 		</div>
 
 		<div>
-			<legend class="desc" id="title1" for="uk_gender">Nem: </legend>
+			<legend class="desc" for="uk_gender">Nem: </legend>
 			<div>
 				<input id="r_01" type="radio" name="uk_gender" value="1" {if 1==$user_data.uk_gender}checked{/if}>
 				<label class="choice" for="r_01">Fiú</label>
@@ -41,28 +41,41 @@
 		</div>
 		
 		<div>
-			<label class="desc" id="title1" for="uk_birth_date">Születési dátum:</label>
+			<label class="desc" for="uk_birth_date">Születési dátum:</label>
 			<div><input type="text" name="uk_birth_date" id="uk_birth_date" value="{$user_data.uk_birth_date}"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_birth_year">Születési év:</label>
+			<label class="desc" for="uk_birth_year">Születési év:</label>
 			<div><input type="text" name="uk_birth_year" id="uk_birth_year" value="{$user_data.uk_birth_year}"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_address">Lakhely (település):</label>
+			<label class="desc" for="uk_address_scc_id">Lakhely (település):</label>
-			<div><input type="text" name="uk_address" id="uk_address" value="{$user_data.uk_address}"></div>
+			<div>
+				<select name="uk_address_scc_id" id="uk_address_scc_id">
+					<option value="null"> - </option>
+					{foreach $school_city_assoc_array as $school_city_array}
+						<option value="{$school_city_array->get_scc_id()}"{if $user_data.uk_address_scc_id == $school_city_array->get_scc_id()} selected{/if}>
+							{$school_city_array->get_scc_city()}
+						</option>
+					{/foreach}
+				</select>
+			</div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_first_training">Első edzés dátuma:</label>
+			<label class="desc" for="uk_first_training">Első edzés dátuma:</label>
 			<div><input type="text" name="uk_first_training" id="uk_first_training" value="{$user_data.uk_first_training}"></div>
 		</div>
 
+		<div>
+			<label class="desc" for="uk_beforehand">Előzmény:</label>
+			<div><input type="text" name="uk_beforehand" id="uk_beforehand" value="{$user_data.uk_beforehand}"></div>
+		</div>
 	
 		<div>
-			<legend class="desc" id="title1" for="uk_hand">Kéz: </legend>
+			<legend class="desc" for="uk_hand">Kéz: </legend>
 			<div>
 				<input id="r_03" type="radio" name="uk_hand" value="1" {if 1==$user_data.uk_hand}checked{/if}>
 				<label class="choice" for="r_03">Bal</label>
@@ -75,22 +88,22 @@
 		
 		
 		<div>
-			<label class="desc" id="title1" for="uk_email">E-mail cím:</label>
+			<label class="desc" for="uk_email">E-mail cím:</label>
 			<div><input type="email" name="uk_email" id="uk_email" value="{$user_data.uk_email}"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_phone">Telefonszám:</label>
+			<label class="desc" for="uk_phone">Telefonszám:</label>
 			<div><input type="text" name="uk_phone" id="uk_phone" value="{$user_data.uk_phone}"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_facebook">Facebook:</label>
+			<label class="desc" for="uk_facebook">Facebook:</label>
 			<div><input type="text" name="uk_facebook" id="uk_facebook" value="{$user_data.uk_facebook}"></div>
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_shirt_size_ss_id">Pólóméret:</label>
+			<label class="desc" for="uk_shirt_size_ss_id">Pólóméret:</label>
 			<div>
 				<select name="uk_shirt_size_ss_id" id="uk_shirt_size_ss_id">
 					<option value="null"> - </option>
@@ -104,38 +117,39 @@
 		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_shirt_note">Póló megjegyzés:</label>
+			<label class="desc" for="uk_shirt_note">Póló megjegyzés:</label>
 			<div><input type="text" name="uk_shirt_note" id="uk_shirt_note" value="{$user_data.uk_shirt_note}"></div>
 		</div>
 
 
 		<div>
-			<label class="desc" id="title1" for="uk_school_sc_id">Iskola neve:</label>
+			<label class="desc" for="uk_school_sc_id">Iskola neve:</label>
 			<div>
 				<select name="uk_school_sc_id" id="uk_school_sc_id">
 					<option value="null"> - (állítsd erre új iskola felvételéhez)</option>
 					{foreach $school_assoc_array as $school_array}
-						<option value="{$school_array.sc_id}"{if $school_array.sc_id == $user_data.uk_school_sc_id} selected{/if}>
+						<option value="{$school_array->get_sc_id()}"{if $school_array->get_sc_id() == $user_data.uk_school_sc_id} selected{/if}>
-							{$school_array.sc_name}
+							{$school_array->get_sc_name()}
+							{if $school_array->get_sc_school_city()}({$school_array->get_sc_school_city()->get_scc_city()}){/if}
 						</option>
 					{/foreach}
 				</select>
 			</div>
 		</div>
 
-		<div class="add_school_block">
+		<div class="add_school">
-			<label class="desc" id="title1" for="add_school">Új iskola felvétele:</label>
+			<label class="desc" for="add_school">Új iskola neve:</label>
 			<div><input type="text" name="add_school" id="add_school"></div>
 		</div>
 
-		<div>
+		<div class="add_school">
-			<label class="desc" id="title1" for="uk_school_city_scc_id">Iskola települése:</label>
+			<label class="desc" for="uk_school_city_scc_id">Új iskola települése:</label>
 			<div>
 				<select name="uk_school_city_scc_id" id="uk_school_city_scc_id">
 					<option value="null"> - </option>
 					{foreach $school_city_assoc_array as $school_city_array}
-						<option value="{$school_city_array.scc_id}"{if $school_city_array.scc_id == $user_data.uk_school_city_scc_id} selected{/if}>
+						<option value="{$school_city_array->get_scc_id()}">
-							{$school_city_array.scc_city}
+							{$school_city_array->get_scc_city()}
 						</option>
 					{/foreach}
 				</select>
@@ -143,13 +157,9 @@
 		</div>
 
 
-		<div>
-			<label class="desc" id="title1" for="uk_school_district">Iskola kerülete:</label>
-			<div><input type="text" name="uk_school_district" id="uk_school_district" value="{$user_data.uk_school_district}"></div>
-		</div>
 		
 		<div>
-			<label class="desc" id="title1" for="uk_region_reg_id">Diákolimpia körzet:</label>
+			<label class="desc" for="uk_region_reg_id">Diákolimpia körzet:</label>
 			<div>
 				<select name="uk_region_reg_id" id="uk_region_reg_id">
 					<option value="null"> - </option>
@@ -162,9 +172,13 @@
 			</div>
 		</div>
 
+		<div>
+			<label class="desc" for="uk_age_category">Diákolimpia korcsoport:</label>
+			<div><input type="text" name="uk_age_category" id="uk_age_category" value="{$user_data.uk_age_category}"></div>
+		</div>
 
 		<div>
-			<label class="desc" id="title1" for="uk_parent_1">Szülő:</label>
+			<label class="desc" for="uk_parent_1">Szülő:</label>
 			<div>
 				<select name="uk_parent_1" id="uk_parent_1">
 					<option value="null"> - (állítsd erre új szülő felvételéhez)</option>
@@ -178,22 +192,22 @@
 		</div>
 
 		<div class="add_parent_1_block">
-			<label class="desc" id="title1" for="add_parent_1">Új szülő neve:</label>
+			<label class="desc" for="add_parent_1">Új szülő neve:</label>
 			<div><input type="text" name="add_parent_1" id="add_parent_1"></div>
 		</div>
 
-		<div class="add_parent_1_block">
+		<div>
-			<label class="desc" id="title1" for="parent_1_email">E-mail cím:</label>
+			<label class="desc" for="parent_1_email">E-mail cím:</label>
 			<div><input type="text" name="parent_1_email" id="parent_1_email"></div>
 		</div>
 
-		<div class="add_parent_1_block">
+		<div>
-			<label class="desc" id="title1" for="parent_1_facebook">Facebook:</label>
+			<label class="desc" for="parent_1_facebook">Facebook:</label>
 			<div><input type="text" name="parent_1_facebook" id="parent_1_facebook"></div>
 		</div>
 
-		<div class="add_parent_1_block">
+		<div>
-			<label class="desc" id="title1" for="parent_1_phone">Telefonszám:</label>
+			<label class="desc" for="parent_1_phone">Telefonszám:</label>
 			<div><input type="text" name="parent_1_phone" id="parent_1_phone"></div>
 		</div>
 
@@ -218,17 +232,17 @@
 			<div><input type="text" name="add_parent_2" id="add_parent_2"></div>
 		</div>
 
-		<div class="add_parent_2_block">
+		<div>
 			<label class="desc" id="title2" for="parent_2_email">E-mail cím:</label>
 			<div><input type="text" name="parent_2_email" id="parent_2_email"></div>
 		</div>
 
-		<div class="add_parent_2_block">
+		<div>
 			<label class="desc" id="title2" for="parent_2_facebook">Facebook:</label>
 			<div><input type="text" name="parent_2_facebook" id="parent_2_facebook"></div>
 		</div>
 
-		<div class="add_parent_2_block">
+		<div>
 			<label class="desc" id="title2" for="parent_2_phone">Telefonszám:</label>
 			<div><input type="text" name="parent_2_phone" id="parent_2_phone"></div>
 		</div>
@@ -268,8 +282,10 @@
 	    else $(".add_parent_1_block").hide();
 	    if ($("#uk_parent_2").val() == 'null') $(".add_parent_2_block").show();
 	    else $(".add_parent_2_block").hide();
-	    if ($("#uk_school_sc_id").val() == 'null') $(".add_school_block").show();
+	    if ($("#uk_school_sc_id").val() == 'null') $(".add_school").show();
-	    else $(".add_school_block").hide();
+	    else $(".add_school").hide();
+	    $("#uk_parent_1").trigger("change");
+	    $("#uk_parent_2").trigger("change");
 	});
 
 	$('#uk_parent_1').change(function() {
@@ -281,7 +297,53 @@
 	});
 
 	$('#uk_school_sc_id').change(function() {
-	    $(".add_school_block").toggle(this.value == 'null');
+	    $(".add_school").toggle(this.value == 'null');
+	});
+
+
+	$("#uk_parent_1").change(function(){
+    $.post("/_ajax/get_parent_data.php",
+    {
+        parent_id: $("#uk_parent_1").val(),
+        parent_number: 1
+    },
+    function(data, status){
+        if (!data) {
+        	$("#parent_1_phone").val('');
+        	$("#parent_1_email").val('');
+        	$("#parent_1_facebook").val('');
+        }
+        else {
+        	var pdata = JSON.parse(data);
+        	$("#parent_1_phone").val(pdata[1]);
+        	$("#parent_1_email").val(pdata[0]);
+        	$("#parent_1_facebook").val(pdata[2]);
+        	
+        }
+    });
+	});
+
+
+	$("#uk_parent_2").change(function(){
+    $.post("/_ajax/get_parent_data.php",
+    {
+        parent_id: $("#uk_parent_2").val(),
+        parent_number: 2
+    },
+    function(data, status){
+        if (!data) {
+        	$("#parent_2_phone").val('');
+        	$("#parent_2_email").val('');
+        	$("#parent_2_facebook").val('');
+        }
+        else {
+        	var pdata = JSON.parse(data);
+        	$("#parent_2_phone").val(pdata[1]);
+        	$("#parent_2_email").val(pdata[0]);
+        	$("#parent_2_facebook").val(pdata[2]);
+        	
+        }
+    });
 	});
 
 </script>

template/templates/user_overview.tpl

@@ -39,14 +39,27 @@
 		{/if}
     </div>
 </div>
+<div class="list_item">
+    <label class="desc">
+        <img src="/_image/calendar.png">
+        Előzmény:
+    </label>
+    <div>
+        {if $user_login->get_uk_beforehand()}
+            {$user_login->get_uk_beforehand()}
+        {else}
+            &nbsp;
+        {/if}
+    </div>
+</div>
 <div class="list_item">
     <label class="desc">
         <img src="/_image/house.png">
         Lakhely (település):
     </label>
     <div>
-        {if $user_login->get_uk_address()}
+        {if $user_login->get_uk_address_scc_id()}
-            {$user_login->get_uk_address()}
+            {$user_login->get_uk_address_scc_id()}
         {else}
             &nbsp;
         {/if}
@@ -123,8 +136,8 @@
         Iskola neve:
     </label>
     <div>
-        {if $user_login->get_uk_school_name()}
+        {if $user_login->get_uk_school()}
-            {$user_login->get_uk_school_name()}
+            {$user_login->get_uk_school()->get_sc_name()}
         {else}
             &nbsp;
         {/if}
@@ -136,21 +149,12 @@
         Iskola település:
     </label>
     <div>
-        {if $user_login->get_uk_school_city()}
+        {if $user_login->get_uk_school()}
-            {$user_login->get_uk_school_city()}
+            {if $user_login->get_uk_school()->get_sc_school_city()}
+                {$user_login->get_uk_school()->get_sc_school_city()->get_scc_city()}
             {else}
                 &nbsp;
             {/if}
-    </div>
-</div>
-<div class="list_item">
-    <label class="desc">
-        <img src="/_image/school.png">
-        Iskola kerület:
-    </label>
-    <div>
-        {if $user_login->get_uk_school_district()}
-            {$user_login->get_uk_school_district()}
         {else}
             &nbsp;
         {/if}
@@ -169,6 +173,19 @@
         {/if}
     </div>
 </div>
+<div class="list_item">
+    <label class="desc">
+        <img src="/_image/school.png">
+        Diákolimpia korcsoport:
+    </label>
+    <div>
+        {if $user_login->get_uk_age_category()}
+            {$user_login->get_uk_age_category()}
+        {else}
+            &nbsp;
+        {/if}
+    </div>
+</div>
 <div class="list_item">
     <label class="desc">
         <img src="/_image/person.png">