- getSeason() only for staff members

- new view staff()
- updated bootstrap to version 3.4.1
- updated jquery to 3.6.3
- changed container layout in main view 'matchday'

.gitignore

@@ -7,3 +7,4 @@ old_stuff/
 static/
 templates/blogindex.html-media
 tippy/static/
+warnings.txt

AUTHORS

@@ -1 +1 @@
-Martin Bley <martin@mb-oss.de>
+Martin Bley <dev@mb-oss.de>

CHANGELOG

@@ -0,0 +1,6 @@
+- getSeason() only for staff members
+- new view staff()
+- updated bootstrap to version 3.4.1 
+- updated jquery to 3.6.3
+- changed container layout in main view 'matchday'
+

TipPy/asgi.py

@@ -0,0 +1,16 @@
+"""
+ASGI config for TipPy project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/
+"""
+
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TipPy.settings')
+
+application = get_asgi_application()

TipPy/settings.py

@@ -0,0 +1,146 @@
+"""
+Django settings for TipPy project.
+
+Generated by 'django-admin startproject' using Django 4.0.6.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.0/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/4.0/ref/settings/
+"""
+
+from pathlib import Path
+import os
+
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'django-insecure-jiw8js(^@d)no7tv(oq+ugl3kj=f8@j-kz3bj530&!%!$cjqj9'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+# Application definition
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'django.contrib.humanize',
+    'tipp'
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'TipPy.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [BASE_DIR / 'templates']
+        ,
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'TipPy.wsgi.application'
+WSGI_APPLICATION = 'TipPy.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'tippy',
+        'USER': 'tippy',
+        'PASSWORD': 'tippy',
+        'HOST': 'localhost',
+        'PORT': '5432',
+    }
+}
+
+# Password validation
+# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+# Internationalization
+# https://docs.djangoproject.com/en/4.0/topics/i18n/
+LANGUAGE_CODE = 'de-de'
+TIME_ZONE = 'Europe/Berlin'
+USE_I18N = True
+USE_TZ = True
+
+# Absolute filesystem path to the directory that will hold user-uploaded files.
+# Example: "/home/media/media.lawrence.com/media/"
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash.
+# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
+MEDIA_URL = '/media/'
+# Absolute path to the directory static files should be collected to.
+# Don't put anything in this directory yourself; store your static files
+# in apps' "static/" subdirectories and in STATICFILES_DIRS.
+# Example: "/home/media/media.lawrence.com/static/"
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/4.0/howto/static-files/
+STATIC_URL = 'static/'
+STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
+
+if not DEBUG:
+    STATIC_ROOT = ''
+
+STATICFILES_DIRS = [
+    #os.path.join(BASE_DIR, 'static/'),
+]
+
+# STATIC_ROOT=os.path.join(BASE_DIR,"static/")
+# STATIC_URL = 'static/'
+# STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static'), ]
+
+# Default primary key field type
+# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+# Redirect on logout
+LOGOUT_REDIRECT_URL = "home"

TipPy/urls.py

@@ -0,0 +1,8 @@
+from django.contrib import admin, auth
+from django.urls import include, path, re_path
+
+urlpatterns = [
+    path('', include('tipp.urls')),
+    path('admin/', admin.site.urls),
+]
+

TipPy/wsgi.py

@@ -0,0 +1,16 @@
+"""
+WSGI config for TipPy project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.0/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TipPy.settings')
+
+application = get_wsgi_application()

requirements.txt

@@ -0,0 +1,6 @@
+Django~=4.1.7
+psycopg2~=2.9.5
+suds~=1.1.2
+Pillow~=9.4.0
+pytz~=2023.2
+urllib3~=1.26.15

templates/about.html

@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+{% load i18n static %}
+{% load humanize %}
+{% block head %}
+  <script type="text/javascript" src="{% static 'javascript/tippy.js' %}"></script>
+{% endblock %}
+
+{% block nav %}
+{% include "nav.html" with ls=ls season=season %}
+{% endblock %}
+
+{% block body %}
+<div id="content-main">
+  <div class="row">
+    <div class="col-md-7">
+      <h2>Über TipPy</h2>
+         <p>TipPy ist eine responsive Web-Applikation für Tippspiele mit 
+         einem "Mobile-First-Ansatz" . Unterstützt werden alle auf 
+         <a href="http://www.OpenLigaDB.de">OpenLigaDB</a> bereitgestellten 
+         Sportarten und Ligen.
+
+         TipPy wurde in <a href="http://www.python.org">Python</a> umgesetzt 
+         und benutzt die Frameworks <a href="http://www.django.org">Django</a>
+         als Web Application Framework, und Twitters <a href="www.getbootstrap.com">
+         Bootstrap</a> für CSS.</p>
+    </div>
+  </div>
+</div>
+{% endblock %}

templates/base.html

@@ -16,13 +16,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <!-- Bootstrap -->
-  <link href="{{ STATIC_URL }}css/bootstrap.min.css" rel="stylesheet">
+  <link href="{% static  'css/bootstrap.min.css' %}" rel="stylesheet">
 
   <!-- Bootstrap-Theme -->
-  <link href="{{ STATIC_URL }}css/bootstrap-theme.min.css" rel="stylesheet">
+  <link href="{% static  'css/bootstrap-theme.min.css' %}" rel="stylesheet">
 
   <!-- Bootstrap-Theme -->
-  <link href="{{ STATIC_URL }}css/tippy-bootstrap.css" rel="stylesheet">
+  <link href="{% static  'css/tippy-bootstrap.css' %}" rel="stylesheet">
 
   <!-- Unterstützung für Media Queries und HTML5-Elemente im Internet Explorer über HTML5 shim und Respond.js -->
   <!-- ACHTUNG: Respond.js funktioniert nicht, wenn du die Seite über file:// aufrufst -->
@@ -36,9 +36,9 @@
 <body>
 
   <!-- jQuery (wird für Bootstrap JavaScript-Plugins benötigt) -->
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
   <!-- Binde alle kompilierten Plugins zusammen ein (wie hier unten) oder such dir einzelne Dateien nach Bedarf aus -->
-  <script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
+  <script src="{% static 'js/bootstrap.min.js'%}"></script>
 
   {% block nav %}{% endblock %}
     
@@ -51,8 +51,13 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-7">
-        <p>© Martin Bley, 2014-2015 | Dank an <a href="http://openligadb.de">OpenLigaDB</a> für 
+        <p>
-        die Bereitstellung der Spielergebnisse.</p>
+          <div class="pull-left">
+            © Martin Bley, 2014-2023 | Dank an
+            <a href="http://openligadb.de">OpenLigaDB</a> für die Bereitstellung der 
+            Spielergebnisse.
+          </div>
+        </p> 
       </div>
     </div>
   </div> 

templates/blogindex.html

@@ -2,71 +2,74 @@
 {% load i18n static %}
 {% load humanize %}
 {% block head %}
-<title> TipPy Blog</title>
+    <title> TipPy Blog</title>
 {% endblock %}
 
 {% block nav %}
-{% include "nav.html" with ls=ls season=season %}
+    {% include "nav.html" with ls=ls season=season %}
 {% endblock %}
 
 {% block body %}
-<div id="content-main">
+    <div id="content-main">
-  <div class="row">
+        <div class="row">
-    <div class="col-md-7">
+            <div class="col-md-7">
-      <h2>TipPy Blog</h2>
+                <h2>TipPy Blog</h2>
-      <p class="text-right">
+                <p class="text-right">
-        <a class="btn btn-default" href="/blog/newpost" role="button">Neue Nachricht</a>
+                    <a class="btn btn-default" href="/blog/newpost" role="button">Neue Nachricht</a>
-      </p>
+                </p>
-    </div>
+            </div>
-  </div>
-  {% for post, avatar in posts %}
-  <div class="row">
-    <div class="col-md-7">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          {{post.author.first_name}} schrieb {{post.created|naturaltime}}, 
-          <a href="{{post.get_absolute_url}}">{{post.title}}</a>
         </div>
-        <div class="panel-body">
+        <ul class="media-list">
-          {% if avatar %}
+            {% for post, avatar in posts %}
-              <img class="img-circle img-responsive pull-left blog" alt="Profile Pic" src="/media/{{avatar}}" /> 
+                <li class="media">
-          {% else %}
+                    <a href="#" class="pull-left">
-              <img class="img-circle img-responsive pull-left blog" alt="Profile Pic" src="/media/profiles/dummy.png" /> 
+                        {% if avatar %}
-          {% endif %}
+                            <img class="img-circle img-responsive pull-left blog" alt="Profile Pic"
-          {{post.content|safe}}
+                                 src="/media/{{ avatar }}"/>
-        </div>
+                        {% else %}
-      </div>
+                            <img class="img-circle img-responsive pull-left blog" alt="Profile Pic"
-    </div>
+                                 src="/media/profiles/dummy.png"/>
-  </div>
+                        {% endif %}
-  {% endfor %}
+                    </a>
-  <div class="row">
+                    <div class="media-body">
-    <div class="col-md-7">
+            <span class="text-muted pull-right">
-      <nav>
+                <small class="text-muted">{{ post.created|naturaltime }}</small>
-        <ul class="pager">
+            </span>
-          {% if posts.has_previous %}
+                        <strong class="text-success">{{ post.author.first_name }}</strong>
-          <li data-toggle="tooltip" title="{% trans 'previous' %}" class="previous">
+                        <p>{{ post.content|safe }}</p>
-            <a href="/blog/{{ page|add:"-1" }}">
+                    </div>
-          {% else %}
+                </li>
-          <li data-toggle="tooltip" title="{% trans 'previous' %}" class="previous inactive">
+            {% endfor %}
-            <a href="/blog/{{ page }}">
-          {% endif %}
-              <span aria-hidden="true">&larr;</span>
-            </a>
-          </li>
-          Seite {{ posts.number }} von {{ posts.paginator.num_pages }}.
-          {% if posts.has_next %}
-          <li data-toggle="tooltip" title="{% trans 'next' %}" class="next">
-            <a href="/blog/{{ page|add:"1" }}">
-          {% else %}
-          <li data-toggle="tooltip" title="{% trans 'next' %}" class="next inactive">
-            <a href="/blog/{{ page }}">
-          {% endif %}
-              <span aria-hidden="true">&rarr;</span>
-            </a>
-          </li>
         </ul>
-      </nav>
+
+        <div class="row">
+            <div class="col-md-7">
+                <nav>
+                    <ul class="pager">
+                        {% if posts.has_previous %}
+                            <li data-toggle="tooltip" title="{% trans 'previous' %}" class="previous">
+                                <a href="/blog/{{ page|add:"-1" }}">
+                                    {% else %}
+                            <li data-toggle="tooltip" title="{% trans 'previous' %}" class="previous inactive">
+                            <a href="/blog/{{ page }}">
+                        {% endif %}
+                        <span aria-hidden="true">&larr;</span>
+                        </a>
+                        </li>
+                        Seite {{ posts.number }} von {{ posts.paginator.num_pages }}.
+                        {% if posts.has_next %}
+                            <li data-toggle="tooltip" title="{% trans 'next' %}" class="next">
+                                <a href="/blog/{{ page|add:"1" }}">
+                                    {% else %}
+                            <li data-toggle="tooltip" title="{% trans 'next' %}" class="next inactive">
+                            <a href="/blog/{{ page }}">
+                        {% endif %}
+                        <span aria-hidden="true">&rarr;</span>
+                        </a>
+                        </li>
+                    </ul>
+                </nav>
+            </div>
+        </div>
     </div>
-  </div>
-</div>
 {% endblock %}

templates/chat.xhtml

@@ -0,0 +1,28 @@
+{% load humanize %}
+<hr>
+    <p class="text-left">
+        <a class="btn btn-default" href="/blog/newpost" role="button">neuer Post</a>
+    </p>
+
+    <ul class="media-list">
+        {% for post, avatar in posts %}
+            <li class="media">
+                <a href="#" class="pull-left">
+                    {% if avatar %}
+                        <img class="img-circle img-responsive pull-left blog" alt="Profile Pic"
+                             src="/media/{{ avatar }}"/>
+                    {% else %}
+                        <img class="img-circle img-responsive pull-left blog" alt="Profile Pic"
+                             src="/media/profiles/dummy.png"/>
+                    {% endif %}
+                </a>
+                <div class="media-body">
+            <span class="text-muted pull-right">
+                <small class="text-muted">{{ post.created|naturaltime }}</small>
+            </span>
+                    <strong class="text-success">{{ post.author.first_name }}</strong>
+                    <p>{{ post.content|safe }}</p>
+                </div>
+            </li>
+        {% endfor %}
+    </ul>

templates/login.html

@@ -1,33 +0,0 @@
-{% extends "base.html" %}
-{% load url from future %}
-{% comment %}
-  Main page to authenticate users.
-{% endcomment %}
-
-{% block head %}
-  <title>TipPy | Login</title>
-{% endblock %}
-
-{% block nav %}
-{% include "nav_login.html" with ls=ls season=season %}
-{% endblock %}
-
-{% block body %}
-{% if form.errors %}
-<div class="row">
-    <p>Benutzename und Passwort passen nicht zusammen. Bitte versuche es noch einmal.</p>
-</div>
-{% endif %}
-<div class="row">
-    <div class="col-md-3">
-        <form class="form-signin" role="form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
-            <h2 class="form-signin-heading">Bitte melde dich an</h2>
-            {% csrf_token %}
-            <input class="form-control" type="text" autofocus="" required="" name="{{form.username.html_name}}" placeholder="Anmeldename" />
-            <input class="form-control" type="password" required="" placeholder="Passwort" name="{{form.password.html_name}}" />
-            <button class="btn btn-lg btn-primary btn-block" type="submit">Anmelden</button>
-            <input type="hidden" name="next" value="{{ next }}" />
-        </form>
-    </div>
-</div>
-{% endblock %}

templates/md.html

@@ -2,108 +2,114 @@
 {% load i18n static %}
 {% load humanize %}
 {% block head %}
-  <script type="text/javascript" src="{{ STATIC_URL }}javascript/tippy.js"></script>
+    <script type="text/javascript" src="{% static 'javascript/tippy.js' %}"></script>
 {% endblock %}
 
 {% block nav %}
-{% include "nav.html" with ls=ls season=season %}
+    {% include "nav.html" with ls=ls season=season %}
 {% endblock %}
 
 {% block body %}
-<div id="content-main">
+    <div id="content-main">
-  <div class="row">
+        <div class="row">
-    <div class="col-md-7">
+            <div class="col-md-6">
-      <h2>Neueste Nachrichten</h2>
+                <h3>Deine Tipps</h3>
-      <p class="text-right">
+                <nav>
-        <a class="btn btn-default" href="/blog/1" role="button">zum Blog</a>
+                    <ul class="pager">
-      </p>
+                        <li data-toggle="tooltip" title="{% trans 'previous' %}" class="previous"><a
-      {% for post, avatar in posts %}
+                                href="/matchday/{{ ls }}/{{ season }}/{{ cur_md|add:"-1"|stringformat:"02i" }}"><span
-      <div class="panel panel-default">
+                                aria-hidden="true">&larr;</span></a></li>
-        <div class="panel-heading">
+                        {{ md_name }}
-          {{post.author.first_name}} schrieb {{post.created|naturaltime}}, 
+                        <li data-toggle="tooltip" title="{% trans 'next' %}" class="next"><a
-          <a href="{{post.get_absolute_url}}">{{post.title}}</a>
+                                href="/matchday/{{ ls }}/{{ season }}/{{ cur_md|add:"1"|stringformat:"02i" }}"><span
+                                aria-hidden="true">&rarr;</span></a></li>
+                    </ul>
+                </nav>
+                <form role="form" action="" method="post">{% csrf_token %}
+                    <div class="table-responsive">
+                        <table class="table table-hover table-condensed">
+                            <tr>
+                                <th>Anstoß</th>
+                                <th>Heim</th>
+                                <th>Gast</th>
+                                <th>Erg.</th>
+                                <th colspan="2">Tipp</th>
+                            </tr>
+                            {% for match in matches %}
+                                {% if match.started and not match.finished %}
+                                    <tr class="danger">{% else %}
+                                    <tr>{% endif %}
+                            <td>{{ match.matchDateTime }}</td>
+                            {% if match.iconURLTeam1 != "" %}
+                                <td><img src="{{ match.iconURLTeam1 }}" width="20"/>
+                                    {% else %}
+                                <td><img src="{{ STATIC_URL }}{{ match.iconTeam1 }}"/>
+                            {% endif %}
+                            <span class="hidden-xs"> {{ match.nameTeam1 }}</span>
+                            <span class="visible-xs"> {{ match.abbrTeam1 }}</span>
+                            </td>
+                            {% if match.iconURLTeam1 != "" %}
+                                <td><img src="{{ match.iconURLTeam2 }}" width="20"/>
+                                    {% else %}
+                                <td><img src="{{ STATIC_URL }}{{ match.iconTeam2 }}"/>
+                            {% endif %}
+                            <span class="hidden-xs"> {{ match.nameTeam2 }}</span>
+                            <span class="visible-xs"> {{ match.abbrTeam2 }}</span>
+                            </td>
+                            <td>{{ match.matchResult }}</td>
+                            <td>{{ match.tippFormTeam1 }}</td>
+                            <td>{{ match.tippFormTeam2 }}</td>
+                            </tr>
+                            {% endfor %}
+                        </table>
+                    </div>
+                    <button type="submit" class="btn btn-default btn-lg btn-block">
+                        <span class="glyphicon glyphicon-saved" aria-hidden="true"></span> Tipps abgeben
+                    </button>
+                </form>
+
+                {% for mandant, list in mandant_dict.items %}
+                    <h3>Mitspieler {{ mandant }}</h3>
+                    <div class="table-responsive">
+                        <table class="table table-hover table-condensed">
+                            <tr>
+                                <th>Tipper</th>
+                                <th>Gesamt</th>
+                                {% for match in matches %}
+                                    <th>
+                                        {% if match.iconURLTeam1 != "" %}
+                                            <img src="{{ match.iconURLTeam1 }}" width="20"/>
+                                        {% else %}
+                                            <img src="{{ STATIC_URL }}{{ match.iconTeam1 }}"/>
+                                        {% endif %}
+                                        <br/><br/>
+                                        {% if match.iconURLTeam2 != "" %}
+                                            <img src="{{ match.iconURLTeam2 }}" width="20"/>
+                                        {% else %}
+                                            <img src="{{ STATIC_URL }}{{ match.iconTeam2 }}"/>
+                                        {% endif %}
+                                    </th>
+                                {% endfor %}
+                            </tr>
+                            {% for mate in list %}
+                                <tr>
+                                <td>{{ mate.mate.first_name }}</td>
+                                <td>{{ mate.sum_score }}</td>
+                                {% for tipp in mate.tipps %}
+                                    <td>{{ tipp }}</td>
+                                {% endfor %}
+                            {% endfor %}
+                            </tr>
+                        </table>
+                    </div>
+                {% endfor %}
+            </div>
+            <div class="col-md-6">
+                <h3>Chat</h3>
+                {% block chat %}
+                    {% include "chat.xhtml" with posts=posts %}
+                {% endblock %}
+            </div>
         </div>
-        <div class="panel-body">
-          {% if avatar %}
-              <img class="img-circle img-responsive pull-left blog" alt="Profile Pic" src="/media/{{avatar}}" /> 
-          {% else %}
-              <img class="img-circle img-responsive pull-left blog" alt="Profile Pic" src="/media/profiles/dummy.png" /> 
-          {% endif %}
-          {{post.content|safe}}
-        </div>
-      </div>
-      {% endfor %}
     </div>
-  </div>
-  <div class="row">
-    <div class="col-md-7">
-      <h2>Deine Tipps</h2>
-      <nav>
-        <ul class="pager">
-          <li data-toggle="tooltip" title="{% trans 'previous' %}" class="previous"><a href="/matchday/{{ ls }}/{{ season }}/{{ cur_md|add:"-1"|stringformat:"02i" }}"><span aria-hidden="true">&larr;</span></a></li>
-          {{ cur_md }}. Spieltag
-          <li data-toggle="tooltip" title="{% trans 'next' %}" class="next"><a href="/matchday/{{ ls }}/{{ season }}/{{ cur_md|add:"1"|stringformat:"02i" }}"><span aria-hidden="true">&rarr;</span></a></li>
-        </ul>
-      </nav>
-      <form role="form" action="" method="post">{% csrf_token %}
-        <div class="table-responsive">
-          <table class="table table-hover table-condensed">
-            <tr>
-              <th>Anstoß</th>
-              <th>Heim</th>
-              <th>Gast</th>
-              <th>Erg.></th>
-              <th colspan="2">Tipp</th>
-            </tr>
-            {% for match in matches %}
-              {% if match.started and not match.finished %}
-                <tr class="danger">{% else %}<tr>{% endif %}
-                <td>{{ match.matchDateTime }}</td> 
-                <td><img src="{{ STATIC_URL}}{{ match.iconTeam1 }}" />
-                  <span class="hidden-xs"> {{ match.nameTeam1 }}</span>
-                  <span class="visible-xs"> {{ match.abbrTeam1 }}</span>
-                </td>
-                <td><img src="{{ STATIC_URL}}{{ match.iconTeam2 }}" />
-                  <span class="hidden-xs"> {{ match.nameTeam2 }}</span>
-                  <span class="visible-xs"> {{ match.abbrTeam2 }}</span>
-                </td>
-                <td>{{ match.matchResult }}</td>
-                <td>{{ match.tippFormTeam1 }}</td><td>{{ match.tippFormTeam2 }}</td>
-            </tr>
-            {% endfor %}
-          </table>
-        </div>
-        <button type="submit" class="btn btn-default btn-lg btn-block">
-          <span class="glyphicon glyphicon-saved" aria-hidden="true"></span> Tipps abgeben
-        </button>
-      </form>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-md-7">
-      <h2>Mitspieler</h2>
-      <div class="table-responsive">
-        <table class="table table-hover table-condensed">
-          <tr>
-            <th>Tipper</th>
-            <th>Gesamt</th>
-            {% for match in matches %}
-            <th><img src="{{ STATIC_URL }}{{ match.iconTeam1 }}" /><br /><br />
-                <img src="{{ STATIC_URL }}{{ match.iconTeam2 }}" /></th>
-            {% endfor %}
-            </tr>
-            {% for mate in tipp_mates %}
-            <tr>
-              <td>{{ mate.mate }}</td>     
-              <td>{{ mate.sum_score }}</td>     
-              {% for tipp in mate.tipps %}
-              <td>{{ tipp }}</td>
-              {% endfor %}
-              </tr>
-             {% endfor %}
-        </table>
-      </div>
-    </div>
-  </div>
-</div>
 {% endblock %}

templates/nav.html

@@ -9,13 +9,16 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <span class="navbar-brand">TipPy 1.0</span>
+        <a class="navbar-brand" href="/about">TipPy 1.0</a>
       </div>
       <div class="navbar-collapse collapse">
         <ul class="nav navbar-nav">
           <li><a href="/">Tipps</a></li>
           <li><a href="/charts/{{ ls }}/{{ season }}{% if pos %}/{{ pos }}{% endif %}">Bestenliste</a></li>
           <li><a href="/blog/1">Blog</a></li>
+          {% if request.user.is_active and request.user.is_staff %}
+              <li><a href="/staff">Staff</a></li>
+          {% endif %}
         </ul>
         <ul class="nav navbar-nav navbar-right">
           {% if has_refresh %}
@@ -32,7 +35,7 @@
             <ul class="dropdown-menu">
               <li><a href="/accounts/profile/{{user.id}}">Profil ändern</a></li>
               <li><a href="/accounts/password_change/">Passwort ändern</a></li>
-              <li><a href="/logout">Abmelden</a></li>
+              <li><a href="/accounts/logout">Abmelden</a></li>
             </ul>
           </li>
         </ul>

templates/newblogpost.html

@@ -1,49 +1,58 @@
 {% extends "base.html" %}
 {% load i18n static %}
 {% block head %}
-<title> TipPy Blog</title>
+    <title> TipPy Blog</title>
 {% endblock %}
 
 {% block nav %}
-{% include "nav.html" with ls=ls season=season %}
+    {% include "nav.html" with ls=ls season=season %}
 {% endblock %}
 
 {% block body %}
-<div id="content-main">
+    <div id="content-main">
-  {% if form.errors %}
+        {% if form_bp.errors %}
-    <div>
+            <div>
-      <p class="errornote">
+                <p class="errornote">
-      {% if form.errors.items|length == 1 %}
+                    {% if form_bp.errors.items|length == 1 %}
-        {% trans "Please correct the error below." %}
+                        {% trans "Please correct the error below." %}
-      {% else %}
+                    {% else %}
-        {% trans "Please correct the errors below." %}
+                        {% trans "Please correct the errors below." %}
-      {% endif %}</p>
+                    {% endif %}</p>
+            </div>
+        {% endif %}
+        <div class="row">
+            <div class="col-md-8">
+                <form class="form-horizontal" action="" method="post">{% csrf_token %}
+                    <div class="form-group">
+                        {{ form_bp.content.errors }}
+                        <div class="col-sm-5">
+                            <div class="panel-body">
+                                <textarea class="form-control" placeholder="Schreibe einen Kommentar..." id="id_content"
+                                          name="content" maxlength="100" rows="2"></textarea>
+                                {% if cnt_mandants > 1 %}
+                                    {{ form_mandants.mandants.label_tag }}
+                                    {% for choice in form_mandants.mandants %}
+                                        <label for="{{ choice.id_for_label }}">
+                                            {{ choice.tag }} {{ choice.choice_label }}
+                                        </label>
+                                    {% endfor %}
+                                {% endif %}
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="col-sm-offset-2 col-sm-10">
+                                <button type="submit" class="btn btn-default">{% trans 'Sent' %}</button>
+                            </div>
+                        </div>
+                </form>
+            </div>
+        </div>
+        {% if debug %}
+            <div class="row">
+                <div class="col-md-8">
+                    <p>{{ debug }}</p>
+                </div>
+            </div>
+        {% endif %}
     </div>
-  {% endif %}
-  <div class="row">
-    <div class="col-md-8">
-      <form class="form-horizontal" action="" method="post">{% csrf_token %}
-        <div class="form-group">
-          {{form.title.errors}}
-          <label for="id_title" class="col-sm-4 control-label required">{% trans 'Title' %}</label>
-          <div class="col-sm-5">
-            <input id="id_title" maxlength="32" name="title" class="form-control" type="text" />
-          </div>
-        </div>
-        <div class="form-group">
-          {{form.content.errors}}
-          <label for="id_content" class="col-sm-4 control-label required">{% trans 'Content' %}</label>
-          <div class="col-sm-5">
-            <textarea class="form-control" maxlength="256" rows="2" id="id_content" name="content"></textarea>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="col-sm-offset-2 col-sm-10">
-            <button type="submit" class="btn btn-default">{% trans 'Sent' %}</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
 {% endblock %}

templates/registration/login.html

@@ -1,5 +1,6 @@
 {% extends "base.html" %}
-{% load url from future %}
+{% load admin_urls %}
+
 {% comment %}
   Main page to authenticate users.
 {% endcomment %}
@@ -20,7 +21,7 @@
 {% endif %}
 <div class="row">
     <div class="col-md-3">
-        <form class="form-signin" role="form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
+        <form class="form-signin" role="form" method="post" action="{% url 'login' %}">
             <h2 class="form-signin-heading">Bitte melde dich an</h2>
             {% csrf_token %}
             <input class="form-control" type="text" autofocus="" required="" name="{{form.username.html_name}}" placeholder="Anmeldename" />

templates/staff.html

@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+{% load i18n static %}
+{% load humanize %}
+{% block head %}
+    <script type="text/javascript" src="{% static 'javascript/tippy.js' %}"></script>
+{% endblock %}
+
+{% block nav %}
+    {% include "nav.html" with ls=ls season=season %}
+{% endblock %}
+
+{% block body %}
+    <div id="content-main">
+        <div class="row">
+            <div class="col-md-12">
+                <h3>Wettbewerbe</h3>
+                {% for comp in competitions %}
+                    {{ comp }}<br/>
+                {% endfor %}
+                <h3></h3>
+            </div>
+        </div>
+        {% if debug %}
+            <div class="row">
+                <div class="col-md-12">
+                    <h2 class="form-signin-heading">{% trans 'Debug' %}</h2>
+                    {% for line in debug %}
+                        <p>{{ line }}</p>
+                    {% endfor %}
+                </div>
+            </div>
+        {% endif %}
+    </div>
+{% endblock %}

tipp/admin.py

@@ -18,24 +18,20 @@ You should have received a copy of the GNU General Public License
 along with TipPy.  If not, see <http://www.gnu.org/licenses/>.
 
 """    
