From 06653d53b2b3972808d08b34f125875783bebfdf Mon Sep 17 00:00:00 2001 From: Joachim Lusiardi Date: Tue, 21 May 2024 20:54:09 +0200 Subject: [PATCH 1/8] remove link in header --- app/templates/layout.html | 1 - 1 file changed, 1 deletion(-) diff --git a/app/templates/layout.html b/app/templates/layout.html index 0dcbe32..8ad4882 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -5,7 +5,6 @@
  • Create Regular Cost
  • Statistics
  • Account
    • -
  • Plan Pitstop
    • {% if current_user.has_role('admin') %}
  • Admin
    • {% endif %} -- 2.30.2 From fc1a64ac0cc9a50842fbb34502b4017224ec13e1 Mon Sep 17 00:00:00 2001 From: Joachim Lusiardi Date: Tue, 21 May 2024 20:58:41 +0200 Subject: [PATCH 2/8] remove filling station selector --- app/templates/account.html | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/app/templates/account.html b/app/templates/account.html index 182865b..156696b 100644 --- a/app/templates/account.html +++ b/app/templates/account.html @@ -66,32 +66,6 @@ -
    -
    Filling Stations
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    Account
    -- 2.30.2 From 2ce0b3a34a07c171c8c88bcf6c7887f39298fa99 Mon Sep 17 00:00:00 2001 From: Joachim Lusiardi Date: Tue, 21 May 2024 21:03:53 +0200 Subject: [PATCH 3/8] remove more stuff --- app/routes/pitstop.py | 83 ------------- app/static/js/fillingstations.js | 184 ----------------------------- app/templates/layout.html | 1 - app/templates/planPitStopForm.html | 57 --------- 4 files changed, 325 deletions(-) delete mode 100644 app/static/js/fillingstations.js delete mode 100644 app/templates/planPitStopForm.html diff --git a/app/routes/pitstop.py b/app/routes/pitstop.py index 7113975..59d14fd 100644 --- a/app/routes/pitstop.py +++ b/app/routes/pitstop.py @@ -229,86 +229,3 @@ def get_pit_stops(): user["vehicles"].append(v) return render_template("pitstops.html", user=user) - - -@app.route("/pitstops/plan/vehicle/select", methods=["GET", "POST"]) -@login_required -def select_vehicle_for_plan_pitstop(): - if len(current_user.vehicles) == 1: - return redirect( - url_for( - "select_consumable_for_plan_pitstop", vid=current_user.vehicles[0].id - ) - ) - - form = SelectVehicleForm() - form.vehicle.choices = [(g.id, g.name) for g in current_user.vehicles] - - if form.validate_on_submit(): - return redirect( - url_for("select_consumable_for_plan_pitstop", vid=form.vehicle.data) - ) - - return render_template("selectVehicle.html", form=form) - - -@app.route( - "/pitstops/plan/vehicle//consumable/select", methods=["GET", "POST"] -) -@login_required -def select_consumable_for_plan_pitstop(vid): - vehicle = Vehicle.query.get(vid) - if vehicle is None or vehicle not in current_user.vehicles: - return redirect(url_for("select_consumable_for_plan_pitstop")) - - if len(vehicle.consumables) == 0: - flash("Please choose at least one consumable!", "warning") - return redirect(url_for("edit_vehicle", vid=vid)) - - if len(vehicle.consumables) == 1: - return redirect( - url_for("plan_pit_stop_form", vid=vid, cid=vehicle.consumables[0].id) - ) - - form = SelectConsumableForm() - form.consumable.choices = [(g.id, g.name) for g in vehicle.consumables] - - if form.validate_on_submit(): - return redirect( - url_for("plan_pit_stop_form", vid=vid, cid=form.consumable.data) - ) - - return render_template( - "selectConsumableForVehicle.html", vehicle=vehicle, form=form - ) - - -@app.route( - "/pitstops/plan/vehicle//consumable/", methods=["GET", "POST"] -) -@login_required -def plan_pit_stop_form(vid, cid): - vehicle = Vehicle.query.get(vid) - if vehicle is None or vehicle not in current_user.vehicles: - return redirect(url_for("select_vehicle_for_new_pitstop")) - - consumable = Consumable.query.get(cid) - if consumable not in vehicle.consumables: - return redirect(url_for("select_consumable_for_new_pitstop", vid=vid)) - - update_filling_station_prices( - [x.id for x in current_user.favourite_filling_stations] - ) - - offers = [] - for fs in current_user.favourite_filling_stations: - offers.append( - ( - fs, - getattr(fs, consumable.ext_id), - ) - ) - - return render_template( - "planPitStopForm.html", vehicle=vehicle, consumable=consumable, offers=offers - ) diff --git a/app/static/js/fillingstations.js b/app/static/js/fillingstations.js deleted file mode 100644 index ccd38b8..0000000 --- a/app/static/js/fillingstations.js +++ /dev/null @@ -1,184 +0,0 @@ -// initially display germany -var lat = 50.75653081787912, - lon = 9.262980794432847, - zoom = 5; - -var map; - -var filling_stations = {}; -var filling_station_markers; - -query_location = function(updater) { - if(navigator.geolocation) { - navigator.geolocation.getCurrentPosition(function(position) { - lat = position.coords.latitude; - lon = position.coords.longitude; - zoom = 11; - if(updater){ - updater(lat, lon); - } - }); - } -} - -update_map = function() { - var lonLat = new OpenLayers.LonLat( lon, lat ) - .transform( - new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984 - map.getProjectionObject() // to Spherical Mercator Projection - ); - map.setCenter (lonLat, zoom); -} - -load_filling_stations = function() { - var url = '/filling_stations?latitude=' + lat + '&longitude='+ lon + '&type=all&radius=5&sort=dist'; - $.ajax({ - type: 'GET', - url: url, - success: function(data) { - data.stations.forEach(function(station) { - if (!(station.id in filling_stations)) { - filling_stations[station.id] = station; - filling_stations[station.id].marker = false; - } - }); - update_filling_station_markers(); - } - }); -} - -clicked_on_filling_station_marker = function(station, marker) { - return function(data) { - $.ajax({ - type: 'GET', - url: '/filling_stations/favourites/toggle/'+station.id, - dataType: 'json', - timeout: 1000, - success: function(data) { - if (data.state == 'favourite') { - marker.setUrl('/static/img/filling_station_favourite_marker.png'); - } else { - marker.setUrl('/static/img/filling_station_marker.png'); - } - }, - contentType : 'application/json' - }); - } -} - -display_station_information = function(station) { - return function(event) { - var info = $('#station_info'); - info.empty(); - info.addClass('filling_station_info'); - - var cell1 = $('
    ', {'class':'col-md-8'}) - var cell2 = $('
    ', {'class':'col-md-4'}) - - var img = $('', {'src': '/static/logos/'+station.brand.toLowerCase()+'.png'}); - // hide if the brand icon loads with error - img.error(function(){ - $(this).hide(); - }); - - var name = $('
    ').text(station.name); - - var street_number = $('
    ').text(station.street + ' ' + station.houseNumber); - - var postcode_place = $('
    ').text(station.postCode + ' ' + station.place); - - info.append(cell1 - .append(name) - .append(street_number) - .append(postcode_place)) - .append(cell2 - .append(img)); - - cell2.height(cell1.height()); - }; -} - -update_filling_station_markers = function() { - for(id in filling_stations) { - var station = filling_stations[id]; - if(!station.marker) { - var lonLat = new OpenLayers.LonLat(station.lng, station.lat) - .transform(new OpenLayers.Projection('EPSG:4326'), map.getProjectionObject()); - if (station.state == 'favourite') { - var icon = new OpenLayers.Icon('/static/img/filling_station_favourite_marker.png'); - } else { - var icon = new OpenLayers.Icon('/static/img/filling_station_marker.png'); - } - var marker = new OpenLayers.Marker(lonLat, icon); - marker.events.register('click', marker, clicked_on_filling_station_marker(station, marker)); - marker.events.register('mouseover', null, display_station_information(station)); - filling_station_markers.addMarker(marker); - station.marker = true; - } - } -} - -activate_map = function(map_div_id, button_ids, home_lat, home_long, home_zoom, init_stations) { - - // resize to reasonable height - $('#' + map_div_id).css('height',0.75*($('#' + map_div_id).css('width'))); - - // init map - map = new OpenLayers.Map(map_div_id); - map.addLayer(new OpenLayers.Layer.OSM()); - map.events.register('moveend', null, function(e){ - var p = e.object.center.clone(); - var p = p.transform(map.getProjectionObject(), 'EPSG:4326'); - lon = p.lon; - lat = p.lat; - zoom = e.object.zoom; - }); - filling_station_markers = new OpenLayers.Layer.Markers('Filling Stations'); - map.addLayer(filling_station_markers); - - // handle initial / favourite stations - filling_stations = init_stations; - update_filling_station_markers(); - - update_map(); - if ((home_lat == 0) && (home_long == 0)) { - query_location(update_map); - } else { - lat = home_lat; - lon = home_long; - zoom = home_zoom; - update_map(); - } - - // get button - $('#'+button_ids[0]).click(function(e){ - load_filling_stations(); - }); - // set home button - $('#'+button_ids[1]).click(function(e){ - $.ajax({ - type: 'POST', - url: '/account/home', - data: JSON.stringify({'long': lon, 'lat': lat, 'zoom': zoom}), - dataType: 'json', - timeout: 1000, - contentType : 'application/json' - }); - }); - // go home button - $('#'+button_ids[2]).click(function(e){ - $.ajax({ - type: 'GET', - url: '/account/home', - dataType: 'json', - timeout: 1000, - success: function(data) { - lat = data.lat; - lon = data.long; - zoom = data.zoom; - update_map(); - }, - contentType : 'application/json' - }); - }); -} \ No newline at end of file diff --git a/app/templates/layout.html b/app/templates/layout.html index 8ad4882..8c0be5f 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -135,7 +135,6 @@ -