Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 522

Přidáno uživatelem Tomáš Dulík před téměř 15 roky(ů)

Oprava nefunkcni editace vykazu prace. K vypisu praci uzivatele pridana suma hodin a km.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/i18n/cs_CZ/texts.php
'gps' => 'GPS souřadnice',
'group' => 'Skupina',
'honorary member' => 'Čestný člen',
'hours' => 'Hodiny',
'hours' => 'Hodin',
'chairman and agent' => 'Předseda a jednatel',
'change' => 'Změnit',
'change application password' => 'Změnit aplikační heslo',
......
'subnet_name' => 'Název podsítě',
'subnets list' => 'Seznam podsítí',
'subnets' => 'Podsítě',
'sum' => 'Součet',
'summary' => 'Sumarizace',
'supplier' => 'Dodavatel',
'suppliers account' => 'Účet dodavatelů',
'surname' => 'Příjmení',
freenetis/trunk/kohana/application/models/user.php
GROUP BY CONCAT(surname,' ',name,' - ',login)
");
}
public function get_all_user_names() {
return self::$db->query("SELECT id, CONCAT(name,' ',surname) as username
FROM users
GROUP BY CONCAT(name,' ',surname)
");
}
public function get_his_users_names($user_id) {
$q="SELECT u2.id, CONCAT(u2.name,' ',u2.surname) AS username FROM users AS u1
JOIN users AS u2 ON u1.id=$user_id AND u1.member_id=u2.member_id";
return self::$db->query($q);
}
public function get_his_username($user_id) {
$q="SELECT id, CONCAT(name,' ',surname) AS username FROM users
WHERE id=$user_id";
return self::$db->query($q);
}
public function get_usernames($user)
{
return self::$db->query("SELECT id, CONCAT(name,' ',surname) as username
freenetis/trunk/kohana/application/controllers/works.php
$user_model = new User_Model();
// check iif user has access rights to edit work of all users
// check if user has access rights to edit work of all users
if ($this->acl_check_edit('Users_Controller','work'))
{
// gets all user's names
$users = $user_model->get_all_user_names();
$users = $user_model->get_his_users_names($work->user_id);
}
else
{
$users = $user_model->get_user_name($work->user_id);
$users = $user_model->get_his_username($work->user_id);
}
// transforms array of objects to classic array
$arr_users = arr::from_objects($users);
$arr_users = arr::from_objects($users, "username");
// creates form
$this->form = new Forge(url_lang::base().'works/edit/'.$work_id, '', 'POST', array('id' => 'article_form'));
freenetis/trunk/kohana/application/views/works/show_by_user.php
<?php echo $confirmed_grid ?>
<br /><br />
<h3><?php echo url_lang::lang('texts.Unconfirmed works') ?></h3>
<?php echo $unconfirmed_grid ?>
<?php echo "$unconfirmed_grid <br/>\n".
url_lang::lang('texts.Sum').": ". $sum_unconfirmed_hours. " ". url_lang::lang('texts.Hours'). ", ".
$sum_unconfirmed_kms. " km<br/>\n";
?>

Také k dispozici: Unified diff