-from tipp.models import Team, Match, Tipp, Score, Mandant, RelUserMandant, Competition, Post, UserProfile
+from tipp.models import *
 from django.contrib import admin
 
 class PostAdmin(admin.ModelAdmin):
         # fields display on change list
-        list_display = ['title']
+        list_display = ['content']
         # fields to filter the change list with
         list_filter = ['published', 'created']
         # fields to search in change list
-        search_fields = ['title', 'content']
+        search_fields = ['content']
         # enable the date drill down on change list
         date_hierarchy = 'created'
         # enable the save buttons on top on change form
         save_on_top = True
-        # prepopulate the slug from the title - big timesaver!
-        prepopulated_fields = {"slug": ("title",)}
-     
-
 
 admin.site.register(Team)
 admin.site.register(Match)
@@ -45,4 +41,5 @@ admin.site.register(Score)
 admin.site.register(RelUserMandant)
 admin.site.register(Competition)
 admin.site.register(Post, PostAdmin)
+admin.site.register(RelPostMandant)
 

tipp/forms.py

@@ -22,31 +22,42 @@ from django import forms
 from django.forms import ModelForm
 from django.contrib.auth.models import User
 from django.core.files.images import get_image_dimensions
-from tipp.models import Match, Competition, Post, UserProfile
+from tipp.models import Match, Competition, Post, UserProfile, \
+    Mandant, RelUserMandant
 
 class NumberInput(forms.TextInput):
     input_type = 'number'
 
 class TippForm(forms.Form):
-    tippTeam1 = forms.IntegerField(required=True,widget=NumberInput(attrs={
+    tippTeam1 = forms.IntegerField(required=True,widget=NumberInput(
-        'cols': '2',
+        attrs={
-        'min': '0', 'max': '99', 'step': '1',
+            'cols': '2',
-        'class':'form-inline', 
+            'min': '0', 'max': '99', 'step': '1',
-        'role': 'form'} 
+            'class':'form-inline', 
+            'role': 'form'
+        } 
     ))
-    tippTeam2 = forms.IntegerField(required=True,widget=NumberInput(attrs={
+    tippTeam2 = forms.IntegerField(required=True,widget=NumberInput(
-        'cols': '2',
+        attrs={
-        'min': '0', 'max': '99', 'step': '1',
+            'cols': '2',
-        'class':'form-inline', 
+            'min': '0', 'max': '99', 'step': '1',
-        'role': 'form'}
+            'class':'form-inline', 
+            'role': 'form'
+        }
     ))
-    tippTeam1.widget.attrs['style'] = "width:35px"
+    tippTeam1.widget.attrs['style'] = "width:45px"
-    tippTeam2.widget.attrs['style'] = "width:35px"
+    tippTeam2.widget.attrs['style'] = "width:45px"
 
 class BlogpostForm(ModelForm):
     class Meta:
         model = Post
-        fields = ['title', 'content']
+        fields = ['content']
+
+class MandantsForm(forms.Form):
+    mandants = forms.MultipleChoiceField(
+        label= "Posten in",
+        widget=forms.CheckboxSelectMultiple({'checked':'checked'})
+    )
 
 class UserForm(forms.ModelForm):
     class Meta:

tipp/migrations/0001_initial.py

@@ -0,0 +1,146 @@
+# Generated by Django 4.0.6 on 2022-07-14 15:15
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Competition',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('leagueShortcut', models.CharField(max_length=32)),
+                ('leagueName', models.CharField(max_length=128)),
+                ('season', models.CharField(max_length=4)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Mandant',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=32, unique=True)),
+                ('description', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Post',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content', models.TextField()),
+                ('published', models.BooleanField(default=True)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['-created'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Team',
+            fields=[
+                ('teamID', models.IntegerField(primary_key=True, serialize=False, unique=True)),
+                ('name', models.CharField(max_length=200)),
+                ('icon', models.FileField(upload_to='images/team_logos/')),
+                ('abbr', models.CharField(max_length=3)),
+                ('iconURL', models.CharField(max_length=2000)),
+            ],
+            options={
+                'managed': True,
+            },
+        ),
+        migrations.CreateModel(
+            name='UserProfile',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('avatar', models.ImageField(blank=True, upload_to='profiles/')),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Score',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('exact_high', models.PositiveSmallIntegerField()),
+                ('exact', models.PositiveSmallIntegerField()),
+                ('diff', models.PositiveSmallIntegerField()),
+                ('tendency', models.PositiveSmallIntegerField()),
+                ('client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.mandant')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Match',
+            fields=[
+                ('matchID', models.IntegerField(primary_key=True, serialize=False, unique=True)),
+                ('matchDateTime', models.DateTimeField()),
+                ('group', models.IntegerField()),
+                ('matchday', models.IntegerField()),
+                ('matchday_name', models.CharField(max_length=128)),
+                ('pointsTeam1', models.SmallIntegerField()),
+                ('pointsTeam2', models.SmallIntegerField()),
+                ('finished', models.BooleanField()),
+                ('season', models.CharField(max_length=4)),
+                ('leagueShortcut', models.CharField(max_length=12)),
+                ('idTeam1', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='tipp.team')),
+                ('idTeam2', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='tipp.team')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Tipp',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('pointsTeam1', models.PositiveSmallIntegerField()),
+                ('pointsTeam2', models.PositiveSmallIntegerField()),
+                ('score', models.PositiveIntegerField(blank=True, null=True)),
+                ('matchID', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.match')),
+                ('tipperID', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'unique_together': {('matchID', 'tipperID')},
+            },
+        ),
+        migrations.CreateModel(
+            name='RelUserMandant',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('mandant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.mandant')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'unique_together': {('user', 'mandant')},
+            },
+        ),
+        migrations.CreateModel(
+            name='RelPostMandant',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('mandant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.mandant')),
+                ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.post')),
+            ],
+            options={
+                'unique_together': {('post', 'mandant')},
+            },
+        ),
+        migrations.CreateModel(
+            name='chart',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('points', models.PositiveSmallIntegerField()),
+                ('diff', models.SmallIntegerField()),
+                ('games', models.PositiveSmallIntegerField()),
+                ('competition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.competition')),
+                ('team', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.team')),
+            ],
+            options={
+                'unique_together': {('team', 'competition')},
+            },
+        ),
+    ]

tipp/models.py

@@ -17,42 +17,59 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with TipPy.  If not, see <http://www.gnu.org/licenses/>.
 
-"""    
+"""
-from django.db import models
-from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
+from django.db import models
 
 class UserProfile(models.Model):
-    user = models.OneToOneField(User)
+    user = models.OneToOneField(
+        User,
+        on_delete=models.CASCADE
+    )
     avatar = models.ImageField(upload_to="profiles/", blank=True)
 
     def __unicode__(self):
         return self.user.username
-    
+
+
 class Competition(models.Model):
     leagueShortcut = models.CharField(max_length=32)
     leagueName = models.CharField(max_length=128)
     season = models.CharField(max_length=4)
 
     def __unicode__(self):
-        return(self.leagueShortcut)
+        return (self.leagueShortcut)
+
 
 class Team(models.Model):
     teamID = models.IntegerField(unique=True, primary_key=True)
     name = models.CharField(max_length=200)
     icon = models.FileField(upload_to="images/team_logos/")
     abbr = models.CharField(max_length=3)
+    iconURL = models.CharField(max_length=2000)
 
     def __unicode__(self):
         return self.name
 
+    class Meta:
+        managed = True
+        app_label = 'tipp'
+
+
 class Match(models.Model):
-    matchID = models.IntegerField(unique=True,primary_key=True)
+    matchID = models.IntegerField(unique=True, primary_key=True)
     matchDateTime = models.DateTimeField()
     group = models.IntegerField()
     matchday = models.IntegerField()
-    idTeam1 = models.ForeignKey(Team, related_name='+')
+    matchday_name = models.CharField(max_length=128)
-    idTeam2 = models.ForeignKey(Team, related_name='+')
+    idTeam1 = models.ForeignKey(
+        Team, related_name='+',
+        on_delete=models.CASCADE
+    )
+    idTeam2 = models.ForeignKey(
+        Team, related_name='+',
+        on_delete=models.CASCADE
+    )
     pointsTeam1 = models.SmallIntegerField()
     pointsTeam2 = models.SmallIntegerField()
     finished = models.BooleanField()
@@ -60,72 +77,112 @@ class Match(models.Model):
     leagueShortcut = models.CharField(max_length=12)
 
     def __unicode__(self):
-        """
-        return (str(self.matchID) + 
-            str(Team.objects.get(teamID=int(self.idTeam1)).values(name)) + " - " + 
-            str(Team.objects.get(teamID=int(self.idTeam2)).values(name)))
-        """
         return (str(self.matchID))
 
+
 class Tipp(models.Model):
-    matchID = models.ForeignKey(Match)
+    matchID = models.ForeignKey(
-    tipperID = models.ForeignKey(User)
+        Match,
+        on_delete=models.CASCADE
+    )
+    tipperID = models.ForeignKey(
+        User,
+        on_delete=models.CASCADE
+    )
     pointsTeam1 = models.PositiveSmallIntegerField()
     pointsTeam2 = models.PositiveSmallIntegerField()
-    score = models.PositiveIntegerField(blank=True, null=True)
+    score = models.PositiveIntegerField(
+        blank=True, null=True
+    )
 
     class Meta:
         unique_together = ("matchID", "tipperID")
 
+
 class Mandant(models.Model):
     name = models.CharField(max_length=32, unique=True)
     description = models.CharField(max_length=255)
+
     def __unicode__(self):
         return self.name
 
+
 class Score(models.Model):
-    client = models.ForeignKey(Mandant)
+    client = models.ForeignKey(
+        Mandant,
+        on_delete=models.CASCADE
+    )
     exact_high = models.PositiveSmallIntegerField()
     exact = models.PositiveSmallIntegerField()
     diff = models.PositiveSmallIntegerField()
     tendency = models.PositiveSmallIntegerField()
+
     def __unicode__(self):
         return str(self.client)
 
+
 class chart(models.Model):
-    team = models.ForeignKey(Team)
+    team = models.ForeignKey(
-    competition = models.ForeignKey(Competition)
+        Team,
+        on_delete=models.CASCADE
+    )
+    competition = models.ForeignKey(
+        Competition,
+        on_delete=models.CASCADE
+    )
     points = models.PositiveSmallIntegerField()
     diff = models.SmallIntegerField()
     games = models.PositiveSmallIntegerField()
 
     class Meta:
         unique_together = ("team", "competition")
-    
+
+
 class RelUserMandant(models.Model):
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(
-    mandant = models.ForeignKey(Mandant)
+        User,
+        on_delete=models.CASCADE
+    )
+    mandant = models.ForeignKey(
+        Mandant,
+        on_delete=models.CASCADE
+    )
 
     class Meta:
         unique_together = ("user", "mandant")
+
     def __unicode__(self):
         return (str(self.user) + " -> " + str(self.mandant))
 
+
 class Post(models.Model):
-    title = models.CharField(max_length=255, null=False, blank=False)
-    slug = models.SlugField(unique=True, max_length=255)
     content = models.TextField()
     published = models.BooleanField(default=True)
     created = models.DateTimeField(auto_now_add=True)
-    author = models.ForeignKey(User)
+    author = models.ForeignKey(
- 
+        User,
+        on_delete=models.CASCADE
+    )
+
     class Meta:
         ordering = ['-created']
- 
+
     def __unicode__(self):
-        return u'%s' % self.title
+        return u'%s' % self.created
- 
-    def get_absolute_url(self):
-        return reverse('tipp.views.blogpost', args=[self.slug])
 
 
+class RelPostMandant(models.Model):
+    post = models.ForeignKey(
+        Post,
+        on_delete=models.CASCADE
+    )
+    mandant = models.ForeignKey(
+        Mandant,
+        on_delete=models.CASCADE
+    )
+
+    class Meta:
+        unique_together = ("post", "mandant")
+
+    def __unicode__(self):
+        return (str(self.post) + " -> " + str(self.mandant))

tipp/openliga.py

@@ -18,53 +18,76 @@
 # You should have received a copy of the GNU General Public License
 # along with TipPy.  If not, see <http://www.gnu.org/licenses/>.
 # 
-import sys, locale, suds, urllib2, psycopg2
+import locale
+import urllib.error
+import urllib.parse
+import urllib.request
+
+from suds.client import Client
+
 
 class OpenLiga(object):
-    version     =  "0.1"
+    version = "0.1"
-    error       =  ""
+    error = ""
-    proxyurl    =  None
+    proxyurl = None
-    debug       =  None
+    debug = None
-    client      =  None
+    client = None
 
     def __init__(self, proxyurl=None, debug=False):
 
         # set locale to environment (for dispaying localized dates)
-        locale.setlocale(locale.LC_TIME, "") 
+        locale.setlocale(locale.LC_TIME, "")
 
         self.debug = debug
 
         # get a SUDS client object
         if self.proxyurl is None:
             try:
-                self.client = suds.client.Client('http://www.openligadb.de/Webservices/Sportsdata.asmx?WSDL')
+                self.client = Client(
-            except (urllib2.URLError): 
+                    'http://www.openligadb.de/'
+                    + 'Webservices/Sportsdata.asmx?WSDL')
+            except (urllib.error.URLError):
                 self.error += "Connect to webservice failed."
         else:
             try:
                 t = suds.transport.http.HttpTransport()
-                proxy = urllib2.ProxyHandler({'http':proxyurl})
+                proxy = urllib.request.ProxyHandler({'http': proxyurl})
-                opener = urllib2.build_opener(proxy)
+                opener = urllib.request.build_opener(proxy)
                 t.urlopener = opener
-                self.client = suds.client.Client('http://www.openligadb.de/Webservices/Sportsdata.asmx?WSDL', transport=t)
+                self.client = suds.client.Client(
-            except urllib2.URLError as e: 
+                    'http://www.openligadb.de/Webservices/'
-                self.error += "Connect to webservice failed (via proxy " + proxyurl + "): " + str(e) + "\n"
+                    + 'Sportsdata.asmx?WSDL', transport=t)
+            except urllib.error.URLError as e:
+                self.error += "Connect to webservice failed " \
+                              + "(via proxy " + proxyurl + "): " + str(e) + "\n"
 
     def getSeason(self, season, league='bl1'):
         """ Get the whole season.
 
         Args: season and league shortcut (optional)
         """
-        return(self.client.service.GetMatchdataByLeagueSaison(leagueShortcut=league,leagueSaison=season))
+        return (self.client.service.GetMatchdataByLeagueSaison(
+            leagueShortcut=league, leagueSaison=season)
+        )
 
     def getMatchday(self, season, matchdaynumber, league='bl1'):
         """ Get matchday.
 
         Args: season, matchdaynumber and league shortcut (optional)
         """
-        return(self.client.service.GetMatchdataByGroupLeagueSaison(groupOrderID=matchdaynumber,leagueShortcut=league,leagueSaison=season))
+        return (self.client.service.GetMatchdataByGroupLeagueSaison(
+            groupOrderID=matchdaynumber,
+            leagueShortcut=league,
+            leagueSaison=season)
+        )
 
     def getTeams(self, season, league='bl1'):
-        return(self.client.service.GetTeamsByLeagueSaison(leagueShortcut=league,leagueSaison=season))
+        return (self.client.service.GetTeamsByLeagueSaison(
-
+            leagueShortcut=league,
+            leagueSaison=season)
+        )
 
+    def getCurrentGroup(self, league):
+        return (self.client.service.GetCurrentGroup(
+            leagueShortcut=league)
+        )

tipp/tests.py

@@ -1,6 +1,6 @@
 """
-This file demonstrates writing tests using the unittest module. These will pass
+This file demonstrates writing tests using the unittest module. 
-when you run "manage.py test".
+These will pass when you run "manage.py test".
 
 Replace this with more appropriate tests for your application.
 """

tipp/urls.py

@@ -0,0 +1,33 @@
+from django.contrib.auth import views as auth_views
+from django.urls import re_path
+from django.conf.urls import include
+from django.conf import settings
+from django.conf.urls.static import static
+from . import views
+
+urlpatterns = [
+    re_path(r'^$', views.home, name='home'),
+    re_path(r'^getSeason/(?P<ls>.*)/(?P<season>\d{4})$',
+            views.getSeason),
+    re_path(r'^update/(?P<ls>.*)/(?P<season>\d{4})/(?P<cur_md>\d{2})$',
+            views.update, name='update'),
+    re_path(r'^matchday/(?P<ls>.{3,})/(?P<season>\d{4})/(?P<matchday>\d{2})$',
+            views.matchday, name='matchday'),
+    re_path(r'^charts/(?P<ls>\w{3,})/(?P<season>\d{4})$', views.charts,
+            name='charts'),
+    re_path(r'^charts/(?P<ls>\w{3,})/(?P<season>\d{4})/(?P<pos>\w{1,})$',
+            views.charts, name='charts'),
+    re_path(r'^accounts/profile/(\d+)', views.profile),
+    re_path(r'^accounts/', include('django.contrib.auth.urls')),
+    re_path(r'^blog/newpost$', views.newBlogpost),
+    re_path(r'^blog/(?P<page>\d)$', views.blogindex),
+    re_path(r'^about$', views.about),
+    re_path(r'^staff', views.staff),
+    re_path(r'^accounts/login/', auth_views.LoginView.as_view()),
+    re_path(r'^accounts/logout/', auth_views.LogoutView.as_view())
+]
+# Redirect on logout
+LOGOUT_REDIRECT_URL = "home"
+if settings.DEBUG is True:
+    urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

tipp/views.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-Copyright (c) 2015-2016 by Martin Bley (martin@mb-oss.de)
+Copyright (c) 2015-2016 by Martin Bley (dev@mb-oss.de)
 
 This file is part of TipPy.
 
@@ -17,41 +17,46 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with TipPy.  If not, see <http://www.gnu.org/licenses/>.
 
-"""    
+"""
-from django.http import HttpResponse
+import os
-from django.shortcuts import render_to_response, redirect, render, get_object_or_404
-from django.contrib.auth import authenticate, login
-from django.contrib.auth.models import User
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth.views import password_reset, password_reset_confirm
-from django.core.context_processors import csrf
-from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse
-from django.core.paginator import Paginator, InvalidPage, EmptyPage, PageNotAnInteger
-from django.utils import timezone
-from django.utils.text import slugify
-from django.db.models import Sum, Max
-from django.conf import settings
 from os.path import join as pjoin
-from tipp.models import *
+
-from tipp.forms import *
+import django.shortcuts
-from openliga import *
+import pytz
-from datetime import datetime
 from PIL import Image as PImage
-import urllib2, pytz, os
+from django.conf import settings
+from django.contrib.admin.views.decorators import staff_member_required
+from django.contrib.auth.decorators import login_required
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.paginator import Paginator, EmptyPage, \
+    PageNotAnInteger
+from django.db.models import Sum
+from django.http import HttpResponseRedirect
+from django.utils import timezone
+
+from tipp.forms import *
+from tipp.models import *
+from tipp.openliga import *
 
 timezoneLocal = pytz.timezone('Europe/Berlin')
 
+
+def about(request):
+    return django.shortcuts.render(request, 'about.html')
+
+
 @login_required
 def home(request):
     ls = get_current_ls()
     season = get_current_season()
+    md = get_current_md(ls)
+
+    return django.shortcuts.redirect("matchday",
+                                     ls=ls,
+                                     season=season,
+                                     matchday=str(md).zfill(2)
+                                     )
 
-    return redirect("matchday", 
-        ls = ls,
-        season = season,
-        matchday=str(get_current_md(ls, season)).zfill(2)
-    )
 
 @login_required
 def profile(request, pk):
@@ -62,31 +67,25 @@ def profile(request, pk):
         img = profile.avatar.name
     else:
         img = None
-    
+
     debug = []
     debug.append('avatar: ' + str(img))
 
     # If it's a HTTP POST, we're interested in processing form data.
     if request.method == 'POST':
-        # Attempt to grab information from the raw form information.
-        # Note that we make use of both UserForm and UserProfileForm.
         user_form = UserForm(data=request.POST, instance=user)
-        profile_form = UserProfileForm(data=request.POST, instance=profile)
+        profile_form = UserProfileForm(
+            data=request.POST, instance=profile
+        )
 
-        # If the two forms are valid...
         if user_form.is_valid() and profile_form.is_valid():
-            
+
-            # Save the user's form data to the database.
             user = user_form.save()
 
-            # Now sort out the UserProfile instance.
-            # Since we need to set the user attribute ourselves, we set commit=False.
-            # This delays saving the model until we're ready to avoid integrity problems.
             profile = profile_form.save(commit=False)
             profile.user = user
 
             # Did the user provide a profile picture?
-            # If so, we need to get it from the input form and put it in the UserProfile model.
             if 'avatar' in request.FILES:
                 profile.avatar = request.FILES['avatar']
                 # Now we save the UserProfile model instance.
@@ -95,45 +94,108 @@ def profile(request, pk):
                 # create thumbnail 
                 imfn = pjoin(settings.MEDIA_ROOT, profile.avatar.name)
                 im = PImage.open(imfn)
-                im.thumbnail((50,50), PImage.ANTIALIAS)
+                im.thumbnail((50, 50), PImage.ANTIALIAS)
                 im.save(settings.MEDIA_ROOT + profile.avatar.name)
             if 'avatar-clear' in request.POST:
                 if 'on' in request.POST['avatar-clear']:
                     image = pjoin(settings.MEDIA_ROOT, img)
-                    debug.append('Is the image ' + str(image) + ' a regular file? ' + str(os.path.isfile(image)))
+                    debug.append('Is the image ' + str(image)
+                                 + ' a regular file? '
+                                 + str(os.path.isfile(image))
+                                 )
                     if os.path.isfile(image):
                         os.remove(image)
             profile.save()
 
             for item in request.POST:
-                debug.append(str(item) + " -> " + str(request.POST[item]))
+                debug.append(str(item) + " -> "
-
+                             + str(request.POST[item])
-
+                             )
 
         # Invalid form or forms - mistakes or something else?
         # Print problems to the terminal.
         # They'll also be shown to the user.
         else:
-            print user_form.errors, profile_form.errors
+            print(
+                user_form.errors,
+                profile_form.errors
+            )
 
-        return redirect( '/accounts/profile/' + str(user.id) )
+        return django.shortcuts.redirect('/accounts/profile/' + str(user.id))
-    # Not a HTTP POST, so we render our form using two ModelForm instances.
+
-    # These forms will be blank, ready for user input.
+    # Not a HTTP POST, so we render our form using two ModelForm 
+    # instances. These forms will be blank, ready for user input.
     else:
         user_form = UserForm(
-            initial={ 'last_name': user.last_name,
+            initial={'last_name': user.last_name,
-                'first_name': user.first_name,
+                     'first_name': user.first_name,
-                'email': user.email },
+                     'email': user.email},
             instance=user
         )
         profile_form = UserProfileForm(instance=profile)
 
-    return render(request, 'registration/profile.html', {
+    return django.shortcuts.render(request, 'registration/profile.html', {
-        'user_form': user_form, 
+        'user_form': user_form,
         'profile_form': profile_form,
         'debug': debug,
         'img': img}
-    )
+                                   )
+
+@staff_member_required
+def staff(request):
+    season = get_current_season(),
+    """ get available competitions """
+    competitions = Competition.objects.filter(season=season).order_by('leagueName')
+
+    return django.shortcuts.render(request, 'staff.html', {'competitions': competitions})
+
+
+@staff_member_required
+def getSeason(request, ls, season):
+    ol = OpenLiga()
+    teams = ol.getTeams(str(season), ls)
+    season = ol.getSeason(str(season), ls)
+
+    return_vals = []
+    for team in teams[0]:
+        t = Team(
+            teamID=team['teamID'],
+            name=team['teamName'],
+            iconURL=team['teamIconURL']
+        )
+
+        """
+            check if object exits and do insert if not 
+        """
+        try:
+            to = Team.objects.get(teamID=int(t.teamID))
+            if to.iconURL is None:
+                t.save(update_fields=['iconURL'])
+        except Team.DoesNotExist:
+            t.save()
+
+    for match in season[0]:
+        m = Match(matchID=match['matchID'],
+                  matchDateTime=match['matchDateTime'],
+                  group=int(match['groupID']),
+                  matchday=int(match['groupOrderID']),
+                  matchday_name=match['groupName'],
+                  idTeam1=Team.objects.get(teamID=int(match['idTeam1'])),
+                  idTeam2=Team.objects.get(teamID=int(match['idTeam2'])),
+                  pointsTeam1=match['pointsTeam1'],
+                  pointsTeam2=match['pointsTeam2'],
+                  finished=bool(match['matchIsFinished']),
+                  season=match['leagueSaison'],
+                  leagueShortcut=match['leagueShortcut']
+                  )
+        m.save()
+
+    return django.shortcuts.redirect("matchday",
+                                     ls=ls,
+                                     season=get_current_season(),
+                                     matchday=str(get_current_md(ls)).zfill(2)
+                                     )
+
 
 @login_required
 def update(request, ls, season, cur_md):
@@ -143,7 +205,7 @@ def update(request, ls, season, cur_md):
     """
 
     ol = OpenLiga()
-    md_matches = ol.getMatchday(str(season), int(cur_md) ,ls)
+    md_matches = ol.getMatchday(str(season), int(cur_md), ls)
 
     # Achtung: DateTimeField prüfen
     for match in md_matches[0]:
@@ -151,43 +213,57 @@ def update(request, ls, season, cur_md):
         matchResults = match['matchResults']
         try:
             for result in matchResults[0]:
-                if result['resultName'] == "Endergebnis":
+                if result['resultName'] == "Halbzeit":
-                    pointsTeam1=int(result['pointsTeam1'])
+                    pointsTeam1 = int(result['pointsTeam1'])
-                    pointsTeam2=int(result['pointsTeam2'])
+                    pointsTeam2 = int(result['pointsTeam2'])
-                elif result['resultName'] == "Halbzeitergebnis":
+                elif result['resultName'] == "Endergebnis":
-                    pointsTeam1=int(result['pointsTeam1'])
+                    pointsTeam1 = int(result['pointsTeam1'])
-                    pointsTeam2=int(result['pointsTeam2'])
+                    pointsTeam2 = int(result['pointsTeam2'])
+                    break
+                elif str(result['resultName']) == u"nach Verlängerung":
+                    pointsTeam1 = int(result['pointsTeam1'])
+                    pointsTeam2 = int(result['pointsTeam2'])
+                else:
+                    pointsTeam1 = -1
+                    pointsTeam2 = -1
+
         except:
-            pointsTeam1=-1
+            pointsTeam1 = -1
-            pointsTeam2=-1
+            pointsTeam2 = -1
 
-        m = Match(matchID=unicode(match['matchID']),
+        m = Match(matchID=match['matchID'],
-            matchDateTime=datetime.strptime(unicode(match['matchDateTime']), '%Y-%m-%d %H:%M:%S'),
+                  matchDateTime=match['matchDateTime'],
-            group=int(match['groupID']),
+                  pointsTeam1=pointsTeam1,
-            matchday=int(match['groupOrderID']),
+                  pointsTeam2=pointsTeam2,
-            idTeam1=Team.objects.get(teamID=int(match['idTeam1'])),
+                  finished=bool(match['matchIsFinished']),
-            idTeam2=Team.objects.get(teamID=int(match['idTeam2'])),
+                  )
-            pointsTeam1=pointsTeam1,
+        m.save(update_fields=['matchDateTime', 'pointsTeam1', 'pointsTeam2', 'finished'])
-            pointsTeam2=pointsTeam2,
+        pointsTeam1 = -1
-            finished=bool(match['matchIsFinished']),
+        pointsTeam2 = -1
-            season=match['leagueSaison'],
-            leagueShortcut=match['leagueShortcut']
-        )
-        m.save()
-        pointsTeam1=-1
-        pointsTeam2=-1
 
-    """ evaluate scores """
+    # evaluate scores
-    scores = Score.objects.get(client=Mandant.objects.get(name='huse'))
+    """ get mandants current user is related """
-    finished_matches=Match.objects.filter(finished=True)
+    mandants = RelUserMandant.objects.filter(user=request.user). \
+        values_list('mandant', flat=True)
+
+    # scores = Score.objects.get(client=Mandant.objects.get(name='huse'))
+    scores = Score.objects.get(client=mandants[0])
+
+    finished_matches = Match.objects.filter(
+        finished=True,
+        leagueShortcut=ls,
+        season=season,
+        matchday=cur_md
+    )
     for match in finished_matches:
         tipps = Tipp.objects.filter(matchID=match.matchID)
         for tipp in tipps:
             score = 0
             goals_total = match.pointsTeam1 + match.pointsTeam2
 
-            """ Tipp is acurate """
+            # Tipp is acurate 
-            if (tipp.pointsTeam1 == match.pointsTeam1 and tipp.pointsTeam2 == match.pointsTeam2):
+            if (tipp.pointsTeam1 == match.pointsTeam1
+                    and tipp.pointsTeam2 == match.pointsTeam2):
                 if goals_total >= 5:
                     score = scores.exact_high
                 else:
@@ -196,29 +272,29 @@ def update(request, ls, season, cur_md):
                 tipp.score = score
                 tipp.save()
                 continue
-            
+
-            """ who won? """ 
+            # who won? 
             winnerReal = None
             if match.pointsTeam1 > match.pointsTeam2:
                 winnerReal = 1
-            elif (match.pointsTeam2 > match.pointsTeam1):
+            elif match.pointsTeam2 > match.pointsTeam1:
                 winnerReal = 2
-            elif (match.pointsTeam1 == match.pointsTeam2):
+            elif match.pointsTeam1 == match.pointsTeam2:
                 winnerReal = 0
 
             winnerTipp = None
             if tipp.pointsTeam1 > tipp.pointsTeam2:
                 winnerTipp = 1
-            elif (tipp.pointsTeam2 > tipp.pointsTeam1):
+            elif tipp.pointsTeam2 > tipp.pointsTeam1:
                 winnerTipp = 2
-            elif (tipp.pointsTeam1 == tipp.pointsTeam2):
+            elif tipp.pointsTeam1 == tipp.pointsTeam2:
                 winnerTipp = 0
-            
+
             diffReal = match.pointsTeam1 - match.pointsTeam2
             diffTipp = tipp.pointsTeam1 - tipp.pointsTeam2
 
-            if ( winnerTipp == winnerReal ):
+            if winnerTipp == winnerReal:
-                if ( diffTipp == diffReal ):
+                if diffTipp == diffReal:
                     score = scores.diff
                 else:
                     score = scores.tendency
@@ -231,30 +307,41 @@ def update(request, ls, season, cur_md):
             tipp.save()
             continue
 
-    return redirect("matchday", ls=ls, season=season, matchday=cur_md)
+    return django.shortcuts.redirect("matchday",
+                                     ls=ls,
+                                     season=season,
+                                     matchday=cur_md
+                                     )
+
 
 @login_required
 def matchday(request, ls, season, matchday, template_name='md.html'):
+    update(request, ls, season, matchday)
     debug = ''
     debug += "Debugging: "
     has_refresh = True
 
-    """ get matchday closest to current date """
+    """ get matches of the matchday """
-    md_matches = Match.objects.filter(leagueShortcut=ls, season=season, matchday=int(matchday)).order_by('matchDateTime')
+    md_matches = Match.objects.filter(leagueShortcut=ls, season=season,
+                                      matchday=int(matchday)).order_by('matchDateTime')
 
     """ get the current user """
     user = User.objects.get(username=request.user.username)
 
     """ get mandants current user is related """
-    mandants = RelUserMandant.objects.filter(user=request.user).values_list('mandant', flat=True)
+    mandants = RelUserMandant.objects.filter(user=request.user). \
-    
+        values_list('mandant', flat=True)
+
     """ get mates """
-    tipp_mates = []
+    mandant_dict = {}
     for m in mandants:
+        mandant = Mandant.objects.get(id=m)
+        mandant_dict[mandant.description] = []
         rs = RelUserMandant.objects.filter(mandant=m)
+
         for r in rs:
-            tipp_mates.append({ 
+            mandant_dict[mandant.description].append({
-                'mate': r.user, 
+                'mate': r.user,
                 'tipps': [],
                 'sum_score': 0
             })
@@ -270,7 +357,8 @@ def matchday(request, ls, season, matchday, template_name='md.html'):
             check if Tipp already exists
         """
         try:
-            tipp = Tipp.objects.get(tipperID=user.id,matchID=match.matchID)
+            tipp = Tipp.objects.get(tipperID=user.id,
+                                    matchID=match.matchID)
         except ObjectDoesNotExist:
             tipp = None
 
@@ -283,46 +371,52 @@ def matchday(request, ls, season, matchday, template_name='md.html'):
             if tipp is not None:
                 """ Tipp exists an needs an UPDATE"""
                 tipp = Tipp(id=tipp.pk,
-                    matchID=match,
+                            matchID=match,
-                    tipperID=user,
+                            tipperID=user,
-                    pointsTeam1=data['tippTeam1'],
+                            pointsTeam1=data['tippTeam1'],
-                    pointsTeam2=data['tippTeam2']
+                            pointsTeam2=data['tippTeam2']
-                )
+                            )
                 tipp.save()
 
-            else: 
+            else:
                 """ do INSERT """
-                tipp = Tipp( matchID=match,
+                tipp = Tipp(matchID=match,
-                    tipperID=user,
+                            tipperID=user,
-                    pointsTeam1=data['tippTeam1'],
+                            pointsTeam1=data['tippTeam1'],
-                    pointsTeam2=data['tippTeam2'])
+                            pointsTeam2=data['tippTeam2'])
                 tipp.save()
 
         match_started = timezone.now() >= match.matchDateTime
 
         if tipp is not None:
             f = TippForm(prefix=str(match.matchID),
-                initial={'tippTeam1': tipp.pointsTeam1, 'tippTeam2': tipp.pointsTeam2}
+                         initial={'tippTeam1': tipp.pointsTeam1,
-            )
+                                  'tippTeam2': tipp.pointsTeam2}
+                         )
         else:
             f = TippForm(prefix=str(match.matchID))
 
         item = {}
-        item['matchDateTime'] = (match.matchDateTime.astimezone(timezoneLocal).strftime('%a %d.%m, %H:%M'))
+        item['matchDateTime'] = (match.matchDateTime.
+                                 astimezone(timezoneLocal).strftime('%a %d.%m, %H:%M'))
 
-        item['iconTeam1']= str(match.idTeam1.icon)
+        item['iconTeam1'] = str(match.idTeam1.icon)
-        item['nameTeam1']= str(match.idTeam1)
+        item['iconURLTeam1'] = str(match.idTeam1.iconURL)
-        item['abbrTeam1']= str(match.idTeam1.abbr)
+        item['nameTeam1'] = str(match.idTeam1.name)
+        item['abbrTeam1'] = str(match.idTeam1.abbr)
         item['iconTeam2'] = str(match.idTeam2.icon)
-        item['nameTeam2'] = str(match.idTeam2)
+        item['iconURLTeam2'] = str(match.idTeam2.iconURL)
-        item['abbrTeam2']= str(match.idTeam2.abbr)
+        item['nameTeam2'] = str(match.idTeam2.name)
+        item['abbrTeam2'] = str(match.idTeam2.abbr)
         item['started'] = match_started
         item['finished'] = match.finished
+        item['md_name'] = match.matchday_name
 
-        if (match.pointsTeam1 == -1  or match.pointsTeam2 == -1):
+        if (match.pointsTeam1 == -1 or match.pointsTeam2 == -1):
             item['matchResult'] = "-:-"
         else:
-            item['matchResult'] = str(match.pointsTeam1) + ":" + str(match.pointsTeam2)
+            item['matchResult'] = str(match.pointsTeam1) + ":" \
+                                  + str(match.pointsTeam2)
 
         item['tippFormTeam1'] = f['tippTeam1']
         item['tippFormTeam2'] = f['tippTeam2']
@@ -331,62 +425,96 @@ def matchday(request, ls, season, matchday, template_name='md.html'):
             f.fields['tippTeam1'].widget.attrs['disabled'] = True
             f.fields['tippTeam2'].widget.attrs['disabled'] = True
 
-        for mate in tipp_mates:
+        """ get tipps from mates """
-            try:
+        for mandant in mandant_dict:
-                matetipp = Tipp.objects.get(tipperID=mate['mate'],matchID=match.matchID)
+            for mate in mandant_dict[mandant]:
-                if match_started is True:
+                try:
-                    mate['tipps'].append(str(matetipp.pointsTeam1) + ":" + str(matetipp.pointsTeam2) + "(" + str(matetipp.score) + ")") 
+                    matetipp = Tipp.objects.get(tipperID=mate['mate'],
-                    if match.finished is True:
+                                                matchID=match.matchID)
-                        mate['sum_score'] += matetipp.score
+                    if match_started is True:
-                else:
+                        if matetipp.score is None:
-                    mate['tipps'].append(u'\u2714') 
+                            score = u'\u231B'
-            except Exception as e:
+                        else:
-                mate['tipps'].append(u'\u2717') 
+                            score = matetipp.score
+
+                        mate['tipps'].append(str(matetipp.pointsTeam1)
+                                             + ":" + str(matetipp.pointsTeam2)
+                                             + "(" + str(score) + ")")
+                        if match.finished is True:
+                            mate['sum_score'] += matetipp.score
+                    else:
+                        mate['tipps'].append(u'\u2714')
+                except Exception as e:
+                    mate['tipps'].append(u'\u2717')
+
+            """ sort items in mandant_dict by score """
+            mandant_dict[mandant] = sorted(mandant_dict[mandant],
+                                           key=lambda k: k['sum_score'], reverse=True)
 
         matches.append(item)
 
     # get the newest blogposts 
+    pm = RelPostMandant.objects.filter(mandant__in=mandants). \
+        values_list('post', flat=True)
     posts = []
-    for post in Post.objects.filter(published=True)[:2]:
+    for post in Post.objects.filter(id__in=pm, published=True)[:5]:
         try:
-            avatar = UserProfile.objects.get(user_id=post.author_id).avatar.name
+            avatar = UserProfile.objects.get(user_id=post.author_id). \
-        except: 
+                avatar.name
+        except:
             avatar = None
-        posts.append( (post, avatar) )
+        posts.append((post, avatar))
 
-    return render(request, 'md.html', { 
+    try:
-        #'debug': debug, 
+        cur_group = matches[0]['md_name']
-        #'mds_season': mds_in_season,
+    except:
+        cur_group = "N/A"
+
+    debug += str(mandant_dict)
+
+    return django.shortcuts.render(request, 'md.html', {
+        'debug': debug,
+        # 'mds_season': mds_in_season,
         'cur_md': matchday,
-        'matches': matches, 
+        'md_name': cur_group,
+        'matches': matches,
         'ls': ls,
         'season': season,
         'username': user,
-        'tipp_mates': sorted(tipp_mates, key=lambda k: k['sum_score'], reverse=True),
+        'mandant_dict': mandant_dict,
+        # 'tipp_mates': sorted(tipp_mates, key=lambda k: k['sum_score'],
+        # reverse=True),
         'posts': posts,
         'has_refresh': has_refresh
     })
 
+
 @login_required
-def charts(request, ls, season, pos='default', template_name='charts.html'):
+def charts(request, ls, season, pos='default',
+           template_name='charts.html'):
     debug = ''
 
     if pos == 'default':
-        if get_current_md(ls, season) < 18: 
+        if get_current_md(ls) < 18:
             pos = 'hin'
-            matches = Match.objects.filter(leagueShortcut=ls, season=season, matchday__lte=17)
+            matches = Match.objects.filter(leagueShortcut=ls,
-        else: 
+                                           season=season, matchday__lte=17)
+        else:
             pos = 'rueck'
-            matches = Match.objects.filter(leagueShortcut=ls, season=season, matchday__gte=18)
+            matches = Match.objects.filter(leagueShortcut=ls,
+                                           season=season, matchday__gte=18)
     elif pos == 'hin':
-        matches = Match.objects.filter(leagueShortcut=ls, season=season, matchday__lte=17)
+        matches = Match.objects.filter(leagueShortcut=ls,
+                                       season=season, matchday__lte=17)
     elif pos == 'rueck':
-            matches = Match.objects.filter(leagueShortcut=ls, season=season, matchday__gte=18)
+        matches = Match.objects.filter(leagueShortcut=ls,
+                                       season=season, matchday__gte=18)
     else:
         matches = Match.objects.filter(leagueShortcut=ls, season=season)
 
     # get mandants of current user
-    mandants = RelUserMandant.objects.filter(user=request.user).values_list('mandant', flat=True)
+    mandants = RelUserMandant.objects.filter(user=request.user). \
+        values_list('mandant', flat=True)
 
     # main loop 
     mandant_dict = {}
@@ -394,97 +522,120 @@ def charts(request, ls, season, pos='default', template_name='charts.html'):
         mandant = Mandant.objects.get(id=m)
 
         # get users 
-        users = RelUserMandant.objects.filter(mandant=m).values_list('user', flat=True)
+        users = RelUserMandant.objects.filter(mandant=m). \
+            values_list('user', flat=True)
 
         user_dict = {}
         for userid in users:
             # get user object, then fetch matches for user
             user = User.objects.get(id=userid)
-            score = Tipp.objects.filter(matchID__in=matches, tipperID=user).aggregate(Sum('score'))
+            score = Tipp.objects.filter(matchID__in=matches,
+                                        tipperID=user).aggregate(Sum('score'))
 
-            user_dict[user.first_name] = score['score__sum']
+            if score['score__sum'] is None:
+                user_dict[user.first_name] = 0
+            else:
+                user_dict[user.first_name] = score['score__sum']
 
-        mandant_dict[mandant.name] = sorted(user_dict.items(), key=lambda x: x[1], reverse=True)
+        mandant_dict[mandant.name] = sorted(user_dict.items(),
+                                            key=lambda x: x[1], reverse=True)
 
-    return render(request, template_name, { 
+    return django.shortcuts.render(request, template_name, {
-        #'debug': debug, 
+        # 'debug': debug,
         'mandant_dict': mandant_dict,
         'season': season,
         'ls': ls,
         'pos': pos
     })
 
+
 @login_required
 def blogindex(request, page):
     # get the blog posts that are published
+    # and related to mandant
+    mandants = RelUserMandant.objects.filter(user=request.user). \
+        values_list('mandant', flat=True)
+    posts = RelPostMandant.objects.filter(mandant__in=mandants). \
+        values_list('post', flat=True)
+
     post_list = []
-    for post in Post.objects.filter(published=True):
+    for post in Post.objects.filter(published=True, id__in=posts):
         try:
-            avatar = UserProfile.objects.get(user_id=post.author_id).avatar.name
+            avatar = UserProfile.objects.get(user_id=post.author_id). \
-        except: 
+                avatar.name
+        except:
             avatar = None
-        post_list.append( (post, avatar) )
+        post_list.append((post, avatar))
 
     p = Paginator(post_list, 5)
 
     try:
         posts = p.page(page)
     except PageNotAnInteger:
-        # If page is not an integer, deliver first page.
         posts = p.page(1)
     except EmptyPage:
-        # If page is out of range (e.g. 9999), deliver last page of results.
         posts = p.page(p.num_pages)
 
-    # now return the rendered template
+    return django.shortcuts.render(request, 'blogindex.html', {
-    return render(request, 'blogindex.html', {
         'posts': posts,
         'ls': get_current_ls(),
         'season': get_current_season(),
         'page': page
     })
- 
+
+
 @login_required
-def blogpost(request, slug):
+def newBlogpost(request):
-    # get the Post object
+    debug = ''
-    post = get_object_or_404(Post, slug=slug)
+
-    # now return the rendered template
+    has_mandant = False
-    return render(request, 'blogpost.html', {
+    mandants = RelUserMandant.objects.filter(user=request.user). \
-        'post': post,
+        values_list('mandant', flat=True)
+    choices = []
+    if mandants.count() > 1:
+        has_mandant = True
+        for m in Mandant.objects.filter(id__in=mandants):
+            choices.append((m.name, m.description))
+
+    if request.method == 'POST':
+        form_bp = BlogpostForm(request.POST)
+        if has_mandant is True:
+            form_mandant = MandantsForm(request.POST)
+            form_mandant.fields["mandants"].choices = choices
+
+        if form_bp.is_valid():
+            data = form_bp.cleaned_data
+            p = Post(author_id=request.user.id, content=data['content'])
+            p.save()
+
+            if has_mandant is True and form_mandant.is_valid():
+                data = form_mandant.cleaned_data
+                for m in data['mandants']:
+                    debug += str(m) + " "
+                    m = RelPostMandant(post=p,
+                                       mandant=Mandant.objects.get(name=m))
+                    m.save()
+            else:
+                m = RelPostMandant(post=p,
+                                   mandant=Mandant.objects.get(id=mandants[0]))
+                m.save()
+
+            return django.shortcuts.redirect('/blog/1')
+
+    blogpostForm = BlogpostForm()
+    form_mandant = MandantsForm()
+    form_mandant.fields["mandants"].choices = choices
+    cnt_mandants = len(choices)
+
+    return django.shortcuts.render(request, 'newblogpost.html', {
+        'debug': debug,
+        'form_bp': blogpostForm,
+        'form_mandants': form_mandant,
+        'cnt_mandants': cnt_mandants,
         'ls': get_current_ls(),
         'season': get_current_season()
     })
 
-@login_required
-def newBlogpost(request):
-    """ 
-    if this is a POST request we need to process the form data
-    """
-    if request.method == 'POST':
-        # create form instance and populate it with data from the request
-        form = BlogpostForm(request.POST)
-        # check whether it's valid:
-        if form.is_valid():
-            # process the data
-            # fix me
-            # What to to, if subject is empty?
-            data = form.cleaned_data
-            slug = slugify(data['title'])
-            p = Post(author_id=request.user.id, slug=slug, title=data['title'], content=data['content'])
-            p.save()
-
-            # ...
-            # redirect to a new URL:
-            return redirect( '/blog/1')
-
-    # if a GET (or any other method) we'll create a blank form
-    else:
-        blogpostForm = BlogpostForm()
-        return render(request, 'newblogpost.html', {
-            'form': blogpostForm,
-            'ls': get_current_ls(),
-            'season': get_current_season()
-        })
 
 def logout(request):
     """
@@ -493,20 +644,28 @@ def logout(request):
     logout(request)
     return HttpResponseRedirect('/')
 
-def get_current_md(ls,season):
-    """ get current matchday """
-    try:
-        current_md = Match.objects.filter(leagueShortcut=ls, season=season, \
-            finished=False).order_by('matchday').values_list('matchday', \
-            flat=True).distinct()[0]
-    except IndexError:
-        current_md = Match.objects.filter(leagueShortcut=ls, season=season).aggregate(Max('matchday'))
 
-    return(current_md)
+def get_current_md(ls):
+    """ 
+        get current matchday()
+        returns dict with keys
+            ['groupName']
+            ['groupOrderID'] 
+            ['groupID']
+    """
+
+    try:
+        ol = OpenLiga()
+        cur_md = ol.getCurrentGroup(ls)
+    except:
+        cur_md = {'groupName': u"1. Spieltag", 'groupOrderID': 1}
+
+    return (cur_md['groupOrderID'])
+
 
 def get_current_ls():
-    return("bl1")
+    return ("bl1")
+
 
 def get_current_season():
-    return("2015")
+    return ("2022")
-

tippy/settings.py

@@ -1,188 +0,0 @@
-"""
-Django settings for tippy project.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.7/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.7/ref/settings/
-"""
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-import os
-BASE_DIR = os.path.dirname(os.path.dirname(__file__))
-
-# Django settings for tippy project.
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    ('Martin Bley', 'martin@mb-oss.de'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'django_tippy',
-        'USER': 'tippy', 
-        'PASSWORD': 'tippy', 
-        'HOST': 'localhost',
-        'PORT': '5432',
-    }
-}
-
-# Hosts/domain names that are valid for this site; required if DEBUG is False
-# See https://docs.djangoproject.com/en/1.4/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = ['*']
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# In a Windows environment this must be set to your system time zone.
-TIME_ZONE = 'Europe/Berlin'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'de-de'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale.
-USE_L10N = True
-
-# If you set this to False, Django will not use timezone-aware datetimes.
-USE_TZ = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = '/media/'
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = '/home/martin/dev/tippy/TipPy/static/'
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
-
-# URL prefix for static files.
-# Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
-    # Put strings here, like "/home/html/static" or "C:/www/django/static".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-	'/home/martin/dev/tippy/TipPy/tippy/static',
-)
-
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '-7%ge^nl1b0t0694%ws&0$ft_lo)j4l1f-qv#ku^=$)s(sw6us'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    # Uncomment the next line for simple clickjacking protection:
-    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
-
-ROOT_URLCONF = 'tippy.urls'
-
-# Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'tippy.wsgi.application'
-
-TEMPLATE_DIRS = (
-    [os.path.join(BASE_DIR, 'templates')]
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.humanize',
-    # Uncomment the next line to enable the admin:
-    'django.contrib.admin',
-    # Uncomment the next line to enable admin documentation:
-    'django.contrib.admindocs',
-    'tipp',
-)
-
-# URL of the login page.
-LOGIN_URL = '/login'
-
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error when DEBUG=False.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'filters': {
-        'require_debug_false': {
-            '()': 'django.utils.log.RequireDebugFalse'
-        }
-    },
-    'handlers': {
-        'mail_admins': {
-            'level': 'ERROR',
-            'filters': ['require_debug_false'],
-            'class': 'django.utils.log.AdminEmailHandler'
-        }
-    },
-    'loggers': {
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-    }
-}
-
-EMAIL_USE_TLS = True
-EMAIL_HOST = 'hermes.mb-oss.de'
-EMAIL_PORT = 25
-EMAIL_HOST_USER = 'tippy@mb-oss.de'
-#EMAIL_HOST_PASSWORD = 'p@ssword'
- 
-DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
-SERVER_EMAIL = EMAIL_HOST_USER
-
-SESSION_COOKIE_AGE = 7200
-
-AUTH_PROFILE_MODULE = 'tippy.UserProfile'
-
-

tippy/urls.py

@@ -1,37 +0,0 @@
-from django.conf.urls import patterns, include, url
-from django.conf import settings
-
-# Uncomment the next two lines to enable the admin:
-from django.contrib import admin
-admin.autodiscover()
-
-urlpatterns = patterns('',
-    # Examples:
-    url(r'^$', 'tipp.views.home', name='home'),
-    url(r'^login$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}),
-    url(r'^logout$', 'django.contrib.auth.views.logout', {'next_page': '/'}),
-    url(r'^update/(?P<ls>.*)/(?P<season>\d{4})/(?P<cur_md>\d{2})$', 'tipp.views.update', name='update'),
-    url(r'^matchday/(?P<ls>.{3,})/(?P<season>\d{4})/(?P<matchday>\d{2})$', 'tipp.views.matchday', name='matchday'),
-    url(r'^charts/(?P<ls>\w{3,})/(?P<season>\d{4})$', 'tipp.views.charts', name='charts'),
-    url(r'^charts/(?P<ls>\w{3,})/(?P<season>\d{4})/(?P<pos>\w{1,})$', 'tipp.views.charts', name='charts'),
-    url(r'^accounts/profile/(\d+)', 'tipp.views.profile'),
-    url(r'^accounts/', include('django.contrib.auth.urls')),
-    url(r'^blog/newpost$', 'tipp.views.newBlogpost'),
-    url(r'^blog/(?P<page>\d)$', 'tipp.views.blogindex'),
-    url(r'^blog/(?P<slug>[\w\-]+)', 'tipp.views.blogpost'),
-
-    # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    url(r'^admin/', include(admin.site.urls)),
-)
-
-if settings.DEBUG:
-    urlpatterns += patterns('',
-        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
-            'document_root': settings.MEDIA_ROOT,
-        }),
-)
-
-

tippy/wsgi.py

@@ -1,28 +0,0 @@
-"""
-WSGI config for tippy project.
-
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
-
-Usually you will have the standard Django WSGI application here, but it also
-might make sense to replace the whole Django WSGI application with a custom one
-that later delegates to the Django one. For example, you could introduce WSGI
-middleware here, or combine a Django application with an application of another
-framework.
-
-"""
-import os
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tippy.settings")
-
-# This application object is used by any WSGI server configured to use this
-# file. This includes Django's development server, if the WSGI_APPLICATION
-# setting points here.
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
-
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)