initial support for health district selection (work in progress)

site-osm-baustelle
Hartmut Holzgraefe 2022-09-10 19:16:22 +00:00
rodzic 0147722b36
commit 71d43bca2a
7 zmienionych plików z 146 dodań i 5 usunięć

Wyświetl plik

@ -0,0 +1,12 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('maposmatic', '0026_maprenderingjob_indexer'),
]
operations = [
migrations.RunSQL("UPDATE maposmatic_maprenderingjob SET indexer = 'StreetIndex' WHERE indexer = 'Street'"),
migrations.RunSQL("UPDATE maposmatic_maprenderingjob SET indexer = 'PoiIndex' WHERE indexer = 'Poi'"),
]

Wyświetl plik

@ -43,12 +43,15 @@
<link rel="stylesheet" href="/media/node_modules/@fortawesome/fontawesome-free/css/all.css">
<script src="/media/node_modules/jquery/dist/jquery.js"></script>
<script src="/media/node_modules/popper.js/dist/umd/popper.js"></script>
<script src="/media/node_modules/bootstrap/dist/js/bootstrap.js"></script>
<link rel="stylesheet" href="/media/node_modules/bootstrap/dist/css/bootstrap.css" />
<link rel="stylesheet" href="/media/node_modules/mdbootstrap/css/bootstrap.css">
<link rel="stylesheet" href="/media/node_modules/mdbootstrap/css/mdb.min.css">
<link rel="stylesheet" href="/media/node_modules/mdbootstrap/css/style.css">
<script type="text/javascript" src="/media/node_modules/mdbootstrap/js/jquery.min.js"></script>
<script type="text/javascript" src="/media/node_modules/mdbootstrap/js/popper.min.js"></script>
<script type="text/javascript" src="/media/node_modules/mdbootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/media/node_modules/mdbootstrap/js/mdb.min.js"></script>
<script src="/media/node_modules/leaflet/dist/leaflet.js"></script>
<link rel="stylesheet" href="/media/node_modules/leaflet/dist/leaflet.css" />

Wyświetl plik

@ -0,0 +1,103 @@
{% extends "maposmatic/base.html" %}
{% comment %}
coding: utf-8
maposmatic, the web front-end of the MapOSMatic city map generation system
Copyright (C) 2022 Hartmut Holzgraefe
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
{% endcomment %}
{% load i18n %}
{% load l10n %}
{% load extratags %}
{% block title %}{% trans "Congo Health Map" %}{% endblock %}
{% block page %}
<div class="treeview w-20 border">
<h6 class="pt-3 pl-3">Folders</h6>
<hr>
<ul class="mb-1 pl-3 pb-2">
<li><i class="fas fa-angle-right rotate"></i>
<span><i class="far fa-envelope-open ic-w mx-1"></i>Mail</span>
<ul class="nested">
<li><i class="far fa-bell ic-w mr-1"></i>Offers</li>
<li><i class="far fa-address-book ic-w mr-1"></i>Contacts</li>
<li><i class="fas fa-angle-right rotate"></i>
<span><i class="far fa-calendar-alt ic-w mx-1"></i>Calendar</span>
<ul class="nested">
<li><i class="far fa-clock ic-w mr-1"></i>Deadlines</li>
<li><i class="fas fa-users ic-w mr-1"></i>Meetings</li>
<li><i class="fas fa-basketball-ball ic-w mr-1"></i>Workouts</li>
<li><i class="fas fa-mug-hot ic-w mr-1"></i>Events</li>
</ul>
</li>
</ul>
</li>
<li><i class="fas fa-angle-right rotate"></i>
<span><i class="far fa-folder-open ic-w mx-1"></i>Inbox</span>
<ul class="nested">
<li><i class="far fa-folder-open ic-w mr-1"></i>Admin</li>
<li><i class="far fa-folder-open ic-w mr-1"></i>Corporate</li>
<li><i class="far fa-folder-open ic-w mr-1"></i>Finance</li>
<li><i class="far fa-folder-open ic-w mr-1"></i>Other</li>
</ul>
</li>
<li><i class="fas fa-angle-right rotate"></i>
<span><i class="far fa-gem ic-w mx-1"></i>Favourites</span>
<ul class="nested">
<li><i class="fas fa-pepper-hot ic-w mr-1"></i>Restaurants</li>
<li><i class="far fa-eye ic-w mr-1"></i>Places</li>
<li><i class="fas fa-gamepad ic-w mr-1"></i>Games</li>
<li><i class="fas fa-cocktail ic-w mr-1"></i>Coctails</li>
<li><i class="fas fa-pizza-slice ic-w mr-1"></i>Food</li>
</ul>
</li>
<li><i class="far fa-comment ic-w mr-1"></i>Notes</li>
<li><i class="fas fa-cogs ic-w mr-1"></i>Settings</li>
<li><i class="fas fa-desktop ic-w mr-1"></i>Devices</li>
<li><i class="fas fa-trash-alt ic-w mr-1"></i>Deleted Items</li>
</ul>
</div>
<!--
<div class="treeview w-20 border">
<h6 class="pt-3 pl-3">foobar</h6><hr/>
<ul class="mb-1 pl-3 pb-2">
<li>foo
<ul class="nested">
<li>foo1</li>
<li>foo2</li>
</ul>
</li>
<li>bar
<ul class="nested">
<li>bar1</li>
<li>bar2</li>
</ul>
</li>
</ul>
</div>
-->
{% endblock %}
{% block extrajs %}
$(document).ready(function() {
$('.treeview').mdbTreeview();
});
{% endblock %}

Wyświetl plik

@ -89,6 +89,13 @@ def privacy(request):
{ }
)
def congo(request):
"""The congo health map page."""
return render(request,
'maposmatic/congo.html',
{ }
)
def documentation_user_guide(request):
"""The user guide page."""
return render(request,

Wyświetl plik

@ -52,6 +52,11 @@
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
"integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
},
"bootstrap-material-design": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/bootstrap-material-design/-/bootstrap-material-design-4.1.3.tgz",
"integrity": "sha512-jOB9io76BKLxwF+IAgObFH9f88ityqOiYsQe9Aa8m88h7sSP3eFL1K8ygb0FsYyIiVm194iodg9i4GMOSlLeRA=="
},
"brfs": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz",
@ -493,6 +498,11 @@
"vlq": "^0.2.2"
}
},
"mdbootstrap": {
"version": "4.20.0",
"resolved": "https://registry.npmjs.org/mdbootstrap/-/mdbootstrap-4.20.0.tgz",
"integrity": "sha512-eIxaYsvHct2BKqkJWphh6j7nFQXHh9NjbbN7a+dctfrVsKaydNW5XpKIxmq2tDSb9+XYGm9hK7hMTlHgeV6wdw=="
},
"merge-source-map": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz",

Wyświetl plik

@ -18,6 +18,7 @@
"@fortawesome/fontawesome-free": "^5.12.0",
"@mapbox/leaflet-omnivore": "^0.3.4",
"bootstrap": "^4.3.1",
"bootstrap-material-design": "^4.1.3",
"fastsearch": "^1.11.1",
"fastselect": "^0.7.3",
"flag-icon-css": "^3.3.0",
@ -31,6 +32,7 @@
"leaflet.locatecontrol": "^0.66.2",
"leaflet.locationfilter": "git+https://github.com/marcoqu/leaflet-locationfilter.git",
"leaflet.restoreview": "git+https://github.com/makinacorpus/Leaflet.RestoreView.git",
"mdbootstrap": "^4.20.0",
"minimist": "^1.2.6",
"popper.js": "^1.15.0"
}

Wyświetl plik

@ -140,6 +140,10 @@ urlpatterns = [
views.heatmap,
name='heatmap'),
url(r'^apis/heatdata/(\d*)$', apis.heatdata),
url(r'^congo/$',
views.congo,
name='congo'),
]
if settings.DEBUG: