291 Commits

Author SHA1 Message Date
faf4583383 Merge branch 'custom_field_long_choice' 2015-12-11 11:48:14 +01:00
09439f4e77 Merge branch 'required_fields' into 'master'
add a required field to custom fields type

ref Chill-project/Chill-CustomFields#17

Add a `required` column to the `customfield` table, add a `required` field in customfieldsGroup form.

If the customfield is required, the field is marked as required in the customfield type (when the form is compiled). Although, for compound type (like choices) it is necessary to mark the type manually as required.

See merge request !8
2015-12-11 11:46:51 +01:00
4f13ec6959 add a custom field long choice basic
The `custom field long choice` aim to provide a way to deal with choices
with a big possibilities.

The `custom field long choice` allow :
- to persist different options in the database ;
- each option has a key, a text (translatable string), and eventually a
  parent, and an internal_key
- every key can be activate or not. If the parent is inactivated, all
  childs are inactivated
- the internal key have two purposes :
    - link to an external csv file, with their own key ;
    - add a special class to results, to allow custom layout.

Currently, the field exists, but some elements are missing :

- a script for CSV import
- possibility to select multiple items
- edition of options
- handle of option without parents
- tests are missing
2015-12-11 11:43:39 +01:00
3230659a4b add a required field to custom fields type
ref Chill-project/Chill-CustomFields#17
2015-12-10 17:16:59 +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
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
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
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
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
b96076022f [wip] layout of custom field edition
[ci skip]
2015-11-25 08:45:17 +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
59ce457131 add a title 2015-11-07 08:59:57 +01:00
043f5a1eaf fix show page 2015-11-05 23:49:22 +01:00
bb1e690bec fix "create" page with translation and layout 2015-11-05 22:41:54 +01:00
9d65ca5088 layout of index page for customfieldsgroup
- add a "default" column (according to chill-project/custom-fields#3 )
- translation
2015-10-31 17:55:10 +01:00
Marc Ducobu
7cf270cee4 Removing travis config file 2015-10-30 15:57:27 +01:00
Marc Ducobu
5e211b3f06 Adding ref to the dov 2015-10-30 15:56:43 +01:00
Marc Ducobu
e4aadc891c Removing travis build image 2015-10-30 10:42:45 +01:00
Marc Ducobu
1ebfe7749b Removing .travis.yml file 2015-10-30 10:41:32 +01:00
Marc Ducobu
6ad8d41244 Adding composer.lock in gitignore 2015-10-30 10:40:26 +01:00
Marc Ducobu
e2c1a9bb9f Adding customfileds config in the Admin section menu 2015-10-30 10:36:27 +01:00
d21595d306 add gitlab-ci to project
Squashed commit of the following:

commit 7baa7bddc3a1613816c691e454841baa885a5095
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 26 21:13:47 2015 +0100

    fix auth and database url

commit c47ad68586749e19fce125da9820d0fd0b2bf575
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 26 20:59:33 2015 +0100

    add gitlab-ci
2015-10-26 22:01:57 +01:00
7baa7bddc3 fix auth and database url 2015-10-26 21:13:47 +01:00
c47ad68586 add gitlab-ci 2015-10-26 20:59:33 +01:00
Marc Ducobu
f068ac288f Debug JS - close refs #626 2015-10-22 15:09:43 +02:00
Marc Ducobu
6af61f71dc Refactoring Resources/views/CustomFieldsRendering/choice.html.twig : indentation 2015-10-22 15:07:38 +02:00
Marc Ducobu
bfca9baaeb Refactoring Form/Type/ChoicesType.php : removing useless spaces 2015-10-22 15:06:57 +02:00
Marc Ducobu
46bba56776 Refacotring Form/Type/ChoicesListType.php : indenation 2015-10-22 15:06:14 +02:00
Marc Ducobu
98088e5f7a Refactoring Form/CustomFieldType.php : indentation 2015-10-22 15:05:02 +02:00