Merge branch 'dev' into pwa-optimized

.gitignore

@@ -8,4 +8,5 @@ secure*
 class.pdf
 class.tex
 .idea/
-media/
\ No newline at end of file
+media/
+node_modules
\ No newline at end of file

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (SchoolApps)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (school-apps)" project-jdk-type="Python SDK" />
   <component name="PyCharmProfessionalAdvertiser">
     <option name="shown" value="true" />
   </component>

.idea/school-apps.iml

@@ -20,7 +20,6 @@
     <orderEntry type="jdk" jdkName="Python 3.7 (SchoolApps)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="jquery-3.2.1" level="application" />
-    <orderEntry type="module" module-name="bwinf-36-2" />
     <orderEntry type="library" name="react.production" level="application" />
     <orderEntry type="library" name="react-dom.production" level="application" />
     <orderEntry type="library" name="jquery" level="application" />

.idea/vcs.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/schoolapps/static/materialize" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file

README.md

@@ -49,6 +49,7 @@ pip install django-material
 pip install django-filter
 pip install django_react_templatetags
 pip install kanboard
+pip install PyPDF2
 ```
 - `example_secure_settings.py` zu `secure_settings.py` kopieren und anpassen
 
@@ -67,6 +68,14 @@ python3 schoolapps/manage.py makemigrations
 python3 schoolapps/manage.py migrate
 ```
 
+### Kanboard-Verbindung einrichten
+1. Zu den [Einstellungen](localhost:8000/settings) navigieren (/settings)
+2. Den Kanboard-API-Key von [Kanboard](https://kanboard.katharineum.de/?controller=ConfigController&action) eintragen
+3. Die Project-IDs von ``Rebus`` (#4) und ``Feedback`` (#18) eintragen.
+4. Die richtigen E-Mailadressen eintragen.
+
+### Testlauf
+
 ## LDAP (info.katharineum.de)
 
 **WICHTIG: LDAP funktioniert nur bei Root-Zugriff auf dem Infoserver!**
@@ -91,13 +100,6 @@ dc=skole,dc=skolelinux,dc=no
 3. Verbindung in AD mit oben genannten Daten herstellen
 
 
-### Submodules updaten
-```
-git submodule init
-git submodule update
-```
 
-## Kanboard-Verbindung einrichten
-1. Zu den [Einstellungen](localhost:800/settings) navigieren (/settings)
-2. Den Kanboard-API-Key von [Kanboard](https://kanboard.katharineum.de/?controller=ConfigController&action) eintragen
-3. Die Project-IDs von ``Rebus`` (#4) und ``Feedback`` (#18) eintragen.
\ No newline at end of file
+
+

dynselect/src/App.js

@@ -230,7 +230,8 @@ Select.defaultProps = {
 class Input extends Component {
     render() {
         return <div
-            className={(this.props.show ? "" : "hide ") + "input-field col s4"}>
+        className = {(this.props.show ? "" : "hide ") + "input-field col s12 m12 l4"
+    }>
             <i className={"material-icons prefix"}>{this.props.icon}</i>
             {this.props.children}
             <label>{this.props.label}</label>
@@ -322,7 +323,8 @@ class App extends Component {
         return (
             <div className="App">
                 <div className={"row"}>
-                    <div className="input-field col s4">
+        < div
+    className = "input-field col s12 m12 l4" >
                         <i className={"material-icons prefix"}>list</i>
                         <select onChange={this._onCategoryChanges} defaultValue={"noCategory"}>
                             <option value={"noCategory"} disabled={true}>Keine Kategorie ausgewählt</option>
@@ -396,7 +398,8 @@ class App extends Component {
 
                     {/* Section C – Device Issue */}
                     <div
-                        className={(sC === "deviceIssues" && step === 2 ? "" : "hide ") + "input-field col s4"}>
+    className = {(sC === "deviceIssues" && step === 2 ? "" : "hide ") + "input-field col s12 m12 l4"
+}>
                         <i className={"material-icons prefix"}>device_unknown</i>
                         <input type={"text"} id={"valc"} onChange={this._onSetC} required={true}/>
                         <label htmlFor="valc">Um welches Gerät handelt es sich?</label>

dynselect2/src/App.js

 import React, {Component} from 'react';
-// import "materialize-css/dist/css/materialize.css";
 
 import M from "materialize-css/dist/js/materialize";
 import PropTypes from "prop-types";
@@ -251,7 +250,7 @@ class Input extends Component {
         return
     <
         div
-        className = {(this.props.show ? "" : "hide ") + "input-field col s4"
+        className = {(this.props.show ? "" : "hide ") + "input-field col s12 m12 l4"
     }>
     <
         i
@@ -376,7 +375,7 @@ render()
         < div
     className = {"row"} >
         < div
-    className = "input-field col s4" >
+    className = "input-field col s12 m12 l4" >
         < i
     className = {"material-icons prefix"} > list < /i>
         < select
@@ -570,7 +569,7 @@ render()
     }
 <
     div
-    className = {(sC === "deviceIssues" && step === 2 ? "" : "hide ") + "input-field col s4"
+    className = {(sC === "deviceIssues" && step === 2 ? "" : "hide ") + "input-field col s12 m12 l4"
 }>
 <
     i

schoolapps/aub/README.md

@@ -11,7 +11,6 @@
     - Beschreibung (TextField)
     - Antragsteller (Lehrerkürzel) wird automatisch aus angemeldetem Benutzer generiert
 
-
 2.  Schulleiter erhält Antrag (Link per Mail) und a. bewilligt oder b. lehnt ab
 
     a. Stellvertreter prüft Antrag und i. bewilligt oder ii. formuliert Bedenken und lehnt ab

schoolapps/aub/filters.py

 from django import forms
+from django.contrib.auth.models import User
 import django_filters
-from .models import Aub
+from .models import Aub, Status
+
 
 class AUBFilter(django_filters.FilterSet):
+    def getAUBUsers():
+        ''' Find all users who sends an AUB'''
+        aub_users = Aub.objects.values_list('created_by')
+        users = list(User.objects.filter(id__in=aub_users))
+        user_ids = [(str(user.id),user.username) for user in users]
+        return user_ids
+
+    def get_status_choices():
+        status_values = list(Status.objects.values_list('name'))
+        status_ids = [(i+1,name[0]) for i,name in enumerate(status_values)]
+        return status_ids
+    #print('status_values:', get_status_choices())
+    print('users', getAUBUsers())
     #timerangechoices = [('today','Heute'),('thisWeek','Diese Woche'), ('thisMonth','Dieser Monat')]
     #timerange = django_filters.ChoiceFilter(label='Zeitumfang', choices=timerangechoices)
-    created_by = django_filters.ChoiceFilter(label='Von')
-    statuschoices = [('1','In Bearbeitung 1'),('2','In Bearbeitung 2'),('3','Genehmigt'),('4','Abgelehnt')]
-    status = django_filters.ChoiceFilter(label='Status', choices=statuschoices, initial='In Bearbeitung 1')
+    created_by = django_filters.ChoiceFilter(label='Von', choices=getAUBUsers())
+    #status_choices = [('1','In Bearbeitung 1'),('2','In Bearbeitung 2'),('3','Genehmigt'),('4','Abgelehnt')]
+    #status = django_filters.ChoiceFilter(label='Status', choices=get_status_choices(), initial='In Bearbeitung 1')
     class Meta:
         model = Aub
-        fields = [ 'created_by', 'status']
-        ordering = 'status'
\ No newline at end of file
+        fields = ['created_by',]
+        #fields = ['created_by', 'status']
+        #ordering = 'status'
+

schoolapps/aub/forms.py

@@ -6,38 +6,16 @@ from material import Layout, Row, Fieldset
 from aub.models import Aub
 
 
-class FilterAUBForm(forms.Form):
-    timerangechoices = [('today', 'Heute'), ('thisWeek', 'Diese Woche'), ('thisMonth', 'Dieser Monat')]
-    timerange = forms.ChoiceField(label='Zeitumfang', choices=timerangechoices, initial='thisWeek',
-                                  widget=forms.RadioSelect)
-    statuschoices = [('all', 'Alle'), ('processing', 'In Bearbeitung'), ('decided', 'Entschieden')]
-    status = forms.ChoiceField(label='Status', choices=statuschoices, initial='processing', widget=forms.RadioSelect)
-    sortingchoices = [('created_at_asc', 'Nach Datum (neue oben)'), ('created_at_desc', 'Nach Datum (alte oben)'),
-                      ('created_by', 'Nach Antragsteller')]
-    sorting = forms.ChoiceField(label='Sortierung', choices=sortingchoices, initial='created_at_asc',
-                                widget=forms.RadioSelect)
-
-    layout = Layout(Fieldset('Filter',
-                             Row('timerange', 'status', 'sorting'),
-                             )
-                    )
-
-    def clean(self):
-        cleaned_data = super().clean()
-
-
 class ApplyForAUBForm(forms.ModelForm):
     lessons = [('', ''), ('8:00', '1.'), ('8:45', '2.'), ('9:45', '3.'), ('10:35', '4.'), ('11:35', '5.'),
                ('12:25', '6.'), ('13:15', '7.'), ('14:05', '8.'), ('14:50', '9.')]
     initial_from_time = '8:00'
     initial_to_time = '15:35'
     from_date = forms.DateField(label='Datum', input_formats=['%d.%m.%Y'])
-    from_lesson = forms.ChoiceField(label='Stunde', choices=lessons, required=False,
-                                    widget=forms.Select(attrs={'onchange': 'set_time(this)'}))
+    from_lesson = forms.ChoiceField(label='Stunde', choices=lessons, required=False, widget=forms.Select(attrs={'onchange': 'setTime(this)'}))
     from_time = forms.TimeField(label='Zeit', input_formats=['%H:%M'], initial=initial_from_time, )
     to_date = forms.DateField(label='Datum', input_formats=['%d.%m.%Y'])
-    to_lesson = forms.ChoiceField(label='Stunde', choices=lessons, required=False,
-                                  widget=forms.Select(attrs={'onchange': 'set_time(this)'}))
+    to_lesson = forms.ChoiceField(label='Stunde', choices=lessons, required=False, widget=forms.Select(attrs={'onchange': 'setTime(this)'}))
     to_time = forms.TimeField(label='Zeit', input_formats=['%H:%M'], initial=initial_to_time)
     description = forms.CharField(label='Bitte begründen Sie Ihren Antrag.')
 
@@ -84,83 +62,4 @@ class ApplyForAUBForm(forms.ModelForm):
 
         return data
 
-# class ApplyForAUBForm(forms.Form):
-#     lessons = [('', ''), ('8:00', '1.'), ('8:45', '2.'), ('9:45', '3.'), ('10:35', '4.'), ('11:35', '5.'),
-#                ('12:25', '6.'), ('13:15', '7.'), ('14:05', '8.'), ('14:50', '9.')]
-#     from_date = forms.DateField(label='Datum', input_formats=['%d.%m.%Y'])
-#     from_lesson = forms.ChoiceField(label='Stunde', choices=lessons, required=False,
-#                                     widget=forms.Select(attrs={'onchange': 'set_time(this)'}))
-#     from_time = forms.TimeField(label='Zeit', input_formats=['%H:%M'], initial='8:00', )
-#     to_date = forms.DateField(label='Datum', input_formats=['%d.%m.%Y'])
-#     to_lesson = forms.ChoiceField(label='Stunde', choices=lessons, required=False,
-#                                   widget=forms.Select(attrs={'onchange': 'set_time(this)'}))
-#     to_time = forms.TimeField(label='Zeit', input_formats=['%H:%M'], initial='15:35')
-#
-#     description = forms.CharField(label='Bitte begründen Sie Ihren Antrag.')
-#
-#     layout = Layout(Fieldset('Von',
-#                              Row('from_date', 'from_lesson', 'from_time'),
-#                              ),
-#                     Fieldset('Bis',
-#                              Row('to_date', 'to_lesson', 'to_time'),
-#                              ),
-#                     Fieldset('Grund / Vorhaben',
-#                              'description'),
-#                     )
-#
-#     def clean(self):
-#         cleaned_data = super().clean()
-#
-#     def clean_from_to_date(self):
-#         # not related to a form field, just to clean datetime values
-#         from_date = self.cleaned_data['from_date']
-#         from_lesson = self.cleaned_data['from_lesson']
-#         from_time = self.cleaned_data['from_time']
-#         to_date = self.cleaned_data['to_date']
-#         to_lesson = self.cleaned_data['to_lesson']
-#         to_time = self.cleaned_data['to_time']
-#         from_datetime = timezone.datetime.combine(from_date, from_time)
-#         print(from_datetime)
-#         to_datetime = timezone.datetime.combine(to_date, to_time)
-#         if (from_datetime < datetime.now()) or (to_datetime < datetime.now()):
-#             raise ValidationError(
-#                 'Die Befreiung kann nicht für bereits vergangene Tage durchgeführt werden (Datumsfehler).')
-#         elif from_datetime > to_datetime:
-#             raise ValidationError('Das Von-Datum liegt hinter dem Bis-Datum.')
-#         return True
-#
-#     # def clean_from_date(self):
-#     #     data = self.cleaned_data['from_date']
-#     #     # if data < timezone.datetime.date(timezone.now()):
-#     #     #     raise ValidationError('Die Befreiung kann nur zukünftig durchgeführt werden (Datumsfehler).')
-#     #     return data
-#     #
-#     # def clean_to_date(self):
-#     #     data = self.cleaned_data['to_date']
-#     #     # if data < timezone.datetime.date(timezone.now()):
-#     #     #     raise ValidationError('Die Befreiung kann nur zukünftig durchgeführt werden.')
-#     #     return data
-#     #
-#     # def clean_from_time(self):
-#     #     data = self.cleaned_data['from_time']
-#     #     # print('Data:', type(data), 'Now:', type(timezone.datetime.time(timezone.now())))
-#     #
-#     #     # if data < timezone.datetime.time(timezone.now()):
-#     #     #     raise ValidationError('Die Befreiung kann nur zukünftig durchgeführt werden (Zeitfehler).')
-#     #
-#     #     return data
-#     #
-#     # def clean_to_time(self):
-#     #     data = self.cleaned_data['to_time']
-#     #
-#     #     # if data < timezone.datetime.time(timezone.now()):
-#     #     #     raise ValidationError('Die Befreiung kann nur zukünftig durchgeführt werden.')
-#     #     return data
-#
-#     def clean_description(self):
-#         data = self.cleaned_data['description']
-#         self.clean_from_to_date()
-#         if len(data) < 10:
-#             raise ValidationError('Bitte teilen Sie uns etwas mehr über Ihren Befreiungswunsch mit.')
-#
-#         return data
+ 
\ No newline at end of file

schoolapps/aub/migrations/0009_auto_20190111_1525.py → schoolapps/aub/migrations/0006_auto_20181219_1107.py

-# Generated by Django 2.0.7 on 2019-01-11 14:25
+# Generated by Django 2.0.4 on 2018-12-19 10:07
 
 from django.conf import settings
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
-        ('aub', '0008_auto_20190102_1732'),
+        ('aub', '0005_auto_20181128_1709'),
     ]
 
     operations = [
         migrations.AlterField(
             model_name='aub',
             name='created_by',
-            field=models.ForeignKey(default=3, on_delete=models.SET(3), related_name='aubs',
-                                    to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(default=1, on_delete=models.SET(1), related_name='aubs', to=settings.AUTH_USER_MODEL),
         ),
         migrations.AlterField(
             model_name='aub',
             name='status',
-            field=models.ForeignKey(default=5, on_delete=models.SET(5), related_name='aubs', to='aub.Status'),
+            field=models.ForeignKey(default=7, on_delete=models.SET(7), related_name='aubs', to='aub.Status'),
         ),
     ]

schoolapps/aub/migrations/0006_merge_20181226_1733.py

+# Generated by Django 2.1.2 on 2018-12-26 16:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aub', '0005_auto_20181128_1709'),
+        ('aub', '0003_auto_20181223_0905'),
+    ]
+
+    operations = [
+    ]

schoolapps/aub/migrations/0006_merge_20190106_1714.py

+# Generated by Django 2.0.7 on 2019-01-06 16:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('aub', '0003_auto_20181223_0905'),
+        ('aub', '0005_auto_20181128_1709'),
+    ]
+
+    operations = [
+    ]

schoolapps/aub/migrations/0007_merge_20190118_1452.py

+# Generated by Django 2.0.4 on 2019-01-18 13:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aub', '0006_auto_20181219_1107'),
+        ('aub', '0006_merge_20190106_1714'),
+    ]
+
+    operations = [
+    ]

schoolapps/aub/migrations/0007_merge_20190211_1935.py

+# Generated by Django 2.1.2 on 2019-02-11 18:35
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aub', '0006_merge_20181226_1733'),
+        ('aub', '0006_merge_20190106_1714'),
+    ]
+
+    operations = [
+    ]

schoolapps/aub/migrations/0008_auto_20190102_1732.py → schoolapps/aub/migrations/0008_auto_20190211_1935.py

-# Generated by Django 2.1.4 on 2019-01-02 16:32
+# Generated by Django 2.1.2 on 2019-02-11 18:35
 
 from django.conf import settings
 from django.db import migrations, models
@@ -7,17 +7,16 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('aub', '0007_auto_20190102_1724'),
+        ('aub', '0007_merge_20190211_1935'),
     ]
 
     operations = [
-        migrations.AddField(
+        migrations.AlterField(
             model_name='aub',
             name='created_by',
             field=models.ForeignKey(default=1, on_delete=models.SET(1), related_name='aubs', to=settings.AUTH_USER_MODEL),
         ),
-        migrations.AddField(
+        migrations.AlterField(
             model_name='aub',
             name='status',
             field=models.ForeignKey(default=1, on_delete=models.SET(1), related_name='aubs', to='aub.Status'),

schoolapps/aub/migrations/0009_merge_20190222_1226.py

+# Generated by Django 2.0.4 on 2019-02-22 11:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aub', '0008_auto_20190211_1935'),
+        ('aub', '0007_merge_20190118_1452'),
+    ]
+
+    operations = [
+    ]

schoolapps/aub/migrations/0010_auto_20190304_1404.py

+# Generated by Django 2.1.2 on 2019-03-04 13:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aub', '0009_merge_20190222_1226'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='aub',
+            options={'permissions': (('apply_for_aub', 'Apply for a AUB'), ('cancel_aub', 'Cancel a AUB'), ('allow1_aub', 'First permission'), ('allow2_aub', 'Second permission'), ('check1_aub', 'Check a AUB'), ('check2_aub', 'Check a AUB'), ('view_archive', 'View AUB archive'))},
+        ),
+        migrations.AlterField(
+            model_name='aub',
+            name='status',
+            field=models.ForeignKey(default=1, on_delete=models.SET(1), related_name='aubs', to='aub.Status'),
+        ),
+    ]

schoolapps/aub/migrations/0007_auto_20190102_1724.py → schoolapps/aub/migrations/0011_merge_20190318_2004.py

-# Generated by Django 2.1.4 on 2019-01-02 16:24
+# Generated by Django 2.1.5 on 2019-03-18 19:04
 
 from django.db import migrations
 
@@ -6,16 +6,9 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('aub', '0010_auto_20190304_1404'),
         ('aub', '0006_merge_20190102_1724'),
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name='aub',
-            name='created_by',
-        ),
-        migrations.RemoveField(
-            model_name='aub',
-            name='status',
-        ),
     ]

schoolapps/aub/models.py

@@ -24,8 +24,6 @@ def get_default_status():
 
 class Aub(models.Model):
     # Time
-#    from_dt = models.DateTimeField(default=timezone.now)
-#    to_dt = models.DateTimeField(default=timezone.now)
     from_date = models.DateField(default=date.today)
     from_time = models.TimeField(default=timezone.now)
     to_date = models.DateField(default=date.today)
@@ -50,5 +48,6 @@ class Aub(models.Model):
             ('allow1_aub', 'First permission'),
             ('allow2_aub', 'Second permission'),
             ('check1_aub', 'Check a AUB'),
-            ('check2_aub', 'Check a AUB')
+            ('check2_aub', 'Check a AUB'),
+            ('view_archive', 'View AUB archive'),
         )