Compare commits

..

No commits in common. 'main' and 'hotfix' have entirely different histories.
main ... hotfix

2
.gitignore vendored

@ -1,5 +1,3 @@
venv/ venv/
*/__pycache__* */__pycache__*
*/migrations* */migrations*
*/.DS_Store

@ -177,9 +177,7 @@ async function getActualDataAndFillView(monat = currentDate.getMonth(), jahr = c
}); });
// Filter funktion aufrufen und entsprechend mit dem aktuellen Datum füllen // Filter funktion aufrufen und entsprechend mit dem aktuellen Datum füllen
const filteredEntries = await filterEntriesByMonthYear(monat === 12 ? 1 : monat + 1, monat + 1 >= 9 ? jahr + 1 : jahr); const filteredEntries = await filterEntriesByMonthYear(monat === 12 ? 1 : monat + 1, jahr);
console.log("update-complete")
// Tabelle mit den aktuellen informationen füllen (funktion triggern und Daten übergeben) // Tabelle mit den aktuellen informationen füllen (funktion triggern und Daten übergeben)
fillTableWithEntries(filteredEntries) fillTableWithEntries(filteredEntries)

@ -7,6 +7,7 @@ self.addEventListener("install", event => {
'/static/app/css/bootstrap.css', '/static/app/css/bootstrap.css',
'/static/app/css/custom.css', '/static/app/css/custom.css',
'/static/app/js/dbcontrol.js', '/static/app/js/dbcontrol.js',
'/static/app/js/home.js',
'/static/app/js/timer.js', '/static/app/js/timer.js',
'/static/app/js/welcomeControl.js', '/static/app/js/welcomeControl.js',
'/static/app/js/exportDB.js', '/static/app/js/exportDB.js',
@ -55,15 +56,15 @@ self.addEventListener('activate', event => {
); );
}); });
// // Serve from Cache // Serve from Cache
// self.addEventListener("fetch", event => { self.addEventListener("fetch", event => {
// event.respondWith( event.respondWith(
// caches.match(event.request) caches.match(event.request)
// .then(response => { .then(response => {
// return response || fetch(event.request); return response || fetch(event.request);
// }) })
// .catch(() => { .catch(() => {
// return caches.match('/app/home'); return caches.match('/app/home');
// }) })
// ) )
// }); });

@ -291,7 +291,7 @@
}) })
</script> </script>
<script src="{% static 'app/js/home01.js' %}"></script> <script src="{% static 'app/js/home.js' %}"></script>
<script src="{% static 'app/js/timer.js' %}"></script> <script src="{% static 'app/js/timer.js' %}"></script>
<script src="{% static 'app/js/welcomeControl.js' %}"></script> <script src="{% static 'app/js/welcomeControl.js' %}"></script>
<script src="{% static 'app/js/UpdateInfoControl.js' %}"></script> <script src="{% static 'app/js/UpdateInfoControl.js' %}"></script>

@ -1,22 +1,21 @@
<br> <br>
<h1>Update Time!</h1> <h1>Update Time!</h1>
<br> <br>
<h5>v1.3.3</h5> <h5>v1.3.1</h5>
<p> <p>
<b style="color: red">Fehler Behebung! 🔥</b> <b style="color: red">Fehler Behebung! 🔥</b>
<br>Anicht vom falschen Jahr! <br>Monatswechsel in Januar geht nicht.
<br> <br>
<br><b>Was ist neu?</b> <br><b>Was ist neu?</b>
<br> Aufrund des Dienstjahres was nicht mit Kalender <br> Nun kann man in Januar wechseln :D
<br> übereinstimmt, geht es gegen die Natur.
<br> <br>
<!-- <br><b>Hinweise:</b> <!-- <br><b>Hinweise:</b>
<br> 1. Backup muss Manuell gemacht werden (aktuell)! <br> 1. Backup muss Manuell gemacht werden (aktuell)!
<br> 2. Backup muss Gespeichert werden! */}} <br> 2. Backup muss Gespeichert werden! */}}
<br> --> <br> -->
<br>Danke für die Geduld und das du Piomint nutzt! <br>Viel Freude und schön das du piomint nutzt,
<br><b>Gruß Samuel</b> <br><b>Gruß Samuel</b>
</p> </p>
<br> <br>
<input type="text" name="versionnumber" id="versionnumber" class="d-none" value="1.3.3-5"> <input type="text" name="versionnumber" id="versionnumber" class="d-none" value="1.3.1">

@ -10,11 +10,5 @@ urlpatterns = [
path("home/", views.home), path("home/", views.home),
path('offline/', TemplateView.as_view(template_name="offline.html")), path('offline/', TemplateView.as_view(template_name="offline.html")),
path("install/", views.install), path("install/", views.install),
path("v1321/", views.v1322), path("v131/", views.home)
path("v1322/", views.v1322),
path("v133/", views.v133),
path("v1332/", views.v1332),
path("v1333/", views.v1333),
path("v1334/", views.v1334),
path("v1335/", views.v1335),
] ]

@ -8,28 +8,7 @@ def install(request):
return render(request, "app/install.html") return render(request, "app/install.html")
def home(request): def home(request):
return redirect("/app/v1335") return render(request, "app/home.html")
def login(request): def login(request):
return render(request, "app/login.html") return render(request, "app/login.html")
def v1321(request):
return redirect("/app/v1335")
def v1322(request):
return redirect("/app/v1335")
def v133(request):
return redirect("/app/v1335")
def v1332(request):
return redirect("/app/v1335")
def v1333(request):
return redirect("/app/v1335")
def v1334(request):
return redirect("/app/v1335")
def v1335(request):
return render(request, "app/home.html")

@ -9,7 +9,7 @@ PWA_APP_BACKGROUND_COLOR = '#9FEDD7'
PWA_APP_DISPLAY = 'standalone' PWA_APP_DISPLAY = 'standalone'
PWA_APP_SCOPE = '/' PWA_APP_SCOPE = '/'
PWA_APP_ORIENTATION = 'portrait' PWA_APP_ORIENTATION = 'portrait'
PWA_APP_START_URL = '/app/v1335/' PWA_APP_START_URL = '/app/v131/'
PWA_APP_STATUS_BAR_COLOR = 'black-translucent' PWA_APP_STATUS_BAR_COLOR = 'black-translucent'
PWA_SERVICE_WORKER_PATH = os.path.join(BASE_DIR, 'app/static/app/js', 'serviceworker.js') PWA_SERVICE_WORKER_PATH = os.path.join(BASE_DIR, 'app/static/app/js', 'serviceworker.js')
PWA_APP_ICONS = [ PWA_APP_ICONS = [

@ -27,7 +27,7 @@ SECRET_KEY = 'django-insecure-h^$jdg0n_yarg*l#r3fd_7=7_)-!0bspac70f$1#b7w8gmkc-*
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
ALLOWED_HOSTS = ['*'] if DEBUG else ['localhost', 'app.piomint.de'] ALLOWED_HOSTS = ['*'] if DEBUG else ['localhost']
# Application definition # Application definition

@ -1,7 +0,0 @@
asgiref==3.8.1
Django==5.1.1
django-pwa==2.0.0
gunicorn==23.0.0
mysqlclient==2.2.4
packaging==24.1
sqlparse==0.5.1
Loading…
Cancel
Save

Powered by TurnKey Linux.