final edits

This commit is contained in:
2018-12-27 05:16:24 +04:00
parent 273afd18d0
commit da6260be34
8 changed files with 1443 additions and 4 deletions

View File

@@ -89,7 +89,7 @@ class UserChartsActivityAll(DetailView):
day_r = logs[-1].end_time.replace(hour=0, minute=0, second=0, microsecond=0)
day_l = max(
logs[0].start_time.replace(hour=0, minute=0, second=0, microsecond=0),
day_r - timedelta(days=14)
day_r - timedelta(days=13)
)
day_count = (day_r - day_l) // timedelta(days=1) + 1

View File

@@ -0,0 +1,44 @@
# Generated by Django 2.1.4 on 2018-12-27 00:35
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('web', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='activitylog',
name='activity',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='web.Activity', verbose_name='Тип активности'),
),
migrations.AlterField(
model_name='activitylog',
name='end_time',
field=models.DateTimeField(verbose_name='Момент окончания'),
),
migrations.AlterField(
model_name='activitylog',
name='start_time',
field=models.DateTimeField(verbose_name='Момент начала'),
),
migrations.AlterField(
model_name='activitylog',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='web.User', verbose_name='Пользователь'),
),
migrations.AlterField(
model_name='user',
name='email',
field=models.CharField(max_length=50, verbose_name='Почта'),
),
migrations.AlterField(
model_name='user',
name='name',
field=models.CharField(max_length=50, verbose_name='Имя'),
),
]

View File

@@ -3,8 +3,8 @@ from django.db import models
class User(models.Model):
name = models.TextField(verbose_name='Имя')
email = models.TextField(verbose_name='Почта')
name = models.CharField(verbose_name='Имя', max_length=50)
email = models.CharField(verbose_name='Почта', max_length=50)
def __str__(self):
return f'{self.name}'