Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-01 20:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

improve activity controller & rendering

Browse Source
This commit is contained in:
Julien Fastré
2015-07-03 22:33:29 +02:00
parent 9ca47ada83
commit 402ce86330
5 changed files with 58 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/migrations/Version20150701091248.php
View File

@@ -42,7 +42,7 @@ class Version20150701091248 extends AbstractMigration
$this->addSql('CREATE SEQUENCE ActivityReason_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
$this->addSql('CREATE SEQUENCE ActivityReasonCategory_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
$this->addSql('CREATE SEQUENCE ActivityType_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
$this->addSql('CREATE TABLE Activity (id INT NOT NULL, user_id INT DEFAULT NULL, scope_id INT DEFAULT NULL, reason_id INT DEFAULT NULL, type_id INT DEFAULT NULL, person_id INT DEFAULT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, durationTime TIME(0) WITHOUT TIME ZONE NOT NULL, remark TEXT NOT NULL, attendee BOOLEAN NOT NULL, PRIMARY KEY(id))');
$this->addSql('CREATE TABLE Activity (id INT NOT NULL, user_id INT DEFAULT NULL, scope_id INT DEFAULT NULL, reason_id INT DEFAULT NULL, type_id INT DEFAULT NULL, person_id INT DEFAULT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, durationTime TIME(0) WITHOUT TIME ZONE NOT NULL, remark TEXT NOT NULL, attendee BOOLEAN, PRIMARY KEY(id))');
$this->addSql('CREATE INDEX IDX_55026B0CA76ED395 ON Activity (user_id)');
$this->addSql('CREATE INDEX IDX_55026B0C682B5931 ON Activity (scope_id)');
$this->addSql('CREATE INDEX IDX_55026B0C59BB1592 ON Activity (reason_id)');

2
Resources/views/Activity/edit.html.twig
View File

@@ -27,7 +27,7 @@
<ul class="record_actions">
<li>
<a href="{{ path('chill_activity_activity', {'person_id': person.id}) }}">
<a href="{{ path('chill_activity_activity_list', {'person_id': person.id}) }}">
Back to the list
</a>
</li>

4
Resources/views/Activity/show.html.twig
View File

@@ -11,11 +11,11 @@
</tr>
<tr>
<th>Date</th>
<td>{{ entity.date|date('Y-m-d H:i:s') }}</td>
<td>{{ entity.date|localizeddate('long', 'none') }}</td>
</tr>
<tr>
<th>Durationtime</th>
<td>{{ entity.durationTime }}</td>
<td>{{ entity.durationTime|localizeddate('long', 'none') }}</td>
</tr>
<tr>
<th>Remark</th>