Jelenlet alapfunkcio OK. Edzes torles OK.

This commit is contained in:
Ricsi
2016-11-20 22:55:27 +01:00
parent e4806322fd
commit f9e6e1ecbb
19 changed files with 289 additions and 44 deletions

View File

@@ -3,7 +3,9 @@ Options +FollowSymLinks -MultiViews
RewriteEngine On
RewriteBase /
# RewriteRule ^product/(([0-9]/[0-9a-zA-Z-\s]+)+)$ product.php?id=$1&string=$2
RewriteRule ^\/?(_ajax\/)([a-zA-Z0-9_]+)\.php$ _ajax/$2.php [NC,L]
RewriteRule ^([a-z_]+)\/?([0-9a-z_]*)\/?([0-9a-z]*)$ index.php?page=$1&subpage=$2&id=$3 [NC,L]

View File

@@ -1,11 +1,17 @@
<?php
include('../_class/class_sql.php');
trigger_error('lefut', E_USER_ERROR);
if ($_GET['checked']) {
$sql = new sql('localhost','root','','badminton_coach');
$sql->insert_into('presence', array('pr_user_kid_uk_id' => $_GET['userid'], 'pr_training_tr_id' => '9'));
ini_set('include_path', '/opt/lampp/htdocs/badminton_coach/_class');
include('class_sql.php');
$sql = new sql('localhost','root','','badminton_coach');
/*
foreach ($_POST as $key => $value) {
trigger_error($key . " : " . $value, E_USER_NOTICE);
}
*/
if ($_POST['checked'] == "true") {
$sql->insert_into('presence', array('pr_user_kid_uk_id' => $_POST['user_id'], 'pr_training_tr_id' => $_POST['tr_id']));
}
else {
$sql->execute_query('delete from presence where pr_user_kid_uk_id = ' . $_POST['user_id'] . ' AND pr_training_tr_id = ' . $_POST['tr_id']);
}
?>

View File

@@ -29,8 +29,8 @@ class page {
public function get_page_content() {
global $sql, $user, $smarty;
//var_dump($user);
//ini_set('include_path', '/opt/lampp/htdocs/badminton_coach/_include');
ini_set('include_path', '/var/www/badminton_coach/_include');
ini_set('include_path', '/opt/lampp/htdocs/badminton_coach/_include');
//ini_set('include_path', '/var/www/badminton_coach/_include');
if (!empty($user) && $user->is_logged_in()) {
if ($this->is_page()) {
//TODO: mi van ha nincs page? átirányítás v 404?
@@ -66,6 +66,10 @@ class page {
$tpl = "edit";
include('include_trainings.php');
break;
case 'delete_training':
# EDZÉS TÖRLÉS
include('include_delete_training.php');
break;
case 'create':
# LÉTREHOZÓS OLDALAK
include('include_create.php');

View File

@@ -194,8 +194,8 @@ 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
$this->set_login(true);
//$this->set_ua_type(2); //kid típus beállítása
//$this->set_login(true);
}
}

View File

@@ -86,6 +86,26 @@ class user_parent {
}
}
public static function create_parent($_parent_name, $_email, $_facebook, $_phone) {
global $sql;
//beilleszti AB-ba
//visszaadja az ID-t
return $sql->insert_into('user_parent',
array(
'up_name' => $_parent_name,
'up_email' => $_email,
'up_facebook' => $_facebook,
'up_phone' => $_phone
)
);
}
public static function update_parent($_parent_value_array, $_up_id) {
global $sql;
$sql->update_table('user_parent', $_parent_value_array, array('up_id' => $_up_id));
}
}

View File

@@ -27,7 +27,6 @@ switch ($this->get_id()) {
break;
case 'training':
# code...
//TRAINING TYPE ARRAY
$training_type_query = "SELECT * FROM training_type ORDER BY trt_name ASC;";
$training_type_assoc_array = $sql->assoc_array($training_type_query);
@@ -53,7 +52,11 @@ switch ($this->get_id()) {
$smarty->display('training_type_create.tpl');
break;
case 'parent':
# PARENT LÉTREHOZÁSA
$smarty->display('parent_create.tpl');
break;
default:
# code...
break;

View File

@@ -0,0 +1,10 @@
<?php
if ($this->is_id()) {
$delete_query = "DELETE FROM training WHERE tr_id = " . $this->get_id() . ";";
$sql->execute_query($delete_query);
header("Location: /admin/trainings");
}
?>

View File

@@ -6,6 +6,12 @@
if ($this->is_id()) {
# ADOTT TAG ADATAINAK MEGJELENÍTÉSE
$parent = new user_parent();
$parent->set_user_data_by_id($this->get_id());
$smarty->assign('parent', $parent);
$smarty->display('parent_data_edit.tpl');
}
else {
# SZÜLŐ LISTA

View File

@@ -8,7 +8,7 @@ if ($this->is_id()) {
# GYEREKEK BEJELÖLÉSE
# lekérjük, hogy az elmúlt 4 héten kik voltak ilyen típusú edzésen [egyeznie kell a dayofweeknek és a type-nak]
$presence_query = "SELECT * FROM user_kid ORDER BY uk_last_name, uk_first_name;";
$presence_query = "SELECT * FROM user_kid ORDER BY uk_name;";
$presence_assoc_array = $sql->assoc_array($presence_query);
//végig kell menni rajta h legeneráljuk az usereket
@@ -31,9 +31,7 @@ if ($this->is_id()) {
}
else {
$actual_month = date('m');
$actual_month = 10;
$traning_list_query = "SELECT * FROM training WHERE MONTH(tr_date) = " . $actual_month . ";";
$traning_list_query = "SELECT * FROM training ORDER BY tr_date DESC;";
$training_list_assoc_array = $sql->assoc_array($traning_list_query);
$training_array = array();
@@ -45,7 +43,7 @@ else {
//var_dump($training_array);
$smarty->assign('edit', $tpl);
$smarty->assign("training_array", $training_array);
$smarty->display("training_list.tpl");
$smarty->display("presence_list.tpl");
}

View File

@@ -48,7 +48,7 @@ else {
$actual_month = date('m');
//$actual_month = 10;
$traning_list_query = "SELECT * FROM training WHERE MONTH(tr_date) = " . $actual_month . ";";
$traning_list_query = "SELECT * FROM training ORDER BY tr_date DESC;";
$training_list_assoc_array = $sql->assoc_array($traning_list_query);
$training_array = array();

View File

@@ -47,6 +47,28 @@ if (isset($_POST['action'])) {
header("Location: /admin/edit_member/" . $new_user_id);
break;
case 'parent_create':
# parent létrehozása
unset($_POST['action']);
if (!isset($_POST['up_email'])) $_POST['up_email'] = null;
if (!isset($_POST['up_phone'])) $_POST['up_phone'] = null;
if (!isset($_POST['up_facebook'])) $_POST['up_facebook'] = null;
user_parent::create_parent($_POST['up_name'], $_POST['up_email'], $_POST['up_facebook'], $_POST['up_phone']);
header("Location: /admin/parents");
break;
case 'parent_data_update':
# parent updatelés
unset($_POST['action']);
$up_id = $_POST['up_id'];
unset($_POST['up_id']);
if (!isset($_POST['up_email'])) $_POST['up_email'] = null;
if (!isset($_POST['up_phone'])) $_POST['up_phone'] = null;
if (!isset($_POST['up_facebook'])) $_POST['up_facebook'] = null;
user_parent::update_parent($_POST, $up_id);
header("Location: /admin/parents/" . $up_id);
break;
case 'training_data_edit':
#training edit
$tr_id = $_POST['tr_id'];

View File

@@ -29,6 +29,22 @@
line-height: 18px;
font-size: 18px;
}
.name_tag {
width: 200px;
text-align: left;
padding: 10px 0px 10px 10px;
margin: 5px;
background-color: #e2edff;
cursor: pointer;
}
.name_tag_checked {
width: 200px;
text-align: left;
padding: 10px 0px 10px 10px;
margin: 5px;
background-color: #1eea0b;
cursor: pointer;
}
</style>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>

View File

@@ -0,0 +1,42 @@
<form method="post">
<input type="hidden" name="action" value="parent_create">
<table>
<tr>
<td>
Név:
</td>
<td>
<input type="text" name="up_name">
</td>
</tr>
<tr>
<td>
E-mail cím:
</td>
<td>
<input type="text" name="up_email">
</td>
</tr>
<tr>
<td>
Telefonszám:
</td>
<td>
<input type="text" name="up_phone">
</td>
</tr>
<tr>
<td>
Facebook:
</td>
<td>
<input type="text" name="up_facebook">
</td>
</tr>
<tr>
<td colspan="2">
<input type="submit" value="Létrehozás">
</td>
</tr>
</table>
</form>

View File

@@ -0,0 +1,43 @@
<form method="post">
<input type="hidden" name="action" value="parent_data_update">
<input type="hidden" name="up_id" value="{$parent->get_up_id()}">
<table>
<tr>
<td>
Név:
</td>
<td>
<input type="text" name="up_name" value="{$parent->get_up_name()}">
</td>
</tr>
<tr>
<td>
E-mail cím:
</td>
<td>
<input type="text" name="up_email" value="{$parent->get_up_email()}">
</td>
</tr>
<tr>
<td>
Telefonszám:
</td>
<td>
<input type="text" name="up_phone" value="{$parent->get_up_phone()}">
</td>
</tr>
<tr>
<td>
Facebook:
</td>
<td>
<input type="text" name="up_facebook" value="{$parent->get_up_facebook()}">
</td>
</tr>
<tr>
<td colspan="2">
<input type="submit" value="Mentés">
</td>
</tr>
</table>
</form>

View File

@@ -7,8 +7,8 @@
{foreach $parent_array as $parent}
<tr>
<td>
<a href="/admin/{if !$edit}members{else}edit_member{/if}/{$user->get_uk_id()}">
{$user->get_up_name()}
<a href="/admin/parents/{$parent->get_up_id()}">
{$parent->get_up_name()}
</a>
</td>
</tr>

View File

@@ -1,28 +1,85 @@
<table>
<input type="hidden" id="tr_id" value="{$tr_id}">
{foreach $users as $user}
<tr>
<td>{$user->get_uk_last_name()} {$user->get_uk_first_name()}</td>
<td><input name="chk" type="checkbox" id="chk" value="{$user->get_uk_id()}" class="chk" {if $user->get_uk_presence($tr_id)}checked{/if}> </td>
</tr>
{/foreach}
</table>
<input type="hidden" id="tr_id" value="{$tr_id}">
{foreach $users as $user}
<div class="{if $user->get_uk_presence($tr_id)}name_tag_checked{else}name_tag{/if}" id="{$user->get_uk_id()}">{$user->get_uk_name()}</div>
{/foreach}
<script>
$('.chk').click(function() {
var checked = $(this).is(':checked');
var user_id = $(this).val();
$('.name_tag').click(function() {
//alert($(this).css('backgroundColor'));
var user_id = $(this).attr('id');
var x = $(this).css('backgroundColor');
hexc(x);
var checked = (color == '#e2edff');
var tr_id = $("#tr_id").val();
alert(checked);
//ha kék, akkor zöldre változtatja, egyébként fordítva
if (color == '#e2edff') {
$(this).css('backgroundColor', '#1eea0b');
}
else {
$(this).css('backgroundColor', '#e2edff');
}
//alert(checked);
$.ajax({
type: "POST",
url: '/ajax/update_presence.php',
url: '/_ajax/update_presence.php',
data: { checked : checked, user_id : user_id, tr_id : tr_id },
success: function(data) {
//alert('it worked');
}
});
});
$('.name_tag_checked').click(function() {
//alert($(this).css('backgroundColor'));
var user_id = $(this).attr('id');
var x = $(this).css('backgroundColor');
hexc(x);
var checked = (color == '#e2edff');
var tr_id = $("#tr_id").val();
//ha kék, akkor zöldre változtatja, egyébként fordítva
if (color == '#e2edff') {
$(this).css('backgroundColor', '#1eea0b');
}
else {
$(this).css('backgroundColor', '#e2edff');
}
//alert(checked);
$.ajax({
type: "POST",
url: '/_ajax/update_presence.php',
data: { checked : checked, user_id : user_id, tr_id : tr_id },
success: function(data) {
}
});
});
function hexc(colorval) {
var parts = colorval.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
delete(parts[0]);
for (var i = 1; i <= 3; ++i) {
parts[i] = parseInt(parts[i]).toString(16);
if (parts[i].length == 1) parts[i] = '0' + parts[i];
}
color = '#' + parts.join('');
}
</script>

View File

@@ -0,0 +1,18 @@
<h1>Jelenlét</h1>
<table>
{foreach $training_array as $training}
<tr>
<td>
<a href="/admin/{if $edit=='edit'}edit_training{elseif $edit=='view'}trainings{else}presence{/if}/{$training->get_tr_id()}">
{$training->get_tr_date()|substr:0:-3} ({$training->get_tr_type_name_by_id()})
</a>
</td>
</tr>
{/foreach}
</table>

View File

@@ -1,6 +1,7 @@
<table>
<tr>
<td colspan="2"><a href="/admin/edit_training/{$training_data.tr_id}">SZERKESZTÉS</a></td>
<td><a href="/admin/edit_training/{$training_data.tr_id}">SZERKESZTÉS</a></td>
<td><a href="/admin/delete_training/{$training_data.tr_id}">TÖRLÉS</a></td>
</tr>

View File

@@ -1,9 +1,6 @@
<form method="post">
<input type="hidden" name="action" value="training_type_create">
<table>
<tr>
<td>
Új edzés típus neve: