From 16320e58c437f304e2e06795be67d922c662a93f Mon Sep 17 00:00:00 2001 From: VladislavOstapov Date: Tue, 23 Jan 2024 19:37:10 +0300 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=BA=D0=B8,=20=D0=BA?= =?UTF-8?q?=D0=BE=D1=81=D0=BC=D0=B5=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index/admin.py | 3 --- logs_service/admin.py | 4 ---- logs_service/services.py | 2 +- ospaz_site/settings.py | 19 +++++++++---------- ospaz_site/urls.py | 5 +---- templates/index.html | 2 +- users/admin.py | 13 ------------- 7 files changed, 12 insertions(+), 36 deletions(-) delete mode 100644 index/admin.py delete mode 100644 logs_service/admin.py delete mode 100644 users/admin.py diff --git a/index/admin.py b/index/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/index/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/logs_service/admin.py b/logs_service/admin.py deleted file mode 100644 index c7ee86b..0000000 --- a/logs_service/admin.py +++ /dev/null @@ -1,4 +0,0 @@ -from django.contrib import admin -from .models import MbTankRecord - -admin.site.register(MbTankRecord) diff --git a/logs_service/services.py b/logs_service/services.py index ea3713b..f25cce1 100644 --- a/logs_service/services.py +++ b/logs_service/services.py @@ -163,7 +163,7 @@ class MbPumpService(MbService): self._curr_state = { 'alarms': values[35 - off], - 'flow_meter': values[16 - off] / 100, + 'flow_meter': values[16 - off] / 10, 'last_update': int(datetime.now().timestamp()), 'pump_stage': values[28 - off], 'vfd_curr': values[26 - off] / 100, diff --git a/ospaz_site/settings.py b/ospaz_site/settings.py index 83fcc86..ac9fe4d 100644 --- a/ospaz_site/settings.py +++ b/ospaz_site/settings.py @@ -28,21 +28,20 @@ PROJECT_ROOT = os.path.dirname(__file__) SECRET_KEY = os.getenv('DJANGO_SECRET') -ALLOWED_HOSTS = ['10.8.0.2', '10.8.0.6', 'ospaz.wawaa.ru', 'dev.ospaz.wawaa.ru'] -CSRF_TRUSTED_ORIGINS = ['http://10.8.0.2', 'http://10.8.0.6', 'https://ospaz.wawaa.ru', 'https://dev.ospaz.wawaa.ru'] +ALLOWED_HOSTS = ['10.8.0.2', 'ospaz.wawaa.ru'] +CSRF_TRUSTED_ORIGINS = ['http://10.8.0.2', 'https://ospaz.wawaa.ru'] + + +DEBUG = int(os.getenv('PROJECT_DEBUG', '0')) != 0 # HTTPS settings https://docs.djangoproject.com/en/5.0/topics/security/ -#CSRF_COOKIE_SECURE = True -#SESSION_COOKIE_SECURE = True -#DEBUG = False - -# HTTP settings -DEBUG = int(os.getenv('PROJECT_DEBUG', '0')) != 0 +if not DEBUG: + CSRF_COOKIE_SECURE = True + SESSION_COOKIE_SECURE = True # Application definition INSTALLED_APPS = [ - 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -52,7 +51,7 @@ INSTALLED_APPS = [ # custom apps 'users.apps.UsersConfig', 'index.apps.IndexConfig', - 'logs_service' + 'logs_service.apps.LogsServiceConfig' ] MIDDLEWARE = [ diff --git a/ospaz_site/urls.py b/ospaz_site/urls.py index 0ffe2ac..ea02d88 100644 --- a/ospaz_site/urls.py +++ b/ospaz_site/urls.py @@ -14,14 +14,11 @@ Including another URLconf 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ -from django.contrib import admin from django.urls import path, include -from django.contrib.staticfiles.views import serve urlpatterns = [ path('', include('index.urls')), path('account/', include('users.urls')), - path('fetch/', include('logs_service.urls')), - path('admin/', admin.site.urls), + path('fetch/', include('logs_service.urls')) ] diff --git a/templates/index.html b/templates/index.html index 43b0eb8..b8191bb 100644 --- a/templates/index.html +++ b/templates/index.html @@ -48,7 +48,7 @@

Последнее обновление:

Регистр аварий:

Состояние КА:

-

Текущий расход: м³

+

Текущий расход: м³/ч

{% endif %} diff --git a/users/admin.py b/users/admin.py deleted file mode 100644 index f11de67..0000000 --- a/users/admin.py +++ /dev/null @@ -1,13 +0,0 @@ -from django.contrib import admin -from .models import User -from django.contrib.auth.models import Group - - -admin.site.unregister(Group) - - -@admin.register(User) -class UserAdmin(admin.ModelAdmin): - # fields = ['id', 'login', 'is_superuser', 'registered', 'last_password_change', 'last_login'] - list_display = ['id', 'login', 'is_superuser', 'registered', 'last_password_change', 'last_login'] - readonly_fields = ['id', 'registered', 'last_login', 'last_password_change']