Revize 1739
Přidáno uživatelem Ondřej Fibich před téměř 12 roky(ů)
freenetis/branches/1.1/media/css/style.css | ||
---|---|---|
|
||
}
|
||
#menu ul ul {
|
||
margin:0 0 10px 10px;
|
||
margin:0 0 10px 3px;
|
||
list-style-type:none;
|
||
}
|
||
#menu ul ul li {
|
freenetis/branches/1.1/application/models/device.php | ||
---|---|---|
$limit = "";
|
||
|
||
// HACK FOR IMPROVING PERFORMANCE (fixes #362)
|
||
$select_cloud = '';
|
||
$join_cloud = '';
|
||
$select_cloud_iface = '';
|
||
$join_cloud_iface = '';
|
||
|
||
if (strpos($params['filter_sql'], '.`cloud` LIKE '))
|
||
if (strpos($params['filter_sql'], '.`cloud` LIKE ') ||
|
||
strpos($params['filter_sql'], '.`mac` LIKE '))
|
||
{
|
||
$select_cloud = ', c.id AS cloud';
|
||
$join_cloud = "
|
||
$select_cloud_iface = ', c.id AS cloud, i.mac';
|
||
$join_cloud_iface = "
|
||
LEFT JOIN ifaces i ON i.device_id = d.id
|
||
LEFT JOIN ip_addresses ip ON ip.iface_id = i.id
|
||
LEFT JOIN clouds_subnets cs ON cs.subnet_id = ip.subnet_id
|
||
... | ... | |
u.name AS user_name, u.surname AS user_surname, u.login AS user_login,
|
||
d.login, d.password, d.price, d.trade_name, d.payment_rate,
|
||
d.buy_date, m.name AS member_name, s.street, t.town,
|
||
ap.street_number, d.comment $select_cloud
|
||
ap.street_number, d.comment $select_cloud_iface
|
||
FROM devices d
|
||
JOIN users u ON d.user_id = u.id
|
||
JOIN members m ON u.member_id = m.id
|
||
... | ... | |
LEFT JOIN towns t ON ap.town_id = t.id
|
||
LEFT JOIN enum_types e ON d.type = e.id
|
||
LEFT JOIN translations f ON lang = ? AND e.value = f.original_term
|
||
$join_cloud
|
||
$join_cloud_iface
|
||
) d
|
||
$where
|
||
GROUP BY device_id
|
||
... | ... | |
$where = "WHERE $filter_sql";
|
||
|
||
// HACK FOR IMPROVING PERFORMANCE (fixes #362)
|
||
$select_cloud = '';
|
||
$join_cloud = '';
|
||
$select_cloud_iface = '';
|
||
$join_cloud_iface = '';
|
||
|
||
if (strpos($filter_sql, '.`cloud` LIKE '))
|
||
if (strpos($filter_sql, '.`cloud` LIKE ') || strpos($filter_sql, '.`mac` LIKE '))
|
||
{
|
||
$select_cloud = ', c.id AS cloud';
|
||
$join_cloud = "
|
||
$select_cloud_iface = ', c.id AS cloud, i.mac';
|
||
$join_cloud_iface = "
|
||
LEFT JOIN ifaces i ON i.device_id = d.id
|
||
LEFT JOIN ip_addresses ip ON ip.iface_id = i.id
|
||
LEFT JOIN clouds_subnets cs ON cs.subnet_id = ip.subnet_id
|
||
... | ... | |
u.surname AS user_surname, u.login AS user_login,
|
||
d.login, d.password, d.price, d.trade_name, d.payment_rate,
|
||
d.buy_date, m.name AS member_name, s.street, t.town,
|
||
ap.street_number, d.comment $select_cloud
|
||
ap.street_number, d.comment $select_cloud_iface
|
||
FROM devices d
|
||
JOIN users u ON d.user_id = u.id
|
||
JOIN members m ON u.member_id = m.id
|
||
... | ... | |
LEFT JOIN towns t ON ap.town_id = t.id
|
||
LEFT JOIN enum_types e ON d.type = e.id
|
||
LEFT JOIN translations f ON lang = ? AND e.value = f.original_term
|
||
$join_cloud
|
||
$join_cloud_iface
|
||
) d
|
||
$where
|
||
GROUP BY device_id
|
freenetis/branches/1.1/application/models/bank_transfer.php | ||
---|---|---|
}
|
||
|
||
/**
|
||
* Function gets count of unidentified transfers (simplified)
|
||
*
|
||
* @return integer
|
||
*/
|
||
public function scount_unidentified_transfers()
|
||
{
|
||
return $this->db->query("
|
||
SELECT COUNT(srct.id) as total
|
||
FROM transfers srct
|
||
JOIN accounts a ON a.id = srct.origin_id
|
||
AND (srct.member_id = 0 OR srct.member_id IS NULL)
|
||
AND a.account_attribute_id = ?
|
||
JOIN bank_transfers bt ON bt.transfer_id = srct.id
|
||
", array(Account_attribute_Model::MEMBER_FEES))->current()->total;
|
||
|
||
}
|
||
|
||
/**
|
||
* It gets transfer including bank transfer information. Assigned bank transfer must exist.
|
||
*
|
||
* @param $trans_id
|
freenetis/branches/1.1/application/controllers/devices.php | ||
---|---|---|
$filter_form->add('street_number')
|
||
->type('number');
|
||
|
||
$filter_form->add('mac')
|
||
->label('MAC address')
|
||
->class('mac')
|
||
->callback('json/iface_mac');
|
||
|
||
$filter_form->add('comment');
|
||
|
||
$filter_form->add('cloud')
|
freenetis/branches/1.1/application/libraries/MY_Controller.php | ||
---|---|---|
/** @var integer */
|
||
public $count_unfilled_phone_invoices = 0;
|
||
/** @var integer */
|
||
public $count_unidentified_transfers = 0;
|
||
/** @var integer */
|
||
public $devices_down_count = 0;
|
||
/** @var integer $member_id ID of logged member */
|
||
protected $member_id;
|
||
... | ... | |
|
||
// monitoring - devices down
|
||
$this->devices_down_count = ORM::factory('monitor_host')->count_off_down_devices();
|
||
|
||
// unidentified transferts count
|
||
if ($this->acl_check_view('Accounts_Controller', 'unidentified_transfers'))
|
||
{
|
||
$this->count_unidentified_transfers =
|
||
ORM::factory('bank_transfer')->scount_unidentified_transfers();
|
||
}
|
||
|
||
// allowed subnets are enabled
|
||
if (Settings::get('allowed_subnets_enabled') && $this->member_id &&
|
freenetis/branches/1.1/application/views/menu.php | ||
---|---|---|
<li class="transfer"><h2><?php echo __('Finances') ?></h2>
|
||
<ul>
|
||
<?php if ($this->acl_check_view('Accounts_Controller', 'unidentified_transfers')): ?>
|
||
<li><?php echo html::anchor('bank_transfers/unidentified_transfers/', __('Unidentified transfers')) ?></li>
|
||
<li>
|
||
<?php echo html::anchor('bank_transfers/unidentified_transfers/', __('Unidentified transfers')) ?>
|
||
<?php echo html::menu_item_counter($this->count_unidentified_transfers) ?>
|
||
</li>
|
||
<?php endif ?>
|
||
|
||
<?php if ($this->acl_check_view('Accounts_Controller', 'bank_accounts')): ?>
|
Také k dispozici: Unified diff
Novinky:
- fixes #339: Indikator neidentifikovane platby
- fixes #337: Filtr zarizeni - doplnit hledani dle MAC adresy