6446 Commits

Author SHA1 Message Date
25626a6a45 Merge branch 'master' into 'master'
Choice widget expanded use the .inline_choice class & choice_with_other_widget d…

…isplay the label and the input on the same line

See merge request !1
2015-12-10 15:49:23 +01:00
b88bb50b56 Merge branch 'marcu/Chill-CustomFields-master'
Merge request Chill-project/Chill-CustomFields!5

Conflicts:
	Resources/views/Form/fields.html.twig
2015-12-10 15:44:20 +01:00
9f079c1769 remove debug informations 2015-12-10 15:17:47 +01:00
af3bc324c2 Merge branch 'add_number_field' into 'master'
add a number field

The field has three option :

- lesser or equal than. If null, this option is ignored ;
- greather or equal than. If null, this options is ignored ;
- precision : the number of decimal after the number ;
- text after the field : a text to show after the field.

The field is rendered as an HTML integer input if precision = 0, or a
symfony number field if precision > 0.

ref chill-project/Chill-CustomFields#11

See merge request !6
2015-12-10 15:15:17 +01:00
9fe0ae1889 improve person creation to fix error handling 2015-12-10 14:55:49 +01:00
04c56f667a register birthdateValidator
in birthdate validator, improve the message
2015-12-10 14:55:12 +01:00
71eb972c4c create validator and tests 2015-12-09 21:33:57 +01:00
4f2b605efc add a number field
The field has three option :

- lesser or equal than. If null, this option is ignored ;
- greather or equal than. If null, this options is ignored ;
- precision : the number of decimal after the number ;
- text after the field : a text to show after the field.

The field is rendered as an HTML integer input if precision = 0, or a
symfony number field if precision > 0.

ref chill-project/Chill-CustomFields#11
2015-12-08 19:45:04 +01:00
Jean Pierre Huart
2c08bf2c6c Doc to install as a developper 2015-12-08 17:07:21 +01:00
Marc Ducobu
373edab629 CustomFields/CustomFieldInterface.php : Improving the doc 2015-12-08 11:42:38 +01:00
Marc Ducobu
ebfb24a3eb Refactoring CustomFields/CustomFieldChoice.php : removing useless linereturn 2015-12-08 11:42:05 +01:00
Marc Ducobu
57fbd54a9c Removing the choice_with_other_widget that is alreay defined in the main bundle 2015-12-08 11:41:34 +01:00
Marc Ducobu
0f632be80b Choice widget expanded use the .inline_choice class & choice_with_other_widget display the label and the input on the same line 2015-12-08 11:40:16 +01:00
Marc Ducobu
49339d78fa Amelioration UI 2015-12-04 19:39:47 +01:00
Marc Ducobu
39dfd17c5d Improving UI 2015-12-04 19:37:47 +01:00
Marc Ducobu
4674369ce9 Improving UI 2015-12-04 19:35:25 +01:00
Marc Ducobu
508b933ab9 Improving UI 2015-12-04 19:30:35 +01:00
e9ef6718a0 minimal improvement
ref Chill-project/Chill-Report#3
2015-12-01 22:20:29 +01:00
6eb6117c14 Merge branch 'fix_#12' into 'master'
remove 'empty_data' which cause conflict with transformer

this blocked the possibility to uncheck the 'active' field on the
choice.

Should fix chill-project/Chill-CustomFields#12

See merge request !3
2015-12-01 10:30:57 +01:00
c4d2c5e691 fix composer.json 2015-11-30 22:39:30 +01:00
f18b384a06 remove 'empty_data' which cause conflict with transformer
this blocked the possibility to uncheck the 'active' field on the
choice.
2015-11-30 22:33:15 +01:00
9a41052cf1 Merge branch 'fix_admin_interface' into 'master'
Layout of index page for customfieldsgroup

Fix chill-project/custom-fields#2 and chill-project/custom-fields#3

This is a test to see how works merge request in gitlab.

See merge request !1
2015-11-30 22:18:41 +01:00
97475ca3b6 fix test for config according to new dev deps 2015-11-30 22:13:59 +01:00
4c328d0aae remove dump informations 2015-11-30 22:12:59 +01:00
9b5544beaf create test for custom fields group complete scenario
a deps is added on the bundle "person" in order to make test working.
2015-11-30 22:10:04 +01:00
c9ca7c1e1b fix creation of custom field without cfgroup id 2015-11-30 21:31:58 +01:00
2401270754 add flash message for custom fields group 2015-11-27 14:29:38 +01:00
46173231d2 adding flash messages for customfield 2015-11-27 14:18:19 +01:00
cbf9cee65c clean code of usnused methods 2015-11-27 13:51:36 +01:00
fa3245b99b add a btn on edit link 2015-11-27 13:42:06 +01:00
bf99b68a2a Improve rendering of options and fields 2015-11-27 13:37:07 +01:00
f24a088a0d [wip] re-introduce 'add element' functionality 2015-11-25 21:26:30 +01:00
Jean Pierre Huart
9fa208b93a gitignore modified 2015-11-25 18:48:19 +01:00
Jean Pierre Huart
d667c10d04 Installation of Postgressql server and Chill database 2015-11-25 18:39:27 +01:00
Marc Ducobu
113fa1facc Starting solving - #4 2015-11-25 15:57:05 +01:00
Marc Ducobu
fcbd985e4e Chill more responsible (Ok >= 500 px) 2015-11-25 15:36:26 +01:00
Marc Ducobu
5b78cad8d6 More responsibe design 2015-11-25 15:17:05 +01:00
Marc Ducobu
3cda5cd14a Updating the dependencies 2015-11-25 15:16:12 +01:00
Marc Ducobu
24f79d1acb chill_menu("admin") config from Admin/layoutWithVerticalMenu.html.twig 2015-11-25 11:56:29 +01:00
Marc Ducobu
e76f553a6d Removing useless images 2015-11-25 11:44:53 +01:00
Marc Ducobu
bd61bbfdae Slongan : accompagnement -> l'accompagnement 2015-11-25 11:40:19 +01:00
b96076022f [wip] layout of custom field edition
[ci skip]
2015-11-25 08:45:17 +01:00
6886f5f943 remove dev from migration deps 2015-11-11 21:36:37 +01:00
cbcc722c0d remove the field "customFieldsGroup" on custom field creation
The customFieldsGroup field is hidden when creating a new customFields.

The customFieldsGroup is retrieved from the url (`customFieldsGroup` value in the URL).

This should ease the task for administrator and be consistent with the UI which group customFields into customFieldsGroup.
2015-11-08 21:18:03 +01:00
421f54e194 remove code for custom fields default group CRUD
The CRUD of default groups is handled now by the custom fields index page. The CRUD is not necessary.
2015-11-08 18:52:28 +01:00
3e23c1f156 show options in show view 2015-11-08 18:47:16 +01:00
0dcf2c33f0 create custom fields default group from new layout 2015-11-08 17:59:43 +01:00
41c47df0c3 remove delete action and form 2015-11-07 09:56:28 +01:00
45d34dc312 fix customfieldsgroup edit view 2015-11-07 09:51:36 +01:00
e1435d0883 fix form to jump to create a custom field 2015-11-07 09:38:12 +01:00