Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added upload button #1800

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion module/Application/language/en.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 17 additions & 2 deletions module/Application/language/gewisweb.pot

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 19 additions & 3 deletions module/Application/language/nl.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 18 additions & 6 deletions module/Decision/view/decision/decision/view.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
declare(strict_types=1);

use Application\View\HelperTrait;
use Decision\Model\Enums\MeetingTypes;
use Decision\Model\Meeting as MeetingModel;
use Laminas\View\Renderer\PhpRenderer;

Expand Down Expand Up @@ -31,8 +32,19 @@ $this->headScript()
?>
<section class="section">
<div class="container">
<h1><?= $meetingName ?></h1>
<h2><?= $this->dateFormat($meeting->getDate(), IntlDateFormatter::FULL) ?></h2>
<div class="row">
<div class="col-md-10">
<h1><?= $meetingName ?></h1>
<h2><?= $this->dateFormat($meeting->getDate(), IntlDateFormatter::FULL) ?></h2>
</div>
<?php if ($this->acl('decision_service_acl')->isAllowed('meeting','upload_document') && $meeting->getType()->value !== MeetingTypes::BV): ?>
<div class="col-md-2">
<a href="<?= $this->url('decision_admin/document', ['type' => $meeting->getType()->value, 'number' => $meeting->getNumber()]) ?>" class="btn btn-success pull-right">
<span class="fas fa-plus"></span> <?= $this->translate('Add Documents') ?>
</a>
</div>
<?php endif; ?>
</div>
<div class="row">
<div class="col-md-6">
<h3><?= $this->translate('Documents') ?></h3>
Expand All @@ -53,13 +65,13 @@ $this->headScript()

if ($document->getCreatedAt() != $document->getUpdatedAt()) {
$title .= ' ' . sprintf(
$this->translate('It was last edited on %s.'),
$this->dateFormat($document->getUpdatedAt(), IntlDateFormatter::FULL),
);
$this->translate('It was last edited on %s.'),
$this->dateFormat($document->getUpdatedAt(), IntlDateFormatter::FULL),
);
}
?>
<span data-toggle="tooltip" data-placement="right" class="fas fa-info-circle"
title="<?= $title ?>" aria-hidden="true"></span>
title="<?= $title ?>" aria-hidden="true"></span>
</a>
</td>
</tr>
Expand Down
Loading