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

Finish showing, Editing and Create DB-Data

Browse Source
main
Samuel Zielke 2 years ago
parent 74feac26dc
commit dd78ef2b55
8 changed files with 301 additions and 85 deletions
Show Stats Download Patch File Download Diff File

24
main/migrations/0018_alter_info_cleaning_alter_info_gast.py
Unescape View File

@ -0,0 +1,24 @@
# Generated by Django 5.0.4 on 2024-04-09 12:48
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0017_alter_week_place'),
]
operations = [
migrations.AlterField(
model_name='info',
name='cleaning',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='CleanPerson', to='main.group'),
),
migrations.AlterField(
model_name='info',
name='gast',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='gastPerson', to='main.group'),
),
]

34
main/migrations/0019_alter_service_date_1_alter_service_speaker_1_and_more.py
Unescape View File

@ -0,0 +1,34 @@
# Generated by Django 5.0.4 on 2024-04-09 12:57
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0018_alter_info_cleaning_alter_info_gast'),
]
operations = [
migrations.AlterField(
model_name='service',
name='date_1',
field=models.DateField(null=True),
),
migrations.AlterField(
model_name='service',
name='speaker_1',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='speaker_1', to='main.contributors'),
),
migrations.AlterField(
model_name='service',
name='time_1',
field=models.TimeField(null=True),
),
migrations.AlterField(
model_name='service',
name='type_1',
field=models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom')], null=True),
),
]

18
main/migrations/0020_alter_group_nummer.py
Unescape View File

@ -0,0 +1,18 @@
# Generated by Django 5.0.4 on 2024-04-09 13:16
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0019_alter_service_date_1_alter_service_speaker_1_and_more'),
]
operations = [
migrations.AlterField(
model_name='group',
name='nummer',
field=models.CharField(max_length=10),
),
]

18
main/migrations/0021_rename_nummer_group_name.py
Unescape View File

@ -0,0 +1,18 @@
# Generated by Django 5.0.4 on 2024-04-09 13:16
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('main', '0020_alter_group_nummer'),
]
operations = [
migrations.RenameField(
model_name='group',
old_name='nummer',
new_name='Name',
),
]

43
main/migrations/0022_alter_service_type_1_alter_service_type_2_and_more.py
Unescape View File

@ -0,0 +1,43 @@
# Generated by Django 5.0.4 on 2024-04-09 13:58
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0021_rename_nummer_group_name'),
]
operations = [
migrations.AlterField(
model_name='service',
name='type_1',
field=models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom'), (3, 'Gruppe')], null=True),
),
migrations.AlterField(
model_name='service',
name='type_2',
field=models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom'), (3, 'Gruppe')], null=True),
),
migrations.AlterField(
model_name='service',
name='type_3',
field=models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom'), (3, 'Gruppe')], null=True),
),
migrations.AlterField(
model_name='service',
name='type_4',
field=models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom'), (3, 'Gruppe')], null=True),
),
migrations.AlterField(
model_name='service',
name='type_5',
field=models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom'), (3, 'Gruppe')], null=True),
),
migrations.AlterField(
model_name='service',
name='type_6',
field=models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom'), (3, 'Gruppe')], null=True),
),
]

17
main/models.py
Unescape View File

@ -22,10 +22,10 @@ class contributors(models.Model):
return self.first_name return self.first_name
class group(models.Model): class group(models.Model):
nummer = models.IntegerField(auto_created=False) Name = models.CharField(max_length=10)
def __str__(self): def __str__(self):
return str(self.nummer) return str(self.Name)
class week(models.Model): class week(models.Model):
@ -39,12 +39,13 @@ class service(models.Model):
TYPES = ( TYPES = (
(1, 'Saal'), (1, 'Saal'),
(2, 'Zoom'), (2, 'Zoom'),
(3, 'Gruppe'),
) )
week = models.ForeignKey(week, on_delete=models.CASCADE) week = models.ForeignKey(week, on_delete=models.CASCADE)
date_1 = models.DateField(auto_now_add=False) date_1 = models.DateField(auto_now_add=False, null=True)
time_1 = models.TimeField(auto_now_add=False) time_1 = models.TimeField(auto_now_add=False, null=True)
type_1 = models.IntegerField(auto_created=False, choices=TYPES) type_1 = models.IntegerField(auto_created=False, choices=TYPES, null=True)
speaker_1 = models.ForeignKey(contributors, on_delete=models.CASCADE, related_name="speaker_1") speaker_1 = models.ForeignKey(contributors, on_delete=models.CASCADE, related_name="speaker_1", null=True)
date_2 = models.DateField(auto_now_add=False, null=True) date_2 = models.DateField(auto_now_add=False, null=True)
time_2 = models.TimeField(auto_now_add=False, null=True) time_2 = models.TimeField(auto_now_add=False, null=True)
type_2 = models.IntegerField(auto_created=False, choices=TYPES, null=True) type_2 = models.IntegerField(auto_created=False, choices=TYPES, null=True)
@ -92,8 +93,8 @@ class regie(models.Model):
class info(models.Model): class info(models.Model):
week = models.ForeignKey(week, on_delete=models.CASCADE) week = models.ForeignKey(week, on_delete=models.CASCADE)
gast = models.ForeignKey(group, on_delete=models.CASCADE, related_name="gastPerson") gast = models.ForeignKey(group, on_delete=models.CASCADE, related_name="gastPerson", null=True)
cleaning = models.ForeignKey(group, on_delete=models.CASCADE, related_name="CleanPerson") cleaning = models.ForeignKey(group, on_delete=models.CASCADE, related_name="CleanPerson", null=True)
def __str__(self): def __str__(self):
return str(self.week) return str(self.week)

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

@ -58,10 +58,10 @@
<p class="theme" style="text-align: left"> <p class="theme" style="text-align: left">
<b>Gastfreundschaft </b> <b>Gastfreundschaft </b>
<span class="info">Gruppe:</span> <span class="info">Gruppe:</span>
<select name="gastgruppe" id="gastgruppe"> <select name="info" id="info">
<option value="0"></option> <option value="0"{% if not info_data.gast.id %}selected{% endif %}></option>
{% for i in gruppen_data %} {% for i in gruppen_data %}
<option value="{{ i.id }}"{% if info_data.gast.id == i.id %}selected{% endif %}>{{ i.nummer }}</option> <option value="{{ i.id }}"{% if info_data.gast.id == i.id %}selected{% endif %}>{{ i.Name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</p> </p>
@ -69,10 +69,10 @@
<td><p class="theme" style="text-align: left"> <td><p class="theme" style="text-align: left">
<b>Reinigung </b> <b>Reinigung </b>
<span class="info">Gruppe:</span> <span class="info">Gruppe:</span>
<select name="gastgruppe" id="gastgruppe"> <select name="info" id="info">
<option value="0"></option> <option value="0"{% if not info_data.cleaning.id %}selected{% endif %}></option>
{% for i in gruppen_data %} {% for i in gruppen_data %}
<option value="{{ i.id }}"{% if info_data.cleaning.id == i.id %}selected{% endif %}>{{ i.nummer }}</option> <option value="{{ i.id }}"{% if info_data.cleaning.id == i.id %}selected{% endif %}>{{ i.Name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</p> </p>
@ -101,21 +101,22 @@
<tr> <tr>
<td style="width: 2.750rem;"><div class="infobox starttime s">1. Dienst</div></td> <td style="width: 2.750rem;"><div class="infobox starttime s">1. Dienst</div></td>
<td> <td>
<input type="date" name="smd_1" id="smd_1" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_1|date:"Y-m-d"|default_if_none:"" }}"> <input type="date" name="smd" id="smd_1" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_1|date:"Y-m-d"|default_if_none:"0" }}">
<input type="time" name="smt_1" id="smt_1" value="{{ service_data.time_1|time:"H:i"|default_if_none:"" }}"> <input type="time" name="smt" id="smt_1" value="{{ service_data.time_1|time:"H:i"|default_if_none:"0" }}">
</td> </td>
<td> <td>
<select name="smm_1" id="smm_1"> <select name="smm" id="smm_1">
<option value="0"></option> <option value="0"{% if not service_data.type_1 %}selected{% endif %}></option>
<option value="1"{% if service_data.type_1 == 1 %}selected{% endif %}>Zoom</option> <option value="1"{% if service_data.type_1 == 1 %}selected{% endif %}>Zoom</option>
<option value="2"{% if service_data.type_1 == 2 %}selected{% endif %}>Saal</option> <option value="2"{% if service_data.type_1 == 2 %}selected{% endif %}>Saal</option>
<option value="3"{% if service_data.type_1 == 3 %}selected{% endif %}>Gruppe</option>
</select> </select>
</td> </td>
<td> <td>
<select name="sms_1" id="sms_1"> <select name="sms" id="sms_1">
<option value="0"></option> <option value="0"{% if not service_data.speaker_1 %}selected{% endif %}></option>
{% for i in sm %} {% for i in sm %}
<option value="{{ i.id }}"{% if service_data.speaker_1.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if service_data.speaker_1.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</td> </td>
@ -125,21 +126,22 @@
<tr> <tr>
<td style="width: 2.750rem;"><div class="infobox starttime s">2. Dienst</div></td> <td style="width: 2.750rem;"><div class="infobox starttime s">2. Dienst</div></td>
<td> <td>
<input type="date" name="smd_2" id="smd_2" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_2|date:"Y-m-d"|default_if_none:"" }}"> <input type="date" name="smd" id="smd_2" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_2|date:"Y-m-d"|default_if_none:"0" }}">
<input type="time" name="smt_2" id="smt_2" value="{{ service_data.time_2|time:"H:i"|default_if_none:"" }}"> <input type="time" name="smt" id="smt_2" value="{{ service_data.time_2|time:"H:i"|default_if_none:"0" }}">
</td> </td>
<td> <td>
<select name="smm_2" id="smm_2"> <select name="smm" id="smm_2">
<option value="0"></option> <option value="0"{% if not service_data.type_2 %}selected{% endif %}></option>
<option value="1"{% if service_data.type_2 == 1 %}selected{% endif %}>Zoom</option> <option value="1"{% if service_data.type_2 == 1 %}selected{% endif %}>Zoom</option>
<option value="2"{% if service_data.type_2 == 2 %}selected{% endif %}>Saal</option> <option value="2"{% if service_data.type_2 == 2 %}selected{% endif %}>Saal</option>
<option value="3"{% if service_data.type_2 == 3 %}selected{% endif %}>Gruppe</option>
</select> </select>
</td> </td>
<td> <td>
<select name="sms_2" id="sms_2"> <select name="sms" id="sms_2">
<option value="0"></option> <option value="0"{% if not service_data.speaker_2 %}selected{% endif %}></option>
{% for i in sm %} {% for i in sm %}
<option value="{{ i.id }}"{% if service_data.speaker_2.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if service_data.speaker_2.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</td> </td>
@ -149,21 +151,22 @@
<tr> <tr>
<td style="width: 2.750rem;"><div class="infobox starttime s">3. Dienst</div></td> <td style="width: 2.750rem;"><div class="infobox starttime s">3. Dienst</div></td>
<td> <td>
<input type="date" name="smd_3" id="smd_3" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_3|date:"Y-m-d"|default_if_none:"" }}"> <input type="date" name="smd" id="smd_3" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_3|date:"Y-m-d"|default_if_none:"0" }}">
<input type="time" name="smt_3" id="smt_3" value="{{ service_data.time_3|time:"H:i"|default_if_none:"" }}"> <input type="time" name="smt" id="smt_3" value="{{ service_data.time_3|time:"H:i"|default_if_none:"0" }}">
</td> </td>
<td> <td>
<select name="smm_3" id="smm_3"> <select name="smm" id="smm_3">
<option value="0"></option> <option value="0" {% if not service_data.type_3 %}selected{% endif %}></option>
<option value="1"{% if service_data.type_3 == 1 %}selected{% endif %}>Zoom</option> <option value="1"{% if service_data.type_3 == 1 %}selected{% endif %}>Zoom</option>
<option value="2"{% if service_data.type_3 == 2 %}selected{% endif %}>Saal</option> <option value="2"{% if service_data.type_3 == 2 %}selected{% endif %}>Saal</option>
<option value="3"{% if service_data.type_3 == 3 %}selected{% endif %}>Gruppe</option>
</select> </select>
</td> </td>
<td> <td>
<select name="sms_3" id="sms_3"> <select name="sms" id="sms_3">
<option value="0"></option> <option value="0"{% if not service_data.speaker_3 %}selected{% endif %}></option>
{% for i in sm %} {% for i in sm %}
<option value="{{ i.id }}"{% if service_data.speaker_3.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if service_data.speaker_3.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</td> </td>
@ -173,21 +176,22 @@
<tr> <tr>
<td style="width: 2.750rem;"><div class="infobox starttime s">4. Dienst</div></td> <td style="width: 2.750rem;"><div class="infobox starttime s">4. Dienst</div></td>
<td> <td>
<input type="date" name="smd_4" id="smd_4" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_4|date:"Y-m-d"|default_if_none:"" }}"> <input type="date" name="smd" id="smd_4" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_4|date:"Y-m-d"|default_if_none:"0" }}">
<input type="time" name="smt_4" id="smt_4" value="{{ service_data.time_4|time:"H:i"|default_if_none:"" }}"> <input type="time" name="smt" id="smt_4" value="{{ service_data.time_4|time:"H:i"|default_if_none:"0" }}">
</td> </td>
<td> <td>
<select name="smm_4" id="smm_4"> <select name="smm" id="smm_4">
<option value="0"></option> <option value="0"{% if not service_data.type_4 %}selected{% endif %}></option>
<option value="1"{% if service_data.type_4 == 1 %}selected{% endif %}>Zoom</option> <option value="1"{% if service_data.type_4 == 1 %}selected{% endif %}>Zoom</option>
<option value="2"{% if service_data.type_4 == 2 %}selected{% endif %}>Saal</option> <option value="2"{% if service_data.type_4 == 2 %}selected{% endif %}>Saal</option>
<option value="3"{% if service_data.type_4 == 3 %}selected{% endif %}>Gruppe</option>
</select> </select>
</td> </td>
<td> <td>
<select name="sms_4" id="sms_4"> <select name="sms" id="sms_4">
<option value="0"></option> <option value="0"{% if not service_data.speaker_4 %}selected{% endif %}></option>
{% for i in sm %} {% for i in sm %}
<option value="{{ i.id }}"{% if service_data.speaker_4.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if service_data.speaker_4.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</td> </td>
@ -197,21 +201,22 @@
<tr> <tr>
<td style="width: 2.750rem;"><div class="infobox starttime s">5. Dienst</div></td> <td style="width: 2.750rem;"><div class="infobox starttime s">5. Dienst</div></td>
<td> <td>
<input type="date" name="smd_5" id="smd_5" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_5|date:"Y-m-d"|default_if_none:"" }}"> <input type="date" name="smd" id="smd_5" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_5|date:"Y-m-d"|default_if_none:"0" }}">
<input type="time" name="smt_5" id="smt_5" value="{{ service_data.time_5|time:"H:i"|default_if_none:"" }}"> <input type="time" name="smt" id="smt_5" value="{{ service_data.time_5|time:"H:i"|default_if_none:"0" }}">
</td> </td>
<td> <td>
<select name="smm_5" id="smm_5"> <select name="smm" id="smm_5">
<option value="0"></option> <option value="0"{% if not service_data.type_5 %}selected{% endif %}></option>
<option value="1"{% if service_data.type_5 == 1 %}selected{% endif %}>Zoom</option> <option value="1"{% if service_data.type_5 == 1 %}selected{% endif %}>Zoom</option>
<option value="2"{% if service_data.type_5 == 2 %}selected{% endif %}>Saal</option> <option value="2"{% if service_data.type_5 == 2 %}selected{% endif %}>Saal</option>
<option value="3"{% if service_data.type_5 == 3 %}selected{% endif %}>Gruppe</option>
</select> </select>
</td> </td>
<td> <td>
<select name="sms_5" id="sms_5"> <select name="sms" id="sms_5">
<option value="0"></option> <option value="0"{% if not service_data.speaker_5 %}selected{% endif %}></option>
{% for i in sm %} {% for i in sm %}
<option value="{{ i.id }}"{% if service_data.speaker_5.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if service_data.speaker_5.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</td> </td>
@ -221,21 +226,22 @@
<tr> <tr>
<td style="width: 2.750rem;"><div class="infobox starttime s">6. Dienst</div></td> <td style="width: 2.750rem;"><div class="infobox starttime s">6. Dienst</div></td>
<td> <td>
<input type="date" name="smd_6" id="smd_6" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_6|date:"Y-m-d"|default_if_none:"" }}"> <input type="date" name="smd" id="smd_6" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_6|date:"Y-m-d"|default_if_none:"0" }}">
<input type="time" name="smt_6" id="smt_6" value="{{ service_data.time_6|time:"H:i"|default_if_none:"" }}"> <input type="time" name="smt" id="smt_6" value="{{ service_data.time_6|time:"H:i"|default_if_none:"0" }}">
</td> </td>
<td> <td>
<select name="smm_6" id="smm_6"> <select name="smm" id="smm_6">
<option value="0"></option> <option value="0"{% if not service_data.type_6 %}selected{% endif %}></option>
<option value="1"{% if service_data.type_6 == 1 %}selected{% endif %}>Zoom</option> <option value="1"{% if service_data.type_6 == 1 %}selected{% endif %}>Zoom</option>
<option value="2"{% if service_data.type_6 == 2 %}selected{% endif %}>Saal</option> <option value="2"{% if service_data.type_6 == 2 %}selected{% endif %}>Saal</option>
<option value="3"{% if service_data.type_6 == 3 %}selected{% endif %}>Gruppe</option>
</select> </select>
</td> </td>
<td> <td>
<select name="sms_6" id="sms_6"> <select name="sms" id="sms_6">
<option value="0"></option> <option value="0"{% if not service_data.speaker_6 %}selected{% endif %}></option>
{% for i in sm %} {% for i in sm %}
<option value="{{ i.id }}"{% if service_data.speaker_6.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if service_data.speaker_6.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</td> </td>
@ -270,10 +276,10 @@
<td> <td>
<p class="theme" style="text-align: left"> <p class="theme" style="text-align: left">
<b>1. </b> <b>1. </b>
<select name="ods_1" id="ods_1"> <select name="ods" id="ods_1">
<option value="0"></option> <option value="0"{% if not steward_data.hall_1.id %}selected{% endif %}></option>
{% for i in saal_ordner %} {% for i in saal_ordner %}
<option value="{{ i.id }}"{% if steward_data.hall_1.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if steward_data.hall_1.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</p> </p>
@ -283,10 +289,10 @@
<td> <td>
<p class="theme" style="text-align: left"> <p class="theme" style="text-align: left">
<b>2. </b> <b>2. </b>
<select name="ods_1" id="ods_1"> <select name="ods" id="ods_1">
<option value="0"></option> <option value="0"{% if not steward_data.hall_2.id %}selected{% endif %}></option>
{% for i in saal_ordner %} {% for i in saal_ordner %}
<option value="{{ i.id }}"{% if steward_data.hall_2.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if steward_data.hall_2.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</p> </p>
@ -304,10 +310,10 @@
<td> <td>
<p class="theme" style="text-align: left"> <p class="theme" style="text-align: left">
<b>1. </b> <b>1. </b>
<select name="ods_1" id="ods_1"> <select name="ods" id="ods_1">
<option value="0"></option> <option value="0"{% if not steward_data.foyer_1.id %}selected{% endif %}></option>
{% for i in ordner %} {% for i in ordner %}
<option value="{{ i.id }}"{% if steward_data.foyer_1.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if steward_data.foyer_1.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</p> </p>
@ -317,10 +323,10 @@
<td> <td>
<p class="theme" style="text-align: left"> <p class="theme" style="text-align: left">
<b>2. </b> <b>2. </b>
<select name="ods_1" id="ods_1"> <select name="ods" id="ods_1">
<option value="0"></option> <option value="0"{% if not steward_data.foyer_2.id %}selected{% endif %}></option>
{% for i in ordner %} {% for i in ordner %}
<option value="{{ i.id }}"{% if steward_data.foyer_2.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if steward_data.foyer_2.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</p> </p>
@ -356,10 +362,10 @@
<td> <td>
<p class="theme" style="text-align: left"> <p class="theme" style="text-align: left">
<b>1. </b> <b>1. </b>
<select name="ods_1" id="ods_1"> <select name="regie" id="regie_1">
<option value="0"></option> <option value="0"{% if not regie_data.regie_1.id %}selected{% endif %}></option>
{% for i in anlage %} {% for i in anlage %}
<option value="{{ i.id }}"{% if regie_data.regie_1.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if regie_data.regie_1.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</p> </p>
@ -369,10 +375,10 @@
<td> <td>
<p class="theme" style="text-align: left"> <p class="theme" style="text-align: left">
<b>2. </b> <b>2. </b>
<select name="ods_1" id="ods_1"> <select name="regie" id="regie_2">
<option value="0"></option> <option value="0"{% if not regie_data.regie_2.id %}selected{% endif %}></option>
{% for i in anlage %} {% for i in anlage %}
<option value="{{ i.id }}"{% if regie_data.regie_2.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if regie_data.regie_2.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</p> </p>
@ -392,10 +398,10 @@
<td> <td>
<p class="theme" style="text-align: left"> <p class="theme" style="text-align: left">
<b>1. </b> <b>1. </b>
<select name="ods_1" id="ods_1"> <select name="regie" id="regie_3">
<option value="0"></option> <option value="0"{% if not regie_data.zoom_1.id %}selected{% endif %}></option>
{% for i in zoom %} {% for i in zoom %}
<option value="{{ i.id }}"{% if regie_data.zoom_1.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if regie_data.zoom_1.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</p> </p>
@ -405,10 +411,10 @@
<td> <td>
<p class="theme" style="text-align: left"> <p class="theme" style="text-align: left">
<b>2. </b> <b>2. </b>
<select name="ods_1" id="ods_1"> <select name="regie" id="regie_4">
<option value="0"></option> <option value="0"{% if not regie_data.zoom_2.id %}selected{% endif %}></option>
{% for i in zoom %} {% for i in zoom %}
<option value="{{ i.id }}"{% if regie_data.zoom_2.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if regie_data.zoom_2.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</p> </p>
@ -429,10 +435,10 @@
<td> <td>
<p class="theme" style="text-align: left"> <p class="theme" style="text-align: left">
<b>1. </b> <b>1. </b>
<select name="ods_1" id="ods_1"> <select name="regie" id="regie_5">
<option value="0"></option> <option value="0"></option>
{% for i in buehne %} {% for i in buehne %}
<option value="{{ i.id }}"{% if regie_data.stage.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option> <option value="{{ i.id }}"{% if regie_data.stage.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}{% if i.first_name == "Fred" %}red{% endif %}. {{ i.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</p> </p>
@ -442,7 +448,7 @@
</div> </div>
<p style="display: none;">!Technik_END!</p> <p style="display: none;">!Technik_END!</p>
<div class="formcontrol"> <div class="formcontrol">
<button type="submit" class="btn btn-secondary">Speichern</button> <button type="submit" class="btn btn-secondary" name="formsend">Speichern</button>
</div> </div>
</form> </form>
</div> </div>

76
main/views.py
Unescape View File

@ -49,15 +49,87 @@ def index(request):
strDate = url_date.strftime("%d.%m.%y") strDate = url_date.strftime("%d.%m.%y")
# Abfrage der Datenbanken um Informationen einzublenden # AB HIER WIRD DAS SPEICHERN BEHANDELT
# PRÜFEN OB DAS FORMULAR GESENDET WURDE UND AUCH DER BUTTON VERWENDET WURDE
if request.method == "POST":
if 'formsend' in request.POST:
# ÜBERPRÜFEN OB DIE "WEEK" SCHON EINEN EINTRAG HAT - SONST ANLEGEN
MainModel.week.objects.create(date_of_monday=strDate) if MainModel.week.objects.filter(date_of_monday=strDate).count() < 1 else ...
# FUNKTION ZUM VERGLEICH DER BEIDEN DATENSÄTZE
def check_is_same(a, b):
return True if a == b else False
# Abfrage der Datenbanken um Informationen abzugleichen
gruppen_data = MainModel.group.objects.all()
persons = MainModel.contributors.objects.all()
steward_data = MainModel.steward.objects.get(week__date_of_monday=strDate) if MainModel.steward.objects.filter(week__date_of_monday=strDate).count() > 0 else None
regie_data = MainModel.regie.objects.get(week__date_of_monday=strDate) if MainModel.regie.objects.filter(week__date_of_monday=strDate).count() > 0 else None
info_data = MainModel.info.objects.get(week__date_of_monday=strDate) if MainModel.info.objects.filter(week__date_of_monday=strDate).count() > 0 else None
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_info = request.POST.getlist("info")
post_service_date = request.POST.getlist("smd")
post_service_time = request.POST.getlist("smt")
post_service_type = request.POST.getlist("smm")
post_service_speaker = request.POST.getlist("sms")
post_steward = request.POST.getlist("ods")
post_regie = request.POST.getlist("regie")
# INFOS
if info_data == None:
info_data = MainModel.info.objects.create(
week = MainModel.week.objects.get(date_of_monday=strDate),
gast = gruppen_data.get(id=post_info[0]) if post_info[0] != "0" else None,
cleaning = gruppen_data.get(id=post_info[1]) if post_info[1] != "0" else None,
)
else:
info_data.gast = gruppen_data.get(id=post_info[0]) if post_info[0] != "0" else None
info_data.cleaning = gruppen_data.get(id=post_info[1]) if post_info[1] != "0" else None
info_data.save()
# PREDIGTDIENST
if service_data == None: service_data = MainModel.service.objects.create(week = MainModel.week.objects.get(date_of_monday=strDate))
for i in range(1, 7):
# Datum
service_data.__setattr__("date_"+str(i), post_service_date[i-1]) if post_service_date[i-1] != "" else service_data.__setattr__("date_"+str(i), None)
# Uhrzeit
service_data.__setattr__("time_"+str(i), post_service_time[i-1]) if post_service_time[i-1] != "" else service_data.__setattr__("time_"+str(i), None)
# Type
service_data.__setattr__("type_"+str(i), post_service_type[i-1]) if post_service_type[i-1] != "0" else service_data.__setattr__("type_"+str(i), None)
# Leiter
service_data.__setattr__("speaker_"+str(i), persons.get(id=post_service_speaker[i-1])) if post_service_speaker[i-1] != "0" else service_data.__setattr__("speaker_"+str(i), None)
service_data.save()
# ORDNUNGSIENST
if steward_data == None: steward_data = MainModel.steward.objects.create(week = MainModel.week.objects.get(date_of_monday=strDate))
steward_data.hall_1 = persons.get(id=post_steward[0]) if post_steward[0] != "0" else None
steward_data.hall_2 = persons.get(id=post_steward[1]) if post_steward[1] != "0" else None
steward_data.foyer_1 = persons.get(id=post_steward[2]) if post_steward[2] != "0" else None
steward_data.foyer_2 = persons.get(id=post_steward[3]) if post_steward[3] != "0" else None
steward_data.save()
# TECHNIK
if regie_data == None: regie_data = MainModel.regie.objects.create(week = MainModel.week.objects.get(date_of_monday=strDate))
regie_data.regie_1 = persons.get(id=post_regie[0]) if post_regie[0] != "0" else None
regie_data.regie_2 = persons.get(id=post_regie[1]) if post_regie[1] != "0" else None
regie_data.zoom_1 = persons.get(id=post_regie[2]) if post_regie[2] != "0" else None
regie_data.zoom_2 = persons.get(id=post_regie[3]) if post_regie[3] != "0" else None
regie_data.stage = persons.get(id=post_regie[4]) if post_regie[4] != "0" else None
regie_data.save()
# Abfrage der Datenbanken um Informationen einzublenden
steward_data = MainModel.steward.objects.filter(week__date_of_monday=strDate)[0] if MainModel.steward.objects.filter(week__date_of_monday=strDate).count() > 0 else {} steward_data = MainModel.steward.objects.filter(week__date_of_monday=strDate)[0] if MainModel.steward.objects.filter(week__date_of_monday=strDate).count() > 0 else {}
regie_data = MainModel.regie.objects.filter(week__date_of_monday=strDate)[0] if MainModel.regie.objects.filter(week__date_of_monday=strDate).count() > 0 else {} regie_data = MainModel.regie.objects.filter(week__date_of_monday=strDate)[0] if MainModel.regie.objects.filter(week__date_of_monday=strDate).count() > 0 else {}
info_data = MainModel.info.objects.filter(week__date_of_monday=strDate)[0] if MainModel.info.objects.filter(week__date_of_monday=strDate).count() > 0 else {} info_data = MainModel.info.objects.filter(week__date_of_monday=strDate)[0] if MainModel.info.objects.filter(week__date_of_monday=strDate).count() > 0 else {}
gruppen_data = MainModel.group.objects.all() gruppen_data = MainModel.group.objects.all()
persons = MainModel.contributors.objects.all() persons = MainModel.contributors.objects.all()
service_data = MainModel.service.objects.filter(week__date_of_monday=strDate)[0] if MainModel.service.objects.filter(week__date_of_monday=strDate).count() > 0 else {} service_data = MainModel.service.objects.filter(week__date_of_monday=strDate)[0] if MainModel.service.objects.filter(week__date_of_monday=strDate).count() > 0 else {}
return render(request, 'main/index.html', {'actual' : actual, return render(request, 'main/index.html', {'actual' : actual,
'error' : error, 'error' : error,
'date': strDate, 'date': strDate,

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.