Skip to content
Snippets Groups Projects
Commit dc7240cf authored by Elmar Ludwig's avatar Elmar Ludwig
Browse files

fix layout of tables, fixes #9, #17 and #25

parent 5f9dd0e6
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 214 additions and 201 deletions
Stundenzettel.class.php
+ 2
− 6
View file @ dc7240cf
...@@ -112,7 +112,7 @@ class Stundenzettel extends StudipPlugin implements SystemPlugin ...@@ -112,7 +112,7 @@ class Stundenzettel extends StudipPlugin implements SystemPlugin
public function isStumiSupervisor() public function isStumiSupervisor()
{ {
return StundenzettelContract::findBySupervisor($GLOBALS['user']->user_id); return StundenzettelContract::findBySupervisor_id($GLOBALS['user']->user_id);
} }
public function vacationEntitelment($user_id, $inst_id, $year) { public function vacationEntitelment($user_id, $inst_id, $year) {
...@@ -201,11 +201,7 @@ class Stundenzettel extends StudipPlugin implements SystemPlugin ...@@ -201,11 +201,7 @@ class Stundenzettel extends StudipPlugin implements SystemPlugin
public function can_access_contract_timesheets($contract_id) public function can_access_contract_timesheets($contract_id)
{ {
$contract = StundenzettelContract::find($contract_id); $contract = StundenzettelContract::find($contract_id);
if ($contract->supervisor == User::findCurrent()->user_id || $contract->user_id == User::findCurrent()->user_id) { return $contract->supervisor_id == User::findCurrent()->user_id || $contract->user_id == User::findCurrent()->user_id;
return true;
} else {
return false;
}
} }
//TODO gehört in die Models //TODO gehört in die Models
......
controllers/index.php
+ 10
− 9
View file @ dc7240cf
...@@ -73,7 +73,7 @@ class IndexController extends PluginController { ...@@ -73,7 +73,7 @@ class IndexController extends PluginController {
$stumi = User::find($member->user_id); $stumi = User::find($member->user_id);
if (!$this->search || stripos($stumi->username . ' ' . $stumi->vorname . ' ' . $stumi->nachname, $this->search)) { if (!$this->search || stripos($stumi->username . ' ' . $stumi->vorname . ' ' . $stumi->nachname, $this->search)) {
$this->inst_data[$inst_id][$group->id]['stumis'][] = $stumi; $this->inst_data[$inst_id][$group->id]['stumis'][] = $stumi;
$this->inst_data[$inst_id][$group->id]['stumi_contracts'][$member->user_id] = StundenzettelContract::findBySQL('`user_id` = ? AND `inst_id` = ?', [$member->user_id, $inst_id]); $this->inst_data[$inst_id][$group->id]['stumi_contracts'][$member->user_id] = StundenzettelContract::findBySQL('user_id = ? AND inst_id = ?', [$member->user_id, $inst_id]);
$user_ids[] = $member->user_id; $user_ids[] = $member->user_id;
} }
} }
...@@ -84,7 +84,7 @@ class IndexController extends PluginController { ...@@ -84,7 +84,7 @@ class IndexController extends PluginController {
$former_stumi = User::find($old_contract->user_id); $former_stumi = User::find($old_contract->user_id);
if ((!in_array($old_contract->user_id, $user_ids)) && (!$this->search || stripos($former_stumi->username . ' ' . $former_stumi->vorname . ' ' . $former_stumi->nachname, $this->search))) { if ((!in_array($old_contract->user_id, $user_ids)) && (!$this->search || stripos($former_stumi->username . ' ' . $former_stumi->vorname . ' ' . $former_stumi->nachname, $this->search))) {
$this->inst_data[$inst_id][0]['stumis'][] = $former_stumi; $this->inst_data[$inst_id][0]['stumis'][] = $former_stumi;
$this->inst_data[$inst_id][0]['stumi_contracts'][$former_stumi->user_id] = StundenzettelContract::findBySQL('`user_id` = ? AND `inst_id` = ?', [$former_stumi->user_id, $inst_id]); $this->inst_data[$inst_id][0]['stumi_contracts'][$former_stumi->user_id] = StundenzettelContract::findBySQL('user_id = ? AND inst_id = ?', [$former_stumi->user_id, $inst_id]);
$user_ids[] = $former_stumi->user_id; $user_ids[] = $former_stumi->user_id;
} }
} }
...@@ -97,13 +97,13 @@ class IndexController extends PluginController { ...@@ -97,13 +97,13 @@ class IndexController extends PluginController {
if ($this->supervisorrole) { if ($this->supervisorrole) {
//get stumis for this user //get stumis for this user
$stumi_contracts = StundenzettelContract::findBySupervisor(User::findCurrent()->user_id); $stumi_contracts = StundenzettelContract::findBySupervisor_id(User::findCurrent()->user_id);
$this->user_ids = []; $this->user_ids = [];
foreach ($stumi_contracts as $contract) { foreach ($stumi_contracts as $contract) {
if (!in_array($contract->user_id, $this->user_ids)) { if (!in_array($contract->user_id, $this->user_ids)) {
$this->user_ids[] = $contract->user_id; $this->user_ids[] = $contract->user_id;
$this->stumis[] = User::find($contract->user_id); $this->stumis[] = User::find($contract->user_id);
$this->stumi_contracts[$contract->user_id] = StundenzettelContract::findBySQL('`user_id` = ? AND `supervisor` = ?', [$contract->user_id, User::findCurrent()->user_id]); $this->stumi_contracts[$contract->user_id] = StundenzettelContract::findBySQL('user_id = ? AND supervisor_id = ?', [$contract->user_id, User::findCurrent()->user_id]);
} }
} }
...@@ -147,11 +147,11 @@ class IndexController extends PluginController { ...@@ -147,11 +147,11 @@ class IndexController extends PluginController {
$this->contract = StundenzettelContract::find($contract_id); $this->contract = StundenzettelContract::find($contract_id);
$this->inst_id = $this->contract->inst_id; $this->inst_id = $this->contract->inst_id;
$this->stumi = $this->contract->stumi; $this->stumi = $this->contract->stumi;
$supervisor = User::find($this->contract->supervisor); $supervisor = $this->contract->supervisor;
$this->following_contract = $following_contract; $this->following_contract = $following_contract;
$this->search = QuickSearch::get('user_id', new StandardSearch('user_id')) $this->search = QuickSearch::get('user_id', new StandardSearch('user_id'))
->defaultValue($this->contract->supervisor, $supervisor->vorname . ' ' . $supervisor->nachname) ->defaultValue($this->contract->supervisor_id, $supervisor->vorname . ' ' . $supervisor->nachname)
->withButton(array('search_button_name' => 'search_user', 'reset_button_name' => 'reset_search')) ->withButton(array('search_button_name' => 'search_user', 'reset_button_name' => 'reset_search'))
->render(); ->render();
...@@ -188,7 +188,8 @@ class IndexController extends PluginController { ...@@ -188,7 +188,8 @@ class IndexController extends PluginController {
$contract->contract_begin = strtotime(Request::get('begin')); $contract->contract_begin = strtotime(Request::get('begin'));
$contract->contract_end = strtotime(Request::get('end')); $contract->contract_end = strtotime(Request::get('end'));
$contract->contract_hours = Request::get('hours'); $contract->contract_hours = Request::get('hours');
$contract->supervisor = Request::get('user_id'); $contract->description = trim(Request::get('description'));
$contract->supervisor_id = Request::get('user_id');
$contract->store(); $contract->store();
//TODO //TODO
...@@ -309,7 +310,7 @@ class IndexController extends PluginController { ...@@ -309,7 +310,7 @@ class IndexController extends PluginController {
foreach ($settings->stumi_statusgroups as $group) { foreach ($settings->stumi_statusgroups as $group) {
foreach ($group->members as $member) { foreach ($group->members as $member) {
$stumi = User::find($member->user_id); $stumi = User::find($member->user_id);
$stumi_contracts = StundenzettelContract::findBySQL('`user_id` = ? AND `inst_id` = ?', [$member->user_id, $inst_id]); $stumi_contracts = StundenzettelContract::findBySQL('user_id = ? AND inst_id = ?', [$member->user_id, $inst_id]);
foreach ($stumi_contracts as $contract) { foreach ($stumi_contracts as $contract) {
$contract = StundenzettelContract::find($contract->id); $contract = StundenzettelContract::find($contract->id);
$export_data[] = [ $export_data[] = [
...@@ -324,7 +325,7 @@ class IndexController extends PluginController { ...@@ -324,7 +325,7 @@ class IndexController extends PluginController {
StundenzettelTimesheet::stundenzettel_strftimespan($contract->getRemainingVacation(date('Y'))), StundenzettelTimesheet::stundenzettel_strftimespan($contract->getRemainingVacation(date('Y'))),
Stundenzettel::vacationEntitelment($stumi->user_id, $inst_id, date('Y')), Stundenzettel::vacationEntitelment($stumi->user_id, $inst_id, date('Y')),
StundenzettelTimesheet::stundenzettel_strftimespan($contract->getRemainingVacationAtEndOfYear(date('Y')-1)), StundenzettelTimesheet::stundenzettel_strftimespan($contract->getRemainingVacationAtEndOfYear(date('Y')-1)),
User::find($contract->supervisor)->vorname . ' ' . User::find($contract->supervisor)->nachname $contract->supervisor->vorname . ' ' . $contract->supervisor->nachname
]; ];
} }
} }
......
controllers/timesheet.php
+ 1
− 1
View file @ dc7240cf
...@@ -419,7 +419,7 @@ class TimesheetController extends PluginController { ...@@ -419,7 +419,7 @@ class TimesheetController extends PluginController {
{ {
$timesheet = StundenzettelTimesheet::find($timesheet_id); $timesheet = StundenzettelTimesheet::find($timesheet_id);
if (!($this->adminrole || $timesheet->contract->supervisor == User::findCurrent()->user_id)) { if (!($this->adminrole || $timesheet->contract->supervisor_id == User::findCurrent()->user_id)) {
throw new AccessDeniedException($this->_("Sie haben keine Zugriffsberechtigung")); throw new AccessDeniedException($this->_("Sie haben keine Zugriffsberechtigung"));
} }
......
migrations/006_add_approved_timestamp.php
+ 8
− 0
View file @ dc7240cf
...@@ -16,6 +16,10 @@ class AddApprovedTimestamp extends Migration ...@@ -16,6 +16,10 @@ class AddApprovedTimestamp extends Migration
ADD approved_at date DEFAULT NULL, ADD approved_at date DEFAULT NULL,
ADD approver_id varchar(32) COLLATE latin1_bin DEFAULT NULL'; ADD approver_id varchar(32) COLLATE latin1_bin DEFAULT NULL';
$db->exec($sql); $db->exec($sql);
$sql = 'ALTER TABLE stundenzettel_contracts
CHANGE supervisor supervisor_id varchar(32) COLLATE latin1_bin NULL';
$db->exec($sql);
} }
public function down() public function down()
...@@ -27,5 +31,9 @@ class AddApprovedTimestamp extends Migration ...@@ -27,5 +31,9 @@ class AddApprovedTimestamp extends Migration
DROP approved_at, DROP approved_at,
DROP approver_id'; DROP approver_id';
$db->exec($sql); $db->exec($sql);
$sql = 'ALTER TABLE stundenzettel_contracts
CHANGE supervisor_id supervisor varchar(32) COLLATE latin1_bin NULL';
$db->exec($sql);
} }
} }
models/StundenzettelContract.class.php
+ 11
− 10
View file @ dc7240cf
...@@ -77,9 +77,9 @@ class StundenzettelContract extends \SimpleORMap ...@@ -77,9 +77,9 @@ class StundenzettelContract extends \SimpleORMap
{ {
$config['db_table'] = 'stundenzettel_contracts'; $config['db_table'] = 'stundenzettel_contracts';
$config['belongs_to']['supervisor_user'] = [ $config['belongs_to']['supervisor'] = [
'class_name' => 'User', 'class_name' => 'User',
'foreign_key' => 'supervisor' 'foreign_key' => 'supervisor_id'
]; ];
$config['belongs_to']['stumi'] = [ $config['belongs_to']['stumi'] = [
'class_name' => 'User', 'class_name' => 'User',
...@@ -126,9 +126,10 @@ class StundenzettelContract extends \SimpleORMap ...@@ -126,9 +126,10 @@ class StundenzettelContract extends \SimpleORMap
} }
function can_read($user) { function can_read($user) {
if ($this->user_id == $user->user_id || $this->supervisor == $user->user_id || Stundenzettel::isInstAdmin($this->inst_id)) { if ($this->user_id == $user->user_id || $this->supervisor_id == $user->user_id || Stundenzettel::isInstAdmin($this->inst_id)) {
return true; return true;
} }
return false;
} }
static function getCurrentContractId($user_id) static function getCurrentContractId($user_id)
...@@ -161,15 +162,15 @@ class StundenzettelContract extends \SimpleORMap ...@@ -161,15 +162,15 @@ class StundenzettelContract extends \SimpleORMap
if ($GLOBALS['perm']->have_perm('admin')) { if ($GLOBALS['perm']->have_perm('admin')) {
return $all_contracts; return $all_contracts;
} else { }
foreach ($all_contracts as $contract) { foreach ($all_contracts as $contract) {
if ($contract->user_id == User::findCurrent()->user_id || if ($contract->user_id == User::findCurrent()->user_id ||
$contract->supervisor == User::findCurrent()->user_id || $contract->supervisor_id == User::findCurrent()->user_id ||
Stundenzettel::isInstAdmin($contract->inst_id)) { Stundenzettel::isInstAdmin($contract->inst_id)) {
$contracts[] = $contract; $contracts[] = $contract;
} }
} }
}
return $contracts; return $contracts;
} }
......
models/StundenzettelTimesheet.class.php
+ 19
− 23
View file @ dc7240cf
...@@ -201,8 +201,8 @@ class StundenzettelTimesheet extends \SimpleORMap ...@@ -201,8 +201,8 @@ class StundenzettelTimesheet extends \SimpleORMap
function send_finished_mail() function send_finished_mail()
{ {
$user = User::find($this->contract->user_id); $user = $this->contract->stumi;
$supervisor = User::find($this->contract->supervisor); $supervisor = $this->contract->supervisor;
setTempLanguage($supervisor->id); setTempLanguage($supervisor->id);
$sender = "studip@uni-osnabrueck.de"; $sender = "studip@uni-osnabrueck.de";
$subject = sprintf(dgettext('stundenzettel', '%s %s hat den Stundenzettel für den Monat %s eingereicht'), $user->vorname, $user->nachname, strftime("%B", mktime(0, 0, 0, $this->month, 10)) ); $subject = sprintf(dgettext('stundenzettel', '%s %s hat den Stundenzettel für den Monat %s eingereicht'), $user->vorname, $user->nachname, strftime("%B", mktime(0, 0, 0, $this->month, 10)) );
...@@ -236,29 +236,26 @@ class StundenzettelTimesheet extends \SimpleORMap ...@@ -236,29 +236,26 @@ class StundenzettelTimesheet extends \SimpleORMap
function is_supervisor($user) function is_supervisor($user)
{ {
if ($this->contract->supervisor == $user->user_id) { return $this->contract->supervisor_id == $user->user_id;
return true;
} else return false;
} }
function can_edit($user) { function can_edit($user)
if (($this->contract->user_id == $user->user_id) && !$this->locked) { {
return true; return $this->contract->user_id == $user->user_id && !$this->locked;
} else return false;
} }
//TODO InstAdmin identifizieren und Zugriff erlauben //TODO InstAdmin identifizieren und Zugriff erlauben
function can_read($user) { function can_read($user) {
if ($this->contract->can_read($user)) { if ($this->contract->can_read($user)) {
if ($this->contract->user_id == $user->user_id || if ($this->contract->user_id == $user->user_id ||
(($this->contract->supervisor == $user->user_id) && $this->finished)) { $this->contract->supervisor_id == $user->user_id && $this->finished) {
return true; return true;
} }
} }
return false;
} }
function calculate_sum() { function calculate_sum() {
//if (!$this->locked) {
$records = StundenzettelRecord::findByTimesheet_Id($this->id); $records = StundenzettelRecord::findByTimesheet_Id($this->id);
$sum = 0; $sum = 0;
foreach ($records as $record) { foreach ($records as $record) {
...@@ -266,7 +263,6 @@ class StundenzettelTimesheet extends \SimpleORMap ...@@ -266,7 +263,6 @@ class StundenzettelTimesheet extends \SimpleORMap
} }
$this->sum = $sum; $this->sum = $sum;
$this->store(); $this->store();
//}
} }
//wird für vacation Berechnung noch benutzt //wird für vacation Berechnung noch benutzt
......
views/index/index.php
+ 95
− 98
View file @ dc7240cf
...@@ -2,16 +2,12 @@ ...@@ -2,16 +2,12 @@
<? if ($adminrole) : ?> <? if ($adminrole) : ?>
<? foreach ($inst_ids as $inst_id) : ?> <? foreach ($inst_ids as $inst_id) : ?>
<? if ($adminrole) : ?>
<h2> <h2>
<a href='<?=$this->controller->link_for('index/edit_institute_settings/' . $inst_id) ?>' title='<?= $controller->_('Konfiguration bearbeiten') ?>' data-dialog='size=auto'> <a href='<?=$controller->link_for('index/edit_institute_settings/' . $inst_id) ?>' title='<?= $controller->_('Konfiguration bearbeiten') ?>' data-dialog='size=auto'>
<?=Icon::create('edit')?> <?=Icon::create('edit')?>
</a> </a>
<?= htmlready(Institute::find($inst_id)->name) ?> <?= htmlready(Institute::find($inst_id)->name) ?>
</h2> </h2>
<? else : ?>
<h2><?= $controller->_('Studentische MitarbeiterInnen') ?></h2>
<? endif ?>
<? foreach ($groups[$inst_id] as $group) : ?> <? foreach ($groups[$inst_id] as $group) : ?>
<? if ($group->id) : ?> <? if ($group->id) : ?>
<? $group_id = $group->id; ?> <!-- echte Gruppe --> <? $group_id = $group->id; ?> <!-- echte Gruppe -->
...@@ -22,16 +18,15 @@ ...@@ -22,16 +18,15 @@
<table id='stumi-contract-entries' class="sortable-table default" data-sortlist="[[0,0]]"> <table id='stumi-contract-entries' class="sortable-table default" data-sortlist="[[0,0]]">
<thead> <thead>
<tr> <tr>
<th data-sort="text" style='width:10%'><?= $controller->_('Nachname, Vorname') ?></th> <th data-sort="text"><?= $controller->_('Nachname, Vorname') ?></th>
<th data-sort="htmldata" style='width:10%'><?= $controller->_('Vertragsbeginn') ?></th> <th data-sort="htmldata"><?= $controller->_('Vertragsbeginn') ?></th>
<th data-sort="htmldata" style='width:10%'><?= $controller->_('Vertragsende') ?></th> <th data-sort="htmldata"><?= $controller->_('Vertragsende') ?></th>
<th data-sort="digit" style='width:7%'><?= $controller->_('Monatsstunden/Tagessatz') ?></th> <th data-sort="digit"><?= $controller->_('Stunden') ?></th>
<th data-sort="digit" style='width:7%'><?= sprintf($controller->_('Stundenkonto (exkl. %s)'), strftime('%B')) ?></th> <th data-sort="digit"><?= sprintf($controller->_('Stundenkonto (exkl. %s)'), strftime('%B')) ?></th>
<th data-sort="false" style='width:10%'><?= sprintf($controller->_('Urlaub in Anspruch genommen %s'), date('Y')) ?></th> <th data-sort="false"><?= sprintf($controller->_('Urlaub in %s'), date('Y')) ?></th>
<th data-sort="digit" style='width:7%'><?= sprintf($controller->_('Resturlaub %s'), date('Y')) ?></th> <th data-sort="digit"><?= sprintf($controller->_('Resturlaub %s'), date('Y')) ?></th>
<th data-sort="false" style='width:10%'><?= sprintf($controller->_('Urlaubsanspruch %s'), date('Y')) ?></th> <th data-sort="false"><?= sprintf($controller->_('Urlaubsanspruch %s'), date('Y')) ?></th>
<th data-sort="digit" style='width:10%'><?= sprintf($controller->_('Resturlaub %s zu Jahresbeginn'), date('Y')-1) ?></th> <th data-sort="text"><?= $controller->_('Verantwortliche/r MA') ?></th>
<th data-sort="text" style='width:10%'><?= $controller->_('Verantwortliche/r MA') ?></th>
<th class="actions"><?= $controller->_('Aktionen') ?></th> <th class="actions"><?= $controller->_('Aktionen') ?></th>
</tr> </tr>
</thead> </thead>
...@@ -40,7 +35,7 @@ ...@@ -40,7 +35,7 @@
<? if ($inst_data[$inst_id][$group_id]['stumi_contracts'][$stumi->user_id]) : ?> <? if ($inst_data[$inst_id][$group_id]['stumi_contracts'][$stumi->user_id]) : ?>
<? foreach ($inst_data[$inst_id][$group_id]['stumi_contracts'][$stumi->user_id] as $contract): ?> <? foreach ($inst_data[$inst_id][$group_id]['stumi_contracts'][$stumi->user_id] as $contract): ?>
<tr> <tr>
<td><a href='<?=$this->controller->link_for('timesheet/index/' . $contract->id) ?>' ><?= htmlready($stumi->nachname) ?>, <?= htmlready($stumi->vorname) ?></a> <td><a href='<?=$controller->link_for('timesheet/index/' . $contract->id) ?>' ><?= htmlready($stumi->nachname) ?>, <?= htmlready($stumi->vorname) ?></a>
</td> </td>
<td data-sort-value="<?= $contract->contract_begin ?>"><?= date('d.m.Y', $contract->contract_begin) ?> <td data-sort-value="<?= $contract->contract_begin ?>"><?= date('d.m.Y', $contract->contract_begin) ?>
<? if ($contract->begin_digital_recording_month && $contract->begin_digital_recording_year) : ?> <? if ($contract->begin_digital_recording_month && $contract->begin_digital_recording_year) : ?>
...@@ -49,7 +44,7 @@ ...@@ -49,7 +44,7 @@
<? endif ?> <? endif ?>
</td> </td>
<td data-sort-value="<?= $contract->contract_end ?>"><?= date('d.m.Y', $contract->contract_end) ?></td> <td data-sort-value="<?= $contract->contract_end ?>"><?= date('d.m.Y', $contract->contract_end) ?></td>
<td><?= htmlready($contract->contract_hours) ?> / <?= htmlready($contract->default_workday_time) ?></td> <td><?= htmlready($contract->contract_hours) ?></td>
<td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getWorktimeBalance())) ?></td> <td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getWorktimeBalance())) ?></td>
<td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getClaimedVacation(date('Y'))))?></td> <td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getClaimedVacation(date('Y'))))?></td>
<td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getRemainingVacation(date('Y'))))?></td> <td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getRemainingVacation(date('Y'))))?></td>
...@@ -57,21 +52,28 @@ ...@@ -57,21 +52,28 @@
<?= Icon::create('info-circle', Icon::ROLE_CLICKABLE, <?= Icon::create('info-circle', Icon::ROLE_CLICKABLE,
['title' => $controller->_('Davon aus diesem Vertrag erworbener Anspruch') . ': ' . htmlready($contract->getVacationEntitlement(date('Y'))) ]);?> ['title' => $controller->_('Davon aus diesem Vertrag erworbener Anspruch') . ': ' . htmlready($contract->getVacationEntitlement(date('Y'))) ]);?>
</td> </td>
<td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getRemainingVacationAtEndOfYear(date('Y')-1)))?></td> <td><?= htmlready($contract->supervisor->getFullName('no_title_rev')) ?></td>
<td><?= htmlready(sprintf('%s %s', User::find($contract->supervisor)->vorname, User::find($contract->supervisor)->nachname)) ?></td> <td class="actions">
<td> <? $menu = ActionMenu::get() ?>
<? if ($adminrole) : ?> <? $menu->addLink($controller->url_for('index/edit', $contract->id),
<a data-confirm='<?= $controller->_('Eintrag löschen?') ?>' href='<?=$this->controller->link_for('index/delete/' . $contract->id) ?>' title='Eintrag löschen' ><?=Icon::create('trash')?></a> $controller->_('Vertragsdaten bearbeiten'), Icon::create('edit'), ['data-dialog' => 'size=auto']
<a href='<?=$this->controller->link_for('index/edit/' . $contract->id) ?>' title='<?= $controller->_('Vertragsdaten bearbeiten') ?>' data-dialog='size=auto'><?=Icon::create('edit')?></a> ) ?>
<a href='<?=$this->controller->link_for('index/add_contract_begin_data/' . $contract->id) ?>' title='<?= $controller->_('Zeitpunkt für Beginn digitaler Erfassung definieren') ?>' data-dialog='size=auto'><?=Icon::create('date')?></a> <? $menu->addLink($controller->url_for('index/add_contract_begin_data', $contract->id),
<a href='<?=$this->controller->link_for('index/edit/'. $contract->id . '/1') ?>' title='<?= $controller->_('Folgevertrag anlegen') ?>' data-dialog='size=auto'><?=Icon::create('add')?></a> $controller->_('Beginn digitaler Erfassung definieren'), Icon::create('date'), ['data-dialog' => 'size=auto']
<? endif ?> ) ?>
<? $menu->addLink($controller->url_for('index/edit', $contract->id, 1),
$controller->_('Folgevertrag anlegen'), Icon::create('add'), ['data-dialog' => 'size=auto']
) ?>
<? $menu->addLink($controller->url_for('index/delete', $contract->id),
$controller->_('Eintrag löschen'), Icon::create('trash'), ['data-confirm' => $controller->_('Eintrag löschen?')]
) ?>
<?= $menu->render() ?>
</td> </td>
</tr> </tr>
<? endforeach ?> <? endforeach ?>
<? elseif ($adminrole) : ?> <? else : ?>
<tr> <tr>
<td><?= htmlready($stumi->nachname) ?>, <?= htmlready($stumi->vorname) ?> <td><?= htmlready($stumi->nachname) ?>, <?= htmlready($stumi->vorname) ?>
</td> </td>
...@@ -83,9 +85,12 @@ ...@@ -83,9 +85,12 @@
<td> -- </td> <td> -- </td>
<td> -- </td> <td> -- </td>
<td> -- </td> <td> -- </td>
<td> -- </td> <td class="actions">
<td> <? $menu = ActionMenu::get() ?>
<a href='<?=$this->controller->link_for('index/new/'. $inst_id . '/' . $stumi->user_id) ?>' title='<?= $controller->_('Vertrag hinzufügen') ?>' data-dialog='size=auto'><?=Icon::create('add')?></a> <? $menu->addLink($controller->url_for('index/new', $inst_id, $stumi->user_id),
$controller->_('Vertrag hinzufügen'), Icon::create('add'), ['data-dialog' => 'size=auto']
) ?>
<?= $menu->render() ?>
</td> </td>
</tr> </tr>
...@@ -102,22 +107,21 @@ ...@@ -102,22 +107,21 @@
<table id='stumi-contract-entries' class="sortable-table default" data-sortlist="[[0,0]]"> <table id='stumi-contract-entries' class="sortable-table default" data-sortlist="[[0,0]]">
<thead> <thead>
<tr> <tr>
<th data-sort="text" style='width:10%'><?= $controller->_('Nachname, Vorname') ?></th> <th data-sort="text"><?= $controller->_('Nachname, Vorname') ?></th>
<th data-sort="htmldata" style='width:10%'><?= $controller->_('Vertragsbeginn') ?></th> <th data-sort="htmldata"><?= $controller->_('Vertragsbeginn') ?></th>
<th data-sort="htmldata" style='width:10%'><?= $controller->_('Vertragsende') ?></th> <th data-sort="htmldata"><?= $controller->_('Vertragsende') ?></th>
<th data-sort="digit" style='width:7%'><?= $controller->_('Monatsstunden/Tagessatz') ?></th> <th data-sort="digit"><?= $controller->_('Stunden') ?></th>
<th data-sort="digit" style='width:7%'><?= sprintf($controller->_('Stundenkonto (exkl. %s)'), strftime('%B')) ?></th> <th data-sort="digit"><?= sprintf($controller->_('Stundenkonto (exkl. %s)'), strftime('%B')) ?></th>
<th data-sort="false" style='width:10%'><?= sprintf($controller->_('Urlaub in Anspruch genommen %s'), date('Y')) ?></th> <th data-sort="false"><?= sprintf($controller->_('Urlaub in %s'), date('Y')) ?></th>
<th data-sort="digit" style='width:7%'><?= sprintf($controller->_('Resturlaub %s'), date('Y')) ?></th> <th data-sort="digit"><?= sprintf($controller->_('Resturlaub %s'), date('Y')) ?></th>
<th data-sort="false" style='width:10%'><?= sprintf($controller->_('Urlaubsanspruch %s'), date('Y')) ?></th> <th data-sort="false"><?= sprintf($controller->_('Urlaubsanspruch %s'), date('Y')) ?></th>
<th data-sort="digit" style='width:10%'><?= sprintf($controller->_('Resturlaub %s zu Jahresbeginn'), date('Y')-1) ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<? foreach ($stumis as $stumi): ?> <? foreach ($stumis as $stumi): ?>
<? foreach ($stumi_contracts[$stumi->user_id] as $contract): ?> <? foreach ($stumi_contracts[$stumi->user_id] as $contract): ?>
<tr> <tr>
<td><a href='<?=$this->controller->link_for('timesheet/index/' . $contract->id) ?>' title='<?= $controller->_('Stundenzettel einsehen') ?>'><?= htmlready($stumi->nachname) ?>, <?= htmlready($stumi->vorname) ?></a> <td><a href='<?=$controller->link_for('timesheet/index/' . $contract->id) ?>' title='<?= $controller->_('Stundenzettel einsehen') ?>'><?= htmlready($stumi->nachname) ?>, <?= htmlready($stumi->vorname) ?></a>
</td> </td>
<td data-sort-value="<?= $contract->contract_begin ?>"><?= date('d.m.Y', $contract->contract_begin) ?> <td data-sort-value="<?= $contract->contract_begin ?>"><?= date('d.m.Y', $contract->contract_begin) ?>
<? if ($contract->begin_digital_recording_month && $contract->begin_digital_recording_year) : ?> <? if ($contract->begin_digital_recording_month && $contract->begin_digital_recording_year) : ?>
...@@ -126,33 +130,28 @@ ...@@ -126,33 +130,28 @@
<? endif ?> <? endif ?>
</td> </td>
<td data-sort-value="<?= $contract->contract_end ?>"><?= date('d.m.Y', $contract->contract_end) ?></td> <td data-sort-value="<?= $contract->contract_end ?>"><?= date('d.m.Y', $contract->contract_end) ?></td>
<td><?= htmlready($contract->contract_hours) ?> / <?= htmlready($contract->default_workday_time) ?></td> <td><?= htmlready($contract->contract_hours) ?></td>
<td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getWorktimeBalance())) ?></td> <td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getWorktimeBalance())) ?></td>
<td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getClaimedVacation(date('Y'))))?></td> <td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getClaimedVacation(date('Y'))))?></td>
<td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getRemainingVacation(date('Y'))))?></td> <td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getRemainingVacation(date('Y'))))?></td>
<td><?= htmlready($contract->getVacationEntitlement(date('Y')))?></td> <td><?= htmlready($contract->getVacationEntitlement(date('Y')))?></td>
<td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getRemainingVacationAtEndOfYear(date('Y')-1)))?></td>
</tr> </tr>
<? endforeach ?> <? endforeach ?>
<? endforeach ?> <? endforeach ?>
</tbody> </tbody>
</table> </table>
<? elseif ($stumirole) : ?> <? elseif ($stumirole) : ?>
<h2> Meine Verträge </h2> <h2><?= $controller->_('Meine Verträge') ?></h2>
<table id='stumi-contract-entries' class="sortable-table default" data-sortlist="[[0,0]]"> <table id='stumi-contract-entries' class="sortable-table default" data-sortlist="[[0,0]]">
<thead> <thead>
<tr> <tr>
<th data-sort="text" style='width:10%'><?= $controller->_('Institut/Organisationseinheit') ?></th> <th data-sort="text"><?= $controller->_('Institut/Organisationseinheit') ?></th>
<th data-sort="false" style='width:10%'><?= $controller->_('Vertragsbeginn') ?></th> <th data-sort="false"><?= $controller->_('Vertragsbeginn') ?></th>
<th data-sort="false" style='width:10%'><?= $controller->_('Vertragsende') ?></th> <th data-sort="false"><?= $controller->_('Vertragsende') ?></th>
<th data-sort="false" style='width:10%'><?= $controller->_('Stunden lt. Vertrag') ?></th> <th data-sort="false"><?= $controller->_('Stunden lt. Vertrag') ?></th>
<th data-sort="false" style='width:10%'><?= sprintf($controller->_('Stundenkonto (exkl. %s)'), strftime('%B')) ?></th> <th data-sort="false"><?= sprintf($controller->_('Stundenkonto (exkl. %s)'), strftime('%B')) ?></th>
<!-- <th data-sort="false" style='width:10%'><?= sprintf($controller->_('Resturlaub/Urlaubsanspruch %s'), date('Y')) ?></th> --> <th data-sort="text"><?= $controller->_('Verantwortliche/r MA') ?></th>
<th data-sort="text" style='width:10%'><?= $controller->_('Verantwortliche/r MA') ?></th> <th class="actions"><?= $controller->_('Aktionen') ?></th>
<th data-sort="false" style='width:10%'><?= $controller->_('Aktionen') ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -168,18 +167,16 @@ ...@@ -168,18 +167,16 @@
<td><?= date('d.m.Y', $contract->contract_end) ?></td> <td><?= date('d.m.Y', $contract->contract_end) ?></td>
<td><?= htmlready($contract->contract_hours) ?></td> <td><?= htmlready($contract->contract_hours) ?></td>
<td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getWorktimeBalance())) ?></td> <td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getWorktimeBalance())) ?></td>
<!-- <td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getRemainingVacation(date('Y')))) ?>/<?= htmlready($contract->getVacationEntitlement(date('Y'))) ?></td>--> <td><?= htmlready($contract->supervisor->getFullName('no_title_rev')) ?></td>
<td title='<?= User::find($contract->supervisor)->username ?>'><?= sprintf('%s %s', User::find($contract->supervisor)->vorname, User::find($contract->supervisor)->nachname) ?></td> <td class="actions">
<td> <? $menu = ActionMenu::get() ?>
<a data-dialog <? $menu->addLink(URLHelper::getURL('dispatch.php/messages/write', ['rec_uname' => $contract->supervisor->username]),
href="<?= URLHelper::getLink('dispatch.php/messages/write', ['rec_uname' => $contract->supervisor->username]) ?>" $controller->_('Nachricht an verantwortliche/n MA'), Icon::create('mail'), ['data-dialog' => '']
title="<?= $controller->_('eMail an verantwortliche/n MA') ?>"> ) ?>
<?= Icon::create('mail') ?> <? $menu->addLink($controller->url_for('timesheet/index', $contract->id),
</a> $controller->_('Zu den Stundenzetteln'), Icon::create('files')
<a href="<?=PluginEngine::getUrl($plugin, [], 'timesheet/index/' . $contract->id )?>" ) ?>
title="<?= $controller->_('Zu den Stundenzetteln') ?>"> <?= $menu->render() ?>
<?= Icon::create('files') ?>
</a>
</td> </td>
</tr> </tr>
<? endforeach ?> <? endforeach ?>
......
views/index/new.php
+ 5
− 0
View file @ dc7240cf
...@@ -35,6 +35,11 @@ use Studip\Button, Studip\LinkButton; ...@@ -35,6 +35,11 @@ use Studip\Button, Studip\LinkButton;
value='<?= ($contract) ? htmlready($contract->contract_hours) : ''?>'> value='<?= ($contract) ? htmlready($contract->contract_hours) : ''?>'>
</label> </label>
<label>
<?= $controller->_('Beschreibung (optional)') ?>
<textarea name="description"><?= $contract ? htmlready($contract->description) : '' ?></textarea>
</label>
<label> <label>
<?= $controller->_('Verantwortliche/r Mitarbeiter/in') ?> <?= $controller->_('Verantwortliche/r Mitarbeiter/in') ?>
<?= $search ?> <?= $search ?>
......
views/timesheet/admin_index.php
+ 30
− 25
View file @ dc7240cf
...@@ -20,10 +20,11 @@ ...@@ -20,10 +20,11 @@
<table id='stumi-timesheet-entries' class="sortable-table default" data-sortlist="[[0,0]]"> <table id='stumi-timesheet-entries' class="sortable-table default" data-sortlist="[[0,0]]">
<thead> <thead>
<tr> <tr>
<th data-sort="text" style='width:10%'><?= $controller->_('Nachname, Vorname') ?></th> <th data-sort="text"><?= $controller->_('Nachname, Vorname') ?></th>
<th data-sort="false" style='width:10%'><?= $controller->_('Stundenkonto') ?></th> <th data-sort="digit"><?= $controller->_('Stundenkonto') ?></th>
<th data-sort="htmldata" style='width:10%'><?= $controller->_('Status') ?></br><?= $controller->_('Stundenzettel') ?></br><?= strftime("%B", mktime(0, 0, 0, $month, 10))?> </th> <th data-sort="text"><?= $controller->_('Verantwortliche/r MA') ?></th>
<th data-sort="false" style='width:10%'><?= $controller->_('Aktionen') ?></th> <th data-sort="htmldata"><?= $controller->_('Status') ?></th>
<th class="actions"><?= $controller->_('Aktionen') ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -32,10 +33,11 @@ ...@@ -32,10 +33,11 @@
<tr> <tr>
<? $timesheet = $timesheets[$contract->id]; ?> <? $timesheet = $timesheets[$contract->id]; ?>
<td> <td>
<a href='<?=$this->controller->link_for('timesheet/select/' . $contract->id, $month, $year) ?>' title='<?= $controller->_('Stundenzettel einsehen') ?>'><?= htmlready($contract->stumi->nachname) ?>, <?= htmlready($contract->stumi->vorname) ?></a> <a href='<?=$controller->link_for('timesheet/select/' . $contract->id, $month, $year) ?>' title='<?= $controller->_('Stundenzettel einsehen') ?>'><?= htmlready($contract->stumi->nachname) ?>, <?= htmlready($contract->stumi->vorname) ?></a>
</td> </td>
<td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getWorktimeBalance())) ?></td> <td><?= htmlready(StundenzettelTimesheet::stundenzettel_strftimespan($contract->getWorktimeBalance())) ?></td>
<td data-sort-value= <?= htmlready($timesheet->int_status) ?> > <td><?= htmlready($contract->supervisor->getFullName('no_title_rev')) ?></td>
<td data-sort-value="<?= htmlready($timesheet->int_status) ?>">
<? if ($timesheet) : ?> <? if ($timesheet) : ?>
<?= Icon::create($status_infos['finished']['icon'], $status_infos[$timesheet->getCurrentState('finished', 'admin') . '_icon_role'], ['title' => $status_infos['finished'][$timesheet->getCurrentState('finished', 'admin') . '_tooltip']] )?> <?= Icon::create($status_infos['finished']['icon'], $status_infos[$timesheet->getCurrentState('finished', 'admin') . '_icon_role'], ['title' => $status_infos['finished'][$timesheet->getCurrentState('finished', 'admin') . '_tooltip']] )?>
<?= Icon::create($status_infos['approved']['icon'], $status_infos[$timesheet->getCurrentState('approved', 'admin') . '_icon_role'], ['title' => $status_infos['approved'][$timesheet->getCurrentState('approved', 'admin') . '_tooltip']] )?> <?= Icon::create($status_infos['approved']['icon'], $status_infos[$timesheet->getCurrentState('approved', 'admin') . '_icon_role'], ['title' => $status_infos['approved'][$timesheet->getCurrentState('approved', 'admin') . '_tooltip']] )?>
...@@ -46,31 +48,34 @@ ...@@ -46,31 +48,34 @@
<?= Icon::create($status_infos['complete']['icon'], Icon::ROLE_INACTIVE, ['title' => $controller->_('Stundenzettel noch nicht angelegt')] )?> <?= Icon::create($status_infos['complete']['icon'], Icon::ROLE_INACTIVE, ['title' => $controller->_('Stundenzettel noch nicht angelegt')] )?>
<? endif ?> <? endif ?>
</td> </td>
<td> <td class="actions">
<a data-dialog <? $menu = ActionMenu::get() ?>
href="<?= URLHelper::getLink('dispatch.php/messages/write', ['rec_uname' => $contract->stumi->username]) ?>" <? $menu->addLink(URLHelper::getURL('dispatch.php/messages/write', ['rec_uname' => $contract->stumi->username]),
title="<?= $controller->_('eMail an Hilfskraft') ?>"> $controller->_('Nachricht an Hilfskraft'), Icon::create('mail'), ['data-dialog' => '']
<?= Icon::create('mail') ?> ) ?>
</a> <? $menu->addLink(URLHelper::getURL('dispatch.php/messages/write', ['rec_uname' => $contract->supervisor->username]),
$controller->_('Nachricht an verantwortlichen MA'), Icon::create('mail'), ['data-dialog' => '']
) ?>
<? if ($timesheet) : ?> <? if ($timesheet) : ?>
<? if ($timesheet->finished) : ?> <? if ($timesheet->finished) : ?>
<a href="<?= PluginEngine::getLink($plugin, [], 'timesheet/unlock/' . $timesheet->id ) ?>" data-confirm="<?= $controller->_('Einreichen Rückgängig machen? Der Stumi kann diesen Stundnezettel dann wieder bearbeiten und Sie haben erst wieder Zugriff wenn dieser erneut eingereicht wurde.') ?>"> <? $menu->addLink($controller->url_for('timesheet/unlock', $timesheet->id),
<?= Icon::create('rotate-left', ['title' => $controller->_('Einreichen rückgängig machen')] )?> $controller->_('Einreichen rückgängig machen'), Icon::create('rotate-left'),
</a> ['data-confirm' => $controller->_('Einreichen rückgängig machen? Der Stumi kann diesen Stundenzettel dann wieder bearbeiten und Sie haben erst Zugriff, wenn dieser erneut eingereicht wurde.')]
) ?>
<? if (!$timesheet->approved) : ?> <? if (!$timesheet->approved) : ?>
<a href='<?=$this->controller->link_for('timesheet/approve/' . $timesheet->id) ?>' <? $menu->addLink($controller->url_for('timesheet/approve', $timesheet->id),
title='<?= $controller->_("Korrektheit der Angaben bestätigen") ?>'> $controller->_('Korrektheit der Angaben bestätigen'), Icon::create($status_infos['approved']['icon'])
<?= Icon::create($status_infos['approved']['icon']) ?> ) ?>
</a>
<? endif ?> <? endif ?>
<? endif ?> <? endif ?>
<? if ($adminrole) : ?> <? if ($adminrole) : ?>
<a href='<?=$this->controller->link_for('timesheet/complete/' . $timesheet->id) ?>' <? $menu->addLink($controller->url_for('timesheet/complete', $timesheet->id),
title='<?= ($timesheet->complete) ? $controller->_('Vorgang wieder öffnen') : $controller->_('Vorgang abschließen') ?>'> $timesheet->complete ? $controller->_('Vorgang wieder öffnen') : $controller->_('Vorgang abschließen'),
<?= Icon::create($status_infos['complete']['icon']) ?> Icon::create($status_infos['complete']['icon'])
</a> ) ?>
<? endif ?> <? endif ?>
<? endif ?> <? endif ?>
<?= $menu->render() ?>
</td> </td>
</tr> </tr>
<? endforeach ?> <? endforeach ?>
......
views/timesheet/index.php
+ 33
− 29
View file @ dc7240cf
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
<table id='stumi-timesheet-entries' class="default"> <table id='stumi-timesheet-entries' class="default">
<thead> <thead>
<tr> <tr>
<th style='width:10%'><?= $controller->_('Monat/Jahr') ?></th> <th><?= $controller->_('Monat/Jahr') ?></th>
<th style='width:10%'><?= $controller->_('Erfasste Stunden') ?></th> <th><?= $controller->_('Erfasste Stunden') ?></th>
<th style='width:10%'><?= $controller->_('davon Urlaub') ?></th> <th><?= $controller->_('Urlaub') ?></th>
<th style='width:10%'><?= $controller->_('Status') ?></th> <th><?= $controller->_('Status') ?></th>
<th style='width:10%'><?= $controller->_('Aktionen') ?></th> <th class="actions"><?= $controller->_('Aktionen') ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<? foreach ($timesheets as $timesheet): ?> <? foreach ($timesheets as $timesheet): ?>
<tr> <tr>
<td> <td>
<a href='<?=$this->controller->link_for('timesheet/timesheet/' . $timesheet->id) ?>' title='<?= $controller->_('Stundenzettel editieren') ?>'> <a href='<?=$controller->link_for('timesheet/timesheet/' . $timesheet->id) ?>' title='<?= $controller->_('Stundenzettel editieren') ?>'>
<?= strftime("%B", mktime(0, 0, 0, $timesheet->month, 10)) ?> <?= strftime("%B", mktime(0, 0, 0, $timesheet->month, 10)) ?>
<?= htmlready($timesheet->year) ?> <?= htmlready($timesheet->year) ?>
</a> </a>
...@@ -41,25 +41,27 @@ ...@@ -41,25 +41,27 @@
<?= Icon::create($status_infos['approved']['icon'], $status_infos[$timesheet->getCurrentState('approved', $role) . '_icon_role'], ['title' => $status_infos['approved'][$timesheet->getCurrentState('approved', $role) . '_tooltip']] )?> <?= Icon::create($status_infos['approved']['icon'], $status_infos[$timesheet->getCurrentState('approved', $role) . '_icon_role'], ['title' => $status_infos['approved'][$timesheet->getCurrentState('approved', $role) . '_tooltip']] )?>
<?= Icon::create($status_infos['complete']['icon'], $status_infos[$timesheet->getCurrentState('complete', $role) . '_icon_role'], ['title' => $status_infos['complete'][$timesheet->getCurrentState('complete', $role) . '_tooltip']] )?> <?= Icon::create($status_infos['complete']['icon'], $status_infos[$timesheet->getCurrentState('complete', $role) . '_icon_role'], ['title' => $status_infos['complete'][$timesheet->getCurrentState('complete', $role) . '_tooltip']] )?>
</td> </td>
<td> <td class="actions">
<? if ($timesheet) : ?> <? if ($timesheet) : ?>
<? $menu = ActionMenu::get() ?>
<? if ($timesheet->finished) : ?> <? if ($timesheet->finished) : ?>
<a href="<?= PluginEngine::getLink($plugin, [], 'timesheet/unlock/' . $timesheet->id ) ?>" data-confirm="<?= $controller->_('Einreichen Rückgängig machen? Der Stumi kann diesen Stundnezettel dann wieder bearbeiten und Sie haben erst wieder Zugriff wenn dieser erneut eingereicht wurde.') ?>"> <? $menu->addLink($controller->url_for('timesheet/unlock', $timesheet->id),
<?= Icon::create('rotate-left', ['title' => $controller->_('Einreichen rückgängig machen')] )?> $controller->_('Einreichen rückgängig machen'), Icon::create('rotate-left'),
</a> ['data-confirm' => $controller->_('Einreichen rückgängig machen? Der Stumi kann diesen Stundenzettel dann wieder bearbeiten und Sie haben erst Zugriff, wenn dieser erneut eingereicht wurde.')]
) ?>
<? if (!$timesheet->approved) : ?> <? if (!$timesheet->approved) : ?>
<a href='<?=$this->controller->link_for('timesheet/approve/' . $timesheet->id) ?>' <? $menu->addLink($controller->url_for('timesheet/approve', $timesheet->id),
title='<?= $controller->_("Korrektheit der Angaben bestätigen") ?>'> $controller->_('Korrektheit der Angaben bestätigen'), Icon::create($status_infos['approved']['icon'])
<?= Icon::create($status_infos['approved']['icon']) ?> ) ?>
</a>
<? endif ?> <? endif ?>
<? endif ?> <? endif ?>
<? if ($adminrole) : ?> <? if ($adminrole) : ?>
<a href='<?=$this->controller->link_for('timesheet/complete/' . $timesheet->id) ?>' <? $menu->addLink($controller->url_for('timesheet/complete', $timesheet->id),
title='<?= ($timesheet->complete) ? $controller->_('Vorgang wieder öffnen') : $controller->_('Vorgang abschließen') ?>'> $timesheet->complete ? $controller->_('Vorgang wieder öffnen') : $controller->_('Vorgang abschließen'),
<?= Icon::create($status_infos['complete']['icon']) ?> Icon::create($status_infos['complete']['icon'])
</a> ) ?>
<? endif ?> <? endif ?>
<?= $menu->render() ?>
<? endif ?> <? endif ?>
</td> </td>
</tr> </tr>
...@@ -83,12 +85,12 @@ ...@@ -83,12 +85,12 @@
<table id='stumi-timesheet-entries' class="default"> <table id='stumi-timesheet-entries' class="default">
<thead> <thead>
<tr> <tr>
<th style='width:10%'><?= $controller->_('Monat/Jahr') ?></th> <th><?= $controller->_('Monat/Jahr') ?></th>
<th style='width:10%'><?= $controller->_('Stunden') ?></th> <th><?= $controller->_('Stunden') ?></th>
<th style='width:10%'><?= $controller->_('davon Urlaub') ?></th> <th><?= $controller->_('Urlaub') ?></th>
<th style='width:10%'><?= $controller->_('Überstunden') ?></th> <th><?= $controller->_('Überstunden') ?></th>
<th style='width:10%'><?= $controller->_('Status') ?></th> <th><?= $controller->_('Status') ?></th>
<th style='width:10%'><?= $controller->_('Aktionen') ?></th> <th class="actions"><?= $controller->_('Aktionen') ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -96,7 +98,7 @@ ...@@ -96,7 +98,7 @@
<? foreach ($timesheets as $timesheet): ?> <? foreach ($timesheets as $timesheet): ?>
<tr> <tr>
<td> <td>
<a href='<?=$this->controller->link_for('timesheet/timesheet/' . $timesheet->id) ?>' title='<?= $controller->_('Stundenzettel editieren') ?>'> <a href='<?=$controller->link_for('timesheet/timesheet/' . $timesheet->id) ?>' title='<?= $controller->_('Stundenzettel editieren') ?>'>
<?= strftime("%B", mktime(0, 0, 0, $timesheet->month, 10)) ?> <?= strftime("%B", mktime(0, 0, 0, $timesheet->month, 10)) ?>
<?= htmlready($timesheet->year) ?> <?= htmlready($timesheet->year) ?>
</a> </a>
...@@ -111,11 +113,13 @@ ...@@ -111,11 +113,13 @@
--> -->
<?= Icon::create($status_infos['complete']['icon'], $status_infos[$timesheet->getCurrentState('complete', 'stumi') . '_icon_role'], ['title' => $status_infos['complete'][$timesheet->getCurrentState('complete', 'stumi') . '_tooltip']] )?> <?= Icon::create($status_infos['complete']['icon'], $status_infos[$timesheet->getCurrentState('complete', 'stumi') . '_icon_role'], ['title' => $status_infos['complete'][$timesheet->getCurrentState('complete', 'stumi') . '_tooltip']] )?>
</td> </td>
<td> <td class="actions">
<? if ($timesheet->finished) : ?> <? if ($timesheet->finished) : ?>
<a href="<?= PluginEngine::getLink($plugin, [], 'timesheet/pdf/' . $timesheet->id ) ?>"> <? $menu = ActionMenu::get() ?>
<?= Icon::create('file-pdf', ['title' => $controller->_('PDF zum Ausdruck generieren')] )?> <? $menu->addLink($controller->url_for('timesheet/pdf', $timesheet->id),
</a> $controller->_('PDF zum Ausdruck generieren'), Icon::create('file-pdf')
) ?>
<?= $menu->render() ?>
<? endif ?> <? endif ?>
</td> </td>
</tr> </tr>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment