Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1375

Přidáno uživatelem David Raška před asi 12 roky(ů)

Opravy:
- Opraveno vše co souvisí s variabilními symboly, včetně chyb #163 a #164

Zobrazit rozdíly:

freenetis/branches/testing/application/i18n/cs_CZ/texts.php
'ignore' => 'Ignorovat',
'ignore whitelist' => 'Ignorovat bílou listinu',
'im' => 'PČ',
'import addresses' => 'Importovat adresy',
'import dhcp export from mikrotik' => 'Import exportu DHCP z Mikrotiku',
'import has been successfully finished' => 'Import byl úspěšně dokončen.',
'import has failed' => 'Import selhal.',
freenetis/branches/testing/application/models/subnet.php
i.mac, se.name AS segment_name, d.name AS device_name,
IFNULL(f.translated_term, e.value) AS device_type,
u.name AS user_name, u.surname, m.name AS member_name,
m.variable_symbol, m.entrance_date, st.street, ap.street_number,
GROUP_CONCAT(vs.variable_symbol) AS variable_symbol, m.entrance_date, st.street, ap.street_number,
t.town, t.quarter, t.zip_code, m.comment
FROM subnets su
LEFT JOIN ip_addresses ip ON ip.subnet_id = su.id
......
LEFT JOIN address_points ap ON ap.id = m.address_point_id
LEFT JOIN towns t ON t.id = ap.town_id
LEFT JOIN streets st ON st.id = ap.street_id
LEFT JOIN accounts a ON a.member_id = m.id
LEFT JOIN variable_symbols vs ON vs.account_id = a.id
WHERE su.id = ?
GROUP BY ip_address
ORDER BY inet_aton(ip_address)
", Config::get('lang'), $subnet_id);
}
freenetis/branches/testing/application/models/variable_symbol.php
/**
* Description of Variable_Symbol_Model
*
* @author jeff
* @author David Raška
*
* @package Model
*
* @property integer $id
* @property integer $account_id
* @property string $variable_symbol
*/
class Variable_Symbol_Model extends ORM
{
freenetis/branches/testing/application/models/ip_address.php
{
return $this->db->query("
SELECT ip.id, ip.ip_address, ip.whitelisted,
subnet_name, m.name AS member_name,
m.variable_symbol, a.balance
subnet_name, m.name AS member_name,
(
SELECT GROUP_CONCAT(vs.variable_symbol) AS variable_symbol
FROM variable_symbols vs
LEFT JOIN accounts a ON a.id = vs.account_id
WHERE a.member_id = m.id
) AS variable_symbol,
a.balance
FROM
(
SELECT ip.id, ip.ip_address, ip.whitelisted,
s.name AS subnet_name,
IFNULL(u.member_id, ip.member_id) AS member_id
FROM
(
SELECT ip.id, ip.id AS ip_address_id, ip.ip_address,
ip.whitelisted, IFNULL(i1.device_id,i2.device_id) AS device_id,
ip.member_id, ip.subnet_id
FROM ip_addresses ip
LEFT JOIN ifaces i1 ON ip.iface_id = i1.id
LEFT JOIN vlan_ifaces vi ON ip.vlan_iface_id = vi.id
LEFT JOIN ifaces i2 ON vi.iface_id = i2.id
SELECT ip.id, ip.ip_address, ip.whitelisted,
s.name AS subnet_name,
IFNULL(u.member_id, ip.member_id) AS member_id
FROM
(
SELECT ip.id, ip.id AS ip_address_id, ip.ip_address,
ip.whitelisted, IFNULL(i1.device_id,i2.device_id) AS device_id,
ip.member_id, ip.subnet_id
FROM ip_addresses ip
LEFT JOIN ifaces i1 ON ip.iface_id = i1.id
LEFT JOIN vlan_ifaces vi ON ip.vlan_iface_id = vi.id
LEFT JOIN ifaces i2 ON vi.iface_id = i2.id
) ip
JOIN subnets s ON s.id = ip.subnet_id
LEFT JOIN devices d ON d.id = ip.device_id
LEFT JOIN users u ON u.id = d.user_id
) ip
JOIN subnets s ON s.id = ip.subnet_id
LEFT JOIN devices d ON d.id = ip.device_id
LEFT JOIN users u ON u.id = d.user_id
) ip
JOIN members m ON m.id = ip.member_id
JOIN accounts a ON a.member_id = m.id AND m.id <> ?
WHERE a.balance < ?
AND DATEDIFF(CURDATE(), m.entrance_date) >= ?
AND (ip.whitelisted IS NULL OR ip.whitelisted = 0)
JOIN members m ON m.id = ip.member_id
JOIN accounts a ON a.member_id = m.id AND m.id <> ?
WHERE a.balance < ?
AND DATEDIFF(CURDATE(), m.entrance_date) >= ?
AND (ip.whitelisted IS NULL OR ip.whitelisted = 0)
",
array
(
......
{
return $this->db->query("
SELECT ip.id, ip.ip_address, ip.whitelisted,
subnet_name, m.name AS member_name,
m.variable_symbol, a.balance
subnet_name, m.name AS member_name,
(
SELECT GROUP_CONCAT(vs.variable_symbol) AS variable_symbol
FROM variable_symbols vs
LEFT JOIN accounts a ON a.id = vs.account_id
WHERE a.member_id = m.id
) AS variable_symbol,
a.balance
FROM
(
SELECT ip.id, ip.ip_address, ip.whitelisted,
freenetis/branches/testing/application/models/users_contacts.php
return $this->db->query("
SELECT
c.value, a.balance, m.id AS member_id, m.name AS member_name,
m.variable_symbol, u.login, cou.country_code
(
SELECT GROUP_CONCAT(vs.variable_symbol) AS variable_symbol
FROM variable_symbols vs
WHERE vs.account_id = a.id
) AS variable_symbol, u.login, cou.country_code
FROM members m
JOIN accounts a ON a.member_id = m.id AND m.id <> 1
JOIN users u ON u.member_id = m.id
......
JOIN members_fees mf ON mi.members_fee_id = mf.id
WHERE mf.activation_date <= CURDATE() AND mf.deactivation_date >= CURDATE()
) AND DATEDIFF(CURDATE(), m.entrance_date) >= ".intval(Settings::get('initial_debtor_immunity'))."
AND a.balance < ".intval($debtor_boundary)
, $type, self::NO_WHITELIST, Member_Model::TYPE_FORMER);
AND a.balance < ".intval($debtor_boundary)."
", $type, self::NO_WHITELIST, Member_Model::TYPE_FORMER);
}
/**
......
return $this->db->query("
SELECT
c.value, a.balance, m.id AS member_id, m.name AS member_name,
m.variable_symbol, u.login, cou.country_code
(
SELECT GROUP_CONCAT(vs.variable_symbol) AS variable_symbol
FROM variable_symbols vs
WHERE vs.account_id = a.id
) AS variable_symbol, u.login, cou.country_code
FROM members m
JOIN accounts a ON a.member_id = m.id AND m.id <> 1
JOIN users u ON u.member_id = m.id
......
return $this->db->query("
SELECT
c.value, a.balance, m.id AS member_id, m.name AS member_name,
m.variable_symbol, u.login, cou.country_code
(
SELECT GROUP_CONCAT(vs.variable_symbol) AS variable_symbol
FROM variable_symbols vs
WHERE vs.account_id = a.id
) AS variable_symbol, u.login, cou.country_code
FROM
(
SELECT
......
JOIN members_fees mf ON mi.members_fee_id = mf.id
WHERE mf.activation_date <= CURDATE() AND mf.deactivation_date >= CURDATE()
)
GROUP BY c.value
GROUP BY c.id
", $subnet_id, Member_Model::TYPE_FORMER, $type);
}
......
return $this->db->query("
SELECT c.value, a.balance, m.id AS member_id, m.name AS member_name,
m.variable_symbol, u.login, cou.country_code
(
SELECT GROUP_CONCAT(vs.variable_symbol) AS variable_symbol
FROM variable_symbols vs
WHERE vs.account_id = a.id
) AS variable_symbol, u.login, cou.country_code
FROM members m
JOIN accounts a ON a.member_id = m.id
JOIN users u ON u.member_id = m.id
......
JOIN members_fees mf ON mi.members_fee_id = mf.id
WHERE mf.activation_date <= CURDATE() AND mf.deactivation_date >= CURDATE()
)
GROUP BY c.id
", $type, $member_id, Member_Model::TYPE_FORMER);
}
......
return $this->db->query("
SELECT c.value, a.balance, m.id AS member_id, m.name AS member_name,
m.variable_symbol, u.login, cou.country_code
(
SELECT GROUP_CONCAT(vs.variable_symbol) AS variable_symbol
FROM variable_symbols vs
WHERE vs.account_id = a.id
) AS variable_symbol, u.login, cou.country_code
FROM contacts c
JOIN users_contacts uc ON uc.contact_id = c.id $whitelisted
JOIN users u ON uc.user_id = u.id
freenetis/branches/testing/application/models/member.php
* @property integer $user_id
* @property boolean $registration
* @property string $name
* @property string $variable_symbol
* @property integer $address_point_id
* @property integer $type
* @property integer $external_type
......
SELECT
m.id, m.registration, m.name,
s.street, ap.street_number, t.town, t.quarter,
m.variable_symbol, a.id AS aid,
vs.variable_symbol, a.id AS aid,
a.balance, m.applicant_registration_datetime,
CONCAT(u.surname,' ',u.name,' (',SUBSTRING(c.datetime,1,10),'):\n',c.text) AS a_comment,
a.comments_thread_id AS a_comments_thread_id,
......
LEFT JOIN streets s ON ap.street_id = s.id
LEFT JOIN towns t ON ap.town_id = t.id
LEFT JOIN accounts a ON a.member_id = m.id AND m.id <> 1
LEFT JOIN variable_symbols vs ON vs.account_id = a.id
LEFT JOIN comments_threads ct ON a.comments_thread_id = ct.id
LEFT JOIN comments c ON ct.id = c.comments_thread_id
LEFT JOIN users u ON c.user_id = u.id
......
}
// query
return $this->db->query("
SELECT m.id, m.name AS member_name, m.variable_symbol,
s.street, ap.street_number, t.town, t.quarter, u.login AS login_name,
u.birthday, m.entrance_date,
IF(m.leaving_date = '0000-00-00', null, m.leaving_date) AS leaving_date,
IFNULL(f.translated_term, e.value) AS type, m.comment,
IF(m.registration = 1, ?, ?) AS registration,
membership_interrupt
FROM
(
SELECT m.*,
IF(mi.id IS NOT NULL, 1, 0) AS membership_interrupt
FROM members m
LEFT JOIN
SELECT id, member_name, variable_symbol, street, street_number,
town, quarter, login, birthday, entrance_date, leaving_date,
type, comment, registration, membership_interrupt
FROM
(
SELECT mi.id, mi.member_id
FROM membership_interrupts mi
LEFT JOIN members_fees mf ON mi.members_fee_id = mf.id
WHERE mf.activation_date <= CURDATE() AND mf.deactivation_date >= CURDATE()
) mi ON mi.member_id = m.id
) m
JOIN users u ON u.member_id = m.id AND u.type = ?
LEFT JOIN address_points ap ON m.address_point_id = ap.id
LEFT JOIN towns t ON ap.town_id = t.id
LEFT JOIN streets s ON ap.street_id = s.id
LEFT JOIN enum_types e ON m.type = e.id
LEFT JOIN translations f ON e.value = f.original_term AND lang = ?
$filter_sql
ORDER BY id
", __('Yes'), __('No'), User_Model::MAIN_USER, Config::get('lang'));
SELECT id, name AS member_name, registration,
street, street_number, town, quarter, GROUP_CONCAT(variable_symbol) AS variable_symbol,
type, entrance_date,
IF(leaving_date = '0000-00-00', null, leaving_date) AS leaving_date,
birthday, login, comment, membership_interrupt
FROM
(
SELECT
m.id, m.registration, m.name,
s.street, ap.street_number, t.town, t.quarter,
vs.variable_symbol, m.type, m.entrance_date,
m.leaving_date,
u.birthday, u.login, m.comment, m.membership_interrupt
FROM
(
SELECT m.id,
m.name,
m.address_point_id,
IF(m.registration = 1, ?, ?) AS registration,
IFNULL(t.translated_term, e.value) AS type,
IF(mi.id IS NOT NULL, 1, 0) AS membership_interrupt,
m.comment, m.entrance_date, m.leaving_date
FROM members m
LEFT JOIN enum_types e ON m.type = e.id
LEFT JOIN translations t ON e.value = t.original_term AND lang = ?
LEFT JOIN
(
SELECT mi.id, mi.member_id
FROM membership_interrupts mi
LEFT JOIN members_fees mf ON mi.members_fee_id = mf.id
WHERE mf.activation_date <= CURDATE() AND mf.deactivation_date >= CURDATE()
) mi ON mi.member_id = m.id
) AS m
LEFT JOIN address_points ap ON m.address_point_id = ap.id
LEFT JOIN streets s ON ap.street_id = s.id
LEFT JOIN towns t ON ap.town_id = t.id
LEFT JOIN accounts a ON a.member_id = m.id AND m.id <> 1
LEFT JOIN variable_symbols vs ON vs.account_id = a.id
LEFT JOIN users u ON u.member_id = m.id AND u.type = ?
LEFT JOIN enum_types e ON m.type = e.id
$filter_sql
) AS q
GROUP BY q.id
ORDER BY q.id
) AS q
", array
(
__('Yes'),
__('No'),
Config::get('lang'),
User_Model::MAIN_USER
));
}
/**
freenetis/branches/testing/application/controllers/transfers.php
$account = new Account_Model($account_id);
$variable_symbol_model = new Variable_Symbol_Model();
$variable_symbols = 0;
if ($account->member_id != 1)
{
$variable_symbols = $variable_symbol_model->find_account_variable_symbols($account->id);
}
if (!$account->id)
Controller::error(RECORD);
freenetis/branches/testing/application/controllers/address_points.php
'address_points/autocomplete_gps',
__('Automatically fill in GPS coordinates')
);
$grid->add_new_button(
'address_points/import',
__('Import addresses')
);
$grid->order_field('id')
->label('ID');
freenetis/branches/testing/application/controllers/bank_transfers.php
if ($dst_acc->id == 0)
{
// account has not been selected, trying to find member by correct variable symbol
$member = ORM::factory('member')
/*$member = ORM::factory('member')
->where('variable_symbol', $form_data['correct_vs'])
->find();
->find();*/
$member = ORM::factory('variable_symbol')
->where('variable_symbol', $form_data['correct_vs'])
->find()->account->member;
if (is_object($member) && $member->id != 0)
{
$member_id = $member->id;
......
if ($form_data['type'] == self::$member_fee)
{
// searching member
$member = ORM::factory('member')
/*$member = ORM::factory('member')
->where('variable_symbol', $form_data['variable_symbol'])
->find();
->find();*/
$member = ORM::factory('variable_symbol')
->where('variable_symbol',$form_data['variable_symbol'])
->find()->account->member;
if ($member->id)
{
......
if ($this->input->post('name') == 0)
{
$member = ORM::factory('member')
/*$member = ORM::factory('member')
->where('variable_symbol', trim($input->value))
->find();
->find();*/
$member = ORM::factory('variable_symbol')
->where('variable_symbol', trim($input->value))
->find()->account->member;
if (!is_object($member) || $member->id == 0)
{
$input->add_error('required', __(
freenetis/branches/testing/application/controllers/members.php
// contacts of main user of member
$contacts = $contact_model->find_all_users_contacts($user->id);
$variable_symbols = NULL;
$variable_symbols = 0;
if ($member_id != 1)
{
$variable_symbols = $variable_symbol_model->find_account_variable_symbols($account->id);
......
// id of user who added member
$member->user_id = $this->session->get('user_id');
$member->comment = $form_data['comment'];
//$member->variable_symbol = $form_data['variable_symbol']; //nyní je uložen v samostatné tabulce
$member->entrance_date = date("Y-m-d",$form_data['entrance_date']);
if ($form_data['membername'] == '')
......
$town .= '-'.$member->address_point->town->quarter;
$zip_code = $member->address_point->town->zip_code;
$var_sym = $member->variable_symbol;
$variable_symbol_model = new Variable_Symbol_Model();
$account_model = new Account_Model();
$account_id = $account_model->where('member_id',$member_id)->find()->id;
$variable_symbols = array();
$var_syms = $variable_symbol_model->find_account_variable_symbols($account_id);
foreach ($var_syms as $var_sym)
{
$variable_symbols[] = $var_sym->variable_symbol;
}
$entrance_date = date::pretty($member->entrance_date);
$user_model = new User_Model();
......
$tbl .= " <td align=\"center\">$contact_info</td>";
$tbl .= "</tr>";
$tbl .= "<tr>";
$tbl .= " <td><b>".__('variable symbol',NULL,1) ."</b></td>";
$tbl .= " <td align=\"center\">$var_sym</td>";
$tbl .= " <td><b>".__('variable symbols',NULL,1) ."</b></td>";
$tbl .= " <td align=\"center\">".implode("<br />", $variable_symbols)."</td>";
$tbl .= " <td>". __('phones',NULL,1) ."</td>";
$tbl .= " <td align=\"center\">".implode("<br />", $phones)."</td>";
$tbl .= "</tr>";
freenetis/branches/testing/application/controllers/export.php
* and encoding can change this
* @param mixed $id ID of item
*/
public function csv($content = null, $id = null)
public function csv($content = null, $encoding = null, $id = null)
{
$encodings = array
(
......
->options($encodings);
$form->submit('Submit');
// form is validate
if ($form->validate())
{
......
case 'subnets':
$subnet_model = new Subnet_Model($id);
if ($subnet_model->id == 0)
{
Controller::error(RECORD);
}
if (!$this->acl_check_view('Devices_Controller', 'subnet'))
{
Controller::error(ACCESS);
}
$items = $subnet_model->get_items_of_subnet($id);
$filename = $subnet_model->name . '.csv';
freenetis/branches/testing/application/libraries/importers/Raiffeisenbank/RB_Importer.php
// členský příspěvek nebo příjem z faktury odběrateli
// @todo zpracování jiných typů VS u člen. příspěvků (např. ID+CRC16)
// uvedl člen u teto platby jako variabilni symbol (VS) svůj telefon ?
//$member = $member_model->where('variable_symbol', $vs)->find();
$variable_symbol_model = new Variable_Symbol_Model();
$member = $variable_symbol_model->where('variable_symbol',$vs)->find()->account->member;
if (!$member->id)
{
$member = $member_model;
freenetis/branches/testing/redirection/info.php
LEFT JOIN
(
SELECT ip.ip_address, ip.whitelisted, subnet_name,
mm.name AS member_name, mm.id AS member_id,
mm.variable_symbol, login, a.balance
mm.name AS member_name, mm.id AS member_id,
(
SELECT GROUP_CONCAT(vs.variable_symbol) AS variable_symbol
FROM variable_symbols vs
LEFT JOIN accounts a ON a.id = vs.account_id
WHERE a.member_id = mm.id
) AS variable_symbol,
login, a.balance
FROM
(
SELECT ip.ip_address, ip.whitelisted, s.name AS subnet_name,
freenetis/branches/testing/redirection/cancel.php
// content of redirection message
$message_query = "
SELECT message_id, m.text, m.self_cancel, m.ip_address, m.whitelisted, subnet_name,
members.name AS member_name, members.id AS member_id,
members.variable_symbol, a.balance, m.comment, ip_address_id
members.name AS member_name, members.id AS member_id,
(
SELECT GROUP_CONCATE(vs.variable_symbol) AS variable_symbol
FROM variable_symbols vs
LEFT JOIN account a ON a.id = vs.account_id
WHERE a.member_id = members.id
) AS variable_symbol,
a.balance, m.comment, ip_address_id
FROM
(
SELECT m.id,message_id,text,self_cancel,ip_address,whitelisted,
freenetis/branches/testing/redirection/index.php
{
$message_query = "
SELECT ms.id, ms.text, ms.self_cancel, ip.ip_address, ip.whitelisted,
subnet_name, mm.name AS member_name, mm.id AS member_id,
mm.variable_symbol, IFNULL(a.balance,'???') AS balance, mip.comment,
IFNULL(ip.login, u.login) AS login
subnet_name, mm.name AS member_name, mm.id AS member_id,
(
SELECT GROUP_CONCAT(vs.variable_symbol) AS variable_symbol
FROM variable_symbols vs
LEFT JOIN accounts a ON a.id = vs.account_id
WHERE a.member_id = mm.id
) AS variable_symbol,
IFNULL(a.balance,'???') AS balance, mip.comment,
IFNULL(ip.login, u.login) AS login
FROM
(
SELECT ip.id, ip.ip_address, ip.whitelisted,
......
{
$message_query = "
SELECT ms.id, ms.text, ms.self_cancel, '$ip_address' AS ip_address,
ip.whitelisted,
IFNULL(IFNULL(subnet_name, us.name),'???') AS subnet_name,
IFNULL(mm.name,'???') AS member_name, IFNULL(mm.id,'???') AS member_id,
IFNULL(mm.variable_symbol,'???') AS variable_symbol,
IFNULL(a.balance,'???') AS balance,
IFNULL(mip.comment,'???') AS comment,
IFNULL(IFNULL(ip.login, u.login),'???') AS login
ip.whitelisted,
IFNULL(IFNULL(subnet_name, us.name),'???') AS subnet_name,
IFNULL(mm.name,'???') AS member_name, IFNULL(mm.id,'???') AS member_id,
(
SELECT IFNULL(GROUP_CONCAT(vs.variable_symbol),'???') AS variable_symbol
FROM variable_symbols vs
LEFT JOIN accounts a ON a.id = vs.account_id
WHERE a.member_id = mm.id
) AS variable_symbol,
IFNULL(a.balance,'???') AS balance,
IFNULL(mip.comment,'???') AS comment,
IFNULL(IFNULL(ip.login, u.login),'???') AS login
FROM messages ms
LEFT JOIN
(

Také k dispozici: Unified diff