Merge pull request #224 from camptocamp/condition

Allow to customize condition for mobile display
camptocamp · Jul 8, 2020 · d5038ea · d5038ea
2 parents 490821d + ffa994a
commit d5038ea
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/c2cgeoform/__init__.py b/c2cgeoform/__init__.py
@@ -30,6 +30,7 @@
     'geolocationTooltip': _('Zoom to current location'),
     'zoomInTipLabel': _('Zoom in'),
     'zoomOutTipLabel': _('Zoom out'),
+    'mobile': None
 }
 
 

diff --git a/c2cgeoform/scaffolds/c2cgeoform/acceptance_tests/excavation_test.py_tmpl b/c2cgeoform/scaffolds/c2cgeoform/acceptance_tests/excavation_test.py_tmpl
@@ -16,7 +16,7 @@ class TestExcavationViews():
             assert [situation.name] == list(label.stripped_strings)
             assert str(situation.id) == input['value']
             if situation in excavation.situations:
-                assert 'True' == input['checked']
+                assert 'checked' == input['checked']
                 assert resp.form.get('situations', index=i).checked
             else:
                 assert 'checked' not in input

diff --git a/c2cgeoform/static/src/index.js b/c2cgeoform/static/src/index.js
@@ -101,7 +101,14 @@ export function initMapWidget(oid, options) {
     map.getView().fit(options.view.initialExtent)
   }
   if (!options.readonly) {
-    const interactions = addInteractions({ map, source, type, input, multi })
+    const interactions = addInteractions({
+      map,
+      source,
+      type,
+      input,
+      multi,
+      mobile: options.mobile,
+    })
     addControls(
       Object.assign(options, {
         target,

diff --git a/c2cgeoform/static/src/interactions.js b/c2cgeoform/static/src/interactions.js
@@ -21,10 +21,11 @@ export function addInteractions(options) {
     store(options.source.getFeatures()[0]?.getGeometry())
   )
   // Mobile drawing
-  if (
-    window.matchMedia('(max-width: 767px)').matches &&
-    interactionOptions.type === 'Point'
-  ) {
+  const condition =
+    options.mobile !== undefined
+      ? options.mobile
+      : window.matchMedia('(max-width: 767px)').matches
+  if (condition && interactionOptions.type === 'Point') {
     let map = options.map
     draw.setActive(false)
     modify.setActive(false)

diff --git a/c2cgeoform/static/src/main.scss b/c2cgeoform/static/src/main.scss
@@ -23,6 +23,7 @@
       bottom: 0;
       margin: auto;
       z-index: 100;
+      max-width: 10em;
     }
     &:after {
       transform: rotate(0deg);