Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 435

Přidáno uživatelem Jiří Sviták před asi 15 roky(ů)

Pridana prace s variabilnim symbolem, opraven export do csv po zmene na adresni body.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/i18n/cs_CZ/texts.php
'back to vlans list' => 'Zpět na seznam VLANů',
'bad entrance date' => 'Chybný datum vstupu.',
'bad phone format' => 'Špatný formát telefonu',
'bad variable symbol format' => 'Špatný formát variabilního symbolu.',
'bad voip number interval format' => 'Špatný formát VoIP čísel',
'balance' => 'Stav',
'bank account' => 'Bankovní účet',
......
'mac' => 'MAC',
'mac address' => 'MAC adresa',
'map' => 'Mapa',
'master bank account' => 'Hlavní bankovní účet sdružení',
'member' => 'Člen',
'member cannot left association before entrance' => 'Člen nemůže opustit sdružení před vstupem.',
'member cannot be former, if his membership was not ended' => 'Člen nemůže být bývalý, pokud jeho členství nebylo ukončeno.',
......
'value for earning' => 'Hodnota pro příjem',
'value has not been entered' => 'Hodnota nebyla zadána.',
'variable symbol' => 'Variabilní symbol',
'variable symbol already exists in database' => 'Variabilní symbol už existuje v databázi.',
'vat' => 'DPH',
'vlan detail' => 'Detail VLANu',
'vlan interface' => 'VLAN rozhraní',
freenetis/trunk/kohana/application/models/member.php
class Member_Model extends ORM
{
protected $has_many = array('invoices',' users', 'accounts', 'transfers', 'bank_accounts');
protected $has_many = array('invoices', ' users', 'accounts', 'transfers', 'bank_accounts');
protected $belongs_to = array('address_point');
public function __construct($id = false)
{
......
}
/**
* Function gets all members to export to xls file.
* Function gets all members to export.
* @return unknown_type
*/
public function get_all_members_to_export()
......
return self::$db->query("SELECT m.id,
m.registration,
m.name,
m.street, m.street_number,
m.town, m.quarter,
s.street, ap.street_number,
t.town, t.quarter,
u.phone, u.email, u.login, 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
FROM members m
JOIN users u ON u.member_id = m.id AND u.type = ".User_Model::$member."
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 (SELECT * FROM translations WHERE lang = '".Config::item('locale.lang')."') f ON e.value = f.original_term");
}
......
public function get_member($id)
{
return self::$db->select(
array('members.registration', 'members.name as namem', 'members.address_point_id', 'members.street', 'members.street_number',
'members.town', 'members.quarter','members.ZIP_code',
array('members.registration', 'members.name as namem', 'members.address_point_id',
'members.variable_symbol',
'members.type as typem', 'members.organization_identifier', 'members.qos_ceil', 'members.qos_rate',
'members.entrance_fee', 'members.debt_payment_rate', 'members.entrance_fee_left',
'members.entrance_date', 'members.comment',
freenetis/trunk/kohana/application/controllers/members.php
$user->application_password = security::generate_password();
$member->comment = $form_data['comment'];
$member->variable_symbol = $form_data['phone'];
$member->entrance_date = date("Y-m-d",$form_data['entrance_date']);
if ($form_data['membername'] == '')
$member->name = $form_data['name'].' '.$form_data['surname'];
......
$form->input('membername')->label(url_lang::lang('texts.Name of organization').':')->rules('required|length[1,60]')->value($member_data->namem);
if ($this->acl_check_edit(get_class($this),'organization_id', $member_id))
$form->input('organization_identifier')->label(url_lang::lang('texts.Organization identifier').':')->rules('length[3,20]')->value($member_data->organization_identifier);
if ($this->acl_check_edit('Members_Controller', 'var_sym', $member_id))
$form->input('variable_symbol')->label(url_lang::lang('texts.Variable symbol').':')->rules('required|length[9,10]')->value($member_data->variable_symbol)->callback(array($this, 'valid_var_sym'));
$form->group('')->label(url_lang::lang('texts.Login data'));
if ($this->acl_check_edit('Users_Controller','login',$member_id))
$form->input('login')->label(url_lang::lang('texts.username').':')
......
}
}
function valid_var_sym($input)
{
$value = trim($input->value);
$member = ORM::factory('member')->find_by_variable_symbol($value);
if (!ereg("^[0-9]{9,10}$", $value))
{
$input->add_error('required', url_lang::lang('texts.Bad variable symbol format.'));
}
else if ($member->id != 0)
{
$input->add_error('required', url_lang::lang('texts.Variable symbol already exists in database.'));
}
}
/**
* Entrance has to be before current date.
* @param $input
freenetis/trunk/kohana/application/upgrade_sql/upgrade_sql_432.php
<?php
$upgrade_sql[432] = array(
"ALTER TABLE `bank_transfers` ADD `number` INT NOT NULL COMMENT 'Line number or number of the bank listing item' AFTER `transfer_id`",
"ALTER TABLE `bank_transfers` ADD INDEX ( `number` , `variable_symbol` )"
);
?>
freenetis/trunk/kohana/application/upgrade_sql/upgrade_sql.php
// array of sql queries that upgrade database
$upgrade_sql[get_SVN_rev()] = array(
"ALTER TABLE `bank_transfers` ADD `number` INT NOT NULL COMMENT 'Line number or number of the bank listing item' AFTER `transfer_id`",
"ALTER TABLE `bank_transfers` ADD INDEX ( `number` , `variable_symbol` )"
"INSERT INTO `axo` (
`id` ,
`section_value` ,
`value` ,
`order_value` ,
`name` ,
`hidden`
)
VALUES (
'141', 'Members_Controller', 'var_sym', '0', 'Variabilni symbol', '0'
);",
"INSERT INTO `axo_map` (
`acl_id` ,
`section_value` ,
`value`
)
VALUES (
'51', 'Members_Controller', 'var_sym'
), (
'38', 'Members_Controller', 'var_sym'
);"
);
?>
freenetis/trunk/kohana/application/views/members/show.php
<th><?php echo url_lang::lang('texts.Organization identifier') ?></th>
<td><?php echo $member_data->organization_identifier ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Variable symbol') ?></th>
<td><?php echo $member_data->variable_symbol ?></td>
</tr>
<?php if ($this->acl_check_view('Members_Controller', 'entrance_date', $member_data->member_id)) { ?>
<tr>
<th><?php echo url_lang::lang('texts.Entrance date') ?></th>

Také k dispozici: Unified diff