diff --git a/_class/class_camp.php b/_class/class_camp.php index 9a002eb..e799966 100644 --- a/_class/class_camp.php +++ b/_class/class_camp.php @@ -8,7 +8,9 @@ class camp private $camp_id; private $camp_city; private $camp_from; - private $camp_to; + private $camp_to; + private $camp_leader; + private $camp_helpers; private $camp_camp_type_ct_id; //ID private $camp_type; //OBJ private $camp_shuttle = array(); //array @@ -197,6 +199,26 @@ class camp return $this; } + public function get_camp_leader() { + return $this->camp_leader; + } + + private function set_camp_leader($_item) { + $this->camp_leader = $_item; + + return $this; + } + + public function get_camp_helpers() { + return $this->camp_helpers; + } + + private function set_camp_helpers($_item) { + $this->camp_helpers = $_item; + + return $this; + } + public function has_pending_apply() { global $sql; return $sql->num_of_rows("select * from camp join camp_apply on capp_camp_id = camp_id where capp_status = 2 AND camp_id = " . $this->get_camp_id()); @@ -234,13 +256,15 @@ class camp } - public static function create_camp($_city, $_from, $_to, $_is_open, $_ct_id, $_shuttles, $_accoms) { + public static function create_camp($_city, $_from, $_to, $_leader, $_helpers, $_is_open, $_ct_id, $_shuttles, $_accoms) { global $sql; $new_camp_id = $sql->insert_into('camp',array( 'camp_city' => $_city, 'camp_from' => $_from, 'camp_to' => $_to, + 'camp_leader' => $_leader, + 'camp_helpers' => $_helpers, 'camp_is_open' => $_is_open, 'camp_camp_type_ct_id' => $_ct_id )); @@ -259,13 +283,15 @@ class camp } - public static function update_camp($_city, $_from, $_to, $_is_open, $_ct_id, $_shuttles, $_accoms, $_camp_id) { + public static function update_camp($_city, $_from, $_to, $_leader, $_helpers, $_is_open, $_ct_id, $_shuttles, $_accoms, $_camp_id) { global $sql; $new_camp_id = $sql->update_table('camp',array( 'camp_city' => $_city, 'camp_from' => $_from, 'camp_to' => $_to, + 'camp_leader' => $_leader, + 'camp_helpers' => $_helpers, 'camp_is_open' => $_is_open, 'camp_camp_type_ct_id' => $_ct_id ), diff --git a/event_handler.php b/event_handler.php index aa94c18..226e160 100644 --- a/event_handler.php +++ b/event_handler.php @@ -360,7 +360,7 @@ if (isset($_POST['action'])) { $accoms = $_POST['accomodations']; } - camp::create_camp($_POST['camp_city'], $_POST['camp_from'], $_POST['camp_to'], (!empty($_POST['camp_is_open'])?1:0), $_POST['camp_camp_type_ct_id'], $shuttles, $accoms); + camp::create_camp($_POST['camp_city'], $_POST['camp_from'], $_POST['camp_to'], $_POST['camp_leader'], $_POST['camp_helpers'], (!empty($_POST['camp_is_open'])?1:0), $_POST['camp_camp_type_ct_id'], $shuttles, $accoms); log::register('new_camp', $_POST['camp_from'] . " (" . $_POST['camp_city'] . ")"); break; case 'camp_update': @@ -375,7 +375,7 @@ if (isset($_POST['action'])) { $accoms = $_POST['accomodations']; } - camp::update_camp($_POST['camp_city'], $_POST['camp_from'], $_POST['camp_to'], (!empty($_POST['camp_is_open'])?1:0), $_POST['camp_camp_type_ct_id'], $shuttles, $accoms, $_POST['camp_id']); + camp::update_camp($_POST['camp_city'], $_POST['camp_from'], $_POST['camp_to'], $_POST['camp_leader'], $_POST['camp_helpers'], (!empty($_POST['camp_is_open'])?1:0), $_POST['camp_camp_type_ct_id'], $shuttles, $accoms, $_POST['camp_id']); log::register('update_camp', $_POST['camp_from'] . " (" . $_POST['camp_city'] . ")"); header('Location: /admin/camps/' . $_POST['camp_id']); diff --git a/template/templates/apply.tpl b/template/templates/apply.tpl index 55f8127..e57c329 100644 --- a/template/templates/apply.tpl +++ b/template/templates/apply.tpl @@ -108,13 +108,29 @@
{$apply->get_capp_camp_id()->get_camp_from()|substr:0:4}. - {$months[$apply->get_capp_camp_id()->get_camp_from()|date_format:"%m"]}. {$apply->get_capp_camp_id()->get_camp_from()|date_format:"%e"}. - + {$months[$apply->get_capp_camp_id()->get_camp_from()|date_format:"%m"]} {$apply->get_capp_camp_id()->get_camp_from()|date_format:"%e"}. - {if $apply->get_capp_camp_id()->get_camp_from()|date_format:"%m" != $apply->get_capp_camp_id()->get_camp_to()|date_format:"%m"} {$months[$apply->get_capp_camp_id()->get_camp_to()|date_format:"%m"]}. {/if} {$apply->get_capp_camp_id()->get_camp_to()|date_format:"%e"}.
+{if $page == 'admin' || $page == 'taborvezeto'} +
+ +
{$apply->get_capp_camp_id()->get_camp_leader()}
+
+
+ +
{$apply->get_capp_camp_id()->get_camp_helpers()}
+
+{/if}
+
+
+ +
+
+
+ +
+
diff --git a/template/templates/camp_data_update.tpl b/template/templates/camp_data_update.tpl index c6107c0..3fb51ed 100644 --- a/template/templates/camp_data_update.tpl +++ b/template/templates/camp_data_update.tpl @@ -18,6 +18,14 @@
+
+ +
+
+
+ +
+
get_camp_is_open()}checked{/if}>