59 Commits

Author SHA1 Message Date
0ecfcae98b fix layout and menu for activity configuration
close #614 1h00
2015-09-29 17:18:29 +02:00
Marc Ducobu
3dcbec4b87 Merge branch 'master' of git://github.com/Chill-project/Activity 2015-09-28 14:08:17 +02:00
Marc Ducobu
4bd5d70fb2 Remove required in form #622 2015-09-28 14:08:03 +02:00
74c03078c4 Update README.md 2015-09-23 16:24:19 +02:00
ab707e9079 add issue tracker 2015-09-23 16:20:54 +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
Marc Ducobu
c7962c8afd Display only the activities of a person 2015-07-06 09:10:58 +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
Marc Ducobu
7e688d8573 Merge branch 'master' of git://github.com/Chill-project/Activity 2015-07-06 00:27:44 +02:00
Marc Ducobu
e1eeb1bdab Adding activity fixtures 2015-07-06 00:27:16 +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
943032a918 layout of time widget 2015-07-05 23:23:29 +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
Marc Ducobu
a4e3089150 Debuging updating form 2015-07-05 11:42:33 +02:00
6f9015ac08 mark test as skipped for now 2015-07-05 11:20:43 +02:00
c4b2bfa8ff add fixtures into timeline 2015-07-05 11:20:43 +02:00
9927be9e2f forget parameters.yml 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
4788a2dc53 Fixing file name error : LoadReportACL -> LoadActivitytACL 2015-07-05 10:29:09 +02:00
Marc Ducobu
7d4f865f10 remark & attendee can be null 2015-07-04 21:23:19 +02:00
Marc Ducobu
5af14b2307 time type for durationTime in form 2015-07-04 21:22:56 +02:00
Marc Ducobu
e65f78ab31 Debug : enable creation of an acitivy 2015-07-04 20:38:13 +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
9ca47ada83 add fixtures to gitignore 2015-07-03 21:36:05 +02:00
eb11570541 add acl to activity + bootstrap php 2015-07-03 21:36:05 +02:00
508bf02dba move fixture to test directory
refs #561
2015-07-03 21:36:05 +02:00
Marc Ducobu
fba95263eb Adding better fixtures activity reason & activity reason category 2015-07-03 19:03:03 +02:00
Marc Ducobu
f1ff5e3c38 Adding data fixtures 2015-07-03 12:11:27 +02:00
Marc Ducobu
9c565063af Displaying ActivtyReason & ActivityType into activity creation form 2015-07-03 10:15:50 +02:00
Marc Ducobu
a0798c014e mergin conflict 2015-07-03 09:48:39 +02:00
Marc Ducobu
faffdee1ab Integration code generated 2015-07-03 09:40:30 +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
24bd8c9a1d Removing DefaultController 2015-07-02 14:38:48 +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
e9fdfb341d Adding composer.lock in .gitignore 2015-07-02 10:55:08 +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