Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ CHANGELOG
- Filter by multiple structures on Blades list (#3646)
- Add a multiselect to filter the Blades by more than one manager
- Filter by begin date by default on touristic events in APIv2 (#3597)
- Add model LinePictogram for each line (#3327)
- Add fixtures for LinePictogram (#3327)

2.99.0 (2023-07-18)
-----------------------
Expand Down
7 changes: 7 additions & 0 deletions docs/install/advanced-configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,14 @@ Correspond to the format used in export of lines. Used in csv of signage.
* *bladenumber is the number of the blade*
* *linenumber is the number of the line*

If you want to add default pictograms of national parks, you can execute this command:

::

sudo geotrek loaddata /opt/geotrek-admin/lib/python*/site-packages/geotrek/signage/fixtures/pictograms_pn.json
cp /opt/geotrek-admin/lib/python*/site-packages/geotrek/signage/fixtures/upload/* /opt/geotrek-admin/var/media/upload/


**Screenshots**

::
Expand Down
9 changes: 8 additions & 1 deletion geotrek/signage/admin.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.contrib import admin

from geotrek.common.mixins.actions import MergeActionMixin
from geotrek.signage.models import SignageType, Color, Sealing, Direction, BladeType
from geotrek.signage.models import LinePictogram, SignageType, Color, Sealing, Direction, BladeType


class ColorBladeAdmin(MergeActionMixin, admin.ModelAdmin):
Expand All @@ -14,6 +14,12 @@ class DirectionBladeAdmin(MergeActionMixin, admin.ModelAdmin):
merge_field = 'label'


class LinePictogramAdmin(MergeActionMixin, admin.ModelAdmin):
search_fields = ('label',)
merge_field = 'label'
list_display = ('label', 'pictogram_img', 'code')


class SealingAdmin(MergeActionMixin, admin.ModelAdmin):
search_fields = ('label',)
merge_field = 'label'
Expand Down Expand Up @@ -127,3 +133,4 @@ def get_list_filter(self, request):
admin.site.register(Sealing, SealingAdmin)
admin.site.register(Direction, DirectionBladeAdmin)
admin.site.register(BladeType, BladeTypeAdmin)
admin.site.register(LinePictogram, LinePictogramAdmin)
9 changes: 0 additions & 9 deletions geotrek/signage/fixtures/basic.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,6 @@
"date_insert": "2014-02-12T11:21:48.961Z"
}
},
{
"pk": 3,
"model": "signage.bladetype",
"fields": {
"label": "Directionnel",
"date_update": "2014-02-12T11:21:48.961Z",
"date_insert": "2014-02-12T11:21:48.961Z"
}
},
{
"pk": 1,
"model": "signage.color",
Expand Down
227 changes: 227 additions & 0 deletions geotrek/signage/fixtures/pictograms_pn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@
[
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/011.svg",
"label": "No dogs, not even on leashes",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/012.svg",
"label": "No noise, no disturbance",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/021.svg",
"label": "No picking or taking",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/022.svg",
"label": "No guns",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/023.svg",
"label": "No fishing within fifty meters of the shoreline",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/031.svg",
"label": "No trash",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/033.svg",
"label": "No fire",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/034.svg",
"label": "No smoking",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/041.svg",
"label": "No camping",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/042.svg",
"label": "No tramping",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/043.svg",
"label": "Motorhomes prohibited",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/051.svg",
"label": "No car",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/052.svg",
"label": "No motorcycle",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/053.svg",
"label": "No off-road bike",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/054.svg",
"label": "No anchoring",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/055.svg",
"label": "No horseback riding activity",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/056.svg",
"label": "No hang-gliding or other air sports",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/057.svg",
"label": "No paragliding or other air sports",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/058.svg",
"label": "Stay on the paths",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/060.svg",
"label": "Do not collect minerals",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/061.svg",
"label": "Do not collect animals",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/069.svg",
"label": "Collecting turtles prohibited",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/070.svg",
"label": "No picking mushrooms",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/111.svg",
"label": "Dog on leash",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
},
{
"model": "signage.linepictogram",
"fields": {
"pictogram": "upload/153.svg",
"label": "Camping from 7pm to 9am",
"date_update": "2023-08-08T15:35:12.189Z",
"date_insert": "2023-08-08T15:35:12.189Z"
}
}
]
75 changes: 75 additions & 0 deletions geotrek/signage/fixtures/upload/011.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading