Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some usage and time improvement #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Some usage and time improvement #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/datalea/form/fields.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

{% block datalea_generator_column_config_widget %}
{% spaceless %}
<div class="row">
<div class="row">
<div class="span2">{{ form_row(form.name) }}</div>
<div class="span3">{{ form_row(form.value) }}</div>
<div class="span4">{{ form_row(form.convertMethod) }}</div>
Expand Down
46 changes: 35 additions & 11 deletions app/views/datalea/generate.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,31 @@
{% if form.vars.errors|length > 0 %}
<section class="section">
<div class="container">

<div class="alert alert-error">
<a href="#" class="close" data-dismiss="alert">&times;</a>
<div class="control-group error">
<div class="control-group error">
{{ form_errors(form) }}
</div>
</div>
</div>
</section>
{% endif %}

<section id="variables" class="form-horizontal section">
<div class="container">
{{ form_row(form.variableConfigs) }}
</div>
</section>

<section id="column-configs" class="form-horizontal section gray">
<section id="column-configs" class="form-horizontal section gray">
<div class="container">
{{ form_row(form.columnConfigs) }}
</div>
</section>
<section class="section">
<div class="container">

<section class="section">
<div class="container">
<div class="row">
<div class="span6">
<fieldset>
Expand Down Expand Up @@ -107,7 +107,7 @@
</fieldset>
<hr />
</div>

</div>
{{ form_rest(form) }}
<div class="row">
Expand All @@ -131,14 +131,15 @@
jQuery(document).ready(function() {
var fakerMethods = {{ fakerMethods|json_encode()|raw }};
var fakerMethodsCulture = {{ fakerMethodsCulture|json_encode()|raw }};

console.log(fakerMethods);
console.log(fakerMethodsCulture);

var $columnCollectionHolder = $('#datalea_generator_config_columnConfigs');
var addColumnConfigSelector = '.add-columnConfigs';
var $variableCollectionHolder = $('#datalea_generator_config_variableConfigs');
var addVariableConfigSelector = '.add-variableConfigs';
var copyVariableConfigSelector = '.copy-variableConfigs';
var removeConfigSelector = '.remove-collection-item-form';
var $csvFormatOption = $('input[type="checkbox"][name^="datalea_generator_config"][value="csv"]')
var $csvOptions = $('#csv-options');
Expand All @@ -151,6 +152,13 @@ jQuery(document).ready(function() {
addConfigForm($variableCollectionHolder);
});

$(copyVariableConfigSelector).on('click', function(e) {
generateColumnsList($variableCollectionHolder);
});




addRemoveConfigListener($(removeConfigSelector));

$('select.select2-box').select2({
Expand Down Expand Up @@ -189,11 +197,17 @@ jQuery(document).ready(function() {
});
}

function addConfigForm($collectionHolder)
function addConfigForm($collectionHolder, $name)
{
var prototype = $collectionHolder.attr('data-prototype');
var newForm = prototype.replace(/__name__/g, $collectionHolder.children().length);
var elt = $collectionHolder.append(newForm);

if ($name != undefined) {
$collectionHolder.find(".name").last().find("input").val($name);
$collectionHolder.find(".value").last().find("input").val("%"+$name+"%");
}

$collectionHolder.find('select.select2-box').select2({
width: 'resolve'
});
Expand All @@ -205,6 +219,16 @@ jQuery(document).ready(function() {
});
addRemoveConfigListener($collectionHolder.find(removeConfigSelector));
}

function generateColumnsList($collectionHolder) {
$columnCollectionHolder.find(".well").remove();
$variableCollectionHolder.find(".well").each(function() {
$name = $(this).find(".name").find("input").val();
addConfigForm($columnCollectionHolder, $name);
})

}

});
</script>

Expand Down
12 changes: 11 additions & 1 deletion app/views/twitter_bootstrap_form_layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
{{ block('collection_errors') }}
{{ block('collection_widget') }}
</div>
{{ block('end_collection_widget') }}
</fieldset>
{% endspaceless %}
{% endblock collection_row %}
Expand All @@ -37,10 +38,19 @@
<legend {% for attrname, attrvalue in label_attr %} {{ attrname }}="{{ attrvalue }}"{% endfor %}>
{{ label|trans({}, translation_domain)|raw }}{{ block('form_label_asterisk') }}{% if help_type == 'popover' %}{{ block('form_help') }}{% endif %}
<span class="pull-right add-{{name}} btn btn-success" title="{{ 'Add a new element' | trans({}, translation_domain) }}"><i class="icon-plus"></i></span>
{% if name == 'columnConfigs'%}
<span class="pull-right copy-variableConfigs btn btn-info mr10" title="{{ 'Copy columns from variables' | trans({}, translation_domain) }}"><i class="icon-arrow-down"></i></span>
{% endif %}
</legend>
{% endspaceless %}
{% endblock collection_label %}

{% block end_collection_widget %}
{% spaceless %}
<span class="pull-right add-{{name}} btn btn-success" title="{{ 'Add a new element' | trans({}, translation_domain) }}"><i class="icon-plus"></i></span>
{% endspaceless %}
{% endblock end_collection_widget %}

{% block collection_widget %}
{% import _self as macros %}
{% spaceless %}
Expand All @@ -49,7 +59,7 @@
{{ macros.collection_item(child) }}
{% endfor %}
</div>
{##}
{##}
{% endspaceless %}
{% endblock collection_widget %}

Expand Down
Loading