Merge pull request #3 from wmo-raf/dev

implement dynamic api path

Author: Grace-Amondi

forecastmanager/serializers.py

@@ -20,21 +20,21 @@ def get_coordinates(self, obj):
 class ForecastSerializer(serializers.ModelSerializer):
 
     city_detail =  serializers.SerializerMethodField()
-    condition_display = serializers.SerializerMethodField()
+    # condition_display = serializers.SerializerMethodField()
     list_serializer_class = serializers.ListSerializer
 
     class Meta:
         model = Forecast
-        fields =['id','forecast_date','max_temp','min_temp', 'condition_display', 'city', 'city_detail', 'condition']
+        fields =['id','forecast_date','max_temp','min_temp', 'city', 'city_detail', 'condition']
 
 
     @staticmethod
     def get_city_detail(obj):
         serializer = CitySerializer(obj.city)
         return serializer.data
 
-    def get_condition_display(self, obj):
-            return obj.get_condition_display()
+    # def get_condition_display(self, obj):
+    #         return obj.get_condition_display()
 
     def to_representation(self, instance):
         representation = super().to_representation(instance)
@@ -47,8 +47,8 @@ def to_representation(self, instance):
                 'forecast_date': representation['forecast_date'],
                 'max_temp': representation['max_temp'],
                 'min_temp': representation['min_temp'],
-                'condition':representation['condition_display'],
-                'condition_icon': f'static/forecastmanager/img/{representation["condition"]}.png',
+                'condition':representation['condition'],
+                'condition_icon': f'{representation["condition"]}.png',
             },
             "geometry": {
                 "coordinates": representation['city_detail']['coordinates'],

forecastmanager/templates/forecastmanager/create_forecast.html

@@ -189,8 +189,6 @@ <h2 class="w-panel__heading">Add forecast</h2>
     var city_ls = JSON.parse('{{city_ls|escapejs}}')
 
     const container = document.querySelector('#createTable');
-    const BASE_URL = '{{request.get_full_path}}'
-
 
     const hot = new Handsontable(container, {
       width: '100%',
@@ -328,7 +326,7 @@ <h2 class="w-panel__heading">Add forecast</h2>
 
         // Send the JSON data to a Django view via AJAX
         $.ajax({
-          url: `${BASE_URL}/api/forecasts/`,
+          url: `{% url 'forecast-list'%}`,
           type: 'POST',
           headers: {
             'X-CSRFToken': '{{ csrf_token }}',  // Replace with the actual CSRF token value

forecastmanager/templates/forecastmanager/load_forecast.html

@@ -65,7 +65,6 @@ <h2 class="w-panel__heading">Latest Available Forecast</h2>
 
         document.addEventListener("DOMContentLoaded", function() {
 
-        const BASE_URL = '{{request.get_full_path}}'
         // initialize map     
         var forecastMap = new maplibregl.Map({
             container:'forecast_map',
@@ -150,10 +149,9 @@ <h2 class="w-panel__heading">Latest Available Forecast</h2>
 
         }
 
-        function setForecastData(forecast_date){
-
+        function setForecastData(forecast_date){    
             // Make an HTTP GET request to the API endpoint
-            fetch(`${BASE_URL}api/forecasts?forecast_date=${forecast_date}`)
+            fetch(`{% url 'forecast-list'%}?forecast_date=${forecast_date}`)
             .then(response => response.json())  // Parse the response as JSON
             .then(data => {
                 // Process the retrieved data
@@ -168,7 +166,7 @@ <h2 class="w-panel__heading">Latest Available Forecast</h2>
                         }
 
                     }
-                    img.src = `${BASE_URL}${icon.properties.condition_icon}`
+                    img.src = `{% static 'forecastmanager/img/${icon.properties.condition_icon}' %}`
                     return img.src
 
                 })

forecastmanager/urls.py

@@ -1,5 +1,5 @@
 
-from django.urls import path,include
+from django.urls import path,include, reverse
 from .views import CityAPIView, ForecastAPIView
 from rest_framework import routers
 
@@ -9,5 +9,5 @@
 
 
 urlpatterns = [
-    path('api/', include(router.urls)),
+    path('api/', include(router.urls), name='api'),
 ]

sandbox/sandbox/settings/base.py

@@ -173,3 +173,4 @@
 # Base URL to use when referring to full URLs within the Wagtail admin backend -
 # e.g. in notification emails. Don't include '/admin' or a trailing slash
 WAGTAILADMIN_BASE_URL = "http://example.com"
+# FORCE_SCRIPT_NAME='/cms'

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = forecastmanager
-version = 0.0.5
+version = 0.0.6
 description = Integration of Weather City Forecasts Manager in Wagtail Projects.
 long_description = file:README.md
 long_description_content_type = text/markdown