mirror of
https://forge.chapril.org/tykayn/osm-commerces
synced 2025-10-09 17:02:46 +02:00
addr in submit form
This commit is contained in:
Tykayn
tykayn
parent
6707385ec9
commit
e96acf4ab8
9 changed files with 309 additions and 273 deletions
|
|
@ -191,6 +191,7 @@
|
|||
{% set overpass_type_queries = {
|
||||
'fire_hydrant': 'nwr["emergency"="fire_hydrant"](area.searchArea);',
|
||||
'charging_station': 'nwr["amenity"="charging_station"](area.searchArea);',
|
||||
'bicycle_parking' : 'nwr["amenity"="bicycle_parking"](area.searchArea);',
|
||||
'toilets': 'nwr["amenity"="toilets"](area.searchArea);',
|
||||
'bus_stop': 'nwr["highway"="bus_stop"](area.searchArea);',
|
||||
'defibrillator': 'nwr["emergency"="defibrillator"](area.searchArea);',
|
||||
|
|
@ -200,13 +201,14 @@
|
|||
'laboratory': 'nwr["healthcare"="laboratory"](area.searchArea);',
|
||||
'school': 'nwr["amenity"="school"](area.searchArea);',
|
||||
'police': 'nwr["amenity"="police"](area.searchArea);',
|
||||
'drinking_water' : 'nwr["amenity"="drinking_water"](area.searchArea);',
|
||||
'healthcare': 'nwr["healthcare"](area.searchArea);nwr["amenity"="doctors"](area.searchArea);nwr["amenity"="pharmacy"](area.searchArea);nwr["amenity"="hospital"](area.searchArea);nwr["amenity"="clinic"](area.searchArea);nwr["amenity"="social_facility"](area.searchArea);'
|
||||
} %}
|
||||
|
||||
{% set theme_groups = {
|
||||
'emergency': ['fire_hydrant', 'defibrillator'],
|
||||
'transport': ['bus_stop', 'charging_station'],
|
||||
'healthcare': ['healthcare', 'laboratory'],
|
||||
'transport': ['bus_stop', 'charging_station', 'bicycle_parking'],
|
||||
'healthcare': ['healthcare', 'laboratory', 'drinking_water'],
|
||||
'education': ['school'],
|
||||
'security': ['police', 'camera'],
|
||||
'infrastructure': ['toilets', 'recycling', 'substation']
|
||||
|
|
|
|||
|
|
@ -4,204 +4,219 @@
|
|||
|
||||
|
||||
{% block body %}
|
||||
<div class="container edit-land mt-4" id="editLand">
|
||||
<div class="container edit-land mt-4" id="editLand">
|
||||
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-body">
|
||||
<h1 class="card-title h2 mb-4">
|
||||
{{ 'display.welcome'|trans }}
|
||||
{% set main_tag = commerce.mainTag is defined and commerce.mainTag is not empty ? commerce.mainTag : (commerce_overpass.tags_converted.main_tag is defined ? commerce_overpass.tags_converted.main_tag : null) %}
|
||||
{% if main_tag %}
|
||||
{{ tag_emoji(main_tag) }}
|
||||
{% endif %}
|
||||
{{ commerce_overpass.tags_converted.name }} - {{ commerce.stats.name }}
|
||||
</h1>
|
||||
<div id="map" style="height: 400px; width: 100%;" class="rounded mb-4"></div>
|
||||
{% include 'public/edit/address.html.twig' %}
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-body">
|
||||
<h1 class="card-title h2 mb-4">
|
||||
{{ 'display.welcome'|trans }}
|
||||
{% set main_tag = commerce.mainTag is defined and commerce.mainTag is not empty ? commerce.mainTag : (commerce_overpass.tags_converted.main_tag is defined ? commerce_overpass.tags_converted.main_tag : null) %}
|
||||
{% if main_tag %}
|
||||
{{ tag_emoji(main_tag) }}
|
||||
{% endif %}
|
||||
{{ commerce_overpass.tags_converted.name }} - {{ commerce.stats.name }}
|
||||
</h1>
|
||||
<div id="map" style="height: 400px; width: 100%;" class="rounded mb-4"></div>
|
||||
|
||||
{% if commerce_overpass is not empty %}
|
||||
<form action="{{ path('app_public_submit', {'osm_object_id': commerce_overpass['@attributes'].id, 'version': commerce_overpass['@attributes'].version, 'changesetID': commerce_overpass['@attributes'].changeset }) }}" method="post" class="needs-validation">
|
||||
<input type="hidden" name="osm_kind" value="{{ osm_kind }}">
|
||||
{% if commerce_overpass is not empty %}
|
||||
<pre>
|
||||
{% if commerce_overpass.tags_converted is defined %}
|
||||
{{ commerce_overpass.tags_converted |json_encode }}
|
||||
{% endif %}
|
||||
</pre>
|
||||
|
||||
<div class="row g-3 mb-4">
|
||||
<div class="col-12 col-md-4">
|
||||
<label for="commerce_tag_value__name" class="form-label">{{'display.keys.name'|trans}}</label>
|
||||
</div>
|
||||
<div class="col-12 col-md-8">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__name" value="{% if commerce_overpass.tags_converted.name is defined %}{{ commerce_overpass.tags_converted.name }}{% elseif commerce_overpass['@attributes'].name is defined %}{{ commerce_overpass['@attributes'].name }}{% endif %}">
|
||||
</div>
|
||||
<form action="{{ path('app_public_submit', {'osm_object_id': commerce_overpass['@attributes'].id, 'version': commerce_overpass['@attributes'].version, 'changesetID': commerce_overpass['@attributes'].changeset }) }}"
|
||||
method="post" class="needs-validation">
|
||||
{% include 'public/edit/address.html.twig' %}
|
||||
<input type="hidden" name="osm_kind" value="{{ osm_kind }}">
|
||||
|
||||
<div class="row g-3 mb-4">
|
||||
<div class="col-12 col-md-4">
|
||||
<label for="commerce_tag_value__name"
|
||||
class="form-label">{{ 'display.keys.name'|trans }}</label>
|
||||
</div>
|
||||
<div class="col-12 col-md-8">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__name"
|
||||
value="{% if commerce_overpass.tags_converted.name is defined %}{{ commerce_overpass.tags_converted.name }}{% elseif commerce_overpass['@attributes'].name is defined %}{{ commerce_overpass['@attributes'].name }}{% endif %}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div id="images" class="d-none">
|
||||
</div>
|
||||
<div id="images" >
|
||||
{% if commerce_overpass.tags_converted.image is defined and commerce_overpass.tags_converted.image|length > 0 %}
|
||||
<img class="img-fluid img-thumbnail mb-3" style="height: 500px; width: auto;" src="{{ commerce_overpass.tags_converted.image }}" />
|
||||
{% endif %}
|
||||
|
||||
<label for="commerce_tag_value__image" class="form-label">URL de l'image de la façade</label>
|
||||
<input type="text" class="form-control mb-2" id="commerce_tag_value__image" name="commerce_tag_value__image" value="{{ commerce_overpass.tags_converted.image is defined ? commerce_overpass.tags_converted.image : '' }}" placeholder="https://...">
|
||||
{% if commerce_overpass.tags_converted.image is defined and commerce_overpass.tags_converted.image|length > 0 %}
|
||||
<img src="{{ commerce_overpass.tags_converted.image }}" alt="Image de la façade" class="img-fluid img-thumbnail mb-2" style="max-height:200px;">
|
||||
{% endif %}
|
||||
{{ commerce_overpass.tags_converted.image }}
|
||||
<div id="images" class="d-none">
|
||||
</div>
|
||||
<div id="images">
|
||||
{% if commerce_overpass.tags_converted.image is defined and commerce_overpass.tags_converted.image|length > 0 %}
|
||||
<img class="img-fluid img-thumbnail mb-3" style="height: 500px; width: auto;"
|
||||
src="{{ commerce_overpass.tags_converted.image }}"/>
|
||||
{% endif %}
|
||||
|
||||
<label for="commerce_tag_value__image" class="form-label">URL de l'image de la
|
||||
façade</label>
|
||||
<input type="text" class="form-control mb-2" id="commerce_tag_value__image"
|
||||
name="commerce_tag_value__image"
|
||||
value="{{ commerce_overpass.tags_converted.image is defined ? commerce_overpass.tags_converted.image : '' }}"
|
||||
placeholder="https://...">
|
||||
{% if commerce_overpass.tags_converted.image is defined and commerce_overpass.tags_converted.image|length > 0 %}
|
||||
<img src="{{ commerce_overpass.tags_converted.image }}" alt="Image de la façade"
|
||||
class="img-fluid img-thumbnail mb-2" style="max-height:200px;">
|
||||
{% endif %}
|
||||
{{ commerce_overpass.tags_converted.image }}
|
||||
|
||||
|
||||
{% if commerce_overpass.tags_converted.panoramax is defined or commerce_overpass.tags_converted.wikimedia_commons is defined %}
|
||||
<input type="text" class="form-control" name="commerce_tag_value__image" value="{{ commerce_overpass.tags_converted.image }}">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__image"
|
||||
value="{{ commerce_overpass.tags_converted.image }}">
|
||||
url d'image sur Panoramax : {{ commerce_overpass.tags_converted.panoramax is defined ? commerce_overpass.tags_converted.panoramax : '' }}
|
||||
<input type="text" class="form-control" name="commerce_tag_value__panoramax" value="{{ commerce_overpass.tags_converted.panoramax is defined ? commerce_overpass.tags_converted.panoramax : '' }}">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__panoramax"
|
||||
value="{{ commerce_overpass.tags_converted.panoramax is defined ? commerce_overpass.tags_converted.panoramax : '' }}">
|
||||
|
||||
wikimedia_commons:
|
||||
<input type="text" class="form-control" name="commerce_tag_value__wikimedia_commons" value="{{ commerce_overpass.tags_converted.wikimedia_commons is defined ? commerce_overpass.tags_converted.wikimedia_commons : '' }}">
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
|
||||
{% if commerce_overpass.tags_converted.amenity is defined and (commerce_overpass.tags_converted.amenity == 'restaurant' or commerce_overpass.tags_converted.amenity == 'bar' or commerce_overpass.tags_converted.amenity == 'cafe' or commerce_overpass.tags_converted.amenity == 'fast_food') %}
|
||||
{% include 'public/edit/restaurant.html.twig' %}
|
||||
<input type="text" class="form-control" name="commerce_tag_value__wikimedia_commons"
|
||||
value="{{ commerce_overpass.tags_converted.wikimedia_commons is defined ? commerce_overpass.tags_converted.wikimedia_commons : '' }}">
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
{% if hide_filled_inputs and (commerce_overpass.tags_converted.opening_hours) is defined and commerce_overpass.tags_converted.opening_hours is empty %}
|
||||
<span class="deja-rempli d-none">
|
||||
{% if commerce_overpass.tags_converted.amenity is defined and (commerce_overpass.tags_converted.amenity == 'restaurant' or commerce_overpass.tags_converted.amenity == 'bar' or commerce_overpass.tags_converted.amenity == 'cafe' or commerce_overpass.tags_converted.amenity == 'fast_food') %}
|
||||
{% include 'public/edit/restaurant.html.twig' %}
|
||||
{% endif %}
|
||||
|
||||
|
||||
|
||||
{% if hide_filled_inputs and (commerce_overpass.tags_converted.opening_hours) is defined and commerce_overpass.tags_converted.opening_hours is empty %}
|
||||
<span class="deja-rempli d-none">
|
||||
opening_hours {{ 'display.already_filled'|trans }}
|
||||
</span>
|
||||
{% endif %}
|
||||
{% include 'public/edit/opening_hours.html.twig' %}
|
||||
{% include 'public/edit/clim.html.twig' %}
|
||||
{% if hide_filled_inputs and (commerce_overpass.tags_converted.wheelchair) is defined and commerce_overpass.tags_converted.wheelchair is empty %}
|
||||
<span class="deja-rempli d-none">
|
||||
{% endif %}
|
||||
{% include 'public/edit/opening_hours.html.twig' %}
|
||||
|
||||
|
||||
{% include 'public/edit/clim.html.twig' %}
|
||||
{% if hide_filled_inputs and (commerce_overpass.tags_converted.wheelchair) is defined and commerce_overpass.tags_converted.wheelchair is empty %}
|
||||
<span class="deja-rempli d-none">
|
||||
{{ 'display.already_filled'|trans }}
|
||||
</span>
|
||||
|
||||
{% endif %}
|
||||
{% include 'public/edit/wheelchair.html.twig' %}
|
||||
|
||||
{% if hide_filled_inputs and (commerce_overpass.tags_converted.ask_angela) is defined and commerce_overpass.tags_converted.ask_angela is not empty %}
|
||||
<span class="deja-rempli d-none ">
|
||||
|
||||
{% endif %}
|
||||
{% include 'public/edit/wheelchair.html.twig' %}
|
||||
|
||||
{% if hide_filled_inputs and (commerce_overpass.tags_converted.ask_angela) is defined and commerce_overpass.tags_converted.ask_angela is not empty %}
|
||||
<span class="deja-rempli d-none ">
|
||||
{{ 'display.already_filled'|trans }}
|
||||
</span>
|
||||
{% endif %}
|
||||
{% include 'public/edit/ask_angela.html.twig' %}
|
||||
{% endif %}
|
||||
{% include 'public/edit/ask_angela.html.twig' %}
|
||||
|
||||
<fieldset class="input-group mb-2 phone-group">
|
||||
|
||||
<fieldset class="input-group mb-2 phone-group">
|
||||
|
||||
<div class="input-group mb-2">
|
||||
|
||||
<div class="input-group mb-2">
|
||||
<span class="input-group-text" style="width: 10rem;">
|
||||
<i class="bi bi-phone me-2"></i>
|
||||
Téléphone
|
||||
</span>
|
||||
<input type="text" class="form-control"
|
||||
id="commerce_tag_value__contact:phone"
|
||||
name="commerce_tag_value__contact:phone"
|
||||
value="{{ commerce_overpass.tags_converted['contact:phone'] ?? '' }}"
|
||||
placeholder="+33 1 23 45 67 89">
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
|
||||
{% include 'public/edit/social_media.html.twig' %}
|
||||
|
||||
|
||||
<div id="advanced_tags" class="d-none">
|
||||
{# {% include 'public/edit/tags.html.twig' with { 'excluded_tags_to_render': excluded_tags_to_render,
|
||||
'commerce_overpass': commerce_overpass,
|
||||
'hide_filled_inputs': hide_filled_inputs } %}
|
||||
#}
|
||||
{% include 'public/edit/tags.html.twig' with { 'excluded_tags_to_render': {},
|
||||
'commerce_overpass': commerce_overpass,
|
||||
'hide_filled_inputs': hide_filled_inputs } %}
|
||||
|
||||
<input type="text" class="form-control"
|
||||
id="commerce_tag_value__contact:phone"
|
||||
name="commerce_tag_value__contact:phone"
|
||||
value="{{ commerce_overpass.tags_converted['contact:phone'] ?? '' }}"
|
||||
placeholder="+33 1 23 45 67 89">
|
||||
</div>
|
||||
|
||||
<div class="mb-4">
|
||||
<h4>Prévisualisation des tags OSM (texte à copier-coller)</h4>
|
||||
{% set tags_for_textarea = {} %}
|
||||
{% for k, v in commerce_overpass.tags_converted %}
|
||||
{% if v is not empty %}
|
||||
{% set tags_for_textarea = tags_for_textarea|merge({ (k): v }) %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% include 'public/_tags_textarea.html.twig' with { 'tags': tags_for_textarea } %}
|
||||
</div>
|
||||
|
||||
<div id="validation_messages" class="alert alert-danger d-none"></div>
|
||||
<div class="d-grid gap-2 d-md-flex justify-content-md-end mt-4">
|
||||
<button type="submit" class="btn btn-primary col-12 col-md-5">
|
||||
<i class="bi bi-send"></i>
|
||||
{{ 'display.submit'|trans }}
|
||||
</button>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
</form>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
|
||||
{% include 'public/edit/social_media.html.twig' %}
|
||||
{% include 'public/edit/wheelchair.html.twig' %}
|
||||
|
||||
{% include 'public/edit/tags.html.twig' %}
|
||||
|
||||
<div class="mb-4">
|
||||
<h4>Prévisualisation des tags OSM (texte à copier-coller)</h4>
|
||||
{% set tags_for_textarea = {} %}
|
||||
{% for k, v in commerce_overpass.tags_converted %}
|
||||
{% if v is not empty %}
|
||||
{% set tags_for_textarea = tags_for_textarea|merge({ (k): v }) %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% include 'public/_tags_textarea.html.twig' with { 'tags': tags_for_textarea } %}
|
||||
</div>
|
||||
|
||||
<div id="validation_messages" class="alert alert-danger d-none"></div>
|
||||
<div class="d-grid gap-2 d-md-flex justify-content-md-end mt-4">
|
||||
<button type="submit" class="btn btn-primary col-12 col-md-5">
|
||||
<i class="bi bi-send"></i>
|
||||
{{ 'display.submit'|trans }}
|
||||
</button>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
</form>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12 mt-4">
|
||||
<div class="actions-modification mb-4 mx-2">
|
||||
|
||||
<a class="btn btn-info" href="{{ path('app_public_index') }}">
|
||||
<i class="bi bi-people"></i>
|
||||
{{ 'display.contact_humans'|trans }}
|
||||
</a>
|
||||
|
||||
<button id="showAllFields" class="btn btn-secondary mx-4">
|
||||
<i class="bi bi-eye"></i>
|
||||
Voir aussi les champs déjà remplis
|
||||
</button>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12 mt-4">
|
||||
<div class="actions-modification mb-4 mx-2">
|
||||
|
||||
<button id="closedCommerce" class="btn btn-danger mx-4 mt-4">
|
||||
<i class="bi bi-x-circle"></i>
|
||||
Je souhaite signaler que ce commerce est fermé
|
||||
</button>
|
||||
</div>
|
||||
<a class="btn btn-info" href="{{ path('app_public_index') }}">
|
||||
<i class="bi bi-people"></i>
|
||||
{{ 'display.contact_humans'|trans }}
|
||||
</a>
|
||||
|
||||
<button id="showAllFields" class="btn btn-secondary mx-4">
|
||||
<i class="bi bi-eye"></i>
|
||||
Voir aussi les champs déjà remplis
|
||||
</button>
|
||||
|
||||
<button id="closedCommerce" class="btn btn-danger mx-4 mt-4">
|
||||
<i class="bi bi-x-circle"></i>
|
||||
Je souhaite signaler que ce commerce est fermé
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row justify-content-center mt-4">
|
||||
<div class="col-12 col-lg-10 col-xl-8">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="d-flex flex-column flex-md-row align-items-md-center justify-content-between">
|
||||
<div class="mb-3 mb-md-0 mr-4">
|
||||
<span class="last-modification">{{ 'display.last_modification'|trans }}: {{ commerce_overpass['@attributes'].timestamp }}</span>,
|
||||
<span class="last-modification">{{ 'display.last_modification'|trans }}: {{ commerce_overpass['@attributes'].timestamp }}</span>,
|
||||
<strong>{{ 'display.days_ago'|trans({'%days%': date(commerce_overpass['@attributes'].timestamp).diff(date()).days}) }}</strong>
|
||||
{{ 'display.by'|trans }}
|
||||
<a href="https://www.openstreetmap.org/user/{{ commerce_overpass['@attributes'].user }}" >{{ commerce_overpass['@attributes'].user }}</a>
|
||||
</div>
|
||||
{{ 'display.by'|trans }}
|
||||
<a href="https://www.openstreetmap.org/user/{{ commerce_overpass['@attributes'].user }}">{{ commerce_overpass['@attributes'].user }}</a>
|
||||
</div>
|
||||
<div class="lien-OpenStreetMap">
|
||||
<a href="https://www.openstreetmap.org/{{commerce.osmKind}}/{{ commerce_overpass['@attributes'].id }}" class="btn btn-outline-secondary">
|
||||
<i class="bi bi-globe"></i> {{ 'display.view_on_osm'|trans }}
|
||||
<img src="{{ asset('img/logo-osm.png') }}" alt="OpenStreetMap" class="img-fluid thumbnail">
|
||||
<a href="https://www.openstreetmap.org/{{ commerce.osmKind }}/{{ commerce_overpass['@attributes'].id }}"
|
||||
class="btn btn-outline-secondary">
|
||||
<i class="bi bi-globe"></i> {{ 'display.view_on_osm'|trans }}
|
||||
<img src="{{ asset('img/logo-osm.png') }}" alt="OpenStreetMap"
|
||||
class="img-fluid thumbnail">
|
||||
</a>
|
||||
<button onclick="openInJOSM('{{commerce.osmKind}}', '{{ commerce_overpass['@attributes'].id }}')"
|
||||
title="Ouvrir dans JOSM"
|
||||
class="btn btn-outline-secondary ms-2">
|
||||
<i class="bi bi-pencil"></i>
|
||||
<button onclick="openInJOSM('{{ commerce.osmKind }}', '{{ commerce_overpass['@attributes'].id }}')"
|
||||
title="Ouvrir dans JOSM"
|
||||
class="btn btn-outline-secondary ms-2">
|
||||
<i class="bi bi-pencil"></i>
|
||||
<img src="{{ asset('img/josm.png') }}" alt="JOSM" class="img-fluid thumbnail">
|
||||
</button>
|
||||
<button onclick="openInPanoramax()" title="Ouvrir dans Panoramax" class="btn btn-outline-secondary ms-2">
|
||||
<button onclick="openInPanoramax()" title="Ouvrir dans Panoramax"
|
||||
class="btn btn-outline-secondary ms-2">
|
||||
<i class="bi bi-camera"></i>
|
||||
|
||||
<img src="{{ asset('img/panoramax.svg') }}" alt="Panoramax" class="img-fluid thumbnail">
|
||||
|
||||
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if commerce.stats %}
|
||||
<a href="{{ path('app_admin_stats', {'insee_code': commerce.stats.zone}) }}" class="btn btn-outline-secondary">
|
||||
<i class="bi bi-bar-chart"></i> zone {{commerce.stats.zone}}
|
||||
<a href="{{ path('app_admin_stats', {'insee_code': commerce.stats.zone}) }}"
|
||||
class="btn btn-outline-secondary">
|
||||
<i class="bi bi-bar-chart"></i> zone {{ commerce.stats.zone }}
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
<a href="{{ path('app_public_dashboard' )}}" class="btn btn-outline-secondary">
|
||||
<a href="{{ path('app_public_dashboard' ) }}" class="btn btn-outline-secondary">
|
||||
<i class="bi bi-bar-chart"></i> Dashboard
|
||||
</a>
|
||||
</div>
|
||||
|
|
@ -212,116 +227,117 @@
|
|||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
{% block completion_progress %}
|
||||
<div id="completion_progress" class="">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div id="completion_display" class="mb-2"></div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<div class="progress" role="progressbar" aria-label="Progression de complétion" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">
|
||||
<div class="progress-bar" style="width: 0%"></div>
|
||||
<div id="completion_progress" class="">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div id="completion_display" class="mb-2"></div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<div class="progress" role="progressbar" aria-label="Progression de complétion" aria-valuenow="0"
|
||||
aria-valuemin="0" aria-valuemax="100">
|
||||
<div class="progress-bar" style="width: 0%"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block javascripts %}
|
||||
{{ parent() }}
|
||||
<script src="{{ asset('js/mapbox/mapbox-gl.js') }}"></script>
|
||||
<script src='{{ asset('js/utils.js') }}'></script>
|
||||
<script src="{{ asset('js/mapbox/mapbox-gl.js') }}"></script>
|
||||
<script src='{{ asset('js/utils.js') }}'></script>
|
||||
<script>
|
||||
{% if commerce is not empty and mapbox_token is not empty and maptiler_token is not empty and commerce_overpass['@attributes'].lon is defined and commerce_overpass['@attributes'].lat is defined %}
|
||||
mapboxgl.accessToken = '{{ mapbox_token }}';
|
||||
map = new mapboxgl.Map({
|
||||
container: 'map',
|
||||
style: 'https://api.maptiler.com/maps/basic-v2/style.json?key={{ maptiler_token }}',
|
||||
center: [{{ commerce_overpass['@attributes'].lon }}, {{ commerce_overpass['@attributes'].lat }}],
|
||||
zoom: 17
|
||||
});
|
||||
mapboxgl.accessToken = '{{ mapbox_token }}';
|
||||
map = new mapboxgl.Map({
|
||||
container: 'map',
|
||||
style: 'https://api.maptiler.com/maps/basic-v2/style.json?key={{ maptiler_token }}',
|
||||
center: [{{ commerce_overpass['@attributes'].lon }}, {{ commerce_overpass['@attributes'].lat }}],
|
||||
zoom: 17
|
||||
});
|
||||
|
||||
new mapboxgl.Marker()
|
||||
.setLngLat([{{ commerce_overpass['@attributes'].lon }}, {{ commerce_overpass['@attributes'].lat }}])
|
||||
.setPopup(new mapboxgl.Popup({ offset: 25 }).setHTML('<h1>{{ commerce_overpass.tags_converted.name }}</h1>'))
|
||||
.addTo(map);
|
||||
new mapboxgl.Marker()
|
||||
.setLngLat([{{ commerce_overpass['@attributes'].lon }}, {{ commerce_overpass['@attributes'].lat }}])
|
||||
.setPopup(new mapboxgl.Popup({offset: 25}).setHTML('<h1>{{ commerce_overpass.tags_converted.name }}</h1>'))
|
||||
.addTo(map);
|
||||
{% endif %}
|
||||
|
||||
|
||||
// Ajouter un écouteur d'événement pour le redimensionnement de la fenêtre
|
||||
window.addEventListener('resize', () => {
|
||||
updateMapHeightForLargeScreens();
|
||||
});
|
||||
// Ajouter un écouteur d'événement pour le redimensionnement de la fenêtre
|
||||
window.addEventListener('resize', () => {
|
||||
updateMapHeightForLargeScreens();
|
||||
});
|
||||
|
||||
|
||||
function check_validity(e) {
|
||||
function check_validity(e) {
|
||||
|
||||
list_inputs_good_to_fill = [
|
||||
'input[name="commerce_tag_value__contact:email"]',
|
||||
'input[name="commerce_tag_value__contact:phone"]',
|
||||
'input[name="commerce_tag_value__contact:website"]',
|
||||
'input[name="commerce_tag_value__contact:mastodon"]',
|
||||
'input[name="commerce_tag_value__address"]',
|
||||
'input[name="custom_opening_hours"]',
|
||||
'input[name="commerce_tag_value__contact:street"]',
|
||||
'input[name="commerce_tag_value__contact:housenumber"]',
|
||||
'input[name="custom__cuisine"]',
|
||||
]
|
||||
list_inputs_good_to_fill = [
|
||||
'input[name="commerce_tag_value__contact:email"]',
|
||||
'input[name="commerce_tag_value__contact:phone"]',
|
||||
'input[name="commerce_tag_value__contact:website"]',
|
||||
'input[name="commerce_tag_value__contact:mastodon"]',
|
||||
'input[name="commerce_tag_value__address"]',
|
||||
'input[name="custom_opening_hours"]',
|
||||
'input[name="commerce_tag_value__contact:street"]',
|
||||
'input[name="commerce_tag_value__contact:housenumber"]',
|
||||
'input[name="custom__cuisine"]',
|
||||
]
|
||||
|
||||
list_inputs_good_to_fill.forEach(selector => {
|
||||
const input = document.querySelector(selector);
|
||||
if (input) {
|
||||
if (input.value.trim() !== '') {
|
||||
input.classList.add('good_filled');
|
||||
} else {
|
||||
input.classList.remove('good_filled');
|
||||
}
|
||||
}
|
||||
});
|
||||
let errors = [];
|
||||
document.querySelectorAll('.is-invalid').forEach(input => {
|
||||
input.classList.remove('is-invalid');
|
||||
});
|
||||
list_inputs_good_to_fill.forEach(selector => {
|
||||
const input = document.querySelector(selector);
|
||||
if (input) {
|
||||
if (input.value.trim() !== '') {
|
||||
input.classList.add('good_filled');
|
||||
} else {
|
||||
input.classList.remove('good_filled');
|
||||
}
|
||||
}
|
||||
});
|
||||
let errors = [];
|
||||
document.querySelectorAll('.is-invalid').forEach(input => {
|
||||
input.classList.remove('is-invalid');
|
||||
});
|
||||
|
||||
const nameInput = document.querySelector('input[name="commerce_tag_value__name"]');
|
||||
if (!nameInput.value.trim()) {
|
||||
errors.push("Le nom de l'établissement est obligatoire");
|
||||
nameInput.classList.add('is-invalid');
|
||||
}
|
||||
const nameInput = document.querySelector('input[name="commerce_tag_value__name"]');
|
||||
if (!nameInput.value.trim()) {
|
||||
errors.push("Le nom de l'établissement est obligatoire");
|
||||
nameInput.classList.add('is-invalid');
|
||||
}
|
||||
|
||||
const emailInput = document.querySelector('input[name="commerce_tag_value__contact:email"]');
|
||||
if (emailInput && emailInput.value) {
|
||||
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
||||
if (!emailRegex.test(emailInput.value)) {
|
||||
errors.push("L'adresse email n'est pas valide");
|
||||
emailInput.classList.add('is-invalid');
|
||||
}
|
||||
}
|
||||
const emailInput = document.querySelector('input[name="commerce_tag_value__contact:email"]');
|
||||
if (emailInput && emailInput.value) {
|
||||
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
||||
if (!emailRegex.test(emailInput.value)) {
|
||||
errors.push("L'adresse email n'est pas valide");
|
||||
emailInput.classList.add('is-invalid');
|
||||
}
|
||||
}
|
||||
|
||||
const phoneInput = document.querySelector('input[name="commerce_tag_value__contact:phone"]');
|
||||
if (phoneInput && phoneInput.value) {
|
||||
const phoneRegex = /^(\+33|0)[1-9](\d{2}){4}$/;
|
||||
if (!phoneRegex.test(phoneInput.value.replace(/\s/g, ''))) {
|
||||
errors.push("Le numéro de téléphone n'est pas valide");
|
||||
phoneInput.classList.add('is-invalid');
|
||||
}
|
||||
}
|
||||
const phoneInput = document.querySelector('input[name="commerce_tag_value__contact:phone"]');
|
||||
if (phoneInput && phoneInput.value) {
|
||||
const phoneRegex = /^(\+33|0)[1-9](\d{2}){4}$/;
|
||||
if (!phoneRegex.test(phoneInput.value.replace(/\s/g, ''))) {
|
||||
errors.push("Le numéro de téléphone n'est pas valide");
|
||||
phoneInput.classList.add('is-invalid');
|
||||
}
|
||||
}
|
||||
|
||||
if (errors.length > 0) {
|
||||
e.preventDefault();
|
||||
document.querySelector('#validation_messages').innerHTML = errors.join('<br>');
|
||||
document.querySelector('#validation_messages').classList.add('is-invalid');
|
||||
}
|
||||
}
|
||||
if (errors.length > 0) {
|
||||
e.preventDefault();
|
||||
document.querySelector('#validation_messages').innerHTML = errors.join('<br>');
|
||||
document.querySelector('#validation_messages').classList.add('is-invalid');
|
||||
}
|
||||
}
|
||||
|
||||
check_validity ? check_validity() : null;
|
||||
check_validity ? check_validity() : null;
|
||||
|
||||
</script>
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
|
@ -4,12 +4,12 @@
|
|||
{# {{ dump(commerce_overpass)}} #}
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-2">
|
||||
<label for="commerce_tag_value__addr:housenumber">{{'display.keys.contact:housenumber'|trans}}</label>
|
||||
<input type="text" class="form-control text-end" name="commerce_tag_value__contact:housenumber" value="{% if commerce_overpass.tags_converted['contact:housenumber'] is defined %}{{ commerce_overpass.tags_converted['contact:housenumber'] }}{% endif %}">
|
||||
<label for="commerce_tag_value__contact:housenumber">{{'display.keys.contact:housenumber'|trans}}</label>
|
||||
<input type="text" class="form-control text-end" name="commerce_tag_value__contact:housenumber" value="{% if commerce_overpass.tags_converted['contact:housenumber'] is defined %}{{ commerce_overpass.tags_converted['contact:housenumber'] }}{% endif %}">
|
||||
</div>
|
||||
<div class="col-12 col-md-10">
|
||||
<label for="commerce_tag_value__contact:street">{{'display.keys.contact:street'|trans}}</label>
|
||||
<input type="text" class="form-control" name="commerce_tag_value__contact:street" value="{% if commerce_overpass.tags_converted['contact:street'] is defined %}{{ commerce_overpass.tags_converted['contact:street'] }}{% endif %}">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__contact:street" value="{% if commerce_overpass.tags_converted['contact:street'] is defined %}{{ commerce_overpass.tags_converted['contact:street'] }}{% endif %}">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,22 +1,32 @@
|
|||
<div id="clim" class="mb-4">
|
||||
<h2 class="mb-3 title">
|
||||
<label for="commerce_tag_value__clim">
|
||||
<i class="bi bi-thermometer-half"></i>
|
||||
|
||||
{{'display.keys.clim'|trans}}</label>
|
||||
</h2>
|
||||
<div class="form-part mx-3">
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__air_conditioning" id="clim_yes" value="yes" {% if commerce.tags_converted.air_conditioning is defined and commerce.tags_converted.air_conditioning == 'yes' %}checked{% endif %}>
|
||||
<label class="form-check-label" for="clim_yes">Oui</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__air_conditioning" id="clim_no" value="no" {% if commerce.tags_converted.air_conditioning is defined and commerce.tags_converted.air_conditioning == 'no' %}checked{% endif %}>
|
||||
<label class="form-check-label" for="clim_no">Non</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__air_conditioning" id="clim_unknown" value="" {% if commerce.tags_converted.air_conditioning is not defined or commerce.tags_converted.air_conditioning == '' %}checked{% endif %}>
|
||||
<label class="form-check-label" for="clim_unknown">Je ne sais pas</label>
|
||||
</div>
|
||||
<div id="clim" class="mb-4 row">
|
||||
<h2 class="mb-3 title col-12 col-sm-6">
|
||||
<label for="commerce_tag_value__clim">
|
||||
<i class="bi bi-thermometer-half"></i>
|
||||
|
||||
{{ 'display.keys.clim'|trans }}</label>
|
||||
</h2>
|
||||
<div class="form-part mx-3 col-12 col-sm-6">
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__air_conditioning" id="clim_yes"
|
||||
value="yes"
|
||||
{% if commerce_overpass.tags_converted is defined and commerce_overpass.tags_converted.air_conditioning is defined and
|
||||
commerce_overpass.tags_converted.air_conditioning == 'yes' %}checked{% endif %}
|
||||
>
|
||||
<label class="form-check-label" for="clim_yes">Oui</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__air_conditioning" id="clim_no"
|
||||
value="no"
|
||||
{% if commerce_overpass.tags_converted is defined and commerce_overpass.tags_converted.air_conditioning is defined and
|
||||
commerce_overpass.tags_converted.air_conditioning == 'no' %}checked{% endif %}
|
||||
>
|
||||
<label class="form-check-label" for="clim_no">Non</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__air_conditioning" id="clim_unknown"
|
||||
value=""
|
||||
{% if commerce_overpass.tags_converted.air_conditioning is not defined or commerce_overpass.tags_converted.air_conditioning == '' %}checked{% endif %}>
|
||||
<label class="form-check-label" for="clim_unknown">Je ne sais pas</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -12,50 +12,50 @@
|
|||
<div class="col-12 p-4">
|
||||
<input type="text" class="form-control d-none" name="commerce_tag_value__cuisine"
|
||||
placeholder="french;italian"
|
||||
value="{% if commerce.tags_converted.cuisine is defined %}{{ commerce.tags_converted.cuisine }}{% endif %}">
|
||||
value="{% if commerce_overpass.tags_converted.cuisine is defined %}{{ commerce_overpass.tags_converted.cuisine }}{% endif %}">
|
||||
<small class="form-text text-muted">{{'display.help.cuisine'|trans}}</small>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_chinoise" value="chinese" {% if commerce.tags_converted.cuisine is defined and 'chinese' in commerce.tags_converted.cuisine %}checked{% endif %}>
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_chinoise" value="chinese" {% if commerce_overpass.tags_converted.cuisine is defined and 'chinese' in commerce_overpass.tags_converted.cuisine %}checked{% endif %}>
|
||||
<label class="form-check-label col-12" for="cuisine_chinoise">Chinoise</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_coreenne" value="korean" {% if commerce.tags_converted.cuisine is defined and 'korean' in commerce.tags_converted.cuisine %}checked{% endif %}>
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_coreenne" value="korean" {% if commerce_overpass.tags_converted.cuisine is defined and 'korean' in commerce_overpass.tags_converted.cuisine %}checked{% endif %}>
|
||||
<label class="form-check-label col-12" for="cuisine_coreenne">Coréenne</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_francaise" value="french" {% if commerce.tags_converted.cuisine is defined and 'french' in commerce.tags_converted.cuisine %}checked{% endif %}>
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_francaise" value="french" {% if commerce_overpass.tags_converted.cuisine is defined and 'french' in commerce_overpass.tags_converted.cuisine %}checked{% endif %}>
|
||||
<label class="form-check-label col-12" for="cuisine_francaise">Française</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_indienne" value="indian" {% if commerce.tags_converted.cuisine is defined and 'indian' in commerce.tags_converted.cuisine %}checked{% endif %}>
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_indienne" value="indian" {% if commerce_overpass.tags_converted.cuisine is defined and 'indian' in commerce_overpass.tags_converted.cuisine %}checked{% endif %}>
|
||||
<label class="form-check-label col-12" for="cuisine_indienne">Indienne</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_italienne" value="italian" {% if commerce.tags_converted.cuisine is defined and 'italian' in commerce.tags_converted.cuisine %}checked{% endif %}>
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_italienne" value="italian" {% if commerce_overpass.tags_converted.cuisine is defined and 'italian' in commerce_overpass.tags_converted.cuisine %}checked{% endif %}>
|
||||
<label class="form-check-label col-12" for="cuisine_italienne">Italienne</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_japonaise" value="japanese" {% if commerce.tags_converted.cuisine is defined and 'japanese' in commerce.tags_converted.cuisine %}checked{% endif %}>
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_japonaise" value="japanese" {% if commerce_overpass.tags_converted.cuisine is defined and 'japanese' in commerce_overpass.tags_converted.cuisine %}checked{% endif %}>
|
||||
<label class="form-check-label col-12" for="cuisine_japonaise">Japonaise</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_libanaise" value="lebanese" {% if commerce.tags_converted.cuisine is defined and 'lebanese' in commerce.tags_converted.cuisine %}checked{% endif %}>
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_libanaise" value="lebanese" {% if commerce_overpass.tags_converted.cuisine is defined and 'lebanese' in commerce_overpass.tags_converted.cuisine %}checked{% endif %}>
|
||||
<label class="form-check-label col-12" for="cuisine_libanaise">Libanaise</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_thailandaise" value="thai" {% if commerce.tags_converted.cuisine is defined and 'thai' in commerce.tags_converted.cuisine %}checked{% endif %}>
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_thailandaise" value="thai" {% if commerce_overpass.tags_converted.cuisine is defined and 'thai' in commerce_overpass.tags_converted.cuisine %}checked{% endif %}>
|
||||
<label class="form-check-label col-12" for="cuisine_thailandaise">Thaïlandaise</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_turque" value="turkish" {% if commerce.tags_converted.cuisine is defined and 'turkish' in commerce.tags_converted.cuisine %}checked{% endif %}>
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_turque" value="turkish" {% if commerce_overpass.tags_converted.cuisine is defined and 'turkish' in commerce_overpass.tags_converted.cuisine %}checked{% endif %}>
|
||||
<label class="form-check-label col-12" for="cuisine_turque">Turque</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_pizza" value="pizza" {% if commerce.tags_converted.cuisine is defined and 'pizza' in commerce.tags_converted.cuisine %}checked{% endif %}>
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_pizza" value="pizza" {% if commerce_overpass.tags_converted.cuisine is defined and 'pizza' in commerce_overpass.tags_converted.cuisine %}checked{% endif %}>
|
||||
<label class="form-check-label col-12" for="cuisine_pizza">Pizza</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_kebab" value="kebab" {% if commerce.tags_converted.cuisine is defined and 'kebab' in commerce.tags_converted.cuisine %}checked{% endif %}>
|
||||
<input class="form-check-input col-2" type="checkbox" name="cuisine_type" id="cuisine_kebab" value="kebab" {% if commerce_overpass.tags_converted.cuisine is defined and 'kebab' in commerce_overpass.tags_converted.cuisine %}checked{% endif %}>
|
||||
<label class="form-check-label col-12" for="cuisine_kebab">Kebab</label>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue