добавил статус уровня воды "не изменяется"

This commit is contained in:
VladislavOstapov 2024-01-09 18:30:20 +03:00
parent 5de199e35a
commit 0d71d1be29
3 changed files with 31 additions and 4 deletions

View File

@ -1,8 +1,9 @@
import os import os
from django.http import HttpResponse from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import render from django.shortcuts import render
# from django.db.models import Manager # from django.db.models import Manager
from django.contrib.auth import authenticate, login
# только для тестирования! # только для тестирования!
import requests import requests
@ -12,6 +13,10 @@ TEST_BASE_FETCH = "https://test.wawaa.ru/dev-fetch.php"
def view_index(request): def view_index(request):
return render(request, 'index.html') return render(request, 'index.html')
# if request.user.is_authenticated:
# return render(request, 'index.html')
# else:
# return HttpResponseRedirect()
def view_stats(request): def view_stats(request):
@ -29,3 +34,19 @@ def view_tank_chart(request):
response = HttpResponse(res.content) response = HttpResponse(res.content)
response.headers["Content-type"] = response.headers["Content-type"] response.headers["Content-type"] = response.headers["Content-type"]
return response return response
# вход
def view_login(request):
username = request.POST["username"]
password = request.POST["password"]
user = authenticate(request, username=username, password=password)
if user is not None:
login(request, user)
return HttpResponseRedirect('/')
else:
# Return an 'invalid login' error message.
pass

View File

@ -28,7 +28,7 @@ PROJECT_ROOT = os.path.dirname(__file__)
SECRET_KEY = os.getenv('DJANGO_SECRET') SECRET_KEY = os.getenv('DJANGO_SECRET')
ALLOWED_HOSTS = ['localhost', '10.8.0.2'] ALLOWED_HOSTS = ['10.8.0.2']
# CSRF_TRUSTED_ORIGINS = ['https://ospaz.wawaa.ru'] # CSRF_TRUSTED_ORIGINS = ['https://ospaz.wawaa.ru']
# HTTPS settings https://docs.djangoproject.com/en/5.0/topics/security/ # HTTPS settings https://docs.djangoproject.com/en/5.0/topics/security/

View File

@ -165,7 +165,13 @@ async function updateStatus() {
if (last_radar_values.length === 0) { if (last_radar_values.length === 0) {
document.getElementById("tank-level-dir").innerHTML = "(?)" document.getElementById("tank-level-dir").innerHTML = "(?)"
} else { } else {
document.getElementById("tank-level-dir").innerHTML = approximateWithTimestamps(last_radar_values) < 0 ? '↘' : '↗' let ap = approximateWithTimestamps(last_radar_values)
if (Math.abs(ap) < 0.02) {
document.getElementById("tank-level-dir").innerHTML = '→'
} else {
document.getElementById("tank-level-dir").innerHTML = ap < 0 ? '↘' : '↗'
}
} }
//<p>Текущий уровень воды: <span id="tank-level-now"></span>%</p> //<p>Текущий уровень воды: <span id="tank-level-now"></span>%</p>
@ -211,7 +217,7 @@ async function updateStatus() {
//<p>Состояние КА: <span id="pump-stage"></span></p> //<p>Состояние КА: <span id="pump-stage"></span></p>
tmp = document.getElementById("pump-stage") tmp = document.getElementById("pump-stage")
if (dataset['pump']['pump_stage'] in pumpStageDescription) { if (dataset['pump']['pump_stage'] in pumpStageDescription) {
tmp.innerHTML = dataset['pump']['pump_stage'] + " (" + pumpStageDescription[dataset['pump']['vfd_err']] + ")" tmp.innerHTML = dataset['pump']['pump_stage'] + " (" + pumpStageDescription[dataset['pump']['pump_stage']] + ")"
} else { } else {
tmp.innerHTML = dataset['pump']['pump_stage'] tmp.innerHTML = dataset['pump']['pump_stage']
} }