69 Commits

Author SHA1 Message Date
837beb4cb2 layout of timeline 2017-08-19 23:08:00 +02:00
7b9a036589 adapt to main layout for list 2017-08-19 21:47:57 +02:00
b154f5db65 improve layout of list 2017-08-19 20:11:45 +02:00
dff0d15647 add missing translation 2017-07-03 21:50:02 +02:00
87a3cd20ee move test/Fixtures to a new directory 2017-07-03 21:49:21 +02:00
239ea38e92 add ACTIVITY_SEE_DETAILS role
This new role allow to see the details (remark + reasons) in the timeline.
2017-06-20 15:19:58 +02:00
38d69f097c fix translation and make hierarchy in roles 2017-04-19 21:26:22 +02:00
13f3a1f55f add validation and translations 2017-02-26 01:04:02 +01:00
7a76868f6a add validation to activityreasonaggregator 2017-02-26 00:12:52 +01:00
9bcd7a2c10 improve exports and filters 2017-01-31 15:34:41 +01:00
67c8c19885 improve exports & add new filter, export, aggregators 2017-01-17 00:34:32 +01:00
9ad651a5d8 rename ReasonAggregator => ActivityReasonAggregator for consistency 2017-01-12 17:59:06 +01:00
2997614a04 update export & aggregator & filter to new api + add tests 2017-01-12 17:42:37 +01:00
a7dfc5e1bd moving export services definition to new file 2017-01-12 17:42:37 +01:00
9f3cdfdff8 improve layout of activity type form 2016-11-15 14:32:11 +01:00
5dda66342a add an "active" field on activity type 2016-11-14 23:00:13 +01:00
09f46d804a adding translation for export 2016-09-02 08:23:43 +02:00
ef76453fbc add a title on page "list activities" and statement if empty
fix #16
2016-06-08 21:35:31 +02:00
1e476b39da adding the possibility to remove activities
fix #28
2016-06-08 21:26:30 +02:00
Marc Ducobu
3e3cf707de Merge branch 'master' of framagit.org:Chill-project/Chill-Activity 2016-05-06 16:32:34 +02:00
Marc Ducobu
79fa06640a Improving the timeline UI 2016-05-06 16:31:04 +02:00
f863b9db24 adapt to new exportInterface
see Chill-project/Chill-Main#9
2016-04-25 21:58:04 +02:00
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