v1.2.0 - Monatswechsel möglich

sortierung
Samuel Zielke 1 year ago
parent 4090c01f0c
commit 86ece4b9ca

BIN
.DS_Store vendored

Binary file not shown.

@ -13,9 +13,26 @@
@keyframes fade-in { @keyframes fade-in {
0% { 0% {
opacity: 0; opacity: 0;
visibility:hidden;
position: absolute;
} }
100% { 100% {
opacity: 1; opacity: 1;
visibility: visible;
position: relative;
}
}
@keyframes fade-out {
0% {
opacity: 1;
visibility: visible;
position: relative;
}
100% {
opacity: 0;
visibility:hidden;
position: absolute;
} }
} }
@ -28,6 +45,35 @@
} }
} }
@keyframes openMonthArea {
0% {
height: 15vh;
margin-top: 1.5rem;
}
100% {
height: 20vh;
margin-top: 1.5rem;
}
}
@keyframes shrinkActivitys {
0% {
height: 40vh;
}
100% {
height: 35vh;
}
}
@keyframes growActivitys {
0% {
height: 35vh;
}
100% {
height: 40vh;
}
}
@keyframes openSettingscolor { @keyframes openSettingscolor {
0% { 0% {
height: 6vh; height: 6vh;
@ -55,6 +101,17 @@
} }
} }
@keyframes closeMonthArea {
0% {
height: 20vh;
margin-top: 1.5rem;
}
100% {
height: 15vh;
margin-top: 1.5rem;
}
}
.HeaderDefaultHeightbg { .HeaderDefaultHeightbg {
height: 7vh; height: 7vh;
} }
@ -71,9 +128,31 @@
animation: fade-in 1s forwards; animation: fade-in 1s forwards;
} }
.fade-out {
animation: fade-out 1s forwards;
}
.openSettingsbg { .openSettingsbg {
animation: openSettingsbg 1s forwards; animation: openSettingsbg 1s forwards;
} }
.openMonthArea {
animation: openMonthArea 1s forwards;
/* margin-top: -3rem; */
}
.closeMonthArea {
animation: closeMonthArea 1s forwards;
}
.shrinkActivitys {
animation: shrinkActivitys 1s forwards;
}
.growActivitys {
animation: growActivitys 1s forwards;
}
.closeSettingsbg { .closeSettingsbg {
animation: closeSettingsbg 1s forwards; animation: closeSettingsbg 1s forwards;
} }
@ -85,6 +164,15 @@
animation: closeSettingscolor 1s forwards; animation: closeSettingscolor 1s forwards;
} }
.monthEntrys {
opacity: 0;
position: absolute;
}
#dashbord_month_area {
height: 15vh;
}
.header-bg-block { .header-bg-block {
padding: 0; padding: 0;
overflow: hidden; overflow: hidden;

@ -5,7 +5,10 @@ const NewEntryButton = document.getElementById('newEntrySubmitButton')
const SETStudySaveButton = document.getElementById('SETStudySaveButton') const SETStudySaveButton = document.getElementById('SETStudySaveButton')
const SETMonthGoalSaveButton = document.getElementById('SETMonthGoalSaveButton') const SETMonthGoalSaveButton = document.getElementById('SETMonthGoalSaveButton')
var allowToSend = false; var allowToSend = false;
const monate = ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"];
const aktuellerMonat = monate[new Date().getMonth()];
// Aktuelles Datum
const currentDate = new Date();
// //
@ -154,11 +157,11 @@ SETMonthGoalSaveButton.addEventListener('click', () => {
}) })
async function getActualDataAndFillView() { async function getActualDataAndFillView(monat = currentDate.getMonth() + 1, jahr = currentDate.getFullYear()) {
try { try {
// Aktuelles Datum // Einfüfen des aktuellen Monats
const currentDate = new Date(); document.getElementById('actualMonthName').innerHTML = monate[monat - 1];
// Settings vor ausfüllen // Settings vor ausfüllen
@ -174,7 +177,7 @@ async function getActualDataAndFillView() {
}); });
// 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(currentDate.getMonth() + 1, currentDate.getFullYear()); const filteredEntries = await filterEntriesByMonthYear(monat, jahr);
// 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)
@ -337,6 +340,64 @@ document.getElementById('DeleteEntryButton').addEventListener('click', () => {
}) })
//
// MONATSANSICHT Anpassen
//
const monthEntrys = document.querySelectorAll('.monthEntrys');
var diffMonth = 0
document.getElementById('dashbord_month_area').addEventListener('click', () =>{
if (!document.getElementById('dashbord_month_area').classList.contains('ActiveMonth')) {
document.getElementById('dashbord_month_area').classList.replace('closeMonthArea', 'openMonthArea')
document.getElementById('dashbord_month_area').classList.add(['openMonthArea'])
document.getElementById('dashbord_month_area').classList.add(['ActiveMonth'])
document.getElementById('ActivitysTable').classList.add(['shrinkActivitys'])
document.getElementById('ActivitysTable').classList.replace('growActivitys', 'shrinkActivitys')
document.getElementById('dashbord_month_area').classList.remove('mt-4')
// document.getElementById('dashbord_year_area').classList.add('fade-out')
// Für jedes ausgewählte Element die neue Klasse hinzufügen
setTimeout(function() {
monthEntrys.forEach(element => {
if (element.classList.contains('fade-out')) {
element.classList.replace('fade-out', 'fade-in');
} else {
element.classList.add('fade-in');
}
});
document.getElementById('MonthNameOfActual').innerHTML = "Aktuell:"
}, 300);
} else {
document.getElementById('dashbord_month_area').classList.remove('ActiveMonth')
document.getElementById('dashbord_month_area').classList.replace('openMonthArea', 'closeMonthArea')
document.getElementById('ActivitysTable').classList.replace('shrinkActivitys', 'growActivitys')
monthEntrys.forEach(element => {
element.classList.replace('fade-in', 'fade-out');
});
document.getElementById('MonthNameOfActual').innerHTML = "Monat:"
// document.getElementById('actualMonthName').innerHTML = monate[new Date().getMonth()];
diffMonth = 0;
getActualDataAndFillView(new Date().getMonth() + diffMonth + 1)
}
})
document.getElementById('btn-month-before').addEventListener('click', () =>{
diffMonth = ((monate[new Date().getMonth() + diffMonth]) != 'September') ? diffMonth - 1 : diffMonth;
// document.getElementById('actualMonthName').innerHTML = monate[new Date().getMonth() + diffMonth];
getActualDataAndFillView(new Date().getMonth() + diffMonth + 1)
});
document.getElementById('btn-month-next').addEventListener('click', () =>{
diffMonth = ((monate[new Date().getMonth() + diffMonth]) != 'August') ? diffMonth + 1 : diffMonth;
// document.getElementById('actualMonthName').innerHTML = monate[new Date().getMonth() + diffMonth];
getActualDataAndFillView(new Date().getMonth() + diffMonth + 1)
})
function setNewCalsOfMonth(TheMonth) {
}
// //
// FUNKTIONEN LIBARY // FUNKTIONEN LIBARY

@ -43,7 +43,7 @@
<div class="d-none" id="dashboard"> <div class="d-none" id="dashboard">
<div class="row justify-content-around mt-3" style="width: 100vw; color: black;"> <div class="row justify-content-around mt-3" style="width: 100vw; color: black;">
<div class="col-11" style="height: 5vh; padding: 1rem; border-radius:1rem; box-shadow: 0 0 0.5rem gray"> <div class="col-11" id="dashbord_year_area" style="height: 5vh; padding: 1rem; border-radius:1rem; box-shadow: 0 0 0.5rem gray">
<div class="row justify-content-between"> <div class="row justify-content-between">
<p class="col-6" style="font-size: 1rem; margin-top: -0.75rem;"><b>Jahr:</b> <span id="yearHours"></span>h/600h</p> <p class="col-6" style="font-size: 1rem; margin-top: -0.75rem;"><b>Jahr:</b> <span id="yearHours"></span>h/600h</p>
<p class="offset-1 col-5" style="font-size: 1rem; margin-top: -0.75rem;"><b>Offen:</b> <span id="yearRest"></span>h</p> <p class="offset-1 col-5" style="font-size: 1rem; margin-top: -0.75rem;"><b>Offen:</b> <span id="yearRest"></span>h</p>
@ -52,20 +52,30 @@
<div class="progress-bar" role="progressbar" style="background-color:rgb(120,170,86); width: 0.5%; height: 5px;" aria-valuenow="10" aria-valuemin="0" aria-valuemax="50" id="prBarYear"></div> <div class="progress-bar" role="progressbar" style="background-color:rgb(120,170,86); width: 0.5%; height: 5px;" aria-valuenow="10" aria-valuemin="0" aria-valuemax="50" id="prBarYear"></div>
</div> </div>
</div> </div>
<div class="col-11 mt-4" style="height: 15vh; padding: 1rem; border-radius:1rem; box-shadow: 0 0 0.5rem gray"> <div class="col-11 mt-4" id="dashbord_month_area" style="padding: 1rem; border-radius:1rem; box-shadow: 0 0 0.5rem gray">
<div class="row justify-content-between"> <div class="row justify-content-between">
<p class="col-7" style="font-size: 1.25rem;"><b>Monat:</b> <span id="monthHours"></span>h</p> <p class="col-7" style="font-size: 1.25rem;"><b id="MonthNameOfActual">Monat:</b> <span id="monthHours"></span>h</p>
<input type="number" class="d-none" id="MonthSumHours"> <input type="number" class="d-none" id="MonthSumHours">
<p class="col-5" style="font-size: 1.25rem;"><b>Offen:</b> <span id="monthRest"></span>h</p> <p class="col-5" style="font-size: 1.25rem;"><b>Offen:</b> <span id="monthRest"></span>h</p>
</div> </div>
<div class="progress" style="height: 5px; width: 100%; border-radius: 2rem; background-color: lightgray; margin-top: -0.75rem"> <div class="progress" style="height: 5px; width: 100%; border-radius: 2rem; background-color: lightgray; margin-top: -0.75rem">
<div class="progress-bar" role="progressbar" style="background-color:rgb(120,170,86); height: 5px; width: 1%;" aria-valuenow="10" aria-valuemin="0" aria-valuemax="50" id="prBarMonth"></div> <div class="progress-bar" role="progressbar" style="background-color:rgb(120,170,86); height: 5px; width: 1%;" aria-valuenow="10" aria-valuemin="0" aria-valuemax="50" id="prBarMonth"></div>
</div> </div>
<div class="row justify-content-around"> <div class="row justify-content-around">
<button class="col-3 mt-3 badge badge-primary" style="height: 25px; border: none;">Dienst: <span id="monthHourService"></span>h</button> <button class="col-3 mt-3 badge badge-primary" style="height: 25px; border: none;">Dienst: <span id="monthHourService"></span>h</button>
<button class="col-3 mt-3 badge badge-primary" style="height: 25px; border: none;">LDC: <span id="monthHourLDC"></span>h</button> <button class="col-3 mt-3 badge badge-primary" style="height: 25px; border: none;">LDC: <span id="monthHourLDC"></span>h</button>
<button class="col-3 mt-3 badge badge-primary" style="height: 25px; border: none;">Übrig: <span id="monthHourOther"></span>h</button> <button class="col-3 mt-3 badge badge-primary" style="height: 25px; border: none;">Übrig: <span id="monthHourOther"></span>h</button>
</div> </div>
<div class="row justify-content-around align-middle monthEntrys mt-3" style="max-height: 2.5rem; width: 99%; margin-left: 1%;">
<span class="col-2 btn btn-secondary" id="btn-month-before" onclick="event.stopPropagation();"><</span>
<p class="col-6" style="text-align:center; width: 100%; font-size: 1.75rem; margin: 0;"><b id="actualMonthName"></b></p>
<span class="col-2 btn btn-secondary" id="btn-month-next" onclick="event.stopPropagation();">></span>
</div>
</div> </div>
</div> </div>
<div class="row justify-content-around" style="width: 100vw; color: black; padding-top: 2rem;"> <div class="row justify-content-around" style="width: 100vw; color: black; padding-top: 2rem;">
@ -82,7 +92,7 @@
</div> </div>
</div> </div>
<div class="row justify-content-around" style="width: 95vw; color: black; padding-top: 2rem;"></div> <div class="row justify-content-around" style="width: 95vw; color: black; padding-top: 2rem;"></div>
<div class="col-12" style="height: 40vh; padding: 0rem 1rem 1rem 1rem; border-radius:1rem; box-shadow: 0 0 0.5rem gray; overflow-y: auto;"> <div class="col-12" id="ActivitysTable" style="height: 40vh; padding: 0rem 1rem 1rem 1rem; border-radius:1rem; box-shadow: 0 0 0.5rem gray; overflow-y: auto;">
<div class="row justify-content-between align-items-center m-0" style="width: 100%;position: sticky; top: 0; background-color: white; padding-top: 1rem; z-index: 100;"> <div class="row justify-content-between align-items-center m-0" style="width: 100%;position: sticky; top: 0; background-color: white; padding-top: 1rem; z-index: 100;">
<p class="col-5" style="font-size: 1.2rem; margin: 0 1rem 0 -1rem;" ><b>Aktivitäten</b></p> <p class="col-5" style="font-size: 1.2rem; margin: 0 1rem 0 -1rem;" ><b>Aktivitäten</b></p>
<!-- <span class="col-2" style="margin-left: 32%; padding: 0;"><img id="resetTimer" src="{% static 'app/images/addcircle.png' %}" alt="add" class="img-fluid" style="height: 35px"></span> --> <!-- <span class="col-2" style="margin-left: 32%; padding: 0;"><img id="resetTimer" src="{% static 'app/images/addcircle.png' %}" alt="add" class="img-fluid" style="height: 35px"></span> -->

@ -1,21 +1,21 @@
<br> <br>
<h1>Update Time!</h1> <h1>Update Time!</h1>
<h5>v1.1.0</h5> <br>
<h5>v1.2.0</h5>
<p> <p>
Wie versproche geht es weiter! <b style="color: red">WICHTIGE NEUIGKEIT!</b>
<br>Ja kleine Schritte, aber ich hoffe hilfreich 😀 <br>Wieder ein kleiner Schritt 😀
<br> <br>
<br><b>Was ist neu?</b> <br><b>Was ist neu?</b>
<br> 1. Die Einstellungen oben Rechts <br> Du kannst jetzt die Monate wechseln.
<br> 2. Einstellugnen: Bibelstudien pflegen <br>
<br> 3. Einstellungen: Eigenes Monatsziel <br><b>Wie?</b>
<br> <br> Tippe dazu einfach auf die "Monats"-Kachel
<br><b>Fehlerbehebung:</b> <br> mit dem übersichtsbalken.
<br> 1. Einträge nach Datum sortieren nicht nach Hinzufügen
<br> <br>
<br>Viel Freude beim Testen und Gruß, <br>Viel Freude beim Testen und Gruß,
<br><b>Samuel</b> <br><b>Samuel</b>
</p> </p>
<br> <br>
<input type="text" name="versionnumber" id="versionnumber" class="d-none" value="1.1.0"> <input type="text" name="versionnumber" id="versionnumber" class="d-none" value="1.2.0">
Loading…
Cancel
Save

Powered by TurnKey Linux.