tothbt/code-cegled
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added lease styleing; kids without lease can be added even if they have no balance

Browse Source
This commit is contained in:
Tóth Richárd
2019-08-06 12:55:37 +02:00
parent 409a2fe6b0
commit 5be4e84ff1
7 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
_ajax/get_user_list.php
View File

@@ -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";

9
_class/class_user_kid.php
View File

@@ -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) {

9
_css/default.css
View File

@@ -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;

14
template/templates/presence.tpl
View File

@@ -94,9 +94,9 @@
</span>
{/if}
<div class="{if $user->get_uk_presence($tr_id)}name_tag_checked{else}name_tag{/if} width70 {$user->get_credit_color($has_credit, $credit, $training->get_tr_price())}" id="{$user->get_uk_id()}" data-credit="{$user->get_uk_credit()}">
<img src="/_image/shuttlecock.png">
<img class="{if !$user->get_uk_lease()}no-lease{/if}" src="/_image/shuttlecock.png">
<div>
{$user->get_uk_name()}
<span class="{if !$user->get_uk_lease()}no-lease{/if}">{$user->get_uk_name()}</span>
{if $user->get_credit_color($has_credit, $credit, $training->get_tr_price())}
<span class="credit-text">(<span class="credit-counter">{$user->get_uk_credit()}</span>/{$credit})</span>
{/if}
@@ -111,9 +111,9 @@
<div class="list">
{foreach $rest_users as $rest_user}
<div class="{if $rest_user->get_uk_presence($tr_id)}name_tag_checked{else}name_tag{/if} width70 {$rest_user->get_credit_color($has_credit, $credit, $training->get_tr_price())}" id="{$rest_user->get_uk_id()}" data-credit="{$rest_user->get_uk_credit()}">
<img src="/_image/shuttlecock.png">
<img class="{if !$rest_user->get_uk_lease()}no-lease{/if}" src="/_image/shuttlecock.png">
<div>
{$rest_user->get_uk_name()}
<span class="{if !$rest_user->get_uk_lease()}no-lease{/if}">{$rest_user->get_uk_name()}</span>
{if $rest_user->get_credit_color($has_credit, $credit, $training->get_tr_price())}
<span class="credit-text">(<span class="credit-counter">{$rest_user->get_uk_credit()}</span>/{$credit})</span>
{/if}
@@ -125,10 +125,10 @@
<div class="list">
{foreach $sorted_users as $user}
<div class="list_item {$user->get_credit_color($has_credit, $credit, $training->get_tr_price())}" data-credit="{$user->get_uk_credit()}">
<img src="/_image/shuttlecock.png">
<img class="{if !$user->get_uk_lease()}no-lease{/if}" src="/_image/shuttlecock.png">
<div>
{$user->get_uk_name()}
{if $user->get_uk_credit()}
<span class="{if !$user->get_uk_lease()}no-lease{/if}">{$user->get_uk_name()}</span>
{if $user->get_uk_credit() and $user->get_credit_color($has_credit, $credit, $training->get_tr_price())}
<span class="credit-text">(<span class="credit-counter">{$user->get_uk_credit()}</span>/{$credit})</span>
{/if}
</div>

6
template/templates/user_data_create.tpl
View File

@@ -6,12 +6,16 @@
<div><input type="text" name="uk_name" id="uk_name" size="8" class="field text fn" required></div>
</div>
<div>
<label class="desc" for="uk_is_active">Aktív:</label>
<div><input type="checkbox" name="uk_is_active" id="uk_is_active" value="1" checked></div>
</div>
<div>
<label for="uk_lease">Bérletes:</label>
<div><input type="checkbox" name="uk_lease" id="uk_lease" value="1" checked></div>
</div>
<div>
<label class="desc" for="uk_last_modified">Utolsó módosítás dátuma:</label>
<div><input type="text" name="uk_last_modified" id="uk_last_modified" value="{$today}"></div>

6
template/templates/user_data_edit.tpl
View File

@@ -12,12 +12,16 @@
<div><input type="text" name="uk_name" id="uk_name" size="8" class="field text fn" value="{$user_data.uk_name}" required></div>
</div>
<div>
<label class="desc" for="uk_is_active">Aktív:</label>
<div><input type="checkbox" name="uk_is_active" id="uk_is_active" value="1" {if 1==$user_data.uk_is_active}checked{/if}></div>
</div>
<div>
<label for="uk_lease">Bérletes:</label>
<div><input type="checkbox" name="uk_lease" id="uk_lease" value="1" {if 1==$user_data.uk_lease}checked{/if}></div>
</div>
<div>
<label class="desc" for="uk_last_modified">Utolsó módosítás dátuma:</label>
<div><input type="text" name="uk_last_modified" id="uk_last_modified" value="{$user_data.uk_last_modified}"></div>

10
template/templates/user_list.tpl
View File

@@ -90,6 +90,12 @@ function search() {
var pdata = JSON.parse(data);
var content = '';
for (var i=0; i<pdata.length; ++i) {
console.log(pdata[i]['uk_lease']);
if (0 == pdata[i]['uk_lease']) {
var filter = 'no-lease';
} else {
var filter = '';
}
//console.log(pdata[i]['uk_id']);
//add_list_item(pdata[i]['uk_id'],pdata[i]['uk_name']);
content +=
@@ -101,8 +107,8 @@ function search() {
<input type="hidden" name="login_kid" value="'+pdata[i]['uk_id']+'">\
</form>\
<div class="list_item clickable" id="kid_'+pdata[i]['uk_id']+'" onclick="open_kid_menu('+pdata[i]['uk_id']+')">\
<img src="/_image/shuttlecock.png">\
'+pdata[i]['uk_name']+'\
<img class="'+filter+'" src="/_image/shuttlecock.png">\
<span class="'+filter+'">'+pdata[i]['uk_name']+'</span>\
</div>\
<div class="kid_menu" id="kid_menu_'+pdata[i]['uk_id']+'">\
<div class="kid_submenu" onclick="open_datasheet('+pdata[i]['uk_id']+')">\