Revize 940
Přidáno uživatelem Michal Kliment před více než 13 roky(ů)
| freenetis/branches/comments/media/css/style.css | ||
|---|---|---|
|
|
||
|
.ip_box {
|
||
|
border: 1px solid black;
|
||
|
}
|
||
|
|
||
|
.help {
|
||
|
cursor: help;
|
||
|
}
|
||
| freenetis/branches/comments/application/helpers/callback.php | ||
|---|---|---|
|
{
|
||
|
$title = (isset($item->a_comment)) ? $item->a_comment : '';
|
||
|
if ($item->balance > 0)
|
||
|
echo '<span style="color:green" title="'.$title.'">'.number_format((float)$item->balance, 2, ',', ' ').'</span>';
|
||
|
echo '<span style="color:green" title="'.$title.'" class="help">'.number_format((float)$item->balance, 2, ',', ' ').'</span>';
|
||
|
elseif ($item->balance < 0)
|
||
|
echo '<span style="color:red" title="'.$title.'">'.number_format((float)$item->balance, 2, ',', ' ').'</span>';
|
||
|
echo '<span style="color:red" title="'.$title.'" class="help">'.number_format((float)$item->balance, 2, ',', ' ').'</span>';
|
||
|
else
|
||
|
echo $item->balance;
|
||
|
echo '<span class="help" title="'.$title.'">'.$item->balance.'</span>';
|
||
|
}
|
||
|
|
||
|
/**
|
||
| ... | ... | |
|
echo html::anchor (url_lang::base().$args[0].'/delete/'.$item->id, url_lang::lang('texts.Delete'), array('class' => 'delete_link'));
|
||
|
}
|
||
|
|
||
|
/**
|
||
|
* Callback to print comments count with comments as title
|
||
|
*
|
||
|
* @author Michal Kliment
|
||
|
* @param <type> $item
|
||
|
* @param <type> $name
|
||
|
*/
|
||
|
public function comments_field ($item, $name)
|
||
|
{
|
||
|
echo "<span title='$item->comments'>$item->comments_count</span>";
|
||
|
echo "<span title='$item->comments' class='help'>$item->comments_count</span>";
|
||
|
}
|
||
|
|
||
|
/**
|
||
|
* Callback to print vote state with vote comments as title
|
||
|
*
|
||
|
* @author Michal Kliment
|
||
|
* @param <type> $item
|
||
|
* @param <type> $name
|
||
|
*/
|
||
|
public static function vote_state_field ($item, $name)
|
||
|
{
|
||
|
echo "<span title='$item->vote_comments'>";
|
||
|
echo "<span title='$item->vote_comments' class='help'>";
|
||
|
echo '<span style="color: green">'.$item->agree_count.'</span>';
|
||
|
echo '/';
|
||
|
echo '<span style="color: red">'.$item->disagree_count.'</span>';
|
||
| freenetis/branches/comments/application/models/job.php | ||
|---|---|---|
|
return $this->db->query('SELECT q.*, (agree_count - disagree_count) AS approval_state FROM (SELECT j.*, CONCAT(u.name, \' \', u.surname) AS uname, v.vote, v.comment,
|
||
|
(SELECT COUNT(*) FROM votes WHERE vote = 1 AND votes.fk_id = j.id AND votes.type = 1) AS agree_count,
|
||
|
(SELECT COUNT(*) FROM votes WHERE vote = -1 AND votes.fk_id = j.id AND votes.type = 1) AS disagree_count,
|
||
|
(SELECT COUNT(*) FROM votes WHERE vote = 0 AND votes.fk_id = j.id AND votes.type = 1) AS abstain_count
|
||
|
(SELECT COUNT(*) FROM votes WHERE vote = 0 AND votes.fk_id = j.id AND votes.type = 1) AS abstain_count,
|
||
|
(SELECT COUNT(*) FROM comments c WHERE j.comments_thread_id = c.comments_thread_id) AS comments_count,
|
||
|
(
|
||
|
SELECT GROUP_CONCAT(user, " (",SUBSTRING(c.datetime,1,10),"): \n",c.text SEPARATOR ", \n\n") FROM
|
||
|
(
|
||
|
SELECT c.*, CONCAT(u.surname," ",u.name) AS user FROM comments c
|
||
|
LEFT JOIN users u ON c.user_id = u.id
|
||
|
ORDER BY datetime DESC
|
||
|
) AS c WHERE c.comments_thread_id = j.comments_thread_id GROUP BY c.user_id
|
||
|
) AS comments,
|
||
|
(
|
||
|
SELECT GROUP_CONCAT(comment SEPARATOR ", \n\n") FROM
|
||
|
(
|
||
|
SELECT v.fk_id, v.type, CONCAT(u.surname," ",u.name," (",SUBSTRING(v.time,1,10),"): \n",IF(v.vote=1,"'.url_lang::lang('texts.Agree').'",IF(v.vote=-1,"'.url_lang::lang('texts.Disagree').'","'.url_lang::lang('texts.Abstain').'")), IF(v.comment NOT LIKE ""," - ",""), v.comment) AS comment FROM votes v
|
||
|
LEFT JOIN users u ON v.user_id = u.id
|
||
|
ORDER BY v.vote DESC
|
||
|
) AS v
|
||
|
WHERE v.fk_id = j.id AND v.type = 1
|
||
|
GROUP BY fk_id
|
||
|
) AS vote_comments
|
||
|
FROM jobs j
|
||
|
LEFT JOIN users u ON j.user_id = u.id
|
||
|
LEFT JOIN votes v ON j.id = v.fk_id AND v.type =1 AND v.user_id = '.Session::instance()->get('user_id').'
|
||
| ... | ... | |
|
return $this->db->query('SELECT q.*, (agree_count - disagree_count) AS approval_state FROM (SELECT j.*,
|
||
|
(SELECT COUNT(*) FROM votes WHERE vote = 1 AND votes.fk_id = j.id AND votes.type = 1) AS agree_count,
|
||
|
(SELECT COUNT(*) FROM votes WHERE vote = -1 AND votes.fk_id = j.id AND votes.type = 1) AS disagree_count,
|
||
|
(SELECT COUNT(*) FROM votes WHERE vote = 0 AND votes.fk_id = j.id AND votes.type = 1) AS abstain_count
|
||
|
(SELECT COUNT(*) FROM votes WHERE vote = 0 AND votes.fk_id = j.id AND votes.type = 1) AS abstain_count,
|
||
|
(SELECT COUNT(*) FROM comments c WHERE j.comments_thread_id = c.comments_thread_id) AS comments_count,
|
||
|
(
|
||
|
SELECT GROUP_CONCAT(user, " (",SUBSTRING(c.datetime,1,10),"): \n",c.text SEPARATOR ", \n\n") FROM
|
||
|
(
|
||
|
SELECT c.*, CONCAT(u.surname," ",u.name) AS user FROM comments c
|
||
|
LEFT JOIN users u ON c.user_id = u.id
|
||
|
ORDER BY datetime DESC
|
||
|
) AS c WHERE c.comments_thread_id = j.comments_thread_id GROUP BY c.user_id
|
||
|
) AS comments,
|
||
|
(
|
||
|
SELECT GROUP_CONCAT(comment SEPARATOR ", \n\n") FROM
|
||
|
(
|
||
|
SELECT v.fk_id, v.type, CONCAT(u.surname," ",u.name," (",SUBSTRING(v.time,1,10),"): \n",IF(v.vote=1,"'.url_lang::lang('texts.Agree').'",IF(v.vote=-1,"'.url_lang::lang('texts.Disagree').'","'.url_lang::lang('texts.Abstain').'")), IF(v.comment NOT LIKE ""," - ",""), v.comment) AS comment FROM votes v
|
||
|
LEFT JOIN users u ON v.user_id = u.id
|
||
|
ORDER BY v.vote DESC
|
||
|
) AS v
|
||
|
WHERE v.fk_id = j.id AND v.type = 1
|
||
|
GROUP BY fk_id
|
||
|
) AS vote_comments
|
||
|
FROM jobs j
|
||
|
WHERE j.state = 2 AND j.job_report_id IS NULL AND j.user_id = '.$user_id.') AS q');
|
||
|
}
|
||
| ... | ... | |
|
return $this->db->query('SELECT q.*, (agree_count - disagree_count) AS approval_state FROM (SELECT j.*, t.amount as rating,
|
||
|
(SELECT COUNT(*) FROM votes WHERE vote = 1 AND votes.fk_id = j.id AND votes.type = 1) AS agree_count,
|
||
|
(SELECT COUNT(*) FROM votes WHERE vote = -1 AND votes.fk_id = j.id AND votes.type = 1) AS disagree_count,
|
||
|
(SELECT COUNT(*) FROM votes WHERE vote = 0 AND votes.fk_id = j.id AND votes.type = 1) AS abstain_count
|
||
|
(SELECT COUNT(*) FROM votes WHERE vote = 0 AND votes.fk_id = j.id AND votes.type = 1) AS abstain_count,
|
||
|
(SELECT COUNT(*) FROM comments c WHERE j.comments_thread_id = c.comments_thread_id) AS comments_count,
|
||
|
(
|
||
|
SELECT GROUP_CONCAT(user, " (",SUBSTRING(c.datetime,1,10),"): \n",c.text SEPARATOR ", \n\n") FROM
|
||
|
(
|
||
|
SELECT c.*, CONCAT(u.surname," ",u.name) AS user FROM comments c
|
||
|
LEFT JOIN users u ON c.user_id = u.id
|
||
|
ORDER BY datetime DESC
|
||
|
) AS c WHERE c.comments_thread_id = j.comments_thread_id GROUP BY c.user_id
|
||
|
) AS comments,
|
||
|
(
|
||
|
SELECT GROUP_CONCAT(comment SEPARATOR ", \n\n") FROM
|
||
|
(
|
||
|
SELECT v.fk_id, v.type, CONCAT(u.surname," ",u.name," (",SUBSTRING(v.time,1,10),"): \n",IF(v.vote=1,"'.url_lang::lang('texts.Agree').'",IF(v.vote=-1,"'.url_lang::lang('texts.Disagree').'","'.url_lang::lang('texts.Abstain').'")), IF(v.comment NOT LIKE ""," - ",""), v.comment) AS comment FROM votes v
|
||
|
LEFT JOIN users u ON v.user_id = u.id
|
||
|
ORDER BY v.vote DESC
|
||
|
) AS v
|
||
|
WHERE v.fk_id = j.id AND v.type = 1
|
||
|
GROUP BY fk_id
|
||
|
) AS vote_comments
|
||
|
FROM jobs j
|
||
|
LEFT JOIN transfers t ON j.transfer_id = t.id
|
||
|
WHERE j.state = 3 AND j.job_report_id IS NULL AND j.user_id = '.$user_id.') AS q');
|
||
| freenetis/branches/comments/application/controllers/works.php | ||
|---|---|---|
|
$pending_works_grid->field('date')->label(url_lang::lang('texts.Date'));
|
||
|
$pending_works_grid->field('hours')->label(url_lang::lang('texts.Hours'));
|
||
|
$pending_works_grid->field('km')->label(url_lang::lang('texts.Km'));
|
||
|
$pending_works_grid->callback_field('suggest_amount')->label(url_lang::lang('texts.Suggest amount'))->callback('Works_Controller::suggest_amount');
|
||
|
$pending_works_grid->callback_field('approval_state')->label(url_lang::lang('texts.State'))->help(help::hint('approval_state'))->callback('Works_Controller::vote_state_field');
|
||
|
$pending_works_grid->callback_field('approval_state')->label(url_lang::lang('texts.State'))->help(help::hint('approval_state'))->callback('callback::vote_state_field');
|
||
|
$pending_works_grid->callback_field('comments_count')->label(url_lang::lang('texts.Comments count'))->callback('callback::comments_field');
|
||
|
|
||
|
// user can vote -> show columns for form items
|
||
|
if ($can_vote)
|
||
| ... | ... | |
|
$approved_works_grid->field('hours')->label(url_lang::lang('texts.Hours'));
|
||
|
$approved_works_grid->field('km')->label(url_lang::lang('texts.Km'));
|
||
|
$approved_works_grid->callback_field('rating')->label(url_lang::lang('texts.Rating'))->callback('Works_Controller::rating');
|
||
|
$approved_works_grid->callback_field('approval_state')->label(url_lang::lang('texts.State'))->help(help::hint('approval_state'))->callback('Works_Controller::vote_state_field');
|
||
|
$approved_works_grid->callback_field('approval_state')->label(url_lang::lang('texts.State'))->help(help::hint('approval_state'))->callback('callback::vote_state_field');
|
||
|
$approved_works_grid->callback_field('comments_count')->label(url_lang::lang('texts.Comments count'))->callback('callback::comments_field');
|
||
|
|
||
|
// access control
|
||
|
if ($this->acl_check_view('Users_Controller','work', $user->member_id))
|
||
| ... | ... | |
|
$rejected_works_grid->field('hours')->label(url_lang::lang('texts.Hours'));
|
||
|
$rejected_works_grid->field('km')->label(url_lang::lang('texts.Km'));
|
||
|
$rejected_works_grid->callback_field('suggest_amount')->label(url_lang::lang('texts.Suggest amount'))->callback('Works_Controller::suggest_amount');
|
||
|
$rejected_works_grid->callback_field('approval_state')->label(url_lang::lang('texts.State'))->help(help::hint('approval_state'))->callback('Works_Controller::vote_state_field');
|
||
|
$rejected_works_grid->callback_field('approval_state')->label(url_lang::lang('texts.State'))->help(help::hint('approval_state'))->callback('callback::vote_state_field');
|
||
|
$rejected_works_grid->callback_field('comments_count')->label(url_lang::lang('texts.Comments count'))->callback('callback::comments_field');
|
||
|
|
||
|
// access control
|
||
|
if ($this->acl_check_view('Users_Controller','work', $user->member_id))
|
||
Také k dispozici: Unified diff
Zapomnel jsem to udelat i pro zobrazeni praci uzivatele.