From e7ae0f64817bbbd0113b6f374d288601eed79470 Mon Sep 17 00:00:00 2001 From: jopster Date: Tue, 9 Jul 2024 11:28:54 +0200 Subject: [PATCH] Google Maps --- __manifest__.py | 12 +- controllers/main.py | 6 +- models/dss.py | 2 +- .../{xml => archiv}/google_map_templates.xml | 11 +- static/src/archiv/lib/images/conv30.png | Bin 0 -> 1030 bytes static/src/archiv/lib/images/conv40.png | Bin 0 -> 1512 bytes static/src/archiv/lib/images/conv50.png | Bin 0 -> 2202 bytes static/src/archiv/lib/images/heart30.png | Bin 0 -> 1448 bytes static/src/archiv/lib/images/heart40.png | Bin 0 -> 2161 bytes static/src/archiv/lib/images/heart50.png | Bin 0 -> 2999 bytes static/src/archiv/lib/images/m1.png | Bin 0 -> 3003 bytes static/src/archiv/lib/images/m2.png | Bin 0 -> 3259 bytes static/src/archiv/lib/images/m3.png | Bin 0 -> 3956 bytes static/src/archiv/lib/images/m4.png | Bin 0 -> 5705 bytes static/src/archiv/lib/images/m5.png | Bin 0 -> 6839 bytes static/src/archiv/lib/images/people35.png | Bin 0 -> 1392 bytes static/src/archiv/lib/images/people45.png | Bin 0 -> 2076 bytes static/src/archiv/lib/images/people55.png | Bin 0 -> 2928 bytes static/src/archiv/lib/images/pin.png | Bin 0 -> 1135 bytes static/src/archiv/lib/markerclusterer.js | 1315 +++++++++++++++++ static/src/archiv/screenDesignerView.js | 61 + .../src/{js => archiv}/website_google_map.js | 0 static/src/js/dss_google_map.js | 89 ++ views/google_map.xml | 29 + 24 files changed, 1512 insertions(+), 13 deletions(-) rename static/src/{xml => archiv}/google_map_templates.xml (85%) create mode 100644 static/src/archiv/lib/images/conv30.png create mode 100644 static/src/archiv/lib/images/conv40.png create mode 100644 static/src/archiv/lib/images/conv50.png create mode 100644 static/src/archiv/lib/images/heart30.png create mode 100644 static/src/archiv/lib/images/heart40.png create mode 100644 static/src/archiv/lib/images/heart50.png create mode 100644 static/src/archiv/lib/images/m1.png create mode 100644 static/src/archiv/lib/images/m2.png create mode 100644 static/src/archiv/lib/images/m3.png create mode 100644 static/src/archiv/lib/images/m4.png create mode 100644 static/src/archiv/lib/images/m5.png create mode 100644 static/src/archiv/lib/images/people35.png create mode 100644 static/src/archiv/lib/images/people45.png create mode 100644 static/src/archiv/lib/images/people55.png create mode 100644 static/src/archiv/lib/images/pin.png create mode 100755 static/src/archiv/lib/markerclusterer.js create mode 100644 static/src/archiv/screenDesignerView.js rename static/src/{js => archiv}/website_google_map.js (100%) create mode 100644 static/src/js/dss_google_map.js create mode 100644 views/google_map.xml diff --git a/__manifest__.py b/__manifest__.py index fa3cac9..b1d135a 100755 --- a/__manifest__.py +++ b/__manifest__.py @@ -18,8 +18,10 @@ 'views/dss_systemtypen.xml', 'views/dss_mediarelations.xml', 'views/dss_advertisementfields.xml', - 'views/dss_projects.xml','views/dss_import.xml', - 'views/dss_ads.xml','views/dss_settings.xml', + 'views/dss_projects.xml', + 'views/dss_import.xml', + 'views/dss_ads.xml', + 'views/dss_settings.xml', 'views/dss_mediafiles.xml', 'views/dss_addstructures.xml', 'views/dss_geraetetypen.xml', @@ -32,6 +34,7 @@ 'views/mainsystem_view.xml', 'views/menu.xml', 'views/company_view.xml', + 'views/google_map.xml', ], 'demo': [], 'installable': True, @@ -40,16 +43,15 @@ 'auto_install': False, 'assets': { 'web.assets_backend': [ - 'DigitalSignage/static/src/**/*', + 'DigitalSignage/static/src/img/*', 'DigitalSignage/static/src/xml/screenDesignerView.xml', ], 'web.assets_common': [ 'DigitalSignage/static/images/**/*', + 'DigitalSignage/static/src/js/screenDesignerView.js', 'DigitalSignage/static/src/css/dss.css', - 'DigitalSignage/static/src/xml/*', ], 'web.assets_qweb': [ - 'DigitalSignage/static/src/xml/*', ], }, 'license': 'LGPL-3', diff --git a/controllers/main.py b/controllers/main.py index 2b29ad1..fcb45c5 100644 --- a/controllers/main.py +++ b/controllers/main.py @@ -44,10 +44,12 @@ class GoogleMap(http.Controller): 'latitude': str(project.standort_lati) if project.standort_lati else False, 'longitude': str(project.standort_long) if project.standort_long else False, }) + partner_url = "" values = { - 'partner_url': partner_url, - 'partner_data': scriptsafe.dumps(projects_data), + 'project_url': partner_url, + 'address': project.standort_strasse, + 'projects_data': scriptsafe.dumps(projects_data), 'google_maps_api_key': google_maps_api_key, } return request.render("DigitalSignage.google_map", values) diff --git a/models/dss.py b/models/dss.py index 849d7d0..8ee2113 100755 --- a/models/dss.py +++ b/models/dss.py @@ -705,7 +705,7 @@ class dssprojects(models.Model): 'target':'current', 'context':'{"default_project":'+str(self.id)+',"show_project_update":True}', 'res_id':self.id, - 'display_name' : self.projektname, + 'display_name' : self.name, 'domain':'[("project","=",'+str(self.id)+')]' } # context = ast.literal_eval(context) diff --git a/static/src/xml/google_map_templates.xml b/static/src/archiv/google_map_templates.xml similarity index 85% rename from static/src/xml/google_map_templates.xml rename to static/src/archiv/google_map_templates.xml index 93f60b6..5b63669 100644 --- a/static/src/xml/google_map_templates.xml +++ b/static/src/archiv/google_map_templates.xml @@ -1,6 +1,6 @@ - + -