Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 456

Přidáno uživatelem Michal Kliment před asi 15 roky(ů)

Prace s zarizenimi (pridavani, pridavani celeho i editace) predelany na spolupraci adresnimi body.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/i18n/cs_CZ/texts.php
'select only one type of iface' => 'Vyberte jen jeden typ rozhraní.',
'select port' => 'Vyber port',
'select segment' => 'Vyber segment',
'select street' => 'Vyber ulici',
'select subnet name' => 'Vyber jméno podsítě',
'select subnet ip' => 'Vyber IP adresu podsítě',
'select subnet' => 'Vyber podsíť',
freenetis/trunk/kohana/application/models/device.php
class Device_Model extends ORM {
protected $has_many = array('ifaces','ports');
protected $belongs_to = array('user');
protected $belongs_to = array('address_point', 'user');
public $arr_sql = array('id' => 'd.id', 'devicename' => 'd.name', 'username' => 'concat(u.name,\' \',u.surname)', 'device_type'=>'d.type', 'member_id' => 'users.member_id');
public function count_all_devices($filter_values = array())
freenetis/trunk/kohana/application/controllers/devices.php
$grid->action_field('id')->label(url_lang::lang('texts.Port'))->url(url_lang::base().'ports/delete')->action(url_lang::lang('texts.Delete'))->class('center')->script('onclick="return potvrd(\''.url_lang::lang('texts.Do you want to delete this port').'\');"');
$grid->datasource( $query );
$grid_ports = $grid;
$view = new View('main');
$view->title = url_lang::lang('texts.Device detail').' - '.$device->name;
$view->content = new View('show_device');
$view->content->headline = url_lang::lang('texts.Device detail').' - '.$device->name;
$view->content = new View('devices_show');
$view->content->device = $device;
$view->content->device_type = $device_type;
$view->content->count_iface = $iface_model->count_ifaces_of_device($device->id);
......
if ($user->id == 0)
Controller::error(RECORD);
$selected = $user->id;
$selected_GPS = $user->member->address_point->GPS;
$selected_street_id = $user->member->address_point->street_id;
$selected_street_number = $user->member->address_point->street_number;
$selected_town_id = $user->member->address_point->town_id;
$arr_users[$user->id] = $user->surname.' '.$user->name.' - '.$user->login;
}
else
......
$users = $user_model->select('id','name','surname','login')->orderby('id')->find_all();
$arr_users[0] = '----- '.url_lang::lang('texts.select user').' -----';
$selected = 0;
$selected_GPS = '';
$selected_street_id = 0;
$selected_street_number = '';
$selected_town_id = 0;
foreach ($users as $user)
{
$arr_users[$user->id] = $user->surname.' '.$user->name.' - '.$user->login;
......
$types = $enum_type_model->get_values(Enum_type_Model::$device_type_id);
$types[0] = '----- '.url_lang::lang('texts.select type').' -----';
asort($types);
// streets
$street_model = new Street_Model();
$streets = $street_model->orderby('street')->find_all();
$arr_streets = array();
$arr_streets[0] = '----- '.url_lang::lang('texts.select street').' -----';
foreach ($streets as $street)
{
$arr_streets[$street->id] = $street->street;
}
asort($arr_streets);
// towns
$town_model = new Town_Model();
$towns = $town_model->orderby('town')->find_all();
$arr_towns = array();
foreach ($towns as $town)
{
$arr_towns[$town->id] = $town->town;
$arr_towns[$town->id] .= ($town->quarter) ? '-'.$town->quarter : '';
$arr_towns[$town->id] .= ', '.$town->zip_code;
}
asort($arr_towns);
// forge form
$form = new Forge(url_lang::base()."devices/add/".$user_id, '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
......
$form->checkbox('PPPoE_logging_in')->label(url_lang::lang('texts.PPPoE'))->value('1');
$form->input('login')->label(url_lang::lang('texts.username').':')->rules('length[0,250]');
$form->input('password')->label(url_lang::lang('texts.password').':')->rules('length[0,250]');
$form->input('GPS')->label(url_lang::lang('texts.GPS').':')->rules('length[3,100]');
$form->input('location_address')->label(url_lang::lang('texts.location address').':')->rules('length[3,254]');
$form->input('GPS')->label(url_lang::lang('texts.GPS').':')->rules('length[3,100]')->value($selected_GPS);
$form->dropdown('street_id')->label(url_lang::lang('texts.street').':')->options($arr_streets)->selected($selected_street_id);
$form->input('street_number')->label(url_lang::lang('texts.street number').':')->rules('length[1,50]|valid_numeric')->value($selected_street_number);
$form->dropdown('town_id')->label(url_lang::lang('texts.town').':')->rules('required')->options($arr_towns)->selected($selected_town_id);
$form->input('location_details')->label(url_lang::lang('texts.location details').':')->rules('length[3,254]');
$form->textarea('comment')->label(url_lang::lang('texts.comment').':')->rules('length[0,254]');
$form->dropdown('first_engineer_id')->label(url_lang::lang('texts.engineer').':')->options($arr_engineers)->rules('required')->selected($this->session->get('user_id'));
......
$device_model->PPPoE_logging_in = htmlspecialchars($form_data["PPPoE_logging_in"]);
$device_model->login = htmlspecialchars($form_data["login"]);
$device_model->password = htmlspecialchars($form_data["password"]);
$device_model->GPS = htmlspecialchars($form_data["GPS"]);
$device_model->location_address = htmlspecialchars($form_data["location_address"]);
$device_model->location_details = htmlspecialchars($form_data["location_details"]);
$device_model->comment = htmlspecialchars($form_data["comment"]);
$address_point_model = new Address_point_Model();
$address_point = $address_point_model->exist_address_point($form_data["town_id"], $form_data["street_id"], $form_data["street_number"]);
if (!$address_point->id)
{
$address_point->town_id = $form_data["town_id"];
$address_point->street_id = $form_data["street_id"];
$address_point->street_number = $form_data["street_number"];
}
$address_point->GPS = $form_data["GPS"];
$address_point->save();
$device_model->address_point_id = $address_point->id;
$device_saved = $device_model->save();
// device engineer
......
if ($user->id == 0)
Controller::error(RECORD);
$selected = $user->id;
$selected_GPS = $user->member->address_point->GPS;
$selected_street_id = $user->member->address_point->street_id;
$selected_street_number = $user->member->address_point->street_number;
$selected_town_id = $user->member->address_point->town_id;
$arr_users[$user->id] = $user->surname.' '.$user->name.' - '.$user->login;
}
else
......
$users = $user_model->select('id','name','surname','login')->orderby('id')->find_all();
$arr_users[0] = '----- '.url_lang::lang('texts.select user').' -----';
$selected = 0;
$selected_GPS = '';
$selected_street_id = 0;
$selected_street_number = '';
$selected_town_id = 0;
foreach ($users as $user)
{
$arr_users[$user->id] = $user->surname.' '.$user->name.' - '.$user->login;
......
{
$arr_segments[$segment->id] = $segment->name;
}
// streets
$street_model = new Street_Model();
$streets = $street_model->orderby('street')->find_all();
$arr_streets = array();
$arr_streets[0] = '----- '.url_lang::lang('texts.select street').' -----';
foreach ($streets as $street)
{
$arr_streets[$street->id] = $street->street;
}
asort($arr_streets);
// towns
$town_model = new Town_Model();
$towns = $town_model->orderby('town')->find_all();
$arr_towns = array();
foreach ($towns as $town)
{
$arr_towns[$town->id] = $town->town;
$arr_towns[$town->id] .= ($town->quarter) ? '-'.$town->quarter : '';
$arr_towns[$town->id] .= ', '.$town->zip_code;
}
asort($arr_towns);
// forge form
$form = new Forge(url_lang::base()."devices/add_whole", '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
......
$form->checkbox('PPPoE_logging_in')->label(url_lang::lang('texts.PPPoE').':')->value('1');
$form->input('login')->label(url_lang::lang('texts.username').':')->rules('length[0,250]');
$form->input('password')->label(url_lang::lang('texts.password').':')->rules('length[0,250]');
$form->input('GPS')->label(url_lang::lang('texts.GPS').':')->rules('length[3,100]');
$form->input('location_address')->label(url_lang::lang('texts.location address').':')->rules('length[3,254]');
$form->input('GPS')->label(url_lang::lang('texts.GPS').':')->rules('length[3,100]')->value($selected_GPS);
$form->dropdown('street_id')->label(url_lang::lang('texts.street').':')->options($arr_streets)->selected($selected_street_id);
$form->input('street_number')->label(url_lang::lang('texts.street number').':')->rules('length[1,50]|valid_numeric')->value($selected_street_number);
$form->dropdown('town_id')->label(url_lang::lang('texts.town').':')->rules('required')->options($arr_towns)->selected($selected_town_id);
$form->input('location_details')->label(url_lang::lang('texts.location details').':')->rules('length[3,254]');
$form->textarea('comment')->label(url_lang::lang('texts.comment').':')->rules('length[0,254]');
......
$device_model->PPPoE_logging_in = htmlspecialchars($form_data["PPPoE_logging_in"]);
$device_model->login = htmlspecialchars($form_data["login"]);
$device_model->password = htmlspecialchars($form_data["password"]);
$device_model->GPS = htmlspecialchars($form_data["GPS"]);
$device_model->location_address = htmlspecialchars($form_data["location_address"]);
$device_model->location_details = htmlspecialchars($form_data["location_details"]);
$device_model->comment = htmlspecialchars($form_data["comment"]);
$address_point_model = new Address_point_Model();
$address_point = $address_point_model->exist_address_point($form_data["town_id"], $form_data["street_id"], $form_data["street_number"]);
if (!$address_point->id)
{
$address_point->town_id = $form_data["town_id"];
$address_point->street_id = $form_data["street_id"];
$address_point->street_number = $form_data["street_number"];
}
$address_point->GPS = $form_data["GPS"];
$address_point->save();
$device_model->address_point_id = $address_point->id;
$device_saved = $device_model->save();
// device engineer model
......
$enum_type_model = new Enum_type_Model();
$types = $enum_type_model->get_values(Enum_type_Model::$device_type_id);
// streets
$street_model = new Street_Model();
$streets = $street_model->orderby('street')->find_all();
$arr_streets = array();
$arr_streets[0] = '----- '.url_lang::lang('texts.select street').' -----';
foreach ($streets as $street)
{
$arr_streets[$street->id] = $street->street;
}
asort($arr_streets);
// towns
$town_model = new Town_Model();
$towns = $town_model->orderby('town')->find_all();
$arr_towns = array();
foreach ($towns as $town)
{
$arr_towns[$town->id] = $town->town;
$arr_towns[$town->id] .= ($town->quarter) ? '-'.$town->quarter : '';
$arr_towns[$town->id] .= ', '.$town->zip_code;
}
asort($arr_towns);
$form->dropdown('user_id')->label(url_lang::lang('texts.user'))->options($arr_users)->rules('required')->selected($device->user_id);
$form->input('name')->label(url_lang::lang('texts.Device name').':')->rules('required|length[3,250]')->value($device->name);
$form->dropdown('type')->label(url_lang::lang('texts.type'))->options($types)->rules('required')->selected($device->type);
$form->checkbox('PPPoE_logging_in')->label(url_lang::lang('texts.PPPoE'))->value('1')->checked($device->PPPoE_logging_in);
$form->input('login')->label(url_lang::lang('texts.username').':')->rules('length[0,250]')->value($device->login);
$form->input('password')->label(url_lang::lang('texts.password').':')->rules('length[0,250]')->value($device->password);
$form->input('GPS')->label(url_lang::lang('texts.GPS').':')->rules('length[3,100]')->value($device->GPS);
$form->input('location_address')->label(url_lang::lang('texts.location address').':')->rules('length[3,254]')->value($device->location_address);
$form->input('GPS')->label(url_lang::lang('texts.GPS').':')->rules('length[3,100]')->value($device->address_point->GPS);
$form->dropdown('street_id')->label(url_lang::lang('texts.street').':')->options($arr_streets)->selected($device->address_point->street_id);
$form->input('street_number')->label(url_lang::lang('texts.street number').':')->rules('length[1,50]|valid_numeric')->value($device->address_point->street_number);
$form->dropdown('town_id')->label(url_lang::lang('texts.town').':')->rules('required')->options($arr_towns)->selected($device->address_point->town_id);
$form->input('location_details')->label(url_lang::lang('texts.location details').':')->rules('length[3,254]')->value($device->location_details);
$form->textarea('comment')->label(url_lang::lang('texts.comment').':')->rules('length[0,254]')->value($device->comment);
$form->submit('submit')->value(url_lang::lang('texts.update'));
......
{
$form_data = $form->as_array();
// saves device changes
$device_model = new Device_Model();
$device_model->find_by_id($device_id);
$device = new Device_Model($device_id);
foreach($form_data as $key => $value)
{
$device_model->$key = htmlspecialchars($value);
$form_data[$key] = htmlspecialchars($value);
}
$device_model_saved = $device_model->save();
$device->user_id = $form_data["user_id"];
$device->name = $form_data["name"];
$device->type = $form_data["type"];
$device->PPPoE_logging_in = $form_data["PPPoE_logging_in"];
$device->login = $form_data["login"];
$device->password = $form_data["password"];
$device->location_details = $form_data["location_details"];
$device->comment = $form_data["comment"];
$address_point_model = new Address_point_Model();
$address_point = $address_point_model->exist_address_point($form_data["town_id"], $form_data["street_id"], $form_data["street_number"]);
if (!$address_point->id)
{
$address_point->town_id = $form_data["town_id"];
$address_point->street_id = $form_data["street_id"];
$address_point->street_number = $form_data["street_number"];
}
$address_point->GPS = $form_data["GPS"];
$address_point->save();
$device->address_point_id = $address_point->id;
$device_saved = $device->save();
unset($form_data);
if ($device_model_saved )
if ($device_saved )
{
$this->session->set_flash('message', url_lang::lang('texts.Device has been successfully updated.'));
url::redirect(url_lang::base().'devices/show/'.$device_model->id);
url::redirect(url_lang::base().'devices/show/'.$device->id);
}
} // end of validation
$view = new View('main');
freenetis/trunk/kohana/application/upgrade_sql/upgrade_sql.php
// array of sql queries that upgrade database
$upgrade_sql[get_SVN_rev()] = array(
"INSERT INTO `axo` (
`id` ,
`section_value` ,
`value` ,
`order_value` ,
`name` ,
`hidden`
)
VALUES (
'144', 'Members_Controller', 'redirect', '0', 'Presmerovani clena (jeho IP adres)', '0'
), (
'145', 'Devices_Controller', 'redirect', '0', 'Presmerovani podsite', '0'
"UPDATE devices d, users u, members m SET d.address_point_id = m.address_point_id WHERE d.user_id = u.id AND u.member_id = m.id"
);
",
"INSERT INTO `axo_map` (
`acl_id` ,
`section_value` ,
`value`
)
VALUES (
'38', 'Members_Controller', 'redirect'
), (
'38', 'Devices_Controller', 'redirect'
), (
'51', 'Members_Controller', 'redirect'
), (
'51', 'Devices_Controller', 'redirect'
);
"
);
?>
freenetis/trunk/kohana/application/upgrade_sql/upgrade_sql_455.php
<?php
// array of sql queries that upgrade database
$upgrade_sql[455] = array(
"INSERT INTO `axo` (
`id` ,
`section_value` ,
`value` ,
`order_value` ,
`name` ,
`hidden`
)
VALUES (
'144', 'Members_Controller', 'redirect', '0', 'Presmerovani clena (jeho IP adres)', '0'
), (
'145', 'Devices_Controller', 'redirect', '0', 'Presmerovani podsite', '0'
);
",
"INSERT INTO `axo_map` (
`acl_id` ,
`section_value` ,
`value`
)
VALUES (
'38', 'Members_Controller', 'redirect'
), (
'38', 'Devices_Controller', 'redirect'
), (
'51', 'Members_Controller', 'redirect'
), (
'51', 'Devices_Controller', 'redirect'
);
"
);
?>
freenetis/trunk/kohana/application/views/show_device.php
<h2><?php echo $headline ?></h2>
<?php
echo ($message = $this->session->get('message')) ? '<div class="message">'.$message.'</div>' : '';
if ($this->acl_check_view(get_class($this),'devices',$device->user->id))
$links[] = html::anchor(url_lang::base().'devices/show_by_user/'.$device->user->id, url_lang::lang('texts.Back to devices of user'));
if($this->acl_check_edit(get_class($this),'devices'))
$links[] = html::anchor(url_lang::base().'devices/edit/'.$device->id, url_lang::lang('texts.Edit'));
echo implode(' | ', $links)
?>
<br />
<br />
<table class="extended" cellspacing="0" style="float:left;">
<tr>
<th><?php echo url_lang::lang('texts.ID') ?></th>
<td><?php echo $device->id ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.User') ?></th>
<td><?php echo html::anchor(url_lang::base().'users/show/'.$device->user->id,$device->user->name.' '.$device->user->surname); ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Device name') ?></th>
<td><?php echo $device->name ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Type') ?></th>
<td><?php echo $device_type ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.GPS') ?></th>
<td><?php echo $device->GPS ?> <?php echo html::anchor('http://www.mapy.cz/#z=14@st=s@sss=1@mm=FP@ssq=loc:'.$device->GPS, url_lang::lang('texts.Map'), 'target="_blank" title="mapy.cz"') ?></td>
</tr>
</table>
<table class="extended" cellspacing="0" style="margin-left:25px; float:left;">
<tr>
<th><?php echo url_lang::lang('texts.Login name') ?></th>
<td><?php echo $device->login ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Password') ?></th>
<td><?php echo $device->password ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Location address') ?></th>
<td><?php echo $device->location_address ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Location details') ?></th>
<td><?php echo $device->location_details ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Comment') ?></th>
<td><?php echo $device->comment ?></td>
</tr>
</table>
<br class="clear" />
<br />
<!-- device engineers -->
<div style="float:left;">
<?php //if ($this->acl_check_view(get_class($this),'engineer',$device->user->member_id)) { ?>
<h3><?php echo url_lang::lang('texts.Device engineers') ?></h3>
<?php echo $table_device_engineers ?>
<?php //} ?>
</div>
<div style="float:left; margin-left:25px;">
<?php if ($this->acl_check_view(get_class($this),'admin',$device->user->member_id)) { ?>
<h3><?php echo url_lang::lang('texts.Device admins') ?></h3>
<?php echo $table_device_admins ?>
<?php } ?>
</div>
<br class="clear" />
<br />
<?php if ($this->acl_check_view(get_class($this),'iface',$device->user->member_id)) { ?>
<h3><?php echo url_lang::lang('texts.Interfaces') ?></h3>
<?php echo $table_ifaces ?>
<br />
<?php } ?>
<?php if ($this->acl_check_view(get_class($this),'port',$device->user->member_id)) { ?>
<h3><?php echo url_lang::lang('texts.Ports') ?></h3>
<?php echo $table_ports ?>
<?php } ?>
freenetis/trunk/kohana/application/views/devices_show.php
<h2><?php echo url_lang::lang('texts.Device detail').' - '.$device->name ?></h2>
<?php
echo ($message = $this->session->get('message')) ? '<div class="message">'.$message.'</div>' : '';
if ($this->acl_check_view(get_class($this),'devices',$device->user->id))
$links[] = html::anchor(url_lang::base().'devices/show_by_user/'.$device->user->id, url_lang::lang('texts.Back to devices of user'));
if($this->acl_check_edit(get_class($this),'devices'))
$links[] = html::anchor(url_lang::base().'devices/edit/'.$device->id, url_lang::lang('texts.Edit'));
echo implode(' | ', $links)
?>
<br />
<br />
<table class="extended" cellspacing="0" style="float:left;">
<tr>
<th><?php echo url_lang::lang('texts.ID') ?></th>
<td><?php echo $device->id ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.User') ?></th>
<td><?php echo html::anchor(url_lang::base().'users/show/'.$device->user->id,$device->user->name.' '.$device->user->surname); ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Device name') ?></th>
<td><?php echo $device->name ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Type') ?></th>
<td><?php echo $device_type ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.GPS') ?></th>
<td><?php echo $device->address_point->GPS ?> <?php echo html::anchor('http://www.mapy.cz/#z=14@st=s@sss=1@mm=FP@ssq=loc:'.$device->GPS, url_lang::lang('texts.Map'), 'target="_blank" title="mapy.cz"') ?></td>
</tr>
</table>
<table class="extended" cellspacing="0" style="margin-left:25px; float:left;">
<tr>
<th><?php echo url_lang::lang('texts.Login name') ?></th>
<td><?php echo $device->login ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Password') ?></th>
<td><?php echo $device->password ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Location address') ?></th>
<td><?php if ($device->address_point->street_id && $device->address_point->street_number) echo $device->address_point->street->street.' '.$device->address_point->street_number.', ';
else if ($device->address_point->street_id) echo $device->address_point->street->street.', '; else if ($device->address_point->street_number) echo $device->address_point->street_number.', ';
echo $device->address_point->town->town;
echo ($device->address_point->town->quater!='') ? '-'.$device->address_point->town->quater.', ' : ', ';
echo $device->address_point->town->zip_code;
?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Location details') ?></th>
<td><?php echo $device->location_details ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Comment') ?></th>
<td><?php echo $device->comment ?></td>
</tr>
</table>
<br class="clear" />
<br />
<!-- device engineers -->
<div style="float:left;">
<?php //if ($this->acl_check_view(get_class($this),'engineer',$device->user->member_id)) { ?>
<h3><?php echo url_lang::lang('texts.Device engineers') ?></h3>
<?php echo $table_device_engineers ?>
<?php //} ?>
</div>
<div style="float:left; margin-left:25px;">
<?php if ($this->acl_check_view(get_class($this),'admin',$device->user->member_id)) { ?>
<h3><?php echo url_lang::lang('texts.Device admins') ?></h3>
<?php echo $table_device_admins ?>
<?php } ?>
</div>
<br class="clear" />
<br />
<?php if ($this->acl_check_view(get_class($this),'iface',$device->user->member_id)) { ?>
<h3><?php echo url_lang::lang('texts.Interfaces') ?></h3>
<?php echo $table_ifaces ?>
<br />
<?php } ?>
<?php if ($this->acl_check_view(get_class($this),'port',$device->user->member_id)) { ?>
<h3><?php echo url_lang::lang('texts.Ports') ?></h3>
<?php echo $table_ports ?>
<?php } ?>

Také k dispozici: Unified diff