ffe15f2037
Merge branch 'master' into export
2016-04-15 23:21:34 +02:00
1ab0b95e74
order the type alphabetically
...
Improve also the form "TranslatableActivityType" to use the
TranslatableStringHelper.
2016-03-09 20:54:38 +01:00
97df048dfb
add a placeholder in form. Force to choose a type
...
fix #5
2016-03-09 15:17:54 +01:00
3acea7967c
fix the layout of the forms
...
The layout is now consistent with the view page
2016-03-09 14:42:42 +01:00
77b7333fea
Allow encoding of an activity with configuration preset durations
...
fix #11
The activity form allow to receive pre-configured activity durations.
Those duration can be configured through the option
chill_activity.form.time_duration :
```yaml
chill_activity:
form:
time_duration:
- { label: '12 minutes', seconds: 720 }
# - ...
```
If a pre-existing activity receives a different time, the time is added
to the list of pre-configured duration time.
2016-03-09 14:31:42 +01:00
c60d6acf97
An activity may have multiple reasons
...
The relationship between Activity and Reasons is now many-to-many.
Some improvement in show activity layout.
refs #4 #7
2016-02-22 14:48:35 +01:00
7619b41cd4
adapting classes to new interfaces
2016-02-01 00:01:21 +01:00
3c65e2d585
[export] add an export 'count activity' and first filters
...
- reason aggregator
- reason filter
- count activity export
2016-01-02 16:47:55 +01:00
Marc Ducobu
508b933ab9
Improving UI
2015-12-04 19:30:35 +01:00
Marc Ducobu
abbcf50fcc
Admin activity on Admin Section menu
2015-10-30 10:21:12 +01:00
22afd3b3fa
fix bug in redirection to admin index
2015-10-02 23:47:39 +02:00
795c1a74ed
layout and clean activity type CRUD
2015-10-02 23:47:39 +02:00
bebee4fbeb
layout and clean activity reason crud
2015-10-02 23:47:39 +02:00
Marc Ducobu
4ef4a64ea6
Template for ActivityReasonCategory with translation + better looking - refs #622
2015-10-02 14:55:58 +02:00
Marc Ducobu
744a68f195
Category unactive implies all the reasons with this category as unactive - refs #622
2015-10-01 16:35:10 +02:00
0ecfcae98b
fix layout and menu for activity configuration
...
close #614 1h00
2015-09-29 17:18:29 +02:00
4daa44ed57
implements role declaration in activity
...
close #610 @0h15
2015-09-21 23:08:32 +02:00
Marc Ducobu
7008284479
Adding colors for table header of Activity/list
2015-08-26 13:34:17 +02:00
7675f0e250
add grouping and fix localization of trans. string in ActivityReason
...
the label of activity type is now handled by translatableStringHelper.
Reasons are also grouped by categories.
This is thanks to PR https://github.com/symfony/symfony/pull/14050
2015-07-06 00:57:53 +02:00
e36c195ecf
add flashbag message for activity
2015-07-06 00:10:13 +02:00
e0561340a5
add layout for form, consistency with reports
...
- add buttons at the bottom
2015-07-05 23:58:15 +02:00
7f367a857e
layout of show and list
...
- remove attendee from list
- multiple case in show + layout
2015-07-05 23:45:49 +02:00
f7ab4824db
add translation in update form
2015-07-05 11:48:53 +02:00
afdac5390d
add translations
...
I rewrote some messages to be more consistent and avoid multiplication
of messages
2015-07-05 11:46:42 +02:00
Marc Ducobu
bc2b89db03
updating edit template
2015-07-05 11:45:15 +02:00
c4b2bfa8ff
add fixtures into timeline
2015-07-05 11:20:43 +02:00
Marc Ducobu
a637d8ad21
updating the activity show
2015-07-05 11:20:21 +02:00
Marc Ducobu
d937b80038
Error in label : report -> activity
2015-07-05 11:19:48 +02:00
Marc Ducobu
2c9cddcecc
Better list of activities
2015-07-05 11:07:32 +02:00
Marc Ducobu
33461d90ce
Good format for date & durationTIme
2015-07-05 10:41:26 +02:00
Marc Ducobu
40a99a521e
Good format for duration time
2015-07-05 10:35:54 +02:00
Marc Ducobu
7d4f865f10
remark & attendee can be null
2015-07-04 21:23:19 +02:00
2f1386c230
set activity show inside chillpersonbundle layout
2015-07-03 22:36:14 +02:00
402ce86330
improve activity controller & rendering
2015-07-03 22:33:29 +02:00
eb11570541
add acl to activity + bootstrap php
2015-07-03 21:36:05 +02:00
Marc Ducobu
9c565063af
Displaying ActivtyReason & ActivityType into activity creation form
2015-07-03 10:15:50 +02:00
be78c25091
improve activity form
...
- create as a service with required depedencies (required for scope)
- add scope
- fix date show
- adapt controller accordingly
2015-07-02 23:36:43 +02:00
Marc Ducobu
86b24f58ac
First step of integration code generated
2015-07-02 15:41:11 +02:00
Marc Ducobu
77b59958ec
Adding license
2015-07-02 11:33:35 +02:00
Marc Ducobu
5bd8b22569
Activity Reasons, Activity Reasons Category, Activity Types in Translatable strings
2015-07-02 11:33:16 +02:00
Marc Ducobu
f4fb039289
Adding route into the admin menu
2015-07-01 18:26:38 +02:00
Marc Ducobu
b430ac30b0
Adding admin template
2015-07-01 18:22:06 +02:00
Marc Ducobu
b07c6ee6fb
Removing default view
2015-07-01 18:21:31 +02:00
Marc Ducobu
c2a36ef928
Renaming route + in admin
2015-07-01 18:12:25 +02:00
Marc Ducobu
5738de5033
Adding generated files
2015-07-01 13:34:14 +02:00
Marc Ducobu
5bc7bdab2d
Initialisation of the bundle
2015-07-01 09:53:36 +02:00
Marc Ducobu
452f3fba86
skeleton of the bundle
2015-06-30 22:07:55 +02:00