diff --git a/_class/class_user_kid.php b/_class/class_user_kid.php index 9283fb0..441fb8c 100644 --- a/_class/class_user_kid.php +++ b/_class/class_user_kid.php @@ -418,25 +418,12 @@ class user_kid extends user_parent { $_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']); + '', $_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']); - if (isset($_user_value_array['parent_1_facebook'])) unset($_user_value_array['parent_1_facebook']); if (isset($_user_value_array['parent_1_phone'])) unset($_user_value_array['parent_1_phone']); - //PARENT_2 HANDLER - if (isset($_user_value_array['add_parent_2']) && $_user_value_array['add_parent_2'] != "") { - $_user_value_array['uk_parent_2'] = self::add_new_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']); - if (isset($_user_value_array['parent_2_facebook'])) unset($_user_value_array['parent_2_facebook']); - if (isset($_user_value_array['parent_2_phone'])) unset($_user_value_array['parent_2_phone']); //date handler if (!isset($_user_value_array['uk_first_training']) || $_user_value_array['uk_first_training'] == "") { @@ -482,38 +469,21 @@ class user_kid extends user_parent { $_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']); + '', $_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']); - if (isset($_user_value_array['parent_1_facebook'])) unset($_user_value_array['parent_1_facebook']); if (isset($_user_value_array['parent_1_phone'])) unset($_user_value_array['parent_1_phone']); //PARENT_2 HANDLER - if (isset($_user_value_array['add_parent_2']) && $_user_value_array['add_parent_2'] != "") { - $_user_value_array['uk_parent_2'] = self::add_new_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']); if (isset($_user_value_array['parent_2_facebook'])) unset($_user_value_array['parent_2_facebook']); diff --git a/_css/button.css b/_css/button.css index 7f026b9..7784938 100644 --- a/_css/button.css +++ b/_css/button.css @@ -42,8 +42,13 @@ text-shadow: 0 1px 0 #2f2f2f; padding: 5px; } + +.button.black[disabled] { + color: #aa9e9e; + background: linear-gradient(#656565, #6a6262); +} -.button.black:hover { +.button.black:not([disabled]):hover { background: #4c4c4c; background: -webkit-gradient(linear, 0 0, 0 bottom, from(#4c4c4c), to(#565656)); background: -moz-linear-gradient(#4c4c4c, #565656); diff --git a/_include/include_export_users.php b/_include/include_export_users.php index efa39ab..01e9361 100644 --- a/_include/include_export_users.php +++ b/_include/include_export_users.php @@ -3,28 +3,33 @@ $userAssocArray = $sql->assoc_array(" SELECT uk_name AS 'Név', - GROUP_CONCAT(trt_name) as 'Szint', - sc_name as 'Iskola', - uk_email as 'Email', - uk_phone as 'Telefonszám', - p1.up_name as 'Szülő1', - p1.up_email as 'Sz1_Email', - p1.up_phone as 'Sz1_Telefonszám', - p2.up_name as 'Szülő2', - p2.up_email as 'Sz2_Email', - p2.up_phone as 'Sz2_Telefonszám' + CASE + WHEN uk_gender = 1 THEN 'fiú' + ELSE 'lány' + END AS 'Nem', + uk_birth_date AS 'Születési dátum', + scc_city AS 'Lakhely', + CASE + WHEN uk_hand = 1 THEN 'bal' + ELSE 'jobb' + END AS 'Kéz', + sc_name AS 'Iskola', + uk_email AS 'Email', + uk_phone AS 'Telefonszám', + p1.up_name AS 'Szülő', + p1.up_email AS 'Szülő Email', + p1.up_phone AS 'Szülő Telefonszám', + uk_other AS 'Egyéb' FROM user_kid LEFT JOIN user_parent p1 ON p1.up_id = uk_parent_1 LEFT JOIN - user_parent p2 ON p2.up_id = uk_parent_2 - LEFT JOIN school ON sc_id = uk_school_sc_id LEFT JOIN user_kid_training_type ON uktt_user_kid_uk_id = uk_id LEFT JOIN - training_type ON trt_id = uktt_training_type_tt_id + school_city ON uk_address_scc_id = scc_id WHERE uk_deleted = 0 AND uk_is_active = 1 GROUP BY uk_name diff --git a/_include/include_userlist.php b/_include/include_userlist.php index ab07cd7..a560916 100644 --- a/_include/include_userlist.php +++ b/_include/include_userlist.php @@ -3,28 +3,33 @@ $userAssocArray = $sql->assoc_array(" SELECT uk_name AS 'Név', - GROUP_CONCAT(trt_name) as 'Szint', - sc_name as 'Iskola', - uk_email as 'Email', - uk_phone as 'Telefonszám', - p1.up_name as 'Szülő1', - p1.up_email as 'Sz1_Email', - p1.up_phone as 'Sz1_Telefonszám', - p2.up_name as 'Szülő2', - p2.up_email as 'Sz2_Email', - p2.up_phone as 'Sz2_Telefonszám' + CASE + WHEN uk_gender = 1 THEN 'fiú' + ELSE 'lány' + END AS 'Nem', + uk_birth_date AS 'Születési dátum', + scc_city AS 'Lakhely', + CASE + WHEN uk_hand = 1 THEN 'bal' + ELSE 'jobb' + END AS 'Kéz', + sc_name AS 'Iskola', + uk_email AS 'Email', + uk_phone AS 'Telefonszám', + p1.up_name AS 'Szülő', + p1.up_email AS 'Szülő Email', + p1.up_phone AS 'Szülő Telefonszám', + uk_other AS 'Egyéb' FROM user_kid LEFT JOIN user_parent p1 ON p1.up_id = uk_parent_1 LEFT JOIN - user_parent p2 ON p2.up_id = uk_parent_2 - LEFT JOIN school ON sc_id = uk_school_sc_id LEFT JOIN user_kid_training_type ON uktt_user_kid_uk_id = uk_id LEFT JOIN - training_type ON trt_id = uktt_training_type_tt_id + school_city ON uk_address_scc_id = scc_id WHERE uk_deleted = 0 AND uk_is_active = 1 GROUP BY uk_name diff --git a/template/templates/user_data_create.tpl b/template/templates/user_data_create.tpl index 93b8d6d..68a8e77 100644 --- a/template/templates/user_data_create.tpl +++ b/template/templates/user_data_create.tpl @@ -61,18 +61,7 @@ - -
| Név | -Szint | +Nem | +Születési dátum | +Lakhely | +Kéz | +Telefonszám | Iskola | -Telefonszám | -Szülő 1 | -Telefonszám | -Szülő 2 | -Telefonszám | +Szülő | +Szülő Email | +Szülő Telefonszám | +Egyéb | ||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {$user['Név']} | -{$user['Szint']} | -{$user['Iskola']} | +{$user['Nem']} | +{$user['Születési dátum']} | +{$user['Lakhely']} | +{$user['Kéz']} | {$user['Email']} | {$user['Telefonszám']} | -{$user['Szülő1']} | -{$user['Sz1_Email']} | -{$user['Sz1_Telefonszám']} | -{$user['Szülő2']} | -{$user['Sz2_Email']} | -{$user['Sz2_Telefonszám']} | +{$user['Iskola']} | +{$user['Szülő']} | +{$user['Szülő Email']} | +{$user['Szülő Telefonszám']} | +{$user['Egyéb']} |