0001-backoffice-display-status-coloured-markers-on-maps-1.patch

Serghei Mihai, 11 avril 2017 13:51

Voir les différences: en ligne côte à côte

Subject: [PATCH] backoffice: display status-coloured markers on maps (#15533)

 tests/test_backoffice_pages.py      |  4 ++++
 wcs/backoffice/management.py        |  6 ++++++
 wcs/qommon/static/css/dc2/admin.css | 14 ++++++++++++++
 wcs/qommon/static/js/qommon.map.js  | 23 +++++++++--------------
 4 files changed, 33 insertions(+), 14 deletions(-)

         resp = app.get('/backoffice/management/form-title/geojson')
         assert len(resp.json['features']) == 1
         assert resp.json['features'][0]['geometry']['coordinates'] == [2.32, 48.83]
         assert 'status_colour' in resp.json['features'][0]['properties']
         assert resp.json['features'][0]['properties']['status_colour'] == '#66FF00'
         resp = app.get('/backoffice/management/form-title/geojson?filter=pending&filter-status=on')
         assert len(resp.json['features']) == 1
-...
         resp = app.get('/backoffice/management/geojson')
         assert len(resp.json['features']) == 17
         assert resp.json['features'][0]['geometry']['coordinates'] == [2.32, 48.83]
         for feature in resp.json['features']:
             assert feature['properties']['status_colour'] == '#66FF00'
         resp = app.get('/backoffice/management/geojson?q=aa')
         assert len(resp.json['features']) == 5

             if not formdata.geolocations or not geoloc_key in formdata.geolocations:
                 continue
             coords = formdata.geolocations[geoloc_key]
             try:
                 status_colour = formdata.get_status().colour
             except AttributeError:
                 status_colour = 'ffffff'
             feature = {
                 'type': 'Feature',
                 'properties': {
                     'name':  formdata.get_display_name(),
                     'url': formdata.get_url(backoffice=True),
                     'status_colour': '#%s' % status_colour
                 },
                 'geometry': {
                     'type': 'Point',

     	height: 70vh;
     	margin-bottom: 1em;
+    }
     /* Styling for Leaflet's markers */
     div.leaflet-div-icon span {
     	width: 2.3rem;
     	height: 2.3rem;
     	display: block;
     	left: -1rem;
     	top: -1rem;
     	position: relative;
     	border-radius: 11rem 6rem 0.8rem;
     	transform: scale(1, 1.3) rotate(45deg);
     	border: 1px solid #aaa;
+    }

            $map_widget.parent().parent().find('label').addClass('activity')
            map.locate({timeout: 10000, maximumAge: 300000, enableHighAccuracy: false});
+         }
          if ($(this).data('geojson-url')) {
            $.getJSON($(this).data('geojson-url'), function(data) {
              var geo_json = L.geoJson(data, {
                onEachFeature: function(feature, layer) {
                  layer.on('click', function() {
                    window.location = feature.properties.url;
                    return false;
                  });
+               }
              });
              map.fitBounds(geo_json.getBounds());
              geo_json.addTo(map);
            });
+         }
         $(document).on('backoffice-filter-change', function(event, listing_settings) {
           $('.qommon-map').each(function() {
-...
                      window.location = feature.properties.url;
                      return false;
                    });
                  },
                  pointToLayer: function (feature, latlng) {
                      var markerStyles = "background-color: "+feature.properties.status_colour+";";
                      marker = L.divIcon({iconAnchor: [0, 24],
                                          html: '<span style="' + markerStyles + '" />'});
                      return L.marker(latlng, {icon: marker});
+                 }
                });
                map.fitBounds(geo_json.getBounds());
-...
              });
           });
         });
         if ($(this).data('geojson-url')) {
             $(document).trigger('backoffice-filter-change', $('form#listing-settings').serialize());
+        }
       });
     });
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-backoffice-display-status-coloured-markers-on-maps-1.patch