This commit is contained in:
2018-12-27 04:30:12 +04:00
parent 48b4c9bbfe
commit 273afd18d0
24 changed files with 374 additions and 116 deletions

View File

@@ -1,15 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Новая запись</title>
</head>
<body>
{% extends 'web/base.html' %}
{% block main %}
<form method="post">{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="Сохранить">
<input class="btn btn-primary" type="submit" value="Сохранить">
</form>
</body>
</html>
{% endblock %}

39
templates/web/base.html Normal file
View File

@@ -0,0 +1,39 @@
{% load static %}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>
{% block title %}
LifeStats
{% endblock %}
</title>
<link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
crossorigin="anonymous"></script>
{% block head %}
{% endblock %}
</head>
<body>
{% block body %}
<div class="container-fluid">
{% block main %}
{% endblock %}
</div>
{% endblock %}
</body>
</html>

View File

@@ -0,0 +1,28 @@
{% extends 'web/base.html' %}
{% block main %}
<div id='breadcrumbs'>
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="{% url 'users' %}">
Главная
</a>
</li>
<li class="breadcrumb-item">
<a href="{% url 'user' user.id %}">
{{ user.name }}
</a>
</li>
</ol>
</div>
<h2>
{{ user }} — {{ activity }}
</h2>
<img src="{% url 'user_charts_activity_all' user.id activity.id %}"/>
{# <img src="{% url 'user_charts_activity_tracker' user.id activity.id %}"/>#}
{% endblock %}

View File

@@ -1,71 +1,100 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Пользователь</title>
</head>
<body>
{% extends 'web/base.html' %}
<h1>{{ user }}</h1>
{% block main %}
<div id='breadcrumbs'>
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="{% url 'users' %}">
Главная
</a>
</li>
</ol>
</div>
<h1>{{ user }}</h1>
<h2>Записи</h2>
<div class="row">
<div class="col-sm">
<h2>Записи</h2>
<a href="{% url 'activity_log_create' user.id %}">Создать новую запись</a>
<a class="btn btn-primary" href="{% url 'activity_log_create' user.id %}">
Создать новую запись
</a>
{% if activity_logs %}
<table>
<tr>
<td>
Активность
</td>
<td>
Когда начал
</td>
<td>
Когда закончил
</td>
<td>
</td>
<td>
</td>
</tr>
{% if activity_logs %}
<table class="table">
<thead>
<tr>
<th>
Активность
</th>
<th>
Когда начал
</th>
<th>
Когда закончил
</th>
<th>
</th>
<th>
</th>
</tr>
</thead>
{% for activity_log in activity_logs %}
<tr>
<td>
{{ activity_log.activity }}
</td>
<td>
{{ activity_log.start_time }}
</td>
<td>
{{ activity_log.end_time }}
</td>
<td>
<form method="get" action="{% url 'activity_log_update' user.id activity_log.id %}">{% csrf_token %}
<input type="submit" value="изменить">
</form>
</td>
<td>
<form method="post" action="{% url 'activity_log_delete' user.id activity_log.id %}">{% csrf_token %}
<input type="submit" value="удалить">
</form>
</td>
</tr>
{% endfor %}
</table>
{% else %}
<li>Ничего не залогано :(</li>
{% endif %}
<tbody>
{% for activity_log in activity_logs %}
<tr>
<td>
{{ activity_log.activity }}
</td>
<td>
{{ activity_log.start_time }}
</td>
<td>
{{ activity_log.end_time }}
</td>
<td>
<form method="get" action="{% url 'activity_log_update' user.id activity_log.id %}">{% csrf_token %}
<input class="btn btn-outline-primary" type="submit" value="изменить">
</form>
</td>
<td>
<form method="post" action="{% url 'activity_log_delete' user.id activity_log.id %}">{% csrf_token %}
<input class="btn btn-outline-primary" type="submit" value="удалить">
</form>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<li>Ничего не залогано :(</li>
{% endif %}
</div>
<div class="col-sm">
<img src="{% url 'user_charts_pie' user.id %}"/>
<h2>Активности</h2>
<ul>
{% for activity in activities %}
<li>
<a href="{% url 'user_charts_activity' user.id activity.id %}">
{{ activity }}
</a>
</li>
{% endfor %}
</ul>
</div>
</div>
</table>
</body>
</html>
{% endblock %}

View File

@@ -1,15 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Новый пользователь</title>
</head>
<body>
{% extends 'web/base.html' %}
<form method="post">{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="Сохранить">
</form>
{% block main %}
</body>
</html>
<form method="post">{% csrf_token %}
{{ form.as_p }}
<input class="btn btn-primary" type="submit" value="Сохранить">
</form>
{% endblock %}

View File

@@ -1,28 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Пользователи</title>
</head>
<body>
{% extends 'web/base.html' %}
<h1>Пользователи</h1>
<ul>
{% for user in object_list %}
<li>
<a href="{% url 'user' user.id %}">
{{ user.name }} - {{ user.email }}
</a>
</li>
{% empty %}
<li>Нет пользователей :(</li>
{% endfor %}
</ul>
{% block main %}
<h1>Пользователи</h1>
<ul>
{% for user in object_list %}
<li>
<a href="{% url 'user' user.id %}">
{{ user.name }} - {{ user.email }}
</a>
</li>
{% empty %}
<li>Нет пользователей :(</li>
{% endfor %}
</ul>
<a href="{% url 'users_new' %}">
Создать нового пользователя
</a>
<a href="{% url 'users_new' %}" class="btn btn-primary">
Создать нового пользователя
</a>
</body>
</html>
{% endblock %}