sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

passes checks in python3

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-24 15:57:26 +01:00
parent c7ec31344b
commit 866566172c
51 changed files with 4037 additions and 3999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
cvkbrno/models.py
View File

@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# -*- Coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models
@@ -18,86 +18,86 @@ class BoatCategory(models.Model):
club = models.CharField(_("Club"),max_length=30)
class Meta:
verbose_name = _("boat category")
verbose_name_plural = _("boat categories")
ordering = ['name']
verbose_name = _("boat category")
verbose_name_plural = _("boat categories")
ordering = ['name']
def __str__(self):
str = self.name
str = self.name
return str
return str
def __unicode__(self):
str = self.name
str = self.name
return str
return str
class Member(models.Model):
statuses = (
("coach", _("coach")),
("member", _("member")),
("administrator", _("administrator")),
)
("coach", _("coach")),
("member", _("member")),
("administrator", _("administrator")),
)
class Meta:
verbose_name = _("member")
verbose_name_plural = _("members")
ordering = ['user']
verbose_name = _("member")
verbose_name_plural = _("members")
ordering = ['user']
user = models.OneToOneField(User)
user = models.OneToOneField(User,on_delete=models.CASCADE)
contributions = models.BooleanField(default=True)
status = models.CharField(default="member",
choices=statuses,
max_length=30)
choices=statuses,
max_length=30)
categories = models.ManyToManyField(BoatCategory,
verbose_name=_("Boat Categories"))
verbose_name=_("Boat Categories"))
club = models.CharField(_("Club"),max_length=30)
hoursworked = models.FloatField(_("Hours Worked"))
def __str__(self):
str = self.user.first_name+' '+self.user.last_name
return str
str = self.user.first_name+' '+self.user.last_name
return str
def __unicode__(self):
str = self.user.first_name+' '+self.user.last_name
return str
str = self.user.first_name+' '+self.user.last_name
return str
class Boat(models.Model):
class Meta:
verbose_name = _("boat")
verbose_name_plural = _("boats")
ordering = ['boatcode']
verbose_name = _("boat")
verbose_name_plural = _("boats")
ordering = ['boatcode']
boatname = models.CharField(_("Boat Name"),max_length=30)
boatcode = models.CharField(_("Boat Code"),max_length=10)
categories = models.ManyToManyField(BoatCategory)
nrseats = models.IntegerField(_("Nr of Seats"))
statuses = (
("water",_("water")),
("hangar",_("hangar")),
("damaged",_("damaged")),
("races",_("races")),
)
("water",_("water")),
("hangar",_("hangar")),
("damaged",_("damaged")),
("races",_("races")),
)
status = models.CharField(default="hangar",
choices=statuses,
max_length=30)
choices=statuses,
max_length=30)
comment = models.CharField(_("Comment"),blank=True,max_length=100)
def __str__(self):
str = self.boatcode+' '+self.boatname
str = self.boatcode+' '+self.boatname
return str
return str
def __unicode__(self):
str = self.boatcode+' '+self.boatname
str = self.boatcode+' '+self.boatname
return str
return str
class MemberWork(models.Model):
class Meta:
verbose_name = _("member work")
verbose_name_plural = _("member work")
verbose_name = _("member work")
verbose_name_plural = _("member work")
date = models.DateField(_("Date"))
hours = models.FloatField(_("Hours"))
@@ -105,16 +105,16 @@ class MemberWork(models.Model):
comment = models.CharField(_("Comment"),blank=True,max_length=100)
worker = models.ManyToManyField(Member,_("Worker"))
statuses = (
("planned",_("planned")),
("executed",_("executed"))
)
("planned",_("planned")),
("executed",_("executed"))
)
status = models.CharField(default="planned",
choices=statuses,
max_length=30)
choices=statuses,
max_length=30)
class Races(models.Model):
class Meta:
verbose_name = _("race")
verbose_name_plural = _("races")
verbose_name = _("race")
verbose_name_plural = _("races")
name = models.CharField(max_length = 30)
@@ -124,20 +124,20 @@ class Races(models.Model):
transportboats = models.ManyToManyField(Boat)
def __str__(self):
str = self.name
str = str+' '+self.startdatetime.strftime('%Y-%m-%d %H:%M:%S')
return str
str = self.name
str = str+' '+self.startdatetime.strftime('%Y-%m-%d %H:%M:%S')
return str
def __unicode__(self):
str = self.name
str = str+' '+self.startdatetime.strftime('%Y-%m-%d %H:%M:%S')
return str
str = self.name
str = str+' '+self.startdatetime.strftime('%Y-%m-%d %H:%M:%S')
return str
class Outing(models.Model):
class Meta:
verbose_name = _("outing")
verbose_name_plural = _("outings")
verbose_name = _("outing")
verbose_name_plural = _("outings")
starttime = models.DateTimeField(verbose_name = _("Start Time"),default=timezone.now)
@@ -145,27 +145,27 @@ class Outing(models.Model):
distance = models.FloatField(_("Distance (km)"),default=12)
comment = models.CharField(_("Comment"),blank=True,max_length=100)
statuses = (
("reservation",_("reservation")),
("active", _("active")),
("completed", _("completed")),
("race", _("race")),
)
boat = models.ForeignKey(Boat)
rower = models.ForeignKey(Member)
("reservation",_("reservation")),
("active", _("active")),
("completed", _("completed")),
("race", _("race")),
)
boat = models.ForeignKey(Boat,on_delete=models.CASCADE)
rower = models.ForeignKey(Member,on_delete=models.CASCADE)
race = models.ManyToManyField(Races,blank=True)
otherrowers = models.ManyToManyField(Member,related_name="otherrowers")
status = models.CharField(_("Status"),default="active",
choices=statuses,
max_length=30)
choices=statuses,
max_length=30)
def __str__(self):
str = self.boat.boatcode
str = str+' '+self.starttime.strftime('%Y-%m-%d %H:%M:%S')
return str
str = self.boat.boatcode
str = str+' '+self.starttime.strftime('%Y-%m-%d %H:%M:%S')
return str
def __unicode__(self):
str = self.boat.boatcode
str = str+' '+self.starttime.strftime('%Y-%m-%d %H:%M:%S')
return str
str = self.boat.boatcode
str = str+' '+self.starttime.strftime('%Y-%m-%d %H:%M:%S')
return str

2
cvkbrno/tasks.py
View File

@@ -1,4 +1,4 @@
from celery import Celery,app
from .celery import Celery,app
import os
import time
import gc