svxf/LifeStats
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

final edits

Browse Source
This commit is contained in:
svxf
2018-12-27 05:16:24 +04:00
parent 273afd18d0
commit da6260be34
8 changed files with 1443 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/base.html
View File

@@ -31,6 +31,8 @@
<body> <body>
{% block body %} {% block body %}
<div class="container-fluid"> <div class="container-fluid">
<h1>LifeStats</h1>
{% block main %} {% block main %}
{% endblock %} {% endblock %}
</div> </div>

11
timelogger/main_web_activity.sql Normal file
View File

@@ -0,0 +1,11 @@
CREATE TABLE web_activity
(
id integer PRIMARY KEY AUTOINCREMENT NOT NULL,
type text NOT NULL
);
INSERT INTO web_activity (id, type) VALUES (181, 'Сон');
INSERT INTO web_activity (id, type) VALUES (182, 'Еда');
INSERT INTO web_activity (id, type) VALUES (183, 'Учёба');
INSERT INTO web_activity (id, type) VALUES (184, 'Работа');
INSERT INTO web_activity (id, type) VALUES (185, 'Транспорт');
INSERT INTO web_activity (id, type) VALUES (186, 'Досуг');

1373
timelogger/main_web_activitylog.sql Normal file
View File

File diff suppressed because it is too large Load Diff

9
timelogger/main_web_user.sql Normal file
View File

@@ -0,0 +1,9 @@
CREATE TABLE web_user
(
id integer PRIMARY KEY AUTOINCREMENT NOT NULL,
name text NOT NULL,
email text NOT NULL
);
INSERT INTO web_user (id, email, name) VALUES (63, 'vasya@abra.me', 'Вася');
INSERT INTO web_user (id, email, name) VALUES (64, 'petya@abra.me', 'Петя');
INSERT INTO web_user (id, email, name) VALUES (67, 'vgrinina@gmail.com', 'Ника');

2
timelogger/settings.py
View File

@@ -24,7 +24,7 @@ SECRET_KEY = '@uo#()klkn3kl-c@6el=7jfyhcunmw-542ry5e$f$$^+xo%q#x'
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
ALLOWED_HOSTS = [] ALLOWED_HOSTS = ['*']
# Application definition # Application definition

2
web/chart_views.py
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_r = logs[-1].end_time.replace(hour=0, minute=0, second=0, microsecond=0)
day_l = max( day_l = max(
logs[0].start_time.replace(hour=0, minute=0, second=0, microsecond=0), 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 day_count = (day_r - day_l) // timedelta(days=1) + 1

44
web/migrations/0002_auto_20181227_0035.py Normal file
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='Имя'),
),
]

4
web/models.py
View File

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