Changeset 9819 for src/django_gheat/wlheatmap
- Timestamp:
- Dec 23, 2011, 8:31:50 AM (13 years ago)
- Location:
- src/django_gheat/wlheatmap
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
src/django_gheat/wlheatmap/filters.py
r9778 r9819 18 18 sum_ssid = set() 19 19 for mr in MeetRondje.objects.filter(gebruiker=user).order_by('naam'): 20 # Get list if acces points found in the specific 'Meting', and make this is list.20 # Get list if accesspoints found in the specific 'Meting', and make this is list. 21 21 wirelessleiden_ssid = Meting.objects.filter(meetrondje=mr, 22 acces point__organization__name__startswith='Wireless').\23 values_list('acces point__ssid',flat=True).\24 order_by('acces point__ssid').distinct()22 accesspoint__organization__name__startswith='Wireless').\ 23 values_list('accesspoint__ssid',flat=True).\ 24 order_by('accesspoint__ssid').distinct() 25 25 # The explicit cast to list is required as django lists are special and 26 26 # cannot be handled by simplejson. -
src/django_gheat/wlheatmap/nodelist.py
r9596 r9819 47 47 }) 48 48 49 objquery = Acces point.objects.filter(**filter).distinct()49 objquery = Accesspoint.objects.filter(**filter).distinct() 50 50 nodelist = serializers.serialize('json', objquery, fields=('fields','ssid')) 51 51 -
src/django_gheat/wlheatmap/static/heatmap_extensions.js
r9816 r9819 313 313 initialize: function(name, options) { 314 314 var url = [ 315 "tile/${z}/${x},${y}.png?&colour=" + colour + "&acces point__ssid=" + node315 "tile/${z}/${x},${y}.png?&colour=" + colour + "&accesspoint__ssid=" + node 316 316 ]; 317 317 options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options); … … 357 357 } 358 358 if (wlnode != 'all') { 359 query_array.push('acces point__ssid=' + wlnode);359 query_array.push('accesspoint__ssid=' + wlnode); 360 360 } 361 361 if (nodetype) { -
src/django_gheat/wlheatmap/templates/home.html
r9816 r9819 47 47 <select id="select_node" style="width:104px"></select> Node<br /> 48 48 <select id="select_nodetype" style="width:104px"> 49 <option value="acces point__ssid__icontains=ap-WirelessLeiden">WL Nodes</option>50 <option value="acces point__ssid__icontains=WirelessLeiden">WL Nodes & WL InterLinks</option>49 <option value="accesspoint__ssid__icontains=ap-WirelessLeiden">WL Nodes</option> 50 <option value="accesspoint__ssid__icontains=WirelessLeiden">WL Nodes & WL InterLinks</option> 51 51 <option value="">Alle AccessPoints (ook niet WL)</option> 52 52 </select> Type<br /> -
src/django_gheat/wlheatmap/templates/js/LayerBase.js
r9653 r9819 162 162 163 163 /** 164 * All acces points164 * All accesspoints 165 165 */ 166 166 OpenLayers.Layer.OSM.Overlay2 = OpenLayers.Class(OpenLayers.Layer.OSM, { … … 182 182 initialize: function(name, options) { 183 183 var url = get_balanced_urls('{{ settings.DJANGO_CDN_DOMAINS_PROTOCOL }}', {{ settings.DJANGO_CDN_DOMAINS|safe }}, 184 '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=255,0,0&acces point__organization__name__startswith=Wireless');184 '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=255,0,0&accesspoint__organization__name__startswith=Wireless'); 185 185 options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options); 186 186 var newArguments = [name, url, options];
Note:
See TracChangeset
for help on using the changeset viewer.