From 5bcc1688de7fc65a1a7e1a6a607e18a548c894e2 Mon Sep 17 00:00:00 2001 From: Irwan Fathurrahman Date: Wed, 11 Sep 2024 11:03:35 +0700 Subject: [PATCH] Fix crop insight shift to previous day (#150) * Fix crop insight shift to previous day * Add version * Fix flake --- django_project/_version.txt | 1 + django_project/core/admin.py | 15 +++++++++++++++ django_project/spw/generator/crop_insight.py | 10 +++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 django_project/_version.txt diff --git a/django_project/_version.txt b/django_project/_version.txt new file mode 100644 index 0000000..8a9ecc2 --- /dev/null +++ b/django_project/_version.txt @@ -0,0 +1 @@ +0.0.1 \ No newline at end of file diff --git a/django_project/core/admin.py b/django_project/core/admin.py index 2c1cc4a..95a9d80 100644 --- a/django_project/core/admin.py +++ b/django_project/core/admin.py @@ -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 @@ -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.""" diff --git a/django_project/spw/generator/crop_insight.py b/django_project/spw/generator/crop_insight.py index f0cf599..e3c6193 100644 --- a/django_project/spw/generator/crop_insight.py +++ b/django_project/spw/generator/crop_insight.py @@ -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, @@ -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()