Compare commits

..

No commits in common. "eb028d1783b8852857dc1785b22512d2399627e2" and "dda8db42b10e5872133c94324f5f99a2c573a957" have entirely different histories.

8 changed files with 21 additions and 139 deletions

View File

@ -31,7 +31,7 @@
</div> </div>
</div> </div>
</form> </form>
<table class="table table-sm table-striped" id="bookings" cellspacing="0"></table> <table class="table table-sm" id="bookings" cellspacing="0"></table>
</div> </div>
<div class="col-xxl-4 col-12 d-none d-xxl-block"> <div class="col-xxl-4 col-12 d-none d-xxl-block">
<div class="text-white-50"><h2>Aktuelle Kontostände</h2></div> <div class="text-white-50"><h2>Aktuelle Kontostände</h2></div>

View File

@ -29,12 +29,6 @@
<span>Neuer Transfer</span> <span>Neuer Transfer</span>
</a> </a>
</li> </li>
<li class="sidebar-item active">
<a href="/syncScheduled" class='sidebar-link'>
<i class="fa-solid fa-pen-to-square"></i>
<span>Sync Automatische</span>
</a>
</li>
<li class="sidebar-item active"> <li class="sidebar-item active">
<a href="viewAccounts" class='sidebar-link'> <a href="viewAccounts" class='sidebar-link'>
<i class="fa-solid fa-pen-to-square"></i> <i class="fa-solid fa-pen-to-square"></i>

View File

@ -19,20 +19,7 @@ $(document).ready(function(){
d.source = $('#source').val(); d.source = $('#source').val();
}, },
dataSrc:''}, dataSrc:''},
layout: { dom: '<"toolbar">frt',
topStart: {
buttons: [
{text:'Neu Rechnung',className:'btn-sm',action: function ( e, dt, node, config ) {
location.href = '/newBill/';
}},
{text:'Neuer Transfer',className:'btn-sm mx-2',action: function ( e, dt, node, config ) {
location.href = '/newTransfer/';
}},
]
},
topEnd: 'search'
},
// dom: '<"toolbar">frt',
"createdRow": function ( row, data, index ) { "createdRow": function ( row, data, index ) {
if(data.validate == "t"){ if(data.validate == "t"){
$(row).addClass('text-bg-warning'); $(row).addClass('text-bg-warning');
@ -41,7 +28,7 @@ $(document).ready(function(){
columns: colomnspez, columns: colomnspez,
}); });
// $("div.toolbar").html('<a class="btn-sm btn-secondary mx-2" href="/newBill" role="button">Neue Rechnung</a><a class="btn-sm btn-secondary" href="/newTransfer" role="button">Neuer Transfer</a>'); $("div.toolbar").html('<a class="btn-sm btn-secondary mx-2" href="/newBill" role="button">Neue Rechnung</a><a class="btn-sm btn-secondary" href="/newTransfer" role="button">Neuer Transfer</a>');
$('#bookings tbody').on('click', 'td.dt-receiver', function () {collapseDetails($(this), datatable);} ); $('#bookings tbody').on('click', 'td.dt-receiver', function () {collapseDetails($(this), datatable);} );
$('#bookings tbody').on('click', 'td.dt-datum', function () {location.href = '/editBill/'+getId($(this),datatable);}); $('#bookings tbody').on('click', 'td.dt-datum', function () {location.href = '/editBill/'+getId($(this),datatable);});
$('#bookings tbody').on('click', 'table.tabdet', function () {location.href = '/editBill/'+$(this).attr('data-bs-id');}); $('#bookings tbody').on('click', 'table.tabdet', function () {location.href = '/editBill/'+$(this).attr('data-bs-id');});

View File

@ -1,78 +0,0 @@
let startBtn = document.getElementById('start');
let stopBtn = document.getElementById('stop');
let resetBtn = document.getElementById('reset');
let hour = 0;
let minute = 0;
let second = 0;
let count = 0;
startBtn.addEventListener('click', function () {
timer = true;
stopWatch();
});
stopBtn.addEventListener('click', function () {
timer = false;
});
resetBtn.addEventListener('click', function () {
timer = false;
hour = 0;
minute = 0;
second = 0;
count = 0;
document.getElementById('hr').innerHTML = "00";
document.getElementById('min').innerHTML = "00";
document.getElementById('sec').innerHTML = "00";
document.getElementById('count').innerHTML = "00";
});
function stopWatch() {
if (timer) {
count++;
if (count == 100) {
second++;
count = 0;
}
if (second == 60) {
minute++;
second = 0;
}
if (minute == 60) {
hour++;
minute = 0;
second = 0;
}
let hrString = hour;
let minString = minute;
let secString = second;
let countString = count;
if (hour < 10) {
hrString = "0" + hrString;
}
if (minute < 10) {
minString = "0" + minString;
}
if (second < 10) {
secString = "0" + secString;
}
if (count < 10) {
countString = "0" + countString;
}
document.getElementById('hr').innerHTML = hrString;
document.getElementById('min').innerHTML = minString;
document.getElementById('sec').innerHTML = secString;
document.getElementById('count').innerHTML = countString;
setTimeout(stopWatch, 10);
}
}

View File

@ -2,12 +2,11 @@ var accounts;
$(document).ready(function(){ $(document).ready(function(){
accounts = $('#accounts').DataTable({ accounts = $('#accounts').DataTable({
paging: false, paging: false,
searching:true, searching:false,
scrollX:false, scrollX:false,
info:false, info:false,
ajax: { url: '/Ajax/getAccountsBalance', dataSrc:''}, ajax: { url: '/Ajax/getAccountsBalance', dataSrc:''},
layout: { topEnd: 'search' }, dom: '<"toolbar">frtip',
// dom: '<"toolbar">frtip',
columns: [ columns: [
{ title: "Konto",orderable:false, data: "description",className:"dt-receiver" }, { title: "Konto",orderable:false, data: "description",className:"dt-receiver" },
colBetrag colBetrag

View File

@ -9,20 +9,10 @@ $(document).ready(function(){
info:false, info:false,
order: [[ 1, 'desc' ]], order: [[ 1, 'desc' ]],
ajax: { url: '/Ajax/getOverviewData', dataSrc:''}, ajax: { url: '/Ajax/getOverviewData', dataSrc:''},
layout: { dom: '<"toolbar">frt',
topStart: {
buttons: [
{text:'Neue Rechnung',className:'btn-sm',action: function ( e, dt, node, config ) {
location.href = '/newBill/';
}},
]
},
topEnd: 'search'
},
// dom: '<"toolbar">frt',
columns: columns, columns: columns,
}); });
// $("div.toolbar").html('<a class="btn-sm btn-secondary" href="/newBill" role="button">Neuer Eintrag</a>'); $("div.toolbar").html('<a class="btn-sm btn-secondary" href="/newBill" role="button">Neuer Eintrag</a>');
// Add event listener for opening and closing details // Add event listener for opening and closing details
$('#bookings tbody').on('click', 'td.dt-receiver', function () {collapseDetails($(this), datatable);} ); $('#bookings tbody').on('click', 'td.dt-receiver', function () {collapseDetails($(this), datatable);} );
$('#bookings tbody').on('click', 'td.dt-datum', function () {location.href = '/editBill/'+getId($(this),datatable);}); $('#bookings tbody').on('click', 'td.dt-datum', function () {location.href = '/editBill/'+getId($(this),datatable);});
@ -35,20 +25,10 @@ $(document).ready(function(){
info:true, info:true,
order: [[ 1, 'desc' ]], order: [[ 1, 'desc' ]],
ajax: { url: '/Ajax/getToDosData', dataSrc:''}, ajax: { url: '/Ajax/getToDosData', dataSrc:''},
layout: { dom: '<"top"i<"syncbutton">>frt<"bottom"lp><"clear">',
topStart: {
buttons: [
{text:'Sync',className:'btn-sm',action: function ( e, dt, node, config ) {
location.href = '/syncScheduled/';
}},
]
},
topEnd: 'search'
},
// dom: '<"top"i<"syncbutton">>frt<"bottom"lp><"clear">',
columns: columns, columns: columns,
}); });
// $("div.syncbutton").html('<a class="btn-sm btn-secondary" href="/syncScheduled" role="button">Sync</a>'); $("div.syncbutton").html('<a class="btn-sm btn-secondary" href="/syncScheduled" role="button">Sync</a>');
// Add event listener for opening and closing details // Add event listener for opening and closing details
$('#todos tbody').on('click', 'td.dt-receiver', function () {collapseDetails($(this), todos);} ); $('#todos tbody').on('click', 'td.dt-receiver', function () {collapseDetails($(this), todos);} );
$('#todos tbody').on('click', 'td.dt-datum', function () {location.href = '/editBill/'+getId($(this),todos);}); $('#todos tbody').on('click', 'td.dt-datum', function () {location.href = '/editBill/'+getId($(this),todos);});