473 Commits

Author SHA1 Message Date
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
dfaa4b0968 ordering activities by date
fix #15
2016-06-07 13:58:53 +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
b97a550e2b remove unused locale and request stack
The locale resolving is delegated to TranslatableStringHelper
2016-03-21 00:00:58 +01: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
f28a6e9fa0 Merge remote-tracking branch 'framagit/master' 2016-02-25 20:03:30 +01:00
1b851e8f09 upgrade dependency on doctrine-migration-bundle to ~1.1 2016-02-23 15:37:54 +01:00
9bf7b4ac60 set deps on doctrine-migration to ~1.1 2016-02-23 15:09:54 +01:00
737d0f4c52 Add license 2016-02-23 14:49:42 +01:00
d8bf3a6431 add mapping_types information to allow jsonb from postgresql 2016-02-22 14:51:48 +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
42f7bdb742 adapt to new ExportInterface 2016-02-05 15:05:27 +01:00
7619b41cd4 adapting classes to new interfaces 2016-02-01 00:01:21 +01:00
9f7fe05991 implements required role in export 2016-01-26 12:21:16 +01:00
1671be107f implements dummy role 2016-01-26 11:47:34 +01:00
af359c9a2b add dummy acl for export [WIP][ci-skip] 2016-01-24 22:26:38 +01:00
84128fa718 transform raw value to serialized value in isEmptyValue 2016-01-05 12:10:49 +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
0e0a764652 Merge remote-tracking branch 'framagit/master' 2016-01-01 22:26:47 +01:00
f288f67bb9 fix error with empty values with multiple and non-existant data
if a value was array(null) or array(_other => null, _choices => null),
the isEmptyValue function failed.
2016-01-01 22:25:05 +01:00
b4ce83453c Merge branch 'master' into 'master'
Various improvements

- Introduce tests for twig functions ;
- Make the twig function `chill_custom_field_is_emtpy` consistent with other functions ;
- remove dead code from CustomFieldsHelper ;
- add validation on custom field slug
- fix bug in test
- re-introduce the units label in numeric/integer custom fields

See merge request !12
2016-01-01 16:25:59 +01:00
f145ae7f88 re-introduce post_text extension in fields.html.twig + tests 2015-12-30 16:57:16 +01:00
8849d8bb54 fix test for custom field helper
The test was requesting an entity not present in database
2015-12-29 17:54:00 +01:00
546fe49960 ignore platform reqs on build 2015-12-29 17:09:04 +01:00
7a8ef70cd1 fix renderLabel signature 2015-12-29 17:04:58 +01:00
287c70c6f3 add validation rule on slug for custom fields 2015-12-28 21:16:01 +01:00
3d2426d8df allow php7 and upgrade to symfony 2.8 2015-12-28 20:59:19 +01:00
cad44ae461 fix test 'complete scenario'
The link 'modifier' was changed to 'Modifier'
2015-12-28 20:54:34 +01:00
54391b02f3 consistency in twig methods
The method chill_custom_fields_is_empty take now the fields as first argument, and the customField as second argument, to be consistent with other twig methods.
2015-12-28 00:54:38 +01:00
d2039893b3 Simplifiying Helper and twig functions
Now, the CustomFieldsHelper methods and the twig function which render customFields require always a `Chill\CustomFields\Entity\CustomField`.

The possibility to add a slug and an object as argument to those method is abandoned, and was not used in other bundle (nevertheless, the method to catch a customField from his slug was buggy).
2015-12-28 00:38:27 +01:00
89221599d4 Merge branch 'add_gitlab_ci' 2015-12-24 16:09:26 +01:00
f7dd99ab87 add test for custom_fields_group_widget 2015-12-24 16:05:49 +01:00
7a73c0170c set a composer root version + select image php-7
The composer root version is required to let composer decide on which branch he is, as we have mirrored dependencies (custom field requires person, which requires custom field).

The php 7 build select now php 7 image
2015-12-24 15:16:04 +01:00
1de944f838 Merge branch 'master' into add_gitlab_ci
Conflicts:
	.gitignore
2015-12-24 15:00:00 +01:00
09a69765b9 adding test for customFieldRendering function 2015-12-23 23:46:44 +01:00
3e5a90c36c escaping argument 2015-12-23 23:46:15 +01:00
573697d8c7 improve function isEmptyValue + tests 2015-12-18 00:22:09 +01:00
24f9db6ae7 fix bug in changing custom field option
bug description :

> if you change the options of a custom field choice (i.e. from a
> multiple to a single, removing or adding allow_other), the data
> representation change and do not match with the expected
> representation of the form.

This commit fix this bug by switching the data representation to the
current options.
2015-12-17 23:50:24 +01:00
9867cca632 improve rendering of cfgroup index 2015-12-17 22:16:06 +01:00
60dc11caed translation in choices name 2015-12-17 22:12:50 +01:00
cbc66dc0f0 allow choosing empty value in CFLongChoice 2015-12-17 22:07:28 +01:00
9c622bc852 improve cfgroup rendering to show title only if necessary
If the value `chill_custom_fields.show_empty_values_in_views` is false,
the title is shown only if a field has been filled "below" the title.
2015-12-17 07:46:06 +01:00
0a1898e9a7 take into account the different type of choices in empty value 2015-12-16 20:25:40 +01:00