diff --git a/kaehmy/__init__.py b/kaehmy/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/kaehmy/admin.py b/kaehmy/admin.py
new file mode 100644
index 0000000..a6f11cf
--- /dev/null
+++ b/kaehmy/admin.py
@@ -0,0 +1,10 @@
+from django.contrib import admin
+from modeltranslation.admin import TranslationAdmin
+
+from kaehmy.models import Application, Comment, CustomRole, PresetRole, TelegramChannel
+
+admin.site.register(Application)
+admin.site.register(Comment)
+admin.site.register(CustomRole)
+admin.site.register(PresetRole, TranslationAdmin)
+admin.site.register(TelegramChannel)
diff --git a/kaehmy/apps.py b/kaehmy/apps.py
new file mode 100644
index 0000000..7826c5f
--- /dev/null
+++ b/kaehmy/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class KaehmyConfig(AppConfig):
+ name = 'kaehmy'
diff --git a/kaehmy/forms.py b/kaehmy/forms.py
new file mode 100644
index 0000000..d8440c4
--- /dev/null
+++ b/kaehmy/forms.py
@@ -0,0 +1,89 @@
+from django import forms
+from django.utils.translation import ugettext_lazy as _
+from django.core.exceptions import ValidationError
+
+from kaehmy.models import PresetRole, CustomRole, Application, Comment
+from webapp.models import BaseRole
+
+class CheckboxSelectMultiple(forms.widgets.CheckboxSelectMultiple):
+ option_template_name = 'checkbox_option.html'
+
+ def create_option(self, name, value, label, selected, index, subindex=None, attrs=None):
+ dic = super(CheckboxSelectMultiple, self).create_option(name, value, label, selected, index, subindex, attrs)
+ description = PresetRole.objects.get(id=value).description
+ dic['description'] = description
+ return dic
+
+ def __init__(self, *args, **kwargs):
+ super(CheckboxSelectMultiple, self).__init__(*args, **kwargs)
+
+
+class ApplicationForm(forms.ModelForm):
+ """Class representing Kaehmy form."""
+
+ class Meta:
+ """Meta for class Application."""
+
+ model = Application
+ fields = ['name', 'email', 'phone_number', 'year',
+ 'preset_roles', 'custom_roles', 'custom_role_name',
+ 'custom_role_is_board', 'text']
+
+ def __init__(self, *args, **kwargs):
+ super(ApplicationForm, self).__init__(*args, **kwargs)
+
+ self.fields["email"].label = _('Email (not public)')
+ self.fields["phone_number"].label = _('Phone number (not public)')
+
+ custom_roles_exist = CustomRole.objects.all().exists()
+ self.fields["custom_roles"].widget = forms.widgets.CheckboxSelectMultiple() if custom_roles_exist else forms.HiddenInput()
+ self.fields["custom_roles"].help_text = ""
+ self.fields["custom_roles"].label = _('Custom roles')
+ self.fields["custom_roles"].queryset = CustomRole.objects.all()
+
+ for cat_id, category in BaseRole.CATEGORIES:
+ key = 'preset_roles_{}'.format(cat_id)
+ qset = PresetRole.objects.filter(category=cat_id).order_by('category', '-is_board')
+ self.fields[key] = forms.ModelMultipleChoiceField(qset)
+ self.fields[key].widget = CheckboxSelectMultiple(attrs={
+ 'title': _('Preset roles'),
+ 'name': 'preset_roles',
+ })
+ self.fields[key].help_text = ""
+ self.fields[key].queryset = qset
+ self.fields[key].label = _(category)
+ self.fields[key].required = False
+
+ def clean(self):
+ cleaned_data = super(ApplicationForm, self).clean()
+ for key in cleaned_data.keys():
+ if 'preset_roles_' in key:
+ cleaned_data['preset_roles'] = cleaned_data['preset_roles'] | cleaned_data[key]
+
+ return cleaned_data
+
+ def clean_phone_number(self):
+ """Clean phone number field."""
+ number = self.cleaned_data.get('phone_number')
+ if number.isdigit():
+ return number
+ else:
+ raise ValidationError(_('Invalid phone number'))
+
+ def clean_custom_role_name(self):
+ """Check that no other custom role with same name exists."""
+ custom_name = self.cleaned_data.get('custom_role_name')
+ if not CustomRole.objects.filter(name=custom_name).exists():
+ return custom_name
+ else:
+ raise ValidationError(_('Custom role with the same name already exists.'))
+
+ def non_role_fields(self):
+ return [self.fields[k] for k in self.fields.keys() if k not in ["preset_roles", "custom_roles"]]
+
+
+class CommentForm(forms.ModelForm):
+
+ class Meta:
+ model = Comment
+ fields = ['name', 'email', 'message', 'parent']
\ No newline at end of file
diff --git a/kaehmy/migrations/0001_initial.py b/kaehmy/migrations/0001_initial.py
new file mode 100644
index 0000000..d03ec14
--- /dev/null
+++ b/kaehmy/migrations/0001_initial.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-01-25 22:31
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ('webapp', '0038_auto_20180126_0031'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='CommentParent',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(default='', max_length=255, verbose_name='Name')),
+ ('email', models.EmailField(default='', max_length=254, verbose_name='Email')),
+ ('timestamp', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Timestamp')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='CustomRole',
+ fields=[
+ ('baserole_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='webapp.BaseRole')),
+ ],
+ options={
+ 'verbose_name_plural': 'Custom kaehmy roles',
+ 'verbose_name': 'Custom kaehmy role',
+ },
+ bases=('webapp.baserole',),
+ ),
+ migrations.CreateModel(
+ name='PresetRole',
+ fields=[
+ ('presetrole_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='webapp.PresetRole')),
+ ],
+ options={
+ 'verbose_name_plural': 'Preset kaehmy roles',
+ 'verbose_name': 'Preset kaehmy role',
+ },
+ bases=('webapp.presetrole',),
+ ),
+ migrations.CreateModel(
+ name='TelegramChannel',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=255)),
+ ('channel_id', models.CharField(max_length=255, unique=True)),
+ ],
+ options={
+ 'verbose_name_plural': 'Telegram channels',
+ 'verbose_name': 'Telegram channel',
+ },
+ ),
+ migrations.CreateModel(
+ name='Application',
+ fields=[
+ ('commentparent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kaehmy.CommentParent')),
+ ('phone_number', models.CharField(default='', max_length=10, verbose_name='Phone number')),
+ ('year', models.IntegerField(choices=[(1, '1'), (2, '2'), (3, '3'), (4, '4'), (5, 'N')], verbose_name='Year')),
+ ('text', models.TextField(default='', max_length=300, verbose_name='Text')),
+ ('custom_role_name', models.CharField(blank=True, max_length=255, verbose_name='Custom role name')),
+ ('custom_role_is_board', models.BooleanField(verbose_name='Board member')),
+ ('custom_roles', models.ManyToManyField(blank=True, related_name='forms', to='kaehmy.CustomRole')),
+ ('preset_roles', models.ManyToManyField(blank=True, related_name='forms', to='kaehmy.PresetRole')),
+ ],
+ options={
+ 'verbose_name_plural': 'Kaehmylomakkeet',
+ 'verbose_name': 'Kaehmylomake',
+ },
+ bases=('kaehmy.commentparent',),
+ ),
+ migrations.CreateModel(
+ name='Comment',
+ fields=[
+ ('commentparent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kaehmy.CommentParent')),
+ ('message', models.TextField(verbose_name='Message')),
+ ('parent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='messages', to='kaehmy.CommentParent')),
+ ],
+ options={
+ 'verbose_name_plural': 'Kaehmykommentit',
+ 'verbose_name': 'Kaehmykommentti',
+ },
+ bases=('kaehmy.commentparent',),
+ ),
+ ]
diff --git a/kaehmy/migrations/__init__.py b/kaehmy/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/kaehmy/models.py b/kaehmy/models.py
new file mode 100644
index 0000000..dcafbf5
--- /dev/null
+++ b/kaehmy/models.py
@@ -0,0 +1,147 @@
+"""Webapp app models."""
+
+from django.db import models
+from django.utils import timezone
+from datetime import timedelta
+from django.contrib.auth.models import User
+from webapp.utils import month_from_now
+from django.utils.translation import ugettext_lazy as _
+from django.contrib.auth.models import User
+from auditlog.registry import auditlog
+from phonenumber_field.modelfields import PhoneNumberField
+from django.contrib.postgres.fields import JSONField
+
+import logging
+
+import webapp.models
+
+VERBOSE_NAME = _('Kaehmy')
+
+
+class PresetRole(webapp.models.PresetRole):
+ """Model for kaehmy role."""
+
+ class Meta:
+ verbose_name = _('Preset kaehmy role')
+ verbose_name_plural = _('Preset kaehmy roles')
+
+
+class CustomRole(webapp.models.BaseRole):
+ """Model representing a user-specified custom occupation."""
+
+ class Meta:
+ verbose_name = _('Custom kaehmy role')
+ verbose_name_plural = _('Custom kaehmy roles')
+
+
+class CommentParent(models.Model):
+
+ name = models.CharField(_('Name'), max_length=255, default='')
+ email = models.EmailField(_('Email'), default='')
+ timestamp = models.DateTimeField(_('Timestamp'), default=timezone.now)
+
+ def __str__(self):
+ return 'Message parent #{}'.format(self.id)
+
+
+class Comment(CommentParent):
+ """
+ Model representing a kaehmymessage.
+
+ Every message relates to certain kaehmyform or parent message.
+ """
+
+ class Meta:
+ verbose_name = _('Kaehmykommentti')
+ verbose_name_plural = _('Kaehmykommentit')
+
+ message = models.TextField(_('Message'))
+ parent = models.ForeignKey('CommentParent', related_name='messages')
+
+
+class Application(CommentParent):
+ """
+ Model representing a form for kaehmy.
+
+ Allows user to choose from existing roles or to create custom ones.
+ """
+ YEAR_CHOICES = (
+ (1, '1'),
+ (2, '2'),
+ (3, '3'),
+ (4, '4'),
+ (5, 'N'),
+ )
+
+ class Meta:
+ verbose_name = _('Kaehmylomake')
+ verbose_name_plural = _('Kaehmylomakkeet')
+
+ phone_number = models.CharField(
+ _('Phone number'), max_length=10, default="")
+ year = models.IntegerField(_('Year'), choices=YEAR_CHOICES)
+ text = models.TextField(_('Text'), default="", max_length=300)
+ custom_role_name = models.CharField(
+ _('Custom role name'), max_length=255, blank=True)
+ custom_role_is_board = models.BooleanField(
+ _('Board member'), blank=True)
+ custom_roles = models.ManyToManyField(
+ 'kaehmy.CustomRole', related_name='forms', blank=True)
+ preset_roles = models.ManyToManyField(
+ 'kaehmy.PresetRole', related_name='forms', blank=True)
+
+ def __str__(self):
+ """Return model info."""
+ return _('Kaehmy application: {}').format(self.name)
+
+ def comment_count(self):
+ """Count comments for kaehmy."""
+ total = 0
+
+ def recurse(message):
+ count = 0
+ for msg in message.messages.all():
+ count += recurse(msg)
+
+ return count + 1
+
+ for message in self.messages.all():
+ total += recurse(message)
+
+ return total
+
+ def board_roles(self):
+ presets = [r.name.capitalize() for r in self.preset_roles.filter(is_board=True)]
+ customs = [r.name.capitalize() for r in self.custom_roles.filter(is_board=True)]
+ combined = presets + customs
+ return _('Board: {}').format(', '.join(combined)) if len(combined) > 0 else ''
+
+ def official_roles(self):
+ presets = [r.name.capitalize() for r in self.preset_roles.filter(is_board=False)]
+ customs = [r.name.capitalize() for r in self.custom_roles.filter(is_board=False)]
+ combined = presets + customs
+ return _('Official: {}').format(', '.join(combined)) if len(combined) > 0 else ''
+
+ def all_roles(self):
+ presets = [r.name.capitalize() for r in self.preset_roles.all()]
+ customs = [r.name.capitalize() for r in self.custom_roles.all()]
+ combined = presets + customs
+ return ', '.join(combined) if len(combined) > 0 else ''
+
+ def has_any_board_role(self):
+ return self.preset_roles.filter(is_board=True).exists() or self.custom_roles.filter(is_board=True)
+
+
+# Telegram channel entry for Kaehmys
+class TelegramChannel(models.Model):
+ """Model containing the channel id of a Telegram chat"""
+
+ class Meta:
+ verbose_name = _('Telegram channel')
+ verbose_name_plural = _('Telegram channels')
+
+ name = models.CharField(max_length=255)
+ channel_id = models.CharField(max_length=255, unique=True)
+
+ def __str__(self):
+ return 'Telegram channel: "{}"'.format(self.name)
diff --git a/kaehmy/tables.py b/kaehmy/tables.py
new file mode 100644
index 0000000..a304980
--- /dev/null
+++ b/kaehmy/tables.py
@@ -0,0 +1,13 @@
+import django_tables2 as tables
+from django.db.models import Count, Q
+from django.utils.translation import ugettext as _
+
+from webapp.models import Application
+
+
+class ExportTable(tables.Table):
+ class Meta:
+ model = Application
+ exclude = ['text', 'messageparent_ptr', 'custom_role_name', 'custom_role_is_board', 'timestamp']
+
+ all_roles = tables.Column(verbose_name=_('Roles'), orderable=False)
diff --git a/webapp/templates/kaehmy/base.html b/kaehmy/templates/base.html
similarity index 62%
rename from webapp/templates/kaehmy/base.html
rename to kaehmy/templates/base.html
index f36b09e..c3fdd28 100644
--- a/webapp/templates/kaehmy/base.html
+++ b/kaehmy/templates/base.html
@@ -1,17 +1,18 @@
-{% extends "form_base.html" %}
+{% extends "project.html" %}
{% load static %}
{% load i18n %}
+{% block body %}
{% block header %}
{% endblock header %}
{% block navigation %}
- {% include "kaehmy/navigation.html" %}
+ {% include ":navigation.html" %}
{% endblock %}
@@ -20,6 +21,8 @@
\ No newline at end of file
+
+
+{% endblock body %}
\ No newline at end of file
diff --git a/webapp/templates/kaehmy/checkbox_option.html b/kaehmy/templates/checkbox_option.html
similarity index 100%
rename from webapp/templates/kaehmy/checkbox_option.html
rename to kaehmy/templates/checkbox_option.html
diff --git a/webapp/templates/kaehmy/error.html b/kaehmy/templates/error.html
similarity index 91%
rename from webapp/templates/kaehmy/error.html
rename to kaehmy/templates/error.html
index b8a849a..d08acd4 100644
--- a/webapp/templates/kaehmy/error.html
+++ b/kaehmy/templates/error.html
@@ -1,4 +1,4 @@
-{% extends "kaehmy/base.html" %}
+{% extends "kaehmy:base.html" %}
{% load static %}
{% load i18n %}
diff --git a/webapp/templates/kaehmy/export.html b/kaehmy/templates/export.html
similarity index 93%
rename from webapp/templates/kaehmy/export.html
rename to kaehmy/templates/export.html
index fdc5a98..7fa0682 100644
--- a/webapp/templates/kaehmy/export.html
+++ b/kaehmy/templates/export.html
@@ -1,4 +1,4 @@
-{% extends "kaehmy/base.html" %}
+{% extends "base.html" %}
{% load static %}
{% load i18n %}
diff --git a/webapp/templates/kaehmy/footer.html b/kaehmy/templates/footer.html
similarity index 100%
rename from webapp/templates/kaehmy/footer.html
rename to kaehmy/templates/footer.html
diff --git a/webapp/templates/kaehmy/header.html b/kaehmy/templates/header.html
similarity index 100%
rename from webapp/templates/kaehmy/header.html
rename to kaehmy/templates/header.html
diff --git a/webapp/templates/kaehmy/kaehmy.html b/kaehmy/templates/kaehmy.html
similarity index 98%
rename from webapp/templates/kaehmy/kaehmy.html
rename to kaehmy/templates/kaehmy.html
index b4d3143..570c884 100644
--- a/webapp/templates/kaehmy/kaehmy.html
+++ b/kaehmy/templates/kaehmy.html
@@ -1,10 +1,10 @@
-{% extends "kaehmy/base.html" %}
+{% extends "kaehmy:base.html" %}
{% load bootstrap3 %}
{% load i18n %}
{% block navigation %}
- {% include "kaehmy/navigation.html" %}
+ {% include "kaehmy:navigation.html" %}
{% endblock %}
{% block content %}
diff --git a/webapp/templates/kaehmy/list.html b/kaehmy/templates/list.html
similarity index 96%
rename from webapp/templates/kaehmy/list.html
rename to kaehmy/templates/list.html
index 4eedfdd..ae2aa22 100644
--- a/webapp/templates/kaehmy/list.html
+++ b/kaehmy/templates/list.html
@@ -1,10 +1,10 @@
-{% extends "kaehmy/base.html" %}
+{% extends "kaehmy:base.html" %}
{% load static %}
{% load i18n %}
{% block navigation %}
- {% include "kaehmy/navigation.html" %}
+ {% include "kaehmy:navigation.html" %}
{% endblock %}
{% block content %}
@@ -97,7 +97,7 @@
{% for message in application.messages.all %}
- {% include "kaehmy/message.html" with messages=message.messages.all %}
+ {% include "kaehmy:message.html" with messages=message.messages.all %}
{% endfor %}
diff --git a/webapp/templates/kaehmy/message.html b/kaehmy/templates/message.html
similarity index 89%
rename from webapp/templates/kaehmy/message.html
rename to kaehmy/templates/message.html
index 1390f7a..330f890 100644
--- a/webapp/templates/kaehmy/message.html
+++ b/kaehmy/templates/message.html
@@ -13,7 +13,7 @@
{% for message in messages %}
- {% include "kaehmy/message.html" with messages=message.messages.all %}
+ {% include "message.html" with messages=message.messages.all %}
{% endfor %}
diff --git a/webapp/templates/kaehmy/navigation.html b/kaehmy/templates/navigation.html
similarity index 100%
rename from webapp/templates/kaehmy/navigation.html
rename to kaehmy/templates/navigation.html
diff --git a/webapp/templates/kaehmy/statistics.html b/kaehmy/templates/statistics.html
similarity index 90%
rename from webapp/templates/kaehmy/statistics.html
rename to kaehmy/templates/statistics.html
index 488eb41..fc82859 100644
--- a/webapp/templates/kaehmy/statistics.html
+++ b/kaehmy/templates/statistics.html
@@ -1,10 +1,10 @@
-{% extends "kaehmy/base.html" %}
+{% extends "kaehmy:base.html" %}
{% load bootstrap3 %}
{% load i18n %}
{% block navigation %}
- {% include "kaehmy/navigation.html" %}
+ {% include "kaehmy:navigation.html" %}
{% endblock %}
{% block content %}
diff --git a/kaehmy/tests.py b/kaehmy/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/kaehmy/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/kaehmy/translation.py b/kaehmy/translation.py
new file mode 100644
index 0000000..907f6a1
--- /dev/null
+++ b/kaehmy/translation.py
@@ -0,0 +1,11 @@
+"""Translation classes."""
+
+from modeltranslation.translator import register, TranslationOptions
+from kaehmy.models import PresetRole
+
+
+@register(PresetRole)
+class PresetRoleTranslationOptions(TranslationOptions):
+ """ Class for PresetRole translation options"""
+
+ fields = ()
diff --git a/kaehmy/urls.py b/kaehmy/urls.py
new file mode 100644
index 0000000..8f32c7d
--- /dev/null
+++ b/kaehmy/urls.py
@@ -0,0 +1,21 @@
+"""Kaehmy urls."""
+
+from django.conf.urls import url
+# from django.utils.translation import ugettext_lazy as _
+
+from kaehmy.views import view
+from kaehmy.views import list_view
+from kaehmy.views import submit
+from kaehmy.views import comment
+from kaehmy.views import statistics_view
+from kaehmy.views import export_view
+
+urlpatterns = [
+ # kaehmy
+ url(r'^new', view),
+ url(r'^submit', submit),
+ url(r'^add_comment', comment),
+ url(r'^statistics', statistics_view),
+ url(r'^export', export_view),
+ url(r'^$', list_view),
+]
diff --git a/kaehmy/views.py b/kaehmy/views.py
new file mode 100644
index 0000000..787386b
--- /dev/null
+++ b/kaehmy/views.py
@@ -0,0 +1,175 @@
+from django.db.models import Count
+from django.shortcuts import render, redirect
+from django.contrib.auth import login, logout, authenticate
+from django.views.decorators.http import require_http_methods
+from django.views.decorators.csrf import ensure_csrf_cookie
+from django.http import HttpResponse, HttpResponseRedirect
+from django.contrib.auth.decorators import permission_required, login_required
+from django.conf import settings
+from django.core.mail import send_mail
+
+import logging
+import requests
+from dealer.git import git
+
+from members.views.utils import *
+from kaehmy.models import Application, CustomRole, PresetRole
+from kaehmy.forms import ApplicationForm
+
+
+@ensure_csrf_cookie
+@require_http_methods(["GET"])
+def list_view(request, *args, **kwargs):
+ """Kaehmy application list"""
+
+ role_filter = request.GET.get('role', None)
+ if role_filter is not None and str(role_filter) != '-1':
+ applications = Application.objects.filter(custom_roles__id=role_filter) | Application.objects.filter(preset_roles__id=role_filter)
+ else:
+ applications = Application.objects.all()
+
+ applications = applications.order_by('-timestamp')
+ filter_options_preset = PresetRole.objects.annotate(form_count=Count('forms')).filter(form_count__gt=0)
+ filter_options_preset_list = [(r.id, r.name, r.form_count) for r in filter_options_preset]
+ filter_options_custom = CustomRole.objects.annotate(form_count=Count('forms')).filter(form_count__gt=0)
+ filter_options_custom_list = [(r.id, r.name, r.form_count) for r in filter_options_custom]
+
+ filter_options = filter_options_preset_list + filter_options_custom_list
+ filter_options.sort(key=lambda f: f[1])
+
+ context = {
+ 'applications': applications,
+ 'application_count': len(applications),
+ 'filter_options': filter_options
+ }
+ return render(request, 'list.html', context)
+
+
+@ensure_csrf_cookie
+@require_http_methods(["POST"])
+def comment(request, *args, **kwargs):
+ """POST endpoint for commenting"""
+
+ form = KaehmyCommentForm(request.POST)
+ if form.is_valid():
+ comment = form.save()
+ email = comment.parent.email
+ name = comment.name
+
+ subject = 'Kaehmyysi tai kommenttiisi on vastattu!'
+ body = ('{} on vastannut kaehmyhakemukseesi tai kommenttiisi kaehmypalvelussa.\r\n\r\n'
+ 'Käy lukemassa viesti osoitteessa http://sika.sahkoinsinoorikilta.fi/kaehmy').format(name.capitalize())
+
+ send_email(email, subject, body)
+ logging.debug(
+ 'Sent kaehmy comment email to recipient <{}>'.format(email))
+
+ return redirect('/kaehmy')
+ else:
+ print(form)
+ context = {
+ 'error': form.errors
+ }
+ return render(request, 'error.html', context)
+
+
+@require_http_methods(["GET"])
+def statistics_view(request, *args, **kwargs):
+ """Kaehmys roles listed by applications"""
+
+ applications = Application.objects.all()
+ role_list = []
+
+ preset_roles = PresetRole.objects.all()
+ custom_roles = CustomRole.objects.all()
+
+ for preset in preset_roles:
+ people = [form.name for form in preset.forms.all()]
+ role_list.append((preset.name, len(people), ', '.join(people)))
+ for custom in custom_roles:
+ people = [form.name for form in custom.forms.all()]
+ role_list.append((custom.name, len(people), ', '.join(people)))
+
+ context = {
+ 'applications': applications,
+ 'application_count': len(applications),
+ 'role_list': role_list
+ }
+ return render(request, 'statistics.html', context)
+
+
+@require_http_methods(["GET"])
+def view(request, *args, **kwargs):
+ """Render Kaehmy form page."""
+ form = ApplicationForm()
+ return render(request, 'kaehmy.html', {'form': form})
+
+
+@ensure_csrf_cookie
+@require_http_methods(["POST"])
+def submit(request, *args, **kwargs):
+ """Submit Kaehmy form."""
+ form = ApplicationForm(request.POST)
+ if form.is_valid():
+ application = form.save()
+ custom_name = form.cleaned_data.get('custom_role_name')
+ custom_is_board = form.cleaned_data.get('custom_role_is_board')
+
+ if len(custom_name) > 0:
+ custom_role = CustomRole(
+ name=custom_name, is_board=custom_is_board)
+ custom_role.save()
+ application.custom_roles.add(custom_role)
+
+ url = 'https://sika.sahkoinsinoorikilta.fi/kaehmy'
+
+ email = form.cleaned_data.get('email', '')
+ name = form.cleaned_data.get('name', 'Anonymous')
+ subject = 'Arwokas kirjattu kirje mahdolliselle tulewalle kiltahenkilölle'
+ body = ('Moikka {}!\r\n\r\nHienoa, että kilta kiinnostaa! Kaehmysi on vastaanotettu.\r\n'
+ 'Mahdollisista kommenteista tulee ilmoitus sähköpostitse.\r\n\r\n'
+ 'Käy katsomassa kaehmytilanne osoitteessa {}').format(name, url)
+
+ send_email(email, subject, body)
+ logging.debug('Sent kaehmy email to recipient <{}>'.format(email))
+
+ CHAT_IDS = [channel.channel_id for channel in TelegramChannel.objects.all()]
+ for chat_id in CHAT_IDS:
+ tg_string = 'https://api.telegram.org/bot{}/sendMessage?chat_id={}&text={}'.format(
+ settings.TELEGRAM_BOT_TOKEN,
+ chat_id,
+ 'Uusi New kaehmy! {} -> {}'.format(name, url)
+ )
+ response = requests.get(tg_string).json()
+ logging.debug('Telegram API response:\n{}'.format(response))
+ logging.debug('Sent kaehmy announcement to {} channels.'.format(len(CHAT_IDS)))
+
+ else:
+ context = {
+ 'error': form.errors
+ }
+ return render(request, 'error.html', context)
+ return HttpResponseRedirect('/kaehmy')
+
+
+@require_http_methods(['GET'])
+def export_view(request, *args, **kwargs):
+ def make_table(queryset):
+ table = KaehmyExportTable(queryset,
+ request=request,
+ exclude=['id'],
+ attrs={'class': 'table table-bordered table-hover'})
+
+ table.paginate(page=request.GET.get('page', 1), per_page=9999)
+ table_html = convert_table_to_html(table, request)
+ return table_html
+
+ kaehmys = Application.objects.all()
+ non_board = filter(lambda q: not q.has_any_board_role(), kaehmys)
+ board = filter(lambda q: q.has_any_board_role(), kaehmys)
+
+ context = {
+ 'non_board_table': make_table(non_board),
+ 'board_table': make_table(board),
+ }
+ return render(request, 'export.html', context)
diff --git a/requirements.txt b/requirements.txt
index 3f748a4..dcacff6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,4 +33,5 @@ django-password-reset==1.0
pyexcel==0.5.7
pyexcel-xlsx==0.5.5
django-import-export==0.7.0
-openpyxl==2.4.11
\ No newline at end of file
+openpyxl==2.4.11
+django-app-namespace-template-loader==0.4.1
\ No newline at end of file
diff --git a/sikweb/base.py b/sikweb/base.py
index 454b977..3272cff 100644
--- a/sikweb/base.py
+++ b/sikweb/base.py
@@ -79,6 +79,7 @@ INSTALLED_APPS = [
'members',
'infoscreen',
'coffee_scale',
+ 'kaehmy',
'rest_framework',
'django_nose',
'bootstrap3',
@@ -124,8 +125,12 @@ TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': ['templates'],
- 'APP_DIRS': True,
'OPTIONS': {
+ 'loaders': [
+ 'app_namespace.Loader',
+ 'django.template.loaders.filesystem.Loader',
+ 'django.template.loaders.app_directories.Loader',
+ ],
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
diff --git a/sikweb/urls.py b/sikweb/urls.py
index ade52f0..17ac31f 100644
--- a/sikweb/urls.py
+++ b/sikweb/urls.py
@@ -33,6 +33,7 @@ urlpatterns = [
url(r'^members/', include('members.urls')),
url(r'^infoscreen/', include('infoscreen.urls')),
url(r'^coffee/', include('coffee_scale.urls')),
+ url(r'^kaehmy/', include('kaehmy.urls')),
# admin
url(r'^admin/', admin.site.urls),
diff --git a/templates/base.html b/templates/project.html
similarity index 96%
rename from templates/base.html
rename to templates/project.html
index 34e9c9d..16299ec 100644
--- a/templates/base.html
+++ b/templates/project.html
@@ -26,11 +26,12 @@
{% block body %}
- {% endblock %}
+ {% endblock body %}