Skip to content
Snippets Groups Projects
Commit 5531d3e3 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'merge/core-models' into 'master' 

Merge models of SchoolApps and BiscuIT

See merge request AlekSIS/AlekSIS!92
parents 2322d3a1 5d517e32
No related branches found
No related tags found
1 merge request!92Merge models of SchoolApps and BiscuIT
Pipeline #475 failed
Stage: test
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 204 additions and 62 deletions
aleksis/core/admin.py
+ 3
− 1
View file @ 5531d3e3
from django.contrib import admin
from .models import Group, Person, School, SchoolTerm
from .models import Group, Person, School, SchoolTerm, Activity, Notification
admin.site.register(Person)
admin.site.register(Group)
admin.site.register(School)
admin.site.register(SchoolTerm)
admin.site.register(Activity)
admin.site.register(Notification)
aleksis/core/dashboard/__init__.py deleted 100644 → 0
+ 0
− 0
View file @ 2322d3a1
aleksis/core/dashboard/admin.py deleted 100644 → 0
+ 0
− 11
View file @ 2322d3a1
from django.contrib import admin
from .models import Activity, Notification, Cache
class CacheAdmin(admin.ModelAdmin):
readonly_fields = ["id", "site_cache", "last_time_updated"]
admin.site.register(Activity)
admin.site.register(Notification)
admin.site.register(Cache, CacheAdmin)
aleksis/core/dashboard/apps.py deleted 100644 → 0
+ 0
− 6
View file @ 2322d3a1
from django.apps import AppConfig
class DashboardConfig(AppConfig):
name = 'dashboard'
verbose_name = "Dashboard"
aleksis/core/dashboard/migrations/__init__.py deleted 100644 → 0
+ 0
− 0
View file @ 2322d3a1
aleksis/core/dashboard/models.py deleted 100644 → 0
+ 0
− 44
View file @ 2322d3a1
import datetime
from django.core.cache import cache
from django.db import models
from django.contrib.auth.models import User
from django.utils import timezone
from mailer import send_mail_with_template
class Activity(models.Model):
user = models.ForeignKey(to=User, on_delete=models.CASCADE)
title = models.CharField(max_length=150)
description = models.TextField(max_length=500)
app = models.CharField(max_length=100)
created_at = models.DateTimeField(default=timezone.now)
def __str__(self):
return self.title
class Notification(models.Model):
user = models.ForeignKey(to=User, on_delete=models.CASCADE, related_name="notifications")
title = models.CharField(max_length=150)
description = models.TextField(max_length=500)
link = models.URLField(blank=True)
app = models.CharField(max_length=100)
read = models.BooleanField(default=False)
mailed = models.BooleanField(default=False)
created_at = models.DateTimeField(default=timezone.now)
def __str__(self):
return self.title
def save(self):
super().save()
if not self.mailed:
send_mail_with_template(title, [user.email], "mail/notification.txt", "mail/notification.html", context)
self.mailed = True
aleksis/core/migrations/0001_initial.py 0 → 100644
+ 119
− 0
View file @ 5531d3e3
# Generated by Django 3.0.2 on 2020-01-03 19:18
import aleksis.core.mixins
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import image_cropping.fields
import phonenumber_field.modelfields
class Migration(migrations.Migration):
initial = True
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name='Group',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=60, unique=True, verbose_name='Long name of group')),
('short_name', models.CharField(max_length=16, unique=True, verbose_name='Short name of group')),
],
options={
'ordering': ['short_name', 'name'],
},
bases=(models.Model, aleksis.core.mixins.ExtensibleModel),
),
migrations.CreateModel(
name='School',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=30, verbose_name='Name')),
('name_official',
models.CharField(help_text='Official name of the school, e.g. as given by supervisory authority',
max_length=200, verbose_name='Official name')),
('logo',
image_cropping.fields.ImageCropField(blank=True, null=True, upload_to='', verbose_name='School logo')),
('logo_cropping',
image_cropping.fields.ImageRatioField('logo', '600x600', adapt_rotation=False, allow_fullsize=False,
free_crop=False, help_text=None, hide_image_field=False,
size_warning=True, verbose_name='logo cropping')),
],
options={
'ordering': ['name', 'name_official'],
},
),
migrations.CreateModel(
name='SchoolTerm',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('caption', models.CharField(max_length=30, verbose_name='Visible caption of the term')),
('date_start', models.DateField(null=True, verbose_name='Effective start date of term')),
('date_end', models.DateField(null=True, verbose_name='Effective end date of term')),
('current', models.NullBooleanField(default=None, unique=True)),
],
),
migrations.CreateModel(
name='Person',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('is_active', models.BooleanField(default=True, verbose_name='Is person active?')),
('first_name', models.CharField(max_length=30, verbose_name='First name')),
('last_name', models.CharField(max_length=30, verbose_name='Last name')),
('additional_name', models.CharField(blank=True, max_length=30, verbose_name='Additional name(s)')),
('short_name',
models.CharField(blank=True, max_length=5, null=True, unique=True, verbose_name='Short name')),
('street', models.CharField(blank=True, max_length=30, verbose_name='Street')),
('housenumber', models.CharField(blank=True, max_length=10, verbose_name='Street number')),
('postal_code', models.CharField(blank=True, max_length=5, verbose_name='Postal code')),
('place', models.CharField(blank=True, max_length=30, verbose_name='Place')),
('phone_number', phonenumber_field.modelfields.PhoneNumberField(blank=True, max_length=128, region=None,
verbose_name='Home phone')),
('mobile_number',
phonenumber_field.modelfields.PhoneNumberField(blank=True, max_length=128, region=None,
verbose_name='Mobile phone')),
('email', models.EmailField(blank=True, max_length=254, verbose_name='E-mail address')),
('date_of_birth', models.DateField(blank=True, null=True, verbose_name='Date of birth')),
('sex', models.CharField(blank=True, choices=[('f', 'female'), ('m', 'male')], max_length=1,
verbose_name='Sex')),
('photo',
image_cropping.fields.ImageCropField(blank=True, null=True, upload_to='', verbose_name='Photo')),
('photo_cropping',
image_cropping.fields.ImageRatioField('photo', '600x800', adapt_rotation=False, allow_fullsize=False,
free_crop=False, help_text=None, hide_image_field=False,
size_warning=True, verbose_name='photo cropping')),
('import_ref', models.CharField(blank=True, editable=False, max_length=64, null=True, unique=True,
verbose_name='Reference ID of import source')),
('guardians', models.ManyToManyField(blank=True, related_name='children', to='core.Person',
verbose_name='Guardians / Parents')),
('primary_group',
models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.Group')),
('user', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='person', to=settings.AUTH_USER_MODEL)),
],
options={
'ordering': ['last_name', 'first_name'],
},
bases=(models.Model, aleksis.core.mixins.ExtensibleModel),
),
migrations.AddField(
model_name='group',
name='members',
field=models.ManyToManyField(blank=True, related_name='member_of', to='core.Person'),
),
migrations.AddField(
model_name='group',
name='owners',
field=models.ManyToManyField(blank=True, related_name='owner_of', to='core.Person'),
),
migrations.AddField(
model_name='group',
name='parent_groups',
field=models.ManyToManyField(blank=True, related_name='child_groups', to='core.Group',
verbose_name='Parent groups'),
),
]
aleksis/core/migrations/0002_activity_notification.py 0 → 100644
+ 42
− 0
View file @ 5531d3e3
# Generated by Django 3.0.2 on 2020-01-03 19:19
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('core', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='Notification',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=150)),
('description', models.TextField(max_length=500)),
('link', models.URLField(blank=True)),
('app', models.CharField(max_length=100)),
('read', models.BooleanField(default=False)),
('mailed', models.BooleanField(default=False)),
('created_at', models.DateTimeField(default=django.utils.timezone.now)),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notifications',
to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='Activity',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=150)),
('description', models.TextField(max_length=500)),
('app', models.CharField(max_length=100)),
('created_at', models.DateTimeField(default=django.utils.timezone.now)),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
]
aleksis/core/models.py
+ 40
− 0
View file @ 5531d3e3
from typing import Optional
from django.contrib.auth import get_user_model
from django.contrib.auth.models import User
from django.db import models
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
import dbsettings
from image_cropping import ImageCropField, ImageRatioField
from phonenumber_field.modelfields import PhoneNumberField
from .mailer import send_mail_with_template
from .mixins import ExtensibleModel
......@@ -170,3 +173,40 @@ class Group(models.Model, ExtensibleModel):
def __str__(self) -> str:
return "%s (%s)" % (self.name, self.short_name)
class Activity(models.Model):
user = models.ForeignKey(to=User, on_delete=models.CASCADE)
title = models.CharField(max_length=150)
description = models.TextField(max_length=500)
app = models.CharField(max_length=100)
created_at = models.DateTimeField(default=timezone.now)
def __str__(self):
return self.title
class Notification(models.Model):
user = models.ForeignKey(to=User, on_delete=models.CASCADE, related_name="notifications")
title = models.CharField(max_length=150)
description = models.TextField(max_length=500)
link = models.URLField(blank=True)
app = models.CharField(max_length=100)
read = models.BooleanField(default=False)
mailed = models.BooleanField(default=False)
created_at = models.DateTimeField(default=timezone.now)
def __str__(self):
return self.title
def save(self, **kwargs):
super().save(**kwargs)
if not self.mailed:
send_mail_with_template(self.title, [self.user.email], "mail/notification.txt", "mail/notification.html",
{"notification": self})
self.mailed = True
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment