nathan/onboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add basic event system

Browse Source
This commit is contained in:
Nathan Chapman 2021-07-28 18:10:07 -06:00
parent fa98be63fa
commit 391fe5c42a
12 changed files with 91 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
accounts/templates/accounts/profile.html
View File

@ -25,7 +25,7 @@
</section>
<p><a href="{% url 'event-create' %}" class="action-button">Add event</a></p>
<section>
<h3>Upcoming</h3>
<h3>Upcoming (next seven days)</h3>
<div>
{% for event in upcoming_events %}
<div class="today__event">
@ -49,9 +49,13 @@
<h5>{{date.grouper|date:"D, M j"}}</h5>
{% for entry in date.list %}
<p class="activity__item">
{{entry.notes}}
<em>for</em>
<a href="{% url 'employee-detail' entry.employee.pk %}">{{entry.employee}}</a>
<span>{{entry.created_at|time:"TIME_FORMAT"}}</span>
<span>
{{entry.notes}}
<em>for</em>
<a href="{% url 'employee-detail' entry.employee.pk %}">{{entry.employee}}</a>
</span>
<span><a href="{% url 'entry-update' entry.employee.pk entry.pk %}">Edit</a></span>
</p>
{% endfor %}
{% endfor %}

8
board/templates/board/employee_detail.html
View File

@ -60,9 +60,11 @@
{% for date in activity %}
<h5>{{date.grouper|date:"D, M j"}}</h5>
{% for entry in date.list %}
<p class="activity__item">
<span>{{entry.created_at|time:"H:i"}}</span>
<span>{{entry.notes}}</span></p>
<p class="activity__item">
<span>{{entry.created_at|time:"TIME_FORMAT"}}</span>
<span>{{entry.notes}}</span>
<span><a href="{% url 'entry-update' employee.pk entry.pk %}">Edit</a></span>
</p>
{% endfor %}
{% endfor %}
</section>

3
board/templates/board/employee_list.html
View File

@ -8,7 +8,8 @@
{% for employee in employee_list %}
<p>
<a href="{% url 'employee-detail' employee.pk %}"><strong>{{employee.full_name}}</strong></a><br>
<small>Hire date: {{employee.hire_date|date:"SHORT_DATE_FORMAT"}}</small>
<small>Hire date: {{employee.hire_date|date:"SHORT_DATE_FORMAT"}}</small><br>
<small>Department: {{employee.department}}</small>
</p>
{% endfor %}
</section>

2
board/templates/board/event_create_form.html
View File

@ -8,7 +8,7 @@
{% csrf_token %}
{{form.as_p}}
<p>
<input class="action-button" type="submit" value="Create Event"> or <a href="{% url 'event-list' %}">cancel</a>
<input class="action-button" type="submit" value="Create Event"> or <a href="{% url 'profile-detail' %}">cancel</a>
</p>
</form>
</section>

2
board/templates/board/event_form.html
View File

@ -8,7 +8,7 @@
{% csrf_token %}
{{form.as_p}}
<p>
<input class="action-button" type="submit" value="Save changes"> or <a href="{% url 'event-list' %}">cancel</a>
<input class="action-button" type="submit" value="Save changes"> or <a href="{% url 'profile-detail' %}">cancel</a>
</p>
</form>
</section>

17
board/templates/board/event_list.html
View File

@ -20,5 +20,22 @@
<p>There are no events yet.</p>
{% endfor %}
</section>
<section class="pagination">
<span class="step-links">
{% if page_obj.has_previous %}
<a href="?page=1">&laquo; first</a>
<a href="?page={{ page_obj.previous_page_number }}">previous</a>
{% endif %}
<span class="current">
Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
</span>
{% if page_obj.has_next %}
<a href="?page={{ page_obj.next_page_number }}">next</a>
<a href="?page={{ page_obj.paginator.num_pages }}">last &raquo;</a>
{% endif %}
</span>
</section>
</article>
{% endblock %}

4
board/templates/board/logentry_confirm_delete.html
View File

@ -3,10 +3,10 @@
{% block content %}
<article>
<h1>Delete {{logentry}}</h1>
<form method="post" action="{% url 'logentry-delete' logentry.pk %}">
<form method="post" action="{% url 'entry-delete' employee.pk logentry.pk %}">
{% csrf_token %}
<p>
<input class="action-button action-delete" type="submit" value="Confirm Delete {{logentry}}"> or <a href="{% url 'logentry-detail' logentry.pk %}">cancel</a>
<input class="action-button action-button--danger" type="submit" value="Confirm Delete"> or <a href="{% url 'employee-detail' employee.pk %}">cancel</a>
</p>
</form>
</article>

19
board/templates/board/logentry_form.html
View File

@ -2,9 +2,18 @@
{% block content %}
<article>
<h1></h1>
<section>
</section>
</article>
<header>
<h1>Update Event</h1>
<p><a class="action-button action-button--danger" href="{% url 'entry-delete' employee.pk logentry.pk %}">Delete this entry</a></p>
</header>
<section>
<form method="POST" action="{% url 'entry-update' employee.pk logentry.pk %}">
{% csrf_token %}
{{form.as_p}}
<p>
<input class="action-button" type="submit" value="Save changes"> or <a href="{% url 'employee-detail' employee.pk %}">cancel</a>
</p>
</form>
</section>
</article>
{% endblock %}

12
board/views.py
View File

@ -118,7 +118,14 @@ class LogEntryUpdateView(LoginRequiredMixin, UpdateView):
class LogEntryDeleteView(LoginRequiredMixin, DeleteView):
model = LogEntry
pk_url_kwarg = 'entry_pk'
success_url = reverse_lazy('entry-list')
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context['employee'] = Employee.objects.get(pk=self.kwargs['pk'])
return context
def get_success_url(self):
return reverse('employee-detail', kwargs={'pk': self.kwargs['pk']})
# Todos
@ -177,6 +184,8 @@ class TodoDeleteDoneView(LoginRequiredMixin, TemplateView):
# Events
class EventListView(LoginRequiredMixin, ListView):
model = Event
paginate_by = 100
ordering = ('-date', '-time')
class EventCreateView(LoginRequiredMixin, CreateView):
model = Event
@ -194,4 +203,3 @@ class EventUpdateView(LoginRequiredMixin, UpdateView):
class EventDeleteView(LoginRequiredMixin, DeleteView):
model = Event
success_url = reverse_lazy('profile-detail')

24
onboard/settings.py
View File

@ -25,7 +25,7 @@ with open('/etc/secret_key.txt') as f:
SECRET_KEY = f.read().strip()
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = os.environ.get('DJANGO_DEBUG', '') != 'False'
DEBUG = False
ALLOWED_HOSTS = ['onboard.windmillapps.org', '127.0.0.1']
@ -53,7 +53,6 @@ MIDDLEWARE = [
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'onboard.middleware.TimezoneMiddleware',
]
ROOT_URLCONF = 'onboard.urls'
@ -127,10 +126,11 @@ USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/3.2/howto/static-files/
STATICFILES_DIRS = [
BASE_DIR / 'static'
]
STATIC_URL = '/static/'
STATIC_ROOT = [BASE_DIR / 'static/']
STATICFILES_DIRS = [BASE_DIR / 'static']
STATIC_ROOT = '/var/www/onboard.windmillapps.org/static/'
# Default primary key field type
@ -163,7 +163,7 @@ LOGGING = {
# Email
ANYMAIL = {
"MAILGUN_API_KEY": os.environ.get('MAILGUN_API_KEY'),
"MAILGUN_API_KEY": "key-b65d1f9e486825a7d01d099fd3062c2b",
}
SERVER_EMAIL = 'noreply@onboard.windmillapps.org'
@ -174,10 +174,8 @@ ADMINS = (
)
MANAGERS = ADMINS
EMAIL_BACKEND = os.environ.get('EMAIL_BACKEND')
SECURE_HSTS_SECONDS = os.environ.get('DJANGO_SECURE_HSTS_SECONDS', '') != 'False'
SECURE_SSL_REDIRECT = os.environ.get('DJANGO_SECURE_SSL_REDIRECT', '') != 'False'
SESSION_COOKIE_SECURE = os.environ.get('DJANGO_SESSION_COOKIE_SECURE', '') != 'False'
CSRF_COOKIE_SECURE = os.environ.get('DJANGO_CSRF_COOKIE_SECURE', '') != 'False'
EMAIL_BACKEND = 'anymail.backends.mailgun.EmailBackend'
SECURE_HSTS_SECONDS = True
SECURE_SSL_REDIRECT = True
SESSION_COOKIE_SECURE = True
CSRF_COOKIE_SECURE = True

22
static/styles/main.css
View File

@ -1,8 +1,9 @@
:root {
--white: #fdfdff;
--white: #f8f8fb;
--black: #393d3f;
--grey: #a7b4bb;
--blue: #10638c;
--red: #8c1016;
}
html {
@ -98,9 +99,11 @@ article {
font-weight: 900;
}
.navbar__menu {
.navbar__mobile .menu__items {
text-align: center;
}
.navbar__menu_title {
font-weight: 900;
padding: 0.2rem 1rem;
@ -200,6 +203,10 @@ article {
text-decoration: none;
}
.action-button--danger {
background-color: var(--red);
}
/* FORMS */
input[type=text]:not([name=description]),
@ -326,4 +333,13 @@ hgroup {
margin-bottom: 2rem;
padding-bottom: 0.5rem;
border-bottom: 0.046rem solid var(--grey);
}
.activity__item {
display: grid;
grid-template-columns: 0.25fr 2fr 0.25fr;
column-gap: 0.5rem;
margin-bottom: 1rem;
}

5
templates/base.html
View File

@ -27,7 +27,6 @@
</form>
<div class="nav__employees">
<a href="{% url 'profile-detail' %}">Today</a>
<a href="{% url 'event-list' %}">Events</a>
<a href="{% url 'employee-list' %}">Employees</a>
</div>
<div class="nav__auth">
@ -45,7 +44,7 @@
</nav>
<nav class="navbar__mobile">
{% if user.is_authenticated %}
<details class="menu_">
<details class="menu">
<summary class="menu__title">Menu</summary>
<dl class="menu__items">
<dt>
@ -56,8 +55,6 @@
<br>
<dt><a href="{% url 'profile-detail' %}">Today</a></dt>
<br>
<dt><a href="{% url 'event-list' %}">Events</a></dt>
<br>
<dt><a href="{% url 'employee-list' %}">Employees</a></dt>
<br>
<dt><a class="action-button" href="{% url 'logout' %}">Logout</a></dt>