diff --git a/app/templates/nabidky_mapa.html b/app/templates/nabidky_mapa.html
index 0451123d..245a88b5 100644
--- a/app/templates/nabidky_mapa.html
+++ b/app/templates/nabidky_mapa.html
@@ -13,7 +13,7 @@
Mapa nabídek očkování
@@ -58,14 +62,14 @@ Mapa nabídek očkování
icon.appendChild(image);
var options = {
- title: "{{ item.nazev_ordinace }}",
+ title: "{{ item.nazev_cely }}",
url: icon
}
var marker = new SMap.Marker(c, null, options);
var card = new SMap.Card();
card.setSize(450, null);
- card.getHeader().innerHTML = "{{ item.nazev_ordinace }}";
+ card.getHeader().innerHTML = "{{ item.nazev_cely }}";
{% if item.nrpzs_kod %}
card.getBody().innerHTML = 'Detail nabídky';
{% endif %}
@@ -76,7 +80,8 @@ Mapa nabídek očkování
marker.filter_data = {
illness: '{{ item.nemoc }}',
adults: {{ item.dospeli | lower }},
- children: {{ item.deti | lower }}
+ children: {{ item.deti | lower }},
+ nonregistered: {{ item.neregistrovani | lower }}
}
coords.push(c);
@@ -95,6 +100,7 @@ Mapa nabídek očkování
const illnessValue = $("#free-vaccines-illness").val()
const adultsValue = $("#free-vaccines-adults")[0].checked;
const childrenValue = $("#free-vaccines-children")[0].checked;
+ const nonregisteredValue = $("#free-vaccines-nonregistered")[0].checked;
layer.removeAll();
var markers_filtered = [];
@@ -105,8 +111,11 @@ Mapa nabídek očkování
const illness = marker.filter_data.illness;
const adults = marker.filter_data.adults;
const children = marker.filter_data.children;
+ const nonregistered = marker.filter_data.nonregistered;
- if ((!illnessValue || illness === illnessValue) && ((adultsValue && adults) || (childrenValue && children))) {
+ if ((!illnessValue || illness === illnessValue)
+ && ((adultsValue && adults) || (childrenValue && children))
+ && (!nonregisteredValue || nonregistered)) {
markers_filtered.push(marker);
}
}
@@ -130,6 +139,9 @@ Mapa nabídek očkování
}
filterMarkers();
});
+ $("#free-vaccines-nonregistered").change(function () {
+ filterMarkers();
+ });
filterMarkers();
});
diff --git a/app/templates/praktici_admin.html b/app/templates/praktici_admin.html
index 2fe161b9..8fcd95d6 100644
--- a/app/templates/praktici_admin.html
+++ b/app/templates/praktici_admin.html
@@ -167,7 +167,7 @@ Editovat své záznamy
- Pokud jste heslo zapomněli, či máte jiný problém, napište nám na info@opendatalab.cz.
+ Pokud jste heslo zapomněli, či máte jiný problém, napište nám na marek@susicky.net.
diff --git a/scripts/create_static_pages_offers.sh b/scripts/create_static_pages_offers.sh
index 44f0f6ba..b8bd33a9 100644
--- a/scripts/create_static_pages_offers.sh
+++ b/scripts/create_static_pages_offers.sh
@@ -13,6 +13,14 @@ if [ $wget_res -ne 0 ]; then
exit $wget_res
fi
+wget -P $WEB_TMP_DIR/127.0.0.1:5000 -e robots=off --adjust-extension http://127.0.0.1:5000/nabidky_mapa
+wget_res=$?
+
+if [ $wget_res -ne 0 ]; then
+ rm -r $WEB_TMP_DIR
+ exit $wget_res
+fi
+
wget -P $WEB_TMP_DIR/127.0.0.1:5000 -e robots=off --adjust-extension http://127.0.0.1:5000/praktici
wget_res=$?
diff --git a/scripts/cron b/scripts/cron
index 078663c1..0ed4fdb3 100644
--- a/scripts/cron
+++ b/scripts/cron
@@ -1,14 +1,10 @@
# daily fetcher
20 6 * * * bash /home/ockovani/prd/app/scripts/execute_action.sh 15481697
-
# hourly fetcher - disabled, centers probably don't update that often
# 30 7-22 * * * bash /home/ockovani/prd/app/scripts/execute_action.sh 15481698
-
# monthly fetcher
00 5 5 * * bash /home/ockovani/prd/app/scripts/execute_action.sh 16635318
-
# update GP page
2/5 * * * * bash /home/ockovani/prd/app/scripts/execute_action.sh 94783487
-
# post tweet - disabled
# 35 7 * * * bash /home/ockovani/prd/app/scripts/execute_action.sh 6797956