Merge pull request #8 from openagri-eu/bug-issue-48-update

update: Disable parcel without GK && bugfix

Author: JoleVLF

app/utils/farm_calendar_report.py

@@ -250,7 +250,7 @@ def create_farm_calendar_pdf(
                             .get("@id", "N/A:N/A")
                             .split(":")[-1]
                         )
-                        address, farm, _ = get_parcel_info(parcel_id, token, geolocator)
+                        address, farm = get_parcel_info(parcel_id, token, geolocator)
                 row.cell(f"{machinery_ids}")
                 row.cell(address)
                 row.cell(farm)

app/utils/utils.py

@@ -65,7 +65,10 @@ def get_parcel_info(parcel_id: str, token: dict, geolocator: Nominatim, identifi
     farm = ''
     identifier = ''
     if not settings.REPORTING_USING_GATEKEEPER:
-        return address, farm, identifier
+        if identifier_flag:
+            return address, farm, identifier
+        else:
+            return address, farm
     farm_parcel_info = make_get_request(
         url=f'{settings.REPORTING_FARMCALENDAR_BASE_URL}{settings.REPORTING_FARMCALENDAR_URLS["parcel"]}{parcel_id}/',
         token=token,