samuelzielke
/
MeetingOrganizer
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Version 1.0 - Add Week-Info

Browse Source
main
Samuel Zielke 2 years ago
parent b51f0768ec
commit c9e17913a3
10 changed files with 127 additions and 41 deletions
Show Stats Download Patch File Download Diff File

32
COMBO_MO_MOBIL.htm
Unescape View File

@ -67,7 +67,7 @@
#week { page-break-after: always; }
div#outgoing:not(:first-child) { display: none; }
</style>
<!--@JS-DATA@-->
<!--@JS-DATA@--><script>const myDATA ={'15.04.24': ['', '5', 'Russisch', '0', ' - 14:30 Uhr', '1', ' - Samuel Zielke', '1', ' - 09:30 Uhr', '1', ' - Peter Dörsam', '4', ' - 14:00 Uhr', '2', ' - Fred Schlöffel', '5', ' - 09:30 Uhr', '2', ' - Friedhelm Schlöffel', '', '', '', '', '', '', '', '', 'Fred Schlöffel', 'Jürgen Zielke', 'Gary George', 'Axel Hahn', 'Samuel Zielke', 'Daniel Zielke', 'Talita Hahn', 'Erwin Gert', 'Jürgen Zielke']}</script>
</head>
@ -88,7 +88,7 @@
<tr>
<td style="width: 2.750rem; background-color: rgba(210, 214, 214, 0.373);">
<td style="background-color: rgba(210, 214, 214, 0.373); padding-left: 0.250rem;">
<h3 style="text-align: left; color: gray;">Infos und Predigtdienst</h3>
<h3 style="text-align: left; color: gray;">Infos und Predigtdienst <span class="info CustomElem"></span></h3>
</td>
</tr>
</table>
@ -642,18 +642,18 @@
let weeklistpos = 0;
let myIndex = 0;
ordner_elements.forEach((element) => {
if (myIndex == 35){
if (myIndex == 36){
myIndex = 0;
weeklistpos = weeklistpos + 1;
}
if( window.weekdate[weeklistpos] in myDATA ){
if ([3, 7, 11, 15, 19, 23].includes(myIndex+1) && myDATA[window.weekdate[weeklistpos]][myIndex] != "") {
if ([4, 8, 12, 16, 20, 24].includes(myIndex+1) && myDATA[window.weekdate[weeklistpos]][myIndex] != "") {
element.innerHTML = weekdays[myDATA[window.weekdate[weeklistpos]][myIndex]];
}
else if ([5, 9, 13, 17, 21, 25].includes(myIndex+1) && myDATA[window.weekdate[weeklistpos]][myIndex] != "") {
else if ([6, 10, 14, 18, 22, 26].includes(myIndex+1) && myDATA[window.weekdate[weeklistpos]][myIndex] != "") {
element.innerHTML = service_type[myDATA[window.weekdate[weeklistpos]][myIndex]-1];
@ -673,24 +673,6 @@
</script>
</body>
</html></html>DATA[window.weekdate[weeklistpos]][myIndex] != "") {
</html>y>
element.innerHTML = service_type[myDATA[window.weekdate[weeklistpos]][myIndex]-1];
}
else {
element.innerHTML = myDATA[window.weekdate[weeklistpos]][myIndex];
}
}
myIndex = myIndex + 1;
});
}
setData(myDATA)
</script>
</body>
</html></html>
</html>

19
main/migrations/0023_week_info_field.py
Unescape View File

@ -0,0 +1,19 @@
# Generated by Django 5.0.4 on 2024-04-15 15:28
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0022_alter_service_type_1_alter_service_type_2_and_more'),
]
operations = [
migrations.AddField(
model_name='week',
name='info_field',
field=models.CharField(default=django.db.models.deletion.SET_NULL, max_length=100, null=True),
),
]

18
main/migrations/0024_alter_week_info_field.py
Unescape View File

@ -0,0 +1,18 @@
# Generated by Django 5.0.4 on 2024-04-15 15:29
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0023_week_info_field'),
]
operations = [
migrations.AlterField(
model_name='week',
name='info_field',
field=models.CharField(default=None, max_length=100, null=True),
),
]

18
main/migrations/0025_alter_week_info_field.py
Unescape View File

@ -0,0 +1,18 @@
# Generated by Django 5.0.4 on 2024-04-15 15:29
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0024_alter_week_info_field'),
]
operations = [
migrations.AlterField(
model_name='week',
name='info_field',
field=models.CharField(max_length=100, null=True),
),
]

17
main/migrations/0026_remove_week_info_field.py
Unescape View File

@ -0,0 +1,17 @@
# Generated by Django 5.0.4 on 2024-04-15 15:30
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('main', '0025_alter_week_info_field'),
]
operations = [
migrations.RemoveField(
model_name='week',
name='info_field',
),
]

18
main/migrations/0027_week_info_field.py
Unescape View File

@ -0,0 +1,18 @@
# Generated by Django 5.0.4 on 2024-04-15 15:30
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0026_remove_week_info_field'),
]
operations = [
migrations.AddField(
model_name='week',
name='info_field',
field=models.CharField(max_length=100, null=True),
),
]

1
main/models.py
Unescape View File

@ -31,6 +31,7 @@ class group(models.Model):
class week(models.Model):
date_of_monday = models.CharField(max_length=50)
place = models.ForeignKey(place, on_delete=models.CASCADE,default=1)
info_field = models.CharField(max_length=100, null=True)
def __str__(self):
return self.date_of_monday

6
main/templates/main/index.html
Unescape View File

@ -82,7 +82,11 @@
</select>
</p>
</td>
<td><p class="theme" style="text-align: left"></p></td>
<td><p class="theme" style="text-align: left">
<b>Wocheninfo: </b>
<input type="text" name="week_info" id="week_info" value="{{ week_info }}">
</p>
</td>
</tr>
</table>
</div>

28
main/views.py
Unescape View File

@ -78,7 +78,7 @@ def createApi():
type = str(db_service_weekly.__getattribute__("type_"+str(i))) if db_service_weekly.__getattribute__("type_"+str(i)) != None else ""
DatesOfServiceWeek.append(str(type))
if db_service_weekly.__getattribute__("speaker_"+str(i)) != None:
name = " - " + str(db_service_weekly.__getattribute__("speaker_"+str(i))) + ". " + str(db_service_weekly.__getattribute__("speaker_"+str(i)).name)
name = " - " + str(db_service_weekly.__getattribute__("speaker_"+str(i))) + " " + str(db_service_weekly.__getattribute__("speaker_"+str(i)).name)
else:
name = ""
DatesOfServiceWeek.append(name)
@ -90,6 +90,7 @@ def createApi():
week_array = [
# INFO
str("- " + week.info_field) if week.info_field != "" else "",
str(db_info.get(week=week).gast.Name) if db_info.get(week=week).gast != None else "",
str(db_info.get(week=week).cleaning.Name) if db_info.get(week=week).cleaning != None else "",
@ -108,17 +109,17 @@ def createApi():
DatesOfService[6][2], DatesOfService[6][3],
# ORDNER
str(db_steward_weekly.hall_1.first_name) + ". " + str(db_steward_weekly.hall_1.name) if db_steward_weekly.hall_1 != None else "",
str(db_steward_weekly.hall_2.first_name) + ". " + str(db_steward_weekly.hall_2.name) if db_steward_weekly.hall_2 != None else "",
str(db_steward_weekly.foyer_1.first_name) + ". " + str(db_steward_weekly.foyer_1.name) if db_steward_weekly.foyer_1 != None else "",
str(db_steward_weekly.foyer_2.first_name) + ". " + str(db_steward_weekly.foyer_2.name) if db_steward_weekly.foyer_2 != None else "",
str(db_steward_weekly.hall_1.first_name) + " " + str(db_steward_weekly.hall_1.name) if db_steward_weekly.hall_1 != None else "",
str(db_steward_weekly.hall_2.first_name) + " " + str(db_steward_weekly.hall_2.name) if db_steward_weekly.hall_2 != None else "",
str(db_steward_weekly.foyer_1.first_name) + " " + str(db_steward_weekly.foyer_1.name) if db_steward_weekly.foyer_1 != None else "",
str(db_steward_weekly.foyer_2.first_name) + " " + str(db_steward_weekly.foyer_2.name) if db_steward_weekly.foyer_2 != None else "",
# ANLAGE
str(db_regie_weekly.regie_1.first_name) + ". " + str(db_regie_weekly.regie_1.name) if db_regie_weekly.regie_1 != None else "",
str(db_regie_weekly.regie_2.first_name) + ". " + str(db_regie_weekly.regie_2.name) if db_regie_weekly.regie_2 != None else "",
str(db_regie_weekly.zoom_1.first_name) + ". " + str(db_regie_weekly.zoom_1.name) if db_regie_weekly.zoom_1 != None else "",
str(db_regie_weekly.zoom_2.first_name) + ". " + str(db_regie_weekly.zoom_2.name) if db_regie_weekly.zoom_2 != None else "",
str(db_regie_weekly.stage.first_name) + ". " + str(db_regie_weekly.stage.name) if db_regie_weekly.stage != None else "",
str(db_regie_weekly.regie_1.first_name) + " " + str(db_regie_weekly.regie_1.name) if db_regie_weekly.regie_1 != None else "",
str(db_regie_weekly.regie_2.first_name) + " " + str(db_regie_weekly.regie_2.name) if db_regie_weekly.regie_2 != None else "",
str(db_regie_weekly.zoom_1.first_name) + " " + str(db_regie_weekly.zoom_1.name) if db_regie_weekly.zoom_1 != None else "",
str(db_regie_weekly.zoom_2.first_name) + " " + str(db_regie_weekly.zoom_2.name) if db_regie_weekly.zoom_2 != None else "",
str(db_regie_weekly.stage.first_name) + " " + str(db_regie_weekly.stage.name) if db_regie_weekly.stage != None else "",
]
@ -168,6 +169,7 @@ def index(request):
service_data = MainModel.service.objects.get(week__date_of_monday=strDate) if MainModel.service.objects.filter(week__date_of_monday=strDate).count() > 0 else None
# Abfragen der POST-Daten
post_week_info = request.POST.get("week_info")
post_info = request.POST.getlist("info")
post_service_date = request.POST.getlist("smd")
post_service_time = request.POST.getlist("smt")
@ -176,6 +178,11 @@ def index(request):
post_steward = request.POST.getlist("ods")
post_regie = request.POST.getlist("regie")
# WOCHENINFORMATION
NewWeekInfo = MainModel.week.objects.get(date_of_monday=strDate)
NewWeekInfo.info_field = post_week_info
NewWeekInfo.save()
# INFOS
if info_data == None:
info_data = MainModel.info.objects.create(
@ -233,6 +240,7 @@ def index(request):
return render(request, 'main/index.html', {'actual' : actual,
'error' : error,
'date': strDate,
'week_info': MainModel.week.objects.get(date_of_monday=strDate).info_field if MainModel.week.objects.filter(date_of_monday=strDate).count() > 0 else "",
'next_date': FutureyDate(url_date, 1).strftime("%d%m%y"),
'past_date': PastDate(url_date, 1).strftime("%d%m%y"),
'saal_ordner' : persons.filter(saalordner=True),

11
theocbase_templates/COMBO_MO_PC.htm
Unescape View File

@ -86,7 +86,7 @@
<tr>
<td style="width: 2.750rem; background-color: rgba(210, 214, 214, 0.373);">
<td style="background-color: rgba(210, 214, 214, 0.373); padding-left: 0.250rem;">
<h3 style="text-align: left; color: gray;">Infos und Predigtdienst</h3>
<h3 style="text-align: left; color: gray;">Infos und Predigtdienst <span class="info CustomElem"></span></h3>
</td>
</tr>
</table>
@ -640,15 +640,15 @@
let weeklistpos = 0;
let myIndex = 0;
ordner_elements.forEach((element) => {
if (myIndex == 35){
if (myIndex == 36){
myIndex = 0;
weeklistpos = weeklistpos + 1;
} else if ([3, 7, 11, 15, 19, 23].includes(myIndex+1) && myDATA[window.weekdate[weeklistpos]][myIndex] != "") {
} else if ([4, 8, 12, 16, 20, 24].includes(myIndex+1) && myDATA[window.weekdate[weeklistpos]][myIndex] != "") {
element.innerHTML = weekdays[myDATA[window.weekdate[weeklistpos]][myIndex]];
}
else if ([5, 9, 13, 17, 21, 25].includes(myIndex+1) && myDATA[window.weekdate[weeklistpos]][myIndex] != "") {
else if ([6, 10, 14, 18, 22, 26].includes(myIndex+1) && myDATA[window.weekdate[weeklistpos]][myIndex] != "") {
element.innerHTML = service_type[myDATA[window.weekdate[weeklistpos]][myIndex]-1];
@ -663,7 +663,8 @@
}
const req = new XMLHttpRequest();
req.open("GET", "http://mo.samuelzielke.de/api/", false);
// req.open("GET", "http://mo.samuelzielke.de/api/", false);
req.open("GET", "http://localhost:8000/api/", false);
req.send()
myDATA = JSON.parse(req.response);

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.