0.7.3 mehr gefixed
This commit is contained in:
holger.trampe
parent
686a8fe6f1
commit
90dd87c9bd
|
|
@ -2,7 +2,7 @@
|
|||
{% load static %}
|
||||
{% load crispy_forms_tags %}
|
||||
{% block content %}
|
||||
<div class="content-section col-6">
|
||||
<div class="content-section col-6" onmouseup="javascript:checkValue()">
|
||||
<h3>Bereich aktualisieren</h3>
|
||||
<hr>
|
||||
<form method="POST">
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
{{ form|crispy }}
|
||||
<h6>Mitarbeiter hinzufügen</h6>
|
||||
<div class="input-group mb-3">
|
||||
<input class="form-control" list="usersfree" name="searchusers" id="searchusers" type="text" onkeyup="javascript:checkValue()">
|
||||
<input class="form-control" list="usersfree" name="searchusers" id="searchusers" type="text" onkeyup="javascript:checkValue()" onchange="javascript:checkValue()">
|
||||
<div class="input-group-append">
|
||||
<button type="button" id="addusertoareabtn" onclick="javascript:addUserToArea()" class="btn btn-success" disabled>Mitarbeiter hinzufügen</button>
|
||||
<button type="button" onclick="javascript:clearSearchfield()" class="btn btn-secondary" ><i class="fas fa-times"></i></button>
|
||||
|
|
@ -118,6 +118,7 @@
|
|||
//Check for valid input on inputfield
|
||||
function checkValue(){
|
||||
var g = $('#searchusers').val();
|
||||
console.log(g);
|
||||
var id = $('#usersfree').find('option[value="' + g + '"]').attr('id');
|
||||
if(id != undefined && id.length > 0){
|
||||
tempid = id;
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -12,6 +12,22 @@
|
|||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<ul class="nav nav-tabs" id="news_tabs" role="tablist">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="act" data-toggle="tab" href="#t_act" role="tab" aria-controls="news" aria-selected="false">Aktuelle</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="archiv" data-toggle="tab" href="#t_archiv" role="tab" aria-controls="archiv" aria-selected="false">Archiv</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col">
|
||||
<div class="tab-content" id="tab_contents">
|
||||
<div class="tab-pane fade" id="t_act" role="tabpanel" aria-labelledby="act">
|
||||
<h5 class="mt-3"><a href="" style="color: #000000;">Aktuelle News</a></h5>
|
||||
<hr>
|
||||
<div class="row">
|
||||
<div class="form-group mb-2">
|
||||
<input class="form-control" id="tableSearch" size="50" type="text" placeholder="Suche in Tabelle...">
|
||||
|
|
@ -55,14 +71,79 @@
|
|||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane fade" id="t_archiv" role="tabpanel" aria-labelledby="act">
|
||||
<h5 class="mt-3"><a href="" style="color: #000000;">Archivierte News</a></h5>
|
||||
<hr>
|
||||
|
||||
<div class="row">
|
||||
<div class="form-group mb-2">
|
||||
<input class="form-control" id="tableSearch_arch" size="50" type="text" placeholder="Suche in Tabelle...">
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover" >
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Titel</th>
|
||||
<th scope="col">Erstellt von</th>
|
||||
<th scope="col">Erstellt am</th>
|
||||
<th scope="col">Sichtbar von/bis</th>
|
||||
<th scope="col"> </th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tableresults_arch">
|
||||
{% for news_single in news_arch %}
|
||||
<tr>
|
||||
<td><a href="{% url 'news-single' news_single.pk %}">{{news_single.name }}</a></td>
|
||||
<td>{{ news_single.created_by.first_name }} {{ news_single.created_by.last_name }}</td>
|
||||
<td>{{ news_single.created_date }}</td>
|
||||
<td>{{ news_single.go_online_on|date:"d.m.Y, H:i"}} bis {{ news_single.go_offline_on|date:"d.m.Y, H:i"}}</td>
|
||||
<td>
|
||||
{% if news_single.created_by == request.user or perms.users.news_management %}
|
||||
<div class="dropdown no-arrow">
|
||||
<a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i>
|
||||
</a>
|
||||
<div class="dropdown-menu dropdown-menu-right shadow animated--fade-in" aria-labelledby="dropdownMenuLink">
|
||||
<a class="dropdown-item" href="{% url 'news-update' news_single.pk %}" class="btn">Bearbeiten</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
<a class="dropdown-item text-danger" href="{% url 'news-delete' news_single.pk %}">Löschen</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
$('#news_tabs li:first-child a').tab('show');
|
||||
|
||||
$("#tableSearch").on("keyup", function() {
|
||||
var value = $(this).val().toLowerCase();
|
||||
$("#tableresults tr").filter(function() {
|
||||
$(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
|
||||
});
|
||||
});
|
||||
|
||||
$("#tableSearch_arch").on("keyup", function() {
|
||||
var value = $(this).val().toLowerCase();
|
||||
$("#tableresults_arch tr").filter(function() {
|
||||
$(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
$('#news_tabs a').on('click', function (e) {
|
||||
e.preventDefault()
|
||||
$(this).tab('show')
|
||||
});
|
||||
</script>
|
||||
{% endblock content %}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,68 @@
|
|||
{% extends "users/base.html" %}
|
||||
{% block content %}
|
||||
<div class="content-section col-12">
|
||||
<h3>News</h3>
|
||||
<hr>
|
||||
<p>
|
||||
Hier können aktuelle Nachrichten für die Agentur erstellt und verwaltet werden.
|
||||
</p>
|
||||
<div class="row">
|
||||
<div class="content-section col-4">
|
||||
<a class="btn btn-primary" href="{% url 'news-add' %} ">News anlegen</a>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row">
|
||||
<div class="form-group mb-2">
|
||||
<input class="form-control" id="tableSearch" size="50" type="text" placeholder="Suche in Tabelle...">
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover" >
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Titel</th>
|
||||
<th scope="col">Erstellt von</th>
|
||||
<th scope="col">Erstellt am</th>
|
||||
<th scope="col">Sichtbar von/bis</th>
|
||||
<th scope="col"> </th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tableresults">
|
||||
{% for news_single in news %}
|
||||
<tr>
|
||||
<td><a href="{% url 'news-single' news_single.pk %}">{{news_single.name }}</a></td>
|
||||
<td>{{ news_single.created_by.first_name }} {{ news_single.created_by.last_name }}</td>
|
||||
<td>{{ news_single.created_date }}</td>
|
||||
<td>{{ news_single.go_online_on|date:"d.m.Y, H:i"}} bis {{ news_single.go_offline_on|date:"d.m.Y, H:i"}}</td>
|
||||
<td>
|
||||
{% if news_single.created_by == request.user or perms.users.news_management %}
|
||||
<div class="dropdown no-arrow">
|
||||
<a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i>
|
||||
</a>
|
||||
<div class="dropdown-menu dropdown-menu-right shadow animated--fade-in" aria-labelledby="dropdownMenuLink">
|
||||
<a class="dropdown-item" href="{% url 'news-update' news_single.pk %}" class="btn">Bearbeiten</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
<a class="dropdown-item text-danger" href="{% url 'news-delete' news_single.pk %}">Löschen</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
$("#tableSearch").on("keyup", function() {
|
||||
var value = $(this).val().toLowerCase();
|
||||
$("#tableresults tr").filter(function() {
|
||||
$(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
{% endblock content %}
|
||||
|
|
@ -8,6 +8,7 @@ from django.contrib.auth.decorators import login_required
|
|||
from datetime import datetime
|
||||
from django.contrib import messages
|
||||
from django.utils.dateparse import parse_date
|
||||
from django.utils import timezone
|
||||
# Create your views here.
|
||||
# ALLE STANDARDS EINER AGENTUR
|
||||
class NewsManagement(LoginRequiredMixin, ListView):
|
||||
|
|
@ -16,10 +17,11 @@ class NewsManagement(LoginRequiredMixin, ListView):
|
|||
# Loading only user same agency
|
||||
# Change context and return for template-data
|
||||
def get_context_data(self, **kwargs):
|
||||
filterdate = datetime.now()
|
||||
news = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('-created_date')
|
||||
filterdate = timezone.now()
|
||||
news = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-created_date')
|
||||
news_arch = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_offline_on__lt=filterdate).order_by('-created_date')
|
||||
context = super().get_context_data(**kwargs)
|
||||
context.update({'active_link' : 'newsmanagement', 'news' : news})
|
||||
context.update({'active_link' : 'newsmanagement', 'news' : news, 'news_arch' : news_arch})
|
||||
return context
|
||||
'''
|
||||
class NewsAddNews(LoginRequiredMixin, CreateView):
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
{{ form|crispy }}
|
||||
<h6>Mitarbeiter hinzufügen</h6>
|
||||
<div class="input-group mb-3">
|
||||
<input class="form-control" list="usersfree" name="searchusers" id="searchusers" type="text" onkeyup="javascript:checkSearchUser()">
|
||||
<input class="form-control" list="usersfree" name="searchusers" id="searchusers" type="text" onkeyup="javascript:checkSearchUser()" onchange="javascript:checkSearchUser()">
|
||||
<div class="input-group-append">
|
||||
<button type="button" id="addusertotaskbtn" onclick="javascript:addUserToTask()" class="btn btn-success" disabled>Mitarbeiter hinzufügen</button>
|
||||
<button type="button" onclick="javascript:clearSearchfield()" class="btn btn-secondary" ><i class="fas fa-times"></i></button>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<p>TODO Datenschutz Content</p>
|
||||
<p>Informationen über den Datenschutz</p>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<p>TODO Impressum Content</p>
|
||||
<p>E-Mail: support@digitale-agentur.com</p>
|
||||
|
|
|
|||
Loading…
Reference in New Issue