diff --git a/_ajax/get_user_list.php b/_ajax/get_user_list.php index b80fe8e..3c67486 100644 --- a/_ajax/get_user_list.php +++ b/_ajax/get_user_list.php @@ -7,15 +7,15 @@ else $sql = new sql('localhost','id9073794_tollashodos','uprRscU8bGpJ','id907379 $filter1 = ""; if (!empty($_POST['uk_filter_name'])) { - $filter1 = "AND uk_name LIKE '".$_POST['uk_filter_name']."%'"; + $filter1 = "AND uk_name LIKE '".$_POST['uk_filter_name']."%'"; } $filter2 = ""; if (in_array($_POST['is_active'], array(0,1))) { - $filter2 = "AND uk_is_active = " . $_POST['is_active']; + $filter2 = "AND uk_is_active = " . $_POST['is_active']; } -$kid_query = "SELECT uk_id, uk_name FROM user_kid WHERE uk_deleted = 0 +$kid_query = "SELECT uk_id, uk_name, uk_lease FROM user_kid WHERE uk_deleted = 0 ". $filter1 . " ". $filter2 . " ORDER BY uk_name ASC"; diff --git a/_class/class_user_kid.php b/_class/class_user_kid.php index 9580f7f..8c9e7ae 100644 --- a/_class/class_user_kid.php +++ b/_class/class_user_kid.php @@ -452,8 +452,12 @@ class user_kid extends user_parent { if ($value == "") $_user_value_array[$index] = 'null'; } + if (!isset($_user_value_array['uk_is_active'])) $_user_value_array['uk_is_active'] = 0; + if (!isset($_user_value_array['uk_lease'])) $_user_value_array['uk_lease'] = 0; + return $sql->insert_into('user_kid', $_user_value_array); } + public static function update_user($_user_value_array, $_user_id) { global $sql; //a módosítás dátumát updateljük @@ -529,6 +533,8 @@ class user_kid extends user_parent { //ha nincs bejelölve h aktív akkor nem kapja meg ezt az értéket, manuálisan kell beállítani if (!isset($_user_value_array['uk_is_active'])) $_user_value_array['uk_is_active'] = 0; if (!isset($_user_value_array['uk_balance_expires'])) $_user_value_array['uk_balance_expires'] = 0; + if (!isset($_user_value_array['uk_lease'])) $_user_value_array['uk_lease'] = 0; + $sql->update_table('user_kid', $_user_value_array, array('uk_id' => $_user_id)); } @@ -676,6 +682,9 @@ class user_kid extends user_parent { //ha igen, túllepte-e PIROS //ha nem, akkor SÁRGA //ha nincs, akkor azonnal PIROS + if (!$this->get_uk_lease()) { + return false; + } if ($this->get_uk_balance() < 0 || ($this->get_uk_balance() - $trainingPrice) < 0) { if (!$has_credit) { diff --git a/_css/default.css b/_css/default.css index 46ac2f4..af56638 100644 --- a/_css/default.css +++ b/_css/default.css @@ -525,6 +525,15 @@ table.email.log tr:hover { cursor: pointer; } +span.no-lease { + font-style: italic; +} + +img.no-lease { + -webkit-filter: grayscale(100%); + filter: grayscale(100%); +} + .navigator { display: block; text-align: center; diff --git a/template/templates/presence.tpl b/template/templates/presence.tpl index 3fcca66..2df0762 100644 --- a/template/templates/presence.tpl +++ b/template/templates/presence.tpl @@ -94,9 +94,9 @@ {/if}
- +
- {$user->get_uk_name()} + {$user->get_uk_name()} {if $user->get_credit_color($has_credit, $credit, $training->get_tr_price())} ({$user->get_uk_credit()}/{$credit}) {/if} @@ -111,9 +111,9 @@
{foreach $rest_users as $rest_user}
- +
- {$rest_user->get_uk_name()} + {$rest_user->get_uk_name()} {if $rest_user->get_credit_color($has_credit, $credit, $training->get_tr_price())} ({$rest_user->get_uk_credit()}/{$credit}) {/if} @@ -125,10 +125,10 @@
{foreach $sorted_users as $user}
- +
- {$user->get_uk_name()} - {if $user->get_uk_credit()} + {$user->get_uk_name()} + {if $user->get_uk_credit() and $user->get_credit_color($has_credit, $credit, $training->get_tr_price())} ({$user->get_uk_credit()}/{$credit}) {/if}
diff --git a/template/templates/user_data_create.tpl b/template/templates/user_data_create.tpl index cfef537..6330b0e 100644 --- a/template/templates/user_data_create.tpl +++ b/template/templates/user_data_create.tpl @@ -6,12 +6,16 @@
-
+
+ +
+
+
diff --git a/template/templates/user_data_edit.tpl b/template/templates/user_data_edit.tpl index 9e4d899..6074236 100644 --- a/template/templates/user_data_edit.tpl +++ b/template/templates/user_data_edit.tpl @@ -12,12 +12,16 @@
-
+
+ +
+
+
diff --git a/template/templates/user_list.tpl b/template/templates/user_list.tpl index 6feee64..01766ef 100644 --- a/template/templates/user_list.tpl +++ b/template/templates/user_list.tpl @@ -90,6 +90,12 @@ function search() { var pdata = JSON.parse(data); var content = ''; for (var i=0; i\ \
\ - \ - '+pdata[i]['uk_name']+'\ + \ + '+pdata[i]['uk_name']+'\
\
\
\