Skip to content

Commit

Permalink
Fix crop insight shift to previous day (#150)
Browse files Browse the repository at this point in the history
* Fix crop insight shift to previous day

* Add version

* Fix flake
  • Loading branch information
meomancer authored Sep 11, 2024
1 parent a197aaf commit 5bcc168
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 3 deletions.
1 change: 1 addition & 0 deletions django_project/_version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.0.1
15 changes: 15 additions & 0 deletions django_project/core/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
.. note:: Definition admin
"""
import os

from django import forms
from django.contrib import admin
from django.contrib.auth import get_user_model
Expand All @@ -13,9 +15,22 @@
from core.forms import CreateKnoxTokenForm, CreateAuthToken
from core.group_email_receiver import crop_plan_receiver
from core.models.background_task import BackgroundTask
from core.settings.utils import absolute_path

User = get_user_model()

version = ''
try:
folder = absolute_path('')
version_file = os.path.join(folder, '_version.txt')
if os.path.exists(version_file):
version_from_file = (open(version_file, 'rb').read()).decode("utf-8")
version = f'({version_from_file})'
except Exception:
pass

admin.site.site_header = f'Django administration {version}'


class AbstractDefinitionAdmin(admin.ModelAdmin):
"""Abstract admin for definition."""
Expand Down
10 changes: 7 additions & 3 deletions django_project/spw/generator/crop_insight.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
.. note:: Farm SPW Generator.
"""

from datetime import date, datetime, timedelta
from datetime import datetime, timedelta

import pytz
from django.db import transaction
from django.utils import timezone

from gap.models.crop_insight import (
FarmSuitablePlantingWindowSignal, FarmShortTermForecast,
Expand All @@ -24,10 +25,13 @@
class CropInsightFarmGenerator:
"""Insight Farm Generator."""

def __init__(self, farm: Farm, requested_date=date.today()):
def __init__(self, farm: Farm):
"""Init Generator."""
self.farm = farm
self.today = requested_date
self.today = timezone.now()
self.today.replace(tzinfo=pytz.UTC)
self.today = self.today.date()

self.tomorrow = self.today + timedelta(days=1)
self.attributes = calculate_from_point_attrs()

Expand Down

0 comments on commit 5bcc168

Please sign in to comment.