DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tabellensortierung korrigiert

This commit is contained in:
holger.trampe 2021-03-16 17:31:48 +01:00
parent a02e62d89c
commit ac5f93c340
15 changed files with 52 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
adm/templates/adm/adm_agency_single.html
View File

@ -74,7 +74,7 @@ Es liegen keine Rechnungen vor.
<td><a href="{% url 'adm-user-single' ele.pk %}">{{ele.first_name}}</a></td>
<td><a href="{% url 'adm-user-single' ele.pk %}">{{ele.last_name}}</a></td>
<td>{{ele.profile.func|default:""}}</td>
<td>{{ele.last_login|date:"d.m.Y, H:i"|default:""}}</td>
<td data-sort='{{ele.last_login|date:"U"|default:""}}'>{{ele.last_login|date:"d.m.Y, H:i"|default:""}}</td>
<td>{% if ele.profile.visible %} Sichtbar {% else %} Nicht sichtbar {% endif %}</td>
</tr>
{% endfor %}
@ -85,9 +85,7 @@ Es liegen keine Rechnungen vor.
<script type="text/javascript">
$(document).ready(function(){
$('#agdata').DataTable({
columnDefs: [
{ 'targets': 3, type: 'date-euro' },
],
order: [3, 'desc'],
"language": {
"search" : "Suche",
"info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",

6
adm/templates/adm/adm_agencys.html
View File

@ -21,7 +21,7 @@
{% getAgencyData ele as agdata %}
<tr>
<td><a href="{% url 'adm-agency-single' ele.pk %}">{{ele.name}}</a></td>
<td>{{ele.registerdate}}</td>
<td data-sort='{{ele.registerdate|date:"U"}}'>{{ele.registerdate}}</td>
<td>{{agdata.0}}</td>
<td>{{agdata.1}}</td>
<td>
@ -39,9 +39,7 @@
<script type="text/javascript">
$(document).ready(function(){
$('#agdata').DataTable({
columnDefs: [
{ 'targets': 1, type: 'date-euro' },
],
order: [1, 'desc'],
"language": {
"search" : "Suche",
"info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",

10
adm/templates/adm/adm_bills.html
View File

@ -28,9 +28,9 @@
<tr>
<td><a href="{% url 'adm-agency-single' ele.agency.pk %}">{{ele.agency.name}}</a></td>
<td><a href="{% url 'ag-getbillpdf' ele.pk %}" target="_blank">{{ele.billnumber}}</a></td>
<td>{{ele.billdate|date:"d.m.Y"}}</td>
<td>{{ele.start|date:"d.m.Y"}}</td>
<td>{{ele.end|date:"d.m.Y"}}</td>
<td data-sort='{{ele.billdate|date:"U"}}'>{{ele.billdate|date:"d.m.Y"}}</td>
<td data-sort='{{ele.start|date:"U"}}'>{{ele.start|date:"d.m.Y"}}</td>
<td data-sort='{{ele.end|date:"U"}}'>{{ele.end|date:"d.m.Y"}}</td>
<td>
{% loadBillValue ele as fm %}
{% if fm != False %}
@ -50,9 +50,7 @@
<script type="text/javascript">
$(document).ready(function(){
$('#agdata').DataTable({
columnDefs: [
{ 'targets': 1, type: 'date-euro' },
],
order: [2, 'desc'],
"language": {
"search" : "Suche",
"info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",

9
cloud/templates/cloud/cloud_main.html
View File

@ -96,8 +96,8 @@ a.disabled {
{% endif %}
</td>
<td>{{d.owner.first_name}} {{d.owner.last_name}}</td>
<td>{{d.date_created|date:"d.m.Y G:i"}}</td>
<td>{{d.date_last_modified|date:"d.m.Y G:i"}}</td>
<td data-sort='{{d.date_created|date:"U"}}'>{{d.date_created|date:"d.m.Y G:i"}}</td>
<td data-sort='{{d.date_last_modified|date:"U"}}'>{{d.date_last_modified|date:"d.m.Y G:i"}}</td>
<td>
{% if user|usergperm:"filedirmanager" and groupchecker and d.is_defaultstandard == False %}
<div class="dropdown no-arrow">
@ -507,10 +507,7 @@ if ( isIE ) {
$('#dirfilestable').DataTable({
columnDefs: [
{ 'targets': 3, type: 'date-euro' },
{ 'targets': 4, type: 'date-euro' },
],
order: [3, 'desc'],
responsive : true,
"language": {
"search" : "Suche",

2
dasettings/templates/dasettings/calc_content.html
View File

@ -87,7 +87,7 @@
{% for bill in bills %}
<tr>
<td><a href="{% url 'ag-getbillpdf' bill.pk %}" target="_blank">{{bill.billnumber}}</a></td>
<td>{{bill.billdate|date:"d.m.Y"}}</td>
<td data-sort='{{bill.billdate|date:"U"}}'>{{bill.billdate|date:"d.m.Y"}}</td>
<td>
{% if bill.billstatus == "open" %} <i class="far fa-times-circle" style="color: red"></i> {% elif bill.billstatus == "paid" %} <i class="far fa-check-circle" style="color: green"></i> {% endif %}
</td>

BIN
dump.rdb
View File

Binary file not shown.

27
news/templates/news/news_management.html
View File

@ -52,8 +52,8 @@
<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"}} {% if news_single.go_offline_on != None %} bis {% endif %} {{ news_single.go_offline_on|date:"d.m.Y, H:i"}}</td>
<td data-sort='{{ news_single.created_date|date:"U" }}'>{{ news_single.created_date }}</td>
<td data-sort='{{ news_single.go_online_on|date:"U" }}'>{{ news_single.go_online_on|date:"d.m.Y, H:i"}} {% if news_single.go_offline_on != None %} bis {% endif %} {{ 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 %}
<a style="float: right" class="btn btn-secondary btn-sm ml-2" href="{% url 'news-delete' news_single.pk %}">
@ -99,8 +99,8 @@
<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 data-sort='{{ news_single.created_date|date:"U" }}'>{{ news_single.created_date }}</td>
<td data-sort='{{ news_single.go_online_on|date:"U" }}'>{{ 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 %}
<a style="float: right" class="btn btn-secondary btn-sm ml-2" href="{% url 'news-delete' news_single.pk %}">
@ -146,8 +146,8 @@
<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 data-sort='{{ news_single.created_date|date:"U" }}'>{{ news_single.created_date }}</td>
<td data-sort='{{ news_single.go_online_on|date:"U" }}'>{{ 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 %}
<a style="float: right" class="btn btn-secondary btn-sm ml-2" href="{% url 'news-delete' news_single.pk %}">
@ -180,10 +180,7 @@
$(document).ready(function(){
$('#activenews').DataTable({
columnDefs: [
{ 'targets': 2, type: 'date-euro' },
],
order: [2, 'desc'],
"language": {
"search" : "Suche",
"info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
@ -204,10 +201,7 @@ $(document).ready(function(){
});
$('#archnews').DataTable({
columnDefs: [
{ 'targets': 2, type: 'date-euro' },
],
order: [2, 'desc'],
"language": {
"search" : "Suche",
"info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
@ -228,10 +222,7 @@ $(document).ready(function(){
});
$('#comingnews').DataTable({
columnDefs: [
{ 'targets': 2, type: 'date-euro' },
],
order: [2, 'desc'],
"language": {
"search" : "Suche",
"info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",

10
standards/templates/standards/standard_area.html
View File

@ -27,9 +27,9 @@
<tr>
<td><a href="{% url 'standard-single' item.pk %}">{{item.name}}</a></td>
<td>{{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}}</td>
<td>{{ item.created_standard_date|date:"d.m.Y, H:i"}}</td>
<td data-sort='{{ item.created_standard_date|date:"U"}}'>{{ item.created_standard_date|date:"d.m.Y, H:i"}}</td>
<td>{{ item.last_modified_by.first_name }} {{ item.last_modified_by.last_name }}</td>
<td>{{ item.last_modified_on|date:"d.m.Y, H:i"}}</td>
<td data-sort='{{ item.last_modified_on|date:"U"}}'>{{ item.last_modified_on|date:"d.m.Y, H:i"}}</td>
<td>{{item.public|yesno:"Öffentlich,Nicht öffentlich"}}</td>
<td>
{% if item.created_standard_by == user or perms.users.standardmanager %}
@ -55,11 +55,7 @@
$('#standardstable').DataTable({
responsive: true,
columnDefs: [
{ 'targets': 2, type: 'date-euro' },
{ 'targets': 3, type: 'date-euro' },
],
order: [2, 'desc'],
"language": {
"search" : "Suche",
"info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",

18
standards/templates/standards/standard_task.html
View File

@ -28,9 +28,9 @@
<tr>
<td><a href="{% url 'standard-single' item.pk %}">{{item.name}}</a></td>
<td>{{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}}</td>
<td>{{ item.created_standard_date|date:"d.m.Y, H:i"}}</td>
<td data-sort='{{ item.created_standard_date|date:"U"}}'>{{ item.created_standard_date|date:"d.m.Y, H:i"}}</td>
<td>{{ item.last_modified_by.first_name }} {{ item.last_modified_by.last_name }}</td>
<td>{{ item.last_modified_on|date:"d.m.Y, H:i"}}</td>
<td data-sort='{{ item.created_standard_date|date:"U"}}'>{{ item.last_modified_on|date:"d.m.Y, H:i"}}</td>
<td>{{item.public|yesno:"Öffentlich,Nicht öffentlich"}}</td>
<td>
{% if item.created_standard_by == user or perms.users.standardmanager %}
@ -50,7 +50,6 @@
</table>
</div>
</div>
<script type="text/javascript">
function goToStandardMain(){
@ -64,15 +63,10 @@ function goToArea(name){
}
$(document).ready( function () {
$('#standardstable').DataTable({
columnDefs: [
{ 'targets': 2, type: 'date-euro' },
{ 'targets': 4, type: 'date-euro' }
],
order: [
[2, 'desc'] // date column
],
order: [2, 'desc'],
responsive: true,
"language": {
"search" : "Suche",
@ -92,6 +86,8 @@ function goToArea(name){
"className" : "btn-danger"
}
});
} );
</script>
<style>

6
standards/templates/standards/standards_from_agn.html
View File

@ -47,7 +47,7 @@
{% endif %}
</td>
<td>{{standard.agency.name}} <i style="float: right;" class="fas fa-info-circle" onclick="javascript:$('#showAgencyInfo_{{standard.agency.pk}}').modal('toggle');"></i></td>
<td>{{standard.last_modified_on|date:"d.m.Y, H:i"}}</td>
<td data-sort='{{standard.last_modified_on|date:"U"}}'>{{standard.last_modified_on|date:"d.m.Y, H:i"}}</td>
<td>{{standard.agencynetworkcounter}}</td>
<td>{% if isshared %}Übernommen {% elif request.user in standard.favoritfrom.all %}Favorit {% endif %}</td>
</tr>
@ -98,9 +98,7 @@
$('#agnstandards').DataTable({
columnDefs: [
{ 'targets': 2, type: 'date-euro' },
],
order: [2, 'desc'],
responsive: true,
"language": {
"search" : "Suche",

18
standards/templates/standards/standards_management.html
View File

@ -127,9 +127,9 @@
{% endif %}
{% endif %}
</td>
<td>{{standard.created_standard_date|date:"d.m.Y, H:i"}}</td>
<td data-sort='{{standard.created_standard_date|date:"U"}}'>{{standard.created_standard_date|date:"d.m.Y, H:i"}}</td>
<td>{{standard.last_modified_by.first_name}} {{standard.last_modified_by.last_name}}</td>
<td>{{standard.last_modified_on|date:"d.m.Y, H:i"}}</td>
<td data-sort='{{standard.last_modified_on|date:"U"}}'>{{standard.last_modified_on|date:"d.m.Y, H:i"}}</td>
<td>{{standard.public|yesno:"Öffentlich,Nicht öffentlich"}}</td>
<td>
<div class="dropdown no-arrow">
@ -192,9 +192,9 @@
{% endif %}
{% endif %}
</td>
<td>{{standard.created_standard_date|date:"d.m.Y, H:i"}}</td>
<td data-sort='{{standard.created_standard_date|date:"U"}}'>{{standard.created_standard_date|date:"d.m.Y, H:i"}}</td>
<td>{{standard.last_modified_by.first_name}} {{standard.last_modified_by.last_name}}</td>
<td>{{standard.last_modified_on|date:"d.m.Y, H:i"}}</td>
<td data-sort='{{standard.last_modified_on|date:"U"}}'>{{standard.last_modified_on|date:"d.m.Y, H:i"}}</td>
<td>{{standard.public|yesno:"Öffentlich,Nicht öffentlich"}}</td>
<td>
<div class="dropdown no-arrow">
@ -267,10 +267,7 @@
$('[data-toggle="popover"]').popover();
$('#userownstandards').DataTable({
responsive: true,
columnDefs: [
{ 'targets': 1, type: 'date-euro' },
{ 'targets': 3, type: 'date-euro' }
],
order: [1, 'desc'],
"language": {
"search" : "Suche",
"zeroRecords": "Nichts gefunden",
@ -292,10 +289,7 @@
$('#unpubstandardsofuser').DataTable({
responsive: true,
columnDefs: [
{ 'targets': 1, type: 'date-euro' },
{ 'targets': 3, type: 'date-euro' }
],
order: [1, 'desc'],
"language": {
"search" : "Suche",
"zeroRecords": "Nichts gefunden",

4
timemanagement/templates/timemanagement/tm_ab_all.html
View File

@ -18,8 +18,8 @@
<tr id="tableele_ab_{{abday.pk}}">
<td>{{abday.user.first_name}}</td>
<td>{{abday.user.last_name}}</td>
<td>{{abday.start|date:"d.M Y"}}</td>
<td>{{abday.end|date:"d.M Y"}}</td>
<td data-sort='{{abday.start|date:"U"}}'>{{abday.start|date:"d.M Y"}}</td>
<td data-sort='{{abday.end|date:"U"}}'>{{abday.end|date:"d.M Y"}}</td>
<td>{{abday.reason.name}}</td>
<td>{{abday.info}}</td>
<td style="text-align: center;">{% if abday.confirm_status == 0 %} <i class="far fa-check-circle" style="color: green"></i> {% elif abday.confirm_status == 1 %} Beantragt {% else %} <i class="far fa-times-circle" style="color: red"></i> {% endif %}</td>

4
timemanagement/templates/timemanagement/tm_ab_toconfirm.html
View File

@ -16,8 +16,8 @@
{% for abday in needtoconfirm %}
<tr>
<td>{{abday.user.first_name}} {{abday.user.last_name}}</td>
<td>{{abday.start|date:"d.M Y"}}</td>
<td>{{abday.end|date:"d.M Y"}}</td>
<td data-sort='{{abday.start|date:"U"}}'>{{abday.start|date:"d.M Y"}}</td>
<td data-sort='{{abday.end|date:"U"}}'>{{abday.end|date:"d.M Y"}}</td>
<td>{{abday.reason.name}}</td>
<td>{{abday.info}}</td>
<td>

4
timemanagement/templates/timemanagement/tm_ab_userown.html
View File

@ -67,8 +67,8 @@
<tbody id="">
{% for abday in userown %}
<tr>
<td>{{abday.start|date:"d.M Y"}}</td>
<td>{{abday.end|date:"d.M Y"}}</td>
<td data-sort='{{abday.start|date:"U"}}'>{{abday.start|date:"d.M Y"}}</td>
<td data-sort='{{abday.end|date:"U"}}'>{{abday.end|date:"d.M Y"}}</td>
<td>{{abday.reason.name}}</td>
<td>{{abday.info}}</td>
<td>{{abday.confirm_info}}</td>

7
users/templates/users/base.html
View File

@ -87,6 +87,13 @@
<link href="{% static 'users/css/custom.css' %}" type="text/css" rel="stylesheet">
<!-- -->
</head>
<body>