From a50eab752890abbe038da47d40bbb1505dc4c149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B3th=20Rich=C3=A1rd?= Date: Mon, 11 Jun 2018 23:51:23 +0200 Subject: [PATCH] created profile in parent view --- _class/class_milestone.php | 48 ++++++++++++-- _class/class_milestone_camp.php | 2 +- _class/class_page.php | 8 +++ _css/default_view.css | 29 ++++++++- _image/competition.png | Bin 0 -> 5023 bytes _include/include_profile.php | 17 +++++ index.php | 12 ++++ template/templates/user_profile.tpl | 95 ++++++++++++++++++++++++++++ 8 files changed, 202 insertions(+), 9 deletions(-) create mode 100644 _image/competition.png create mode 100644 _include/include_profile.php create mode 100644 template/templates/user_profile.tpl diff --git a/_class/class_milestone.php b/_class/class_milestone.php index 0e7ac02..bf194ba 100644 --- a/_class/class_milestone.php +++ b/_class/class_milestone.php @@ -7,9 +7,9 @@ class milestone { private $ms_id; private $ms_type_mt_id; - private $ms_training_mst_id; - private $ms_competition_msc_id; - private $ms_camp_msca_id; + private $ms_training_mst_id = null; + private $ms_competition_msc_id = null; + private $ms_camp_msca_id = null; private $ms_user_kid_uk_id; public function set_ms_data_by_id($_ms_id) { @@ -20,9 +20,31 @@ class milestone foreach ($cat_array as $field => $value) { $function_name = "set_" . $field; $this->$function_name($value); - } - //todo: egyéb objektumok + if ($field == 'ms_type_mt_id' && $value != null) { + $new_mt = new milestone_type(); + $new_mt->set_mt_data_by_id($value); + $this->set_ms_type_mt_id($new_mt); + } + + if ($field == 'ms_training_mst_id' && $value != null) { + $new_mst = new milestone_training(); + $new_mst->set_mst_data_by_id($value); + $this->set_ms_training_mst_id($new_mst); + } + + if ($field == 'ms_competition_msc_id' && $value != null) { + $new_msc = new milestone_competition(); + $new_msc->set_msc_data_by_id($value); + $this->set_ms_competition_msc_id($new_msc); + } + + if ($field == 'ms_camp_msca_id' && $value != null) { + $new_msca = new milestone_camp(); + $new_msca->set_msca_data_by_id($value); + $this->set_ms_camp_msca_id($new_msca); + } + } } public static function create_ms($_mt, $_uk, $_mst = null, $_msc = null, $_msca = null) @@ -37,6 +59,18 @@ class milestone ), false); } + public function get_ms_month() { + if (null !== $this->ms_competition_msc_id) { + return $this->ms_competition_msc_id->get_msc_month(); + } + elseif (null !== $this->ms_training_mst_id) { + return $this->ms_training_mst_id->get_mst_month(); + } + elseif (null !== $this->ms_camp_msca_id) { + return $this->ms_camp_msca_id->get_msca_month(); + } + } + /** @@ -177,7 +211,7 @@ class milestone $sql->execute_query('DELETE milestone_camp FROM milestone_camp JOIN milestone ON ms_camp_msca_id= msca_id WHERE ms_user_kid_uk_id = ' . $kid); $content = file($_FILES['fileToUpload']['tmp_name']); //makes array - //var_dump($content); + for ($i=0; $i < count($content); $i++) { $line = $content[$i]; @@ -247,7 +281,7 @@ class milestone ++$i; //mérkőzések szöveg $matches = ''; do { - $matches .= trim($content[$i]); + $matches .= trim($content[$i]) . '\n'; ++$i; } while (isset($content[$i]) && !empty(trim($content[$i]))); } diff --git a/_class/class_milestone_camp.php b/_class/class_milestone_camp.php index 0da2106..d375811 100644 --- a/_class/class_milestone_camp.php +++ b/_class/class_milestone_camp.php @@ -13,7 +13,7 @@ class milestone_camp public function set_msca_data_by_id($_msca_id) { global $sql; - $cat_assoc_array = $sql->assoc_array("select * from milestone_camp where msc_id = " . $_msca_id); + $cat_assoc_array = $sql->assoc_array("select * from milestone_camp where msca_id = " . $_msca_id); $cat_array = $cat_assoc_array[0]; //alapadatok foreach ($cat_array as $field => $value) { diff --git a/_class/class_page.php b/_class/class_page.php index f0148ff..6938b4f 100644 --- a/_class/class_page.php +++ b/_class/class_page.php @@ -341,6 +341,10 @@ class page { # információk include('include_information.php'); break; + case 'profile': + # információk + include('include_profile.php'); + break; default: include('include_diary.php'); break; @@ -361,6 +365,10 @@ class page { # információk include('include_information.php'); break; + case 'profile': + # információk + include('include_profile.php'); + break; default: include('include_diary.php'); break; diff --git a/_css/default_view.css b/_css/default_view.css index 7fe065b..d1224a9 100644 --- a/_css/default_view.css +++ b/_css/default_view.css @@ -40,4 +40,31 @@ div.list div.money_deposit { background-color: #F3BF75; border-left: 2px solid #000; color: #002E4C; -} \ No newline at end of file +} + +.list_item.training { + background-color: #a1ffff; + border-left: 2px solid #0a40ff; +} + +.list_item.training:hover { + background-color: #5ecfcf; +} + +.list_item.competition { + background-color: #f6bea0; + border-left: 2px solid #ef4710; +} + +.list_item.competition:hover { + background-color: #f0a278; +} + +.list_item.camp { + background-color: #97fc7e; + border-left: 2px solid #278310; +} + +.list_item.camp:hover { + background-color: #69de4c; +} diff --git a/_image/competition.png b/_image/competition.png new file mode 100644 index 0000000000000000000000000000000000000000..ff4ad2a03edb27776e19e3f993f544f719c85145 GIT binary patch literal 5023 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'select * from milestone where ms_user_kid_uk_id = ' . $user->get_uk_id()); + +$ms_array = array(); + +foreach ($ms_assoc_array as $key => $ms) { + $new_ms = new milestone(); + $new_ms->set_ms_data_by_id($ms['ms_id']); + $ms_array[] = $new_ms; +} + +$smarty->assign('ms_array', $ms_array); + +$smarty->display('user_profile.tpl'); + +?> diff --git a/index.php b/index.php index a775481..ec5dba9 100644 --- a/index.php +++ b/index.php @@ -35,6 +35,8 @@ setlocale(LC_ALL, 'hu_HU'); + + + + + + diff --git a/template/templates/user_profile.tpl b/template/templates/user_profile.tpl new file mode 100644 index 0000000..f7b5aa9 --- /dev/null +++ b/template/templates/user_profile.tpl @@ -0,0 +1,95 @@ +
+{foreach $ms_array as $ms} + {if + $ms@first || + ( + $ms_array[$ms@index]->get_ms_month()|substr:5:2 != $ms_array[$ms@index-1]->get_ms_month()|substr:5:2 + ) + + } + {if !$ms@first && + $ms_array[$ms@index]->get_ms_month()|substr:5:2 != $ms_array[$ms@index-1]->get_ms_month()|substr:5:2 + } +
+ {/if} + {$ms_array[$ms@index]->get_ms_month()|substr:0:4}. + {$months[$ms_array[$ms@index]->get_ms_month()|substr:5:2]} + + + + {/if} +{/foreach} + + + +