Creorga

From: Kilian Saffran Date: Fri, 14 Feb 2020 15:44:25 +0000 (+0100) Subject: v20200214 X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=dksnas.git v20200214 --- diff --git a/CGI/index.cgi b/CGI/index.cgi index 29e92d9..6108560 100755 --- a/CGI/index.cgi +++ b/CGI/index.cgi @@ -12,7 +12,7 @@ use File::Basename qw/dirname basename/; use Template; # use Template::Constants qw( :debug ); use CGI; -#use CGI::Carp qw(fatalsToBrowser); +use CGI::Carp qw(fatalsToBrowser); use CGI::Cookie; use Data::Dumper; use JSON::PP; diff --git a/CGI/tmpl/app/hourtrax/appbutton.tt b/CGI/tmpl/app/hourtrax/appbutton.tt new file mode 100644 index 0000000..266dd03 --- /dev/null +++ b/CGI/tmpl/app/hourtrax/appbutton.tt @@ -0,0 +1 @@ +

HourTrax \ No newline at end of file diff --git a/CGI/tmpl/app/hourtrax/index.tt b/CGI/tmpl/app/hourtrax/index.tt new file mode 100644 index 0000000..d15d27e --- /dev/null +++ b/CGI/tmpl/app/hourtrax/index.tt @@ -0,0 +1,89 @@ + + + + + + + + + + + + + Creorga + + + + + + + +

+ +

+ + +

+ + [% IF creorga.modules.staff.menu %] + + [% END %] +

+ +

+ [% IF creorga.modules.creche.menu %] + + [% END %] + + +

+ +

+ + +

+ +

+ + + +

+ + + + + + + + + + + diff --git a/CGI/tmpl/app/invoicejournal/index.tt b/CGI/tmpl/app/invoicejournal/index.tt index d33ccdf..d3ad840 100644 --- a/CGI/tmpl/app/invoicejournal/index.tt +++ b/CGI/tmpl/app/invoicejournal/index.tt @@ -32,7 +32,7 @@ Journal Buchungen - Addressen + Addressen Bankkonto Angebote diff --git a/CGI/tmpl/app/invoicejournal/module/accounts/accounts.js b/CGI/tmpl/app/invoicejournal/module/accounts/accounts.js index c983eed..8bbf8eb 100644 --- a/CGI/tmpl/app/invoicejournal/module/accounts/accounts.js +++ b/CGI/tmpl/app/invoicejournal/module/accounts/accounts.js @@ -7,28 +7,32 @@ var accounts ={ inittable: function(){ accounts.tbl = new Tabulator("#tbl_" + accounts.name, { headerFilterPlaceholder:"filter...", - height: "100vh", + height: "92vh", layout:"fitDataFill", selectable:1, - responsiveLayout:"collapse", columns:[ {title:"K.Nr", field:"ident",headerFilter:"input"}, - {title:"Name", field:"company",headerFilter:"input"}, + {title:"Name", field:"receipient",headerFilter:"input"}, {title:"E-Mail", field:"email",headerFilter:"input"}, {title:"Tel", field:"phone",headerFilter:"input"}, - {title:"Addresse", field:"address",headerFilter:"input"}, + {title:"Addresse", field:"address",formatter:"textarea",headerFilter:"input"}, + {title:"Typ", field:"types",formatter:"textarea",headerFilter:"input"}, ], }); accounts.gettbldata(); }, gettbldata: function(){ - req.reqdata("POST","db.cgi",{"db":mpref.cfg.db,"type":"array","sql":"SELECT id, company, prename,surname, address, zip, city, country, email, phone, mobile, ident FROM accounts;"},accounts.loadtbldata); + req.reqdata("POST","db.cgi",{"db":parent.app + "/" + mpref.cfg.db,"get":"accountslist",},accounts.loadtbldata); }, loadtbldata: function(data){ if (data && data.sqldata){ accounts.tbl.setData(data.sqldata); } }, + viewtable: function(){ + accounts.gettbldata(); + module.viewpanel('tbl_accounts'); + }, add: function(){ }, diff --git a/CGI/tmpl/app/invoicejournal/module/accounts/index.js b/CGI/tmpl/app/invoicejournal/module/accounts/index.js index f70412f..b6f9ec4 100644 --- a/CGI/tmpl/app/invoicejournal/module/accounts/index.js +++ b/CGI/tmpl/app/invoicejournal/module/accounts/index.js @@ -1,21 +1,12 @@ -var tbl = null; -function initpage(){ +function initpage() { + console.log(mpref.cfg); + console.log("APP:" + parent.app); mpref.loadconfig(); - console.log(mpref); - loadtable(); + accounts.inittable(); + return false; } -function loadtable(){ - -} - -function gettbldata(){ - -} -function filltbldata(data){ - -} diff --git a/CGI/tmpl/app/invoicejournal/module/accounts/index.tt b/CGI/tmpl/app/invoicejournal/module/accounts/index.tt index 001ff9c..2950ea5 100644 --- a/CGI/tmpl/app/invoicejournal/module/accounts/index.tt +++ b/CGI/tmpl/app/invoicejournal/module/accounts/index.tt @@ -1,6 +1,20 @@ - -

- -

- +[% PROCESS macro/fields.tt %] +

+ +

+[% INCLUDE "block/dlgdataload.tt" %] +[% INCLUDE "block/dlgdeleterow.tt" %] +[% INCLUDE "block/dlgmessage.tt" %] + diff --git a/CGI/tmpl/app/invoicejournal/module/invoicejournal/index.tt b/CGI/tmpl/app/invoicejournal/module/invoicejournal/index.tt index 05789de..eda149b 100644 --- a/CGI/tmpl/app/invoicejournal/module/invoicejournal/index.tt +++ b/CGI/tmpl/app/invoicejournal/module/invoicejournal/index.tt @@ -4,15 +4,15 @@

@@ -20,9 +20,7 @@

- - -

[% fieldmoneybox('netamount','invoices','Netto','w3-half','readonly') %] @@ -72,10 +71,11 @@

- - - +

Produkte / Dienstleistungen

+ + +

diff --git a/CGI/tmpl/app/invoicejournal/module/invoicejournal/invoice.js b/CGI/tmpl/app/invoicejournal/module/invoicejournal/invoice.js index 3475acf..e3f111f 100644 --- a/CGI/tmpl/app/invoicejournal/module/invoicejournal/invoice.js +++ b/CGI/tmpl/app/invoicejournal/module/invoicejournal/invoice.js @@ -268,8 +268,10 @@ var invoices = { fillformbydataclass("invoices", data.sqldata[0],invoices.choices, false); //console.log(data.sqldata[0].invoicetype); invoices.current = data.sqldata[0]; - if (data.sqldata[0].invoicetype == "inv-out") { - //document.getElementById("netamount").readonly = true; + if (data.sqldata[0].invoicetype == "inv-in") { + document.getElementById("invoicenotes").style.display = 'none'; + } else { + document.getElementById("invoicenotes").style.display = 'block'; } bookings.gettbldata(); } diff --git a/CGI/tmpl/app/invoicejournal/module/sales/bookings.js b/CGI/tmpl/app/invoicejournal/module/sales/bookings.js new file mode 100644 index 0000000..aa35f3f --- /dev/null +++ b/CGI/tmpl/app/invoicejournal/module/sales/bookings.js @@ -0,0 +1,52 @@ +var bookings ={ + tbl: null, + name: "bookings", + initform: function(){ + + }, + inittable: function(){ + bookings.tbl = new Tabulator("#tbl_" + bookings.name, { + headerFilterPlaceholder:"filter...", + height: "92vh", + layout:"fitDataFill", + selectable:1, + columns:[ + + {title:"Datum", field:"bookingdate",headerFilter:"input"}, + {title:"Anz.", field:"quantity",align:"right",headerFilter:"input"}, + {title:"Einh.", field:"unit",align:"right",headerFilter:"input"}, + {title:"Einheits
Betrag", field:"unitamount",align:"right",headerFilter:"input"}, + {title:"Beschreibung", field:"description",headerFilter:"input"}, + {title:"Mwst.", field:"taxamount",align:"right"}, + {title:"Netto", field:"netamount",align:"right"}, + //{title:"", field:"taxpercent",align:"right",headerFilter:"input"}, + {title:"Status", field:"status",headerFilter:"input"}, + {title:"EmpfÃ¤nger", field:"receipient",headerFilter:"input"}, + {title:"Rechnungs
Status", field:"invoicestatus",headerFilter:"input"}, + {title:"Product-Typ", field:"product_type",headerFilter:"input"} + ], + }); + bookings.gettbldata(); + }, + gettbldata: function(){ + req.reqdata("POST","db.cgi",{"db":parent.app + "/" + mpref.cfg.db,"get":"bookingslist",},bookings.loadtbldata); + }, + loadtbldata: function(data){ + if (data && data.sqldata){ + bookings.tbl.setData(data.sqldata); + } + }, + viewtable: function(){ + bookings.gettbldata(); + module.viewpanel('tbl_bookings'); + }, + add: function(){ + + }, + edit: function(){ + + }, + remove: function(){ + + } +} \ No newline at end of file diff --git a/CGI/tmpl/app/invoicejournal/module/sales/index.js b/CGI/tmpl/app/invoicejournal/module/sales/index.js index 6797a4f..88b283e 100644 --- a/CGI/tmpl/app/invoicejournal/module/sales/index.js +++ b/CGI/tmpl/app/invoicejournal/module/sales/index.js @@ -1,205 +1,214 @@ -var winh = Math.max(document.documentElement.clientHeight, window.innerHeight || 0); -var tblh = winh-54; -var pagepref = undefined; -var selection = []; -// var cfg = { -// byear: 2018 -// } -var sums = { planned: {cnt:0,sum:0},sended: {cnt:0,sum:0},payed: {cnt:0,sum:0},delayed: {cnt:0,sum:0},total: {cnt:0,sum:0}}; -var shiftdown = false; -function initpage(){ - console.log(appdb.url); - pagepref = parent.usersystem.getPreference("bookings"); - if (pagepref === null){ - pagepref= {}; - } - console.log(pagepref); - //loadyears(); - loadtable(); - load_senders(); - load_receipients(); - load_dateranges(); + +function initpage() { + console.log(mpref.cfg); + console.log("APP:" + parent.app); + mpref.loadconfig(); + bookings.inittable(); + return false; } -$(document).on('keydown',function(evt){ - if (evt.key= "Shift"){ - shiftdown = true; - } -}); - -$(document).on('keyup',function(evt){ - if (evt.key = "Shift"){ - shiftdown = false; - } -}); - -function loadtable(){ - var where = ''; - if (pagepref && pagepref.filter && Object.keys(pagepref.filter).length > 0){ - var whfilter = []; - for (var i in pagepref.filter){ - console.log(i); - if (i == 'bookingdate'){ - if ($("#daterange :selected").text() != ''){ - whfilter.push(pagepref.filter[i] + "='" + $("#daterange :selected").text() + "'"); - } +// var winh = Math.max(document.documentElement.clientHeight, window.innerHeight || 0); +// var tblh = winh-54; +// var pagepref = undefined; +// var selection = []; +// // var cfg = { +// // byear: 2018 +// // } +// var sums = { planned: {cnt:0,sum:0},sended: {cnt:0,sum:0},payed: {cnt:0,sum:0},delayed: {cnt:0,sum:0},total: {cnt:0,sum:0}}; +// var shiftdown = false; +// function initpage(){ +// console.log(appdb.url); +// pagepref = parent.usersystem.getPreference("bookings"); +// if (pagepref === null){ +// pagepref= {}; +// } +// console.log(pagepref); +// //loadyears(); +// loadtable(); +// load_senders(); +// load_receipients(); +// load_dateranges(); +// } + +// $(document).on('keydown',function(evt){ +// if (evt.key= "Shift"){ +// shiftdown = true; +// } +// }); + +// $(document).on('keyup',function(evt){ +// if (evt.key = "Shift"){ +// shiftdown = false; +// } +// }); + +// function loadtable(){ +// var where = ''; +// if (pagepref && pagepref.filter && Object.keys(pagepref.filter).length > 0){ +// var whfilter = []; +// for (var i in pagepref.filter){ +// console.log(i); +// if (i == 'bookingdate'){ +// if ($("#daterange :selected").text() != ''){ +// whfilter.push(pagepref.filter[i] + "='" + $("#daterange :selected").text() + "'"); +// } - } else { - whfilter.push(i + "='" + pagepref.filter[i] + "'"); - } +// } else { +// whfilter.push(i + "='" + pagepref.filter[i] + "'"); +// } - } - if (whfilter.length > 0){ - where = ' where ' + whfilter.join( " AND "); - } +// } +// if (whfilter.length > 0){ +// where = ' where ' + whfilter.join( " AND "); +// } - } - console.log(where); - sums = { planned: {cnt:0,sum:0},sended: {cnt:0,sum:0},payed: {cnt:0,sum:0},delayed: {cnt:0,sum:0},total: {cnt:0,sum:0}}; - var sql = "select strftime('%d.%m.%Y',invoicepositions.bookingdate) as bookingdate, invoicepositions.bookingdate as datesortable,invoicepositions.id,sender.company as sender,receipient.company as receipient, invoicepositions.description,replace(printf('%.2fâ¬',quantity * unitamount),'.',',') as amount,quantity * unitamount as sumamount , invoicejournal.status from invoicepositions left join accounts sender on (invoicepositions.id_sender=sender.id) left join invoicejournal on (invoicepositions.id_invoice=invoicejournal.id) left join accounts receipient on (invoicepositions.id_receipient=receipient.id) " + where + " order by invoicepositions.bookingdate desc;"; - //console.log(sql); - //$('#tbl_bookings').bootstrapTable('destroy'); - $("#tbl_bookings > tbody").html(""); - var data = appdb.dbquery(sql); - //console.log(data.sqldata); - for (var i in data.sqldata){ - var cstatus = "secondary"; - if (data.sqldata[i].status== "geplant"){ - sums.planned.cnt = sums.planned.cnt + 1; - sums.planned.sum = sums.planned.sum + parseFloat(data.sqldata[i].sumamount); - } - if (data.sqldata[i].status== "bezahlt"){ - cstatus = "success"; - sums.payed.cnt = sums.payed.cnt + 1; - sums.payed.sum = sums.payed.sum + parseFloat(data.sqldata[i].sumamount); - } - if (data.sqldata[i].status== "Ã¼berfÃ¤llig"){ - cstatus = "danger"; - sums.delayed.cnt = sums.delayed.cnt + 1; - sums.delayed.sum = sums.delayed.sum + parseFloat(data.sqldata[i].sumamount); - } - if (data.sqldata[i].status== "verschickt"){ - cstatus = "warning"; - sums.sended.cnt = sums.sended.cnt + 1; - sums.sended.sum = sums.sended.sum + parseFloat(data.sqldata[i].sumamount); - } - sums.total.cnt = sums.total.cnt + 1; - sums.total.sum = sums.total.sum + parseFloat(data.sqldata[i].sumamount); - var acolor = ""; - if (data.sqldata[i].amount.startsWith("-")){ acolor = "text-danger"; } - var row = ''+ - // '' + - ' ' + data.sqldata[i].bookingdate+ '' + - '' + data.sqldata[i].receipient+ '' + - '' + data.sqldata[i].sender+ '' + - '' + data.sqldata[i].description+ '' + - '' + data.sqldata[i].status+ '' + - '' + data.sqldata[i].amount+ '' + - ''; - - $("#tbl_bookings > tbody").append(row); - } - var cols = $("#tbl_bookings > tbody > tr:first-child").children(); - var colnum = cols.length -1 - console.log("childnum:" + colnum); - for (var i=1;i<=colnum;i++){ - wx = $("#tbl_bookings > tbody > tr:first-child > td:nth-child("+ i +")").width(); - wx = wx +3; - $("#tbl_bookings_head > thead > tr > th:nth-child("+ i +")").width(wx); - } - $("#cnt_planned").val(sums.planned.cnt);$("#sum_planned").val(sums.planned.sum.toFixed(2).toString().replace('.',',')); - $("#cnt_payed").val(sums.payed.cnt);$("#sum_payed").val(sums.payed.sum.toFixed(2).toString().replace('.',',')); - $("#cnt_delayed").val(sums.delayed.cnt);$("#sum_delayed").val(sums.delayed.sum.toFixed(2).toString().replace('.',',')); - $("#cnt_total").val(sums.total.cnt);$("#sum_total").val(sums.total.sum.toFixed(2).toString().replace('.',',')); - $("#cnt_sended").val(sums.sended.cnt);$("#sum_sended").val(sums.sended.sum.toFixed(2).toString().replace('.',',')); -} +// } +// console.log(where); +// sums = { planned: {cnt:0,sum:0},sended: {cnt:0,sum:0},payed: {cnt:0,sum:0},delayed: {cnt:0,sum:0},total: {cnt:0,sum:0}}; +// var sql = "select strftime('%d.%m.%Y',invoicepositions.bookingdate) as bookingdate, invoicepositions.bookingdate as datesortable,invoicepositions.id,sender.company as sender,receipient.company as receipient, invoicepositions.description,replace(printf('%.2fâ¬',quantity * unitamount),'.',',') as amount,quantity * unitamount as sumamount , invoicejournal.status from invoicepositions left join accounts sender on (invoicepositions.id_sender=sender.id) left join invoicejournal on (invoicepositions.id_invoice=invoicejournal.id) left join accounts receipient on (invoicepositions.id_receipient=receipient.id) " + where + " order by invoicepositions.bookingdate desc;"; +// //console.log(sql); +// //$('#tbl_bookings').bootstrapTable('destroy'); +// $("#tbl_bookings > tbody").html(""); +// var data = appdb.dbquery(sql); +// //console.log(data.sqldata); +// for (var i in data.sqldata){ +// var cstatus = "secondary"; +// if (data.sqldata[i].status== "geplant"){ +// sums.planned.cnt = sums.planned.cnt + 1; +// sums.planned.sum = sums.planned.sum + parseFloat(data.sqldata[i].sumamount); +// } +// if (data.sqldata[i].status== "bezahlt"){ +// cstatus = "success"; +// sums.payed.cnt = sums.payed.cnt + 1; +// sums.payed.sum = sums.payed.sum + parseFloat(data.sqldata[i].sumamount); +// } +// if (data.sqldata[i].status== "Ã¼berfÃ¤llig"){ +// cstatus = "danger"; +// sums.delayed.cnt = sums.delayed.cnt + 1; +// sums.delayed.sum = sums.delayed.sum + parseFloat(data.sqldata[i].sumamount); +// } +// if (data.sqldata[i].status== "verschickt"){ +// cstatus = "warning"; +// sums.sended.cnt = sums.sended.cnt + 1; +// sums.sended.sum = sums.sended.sum + parseFloat(data.sqldata[i].sumamount); +// } +// sums.total.cnt = sums.total.cnt + 1; +// sums.total.sum = sums.total.sum + parseFloat(data.sqldata[i].sumamount); +// var acolor = ""; +// if (data.sqldata[i].amount.startsWith("-")){ acolor = "text-danger"; } +// var row = ''+ +// // '' + +// ' ' + data.sqldata[i].bookingdate+ '' + +// '' + data.sqldata[i].receipient+ '' + +// '' + data.sqldata[i].sender+ '' + +// '' + data.sqldata[i].description+ '' + +// '' + data.sqldata[i].status+ '' + +// '' + data.sqldata[i].amount+ '' + +// ''; -function load_senders(){ - var sql = "select distinct (sender.company) as sender from invoicepositions left join accounts sender on (invoicepositions.id_sender=sender.id) order by sender.company;"; - $("#sender").html(''); - var data = appdb.dbquery(sql); +// $("#tbl_bookings > tbody").append(row); +// } +// var cols = $("#tbl_bookings > tbody > tr:first-child").children(); +// var colnum = cols.length -1 +// console.log("childnum:" + colnum); +// for (var i=1;i<=colnum;i++){ +// wx = $("#tbl_bookings > tbody > tr:first-child > td:nth-child("+ i +")").width(); +// wx = wx +3; +// $("#tbl_bookings_head > thead > tr > th:nth-child("+ i +")").width(wx); +// } +// $("#cnt_planned").val(sums.planned.cnt);$("#sum_planned").val(sums.planned.sum.toFixed(2).toString().replace('.',',')); +// $("#cnt_payed").val(sums.payed.cnt);$("#sum_payed").val(sums.payed.sum.toFixed(2).toString().replace('.',',')); +// $("#cnt_delayed").val(sums.delayed.cnt);$("#sum_delayed").val(sums.delayed.sum.toFixed(2).toString().replace('.',',')); +// $("#cnt_total").val(sums.total.cnt);$("#sum_total").val(sums.total.sum.toFixed(2).toString().replace('.',',')); +// $("#cnt_sended").val(sums.sended.cnt);$("#sum_sended").val(sums.sended.sum.toFixed(2).toString().replace('.',',')); +// } + +// function load_senders(){ +// var sql = "select distinct (sender.company) as sender from invoicepositions left join accounts sender on (invoicepositions.id_sender=sender.id) order by sender.company;"; +// $("#sender").html(''); +// var data = appdb.dbquery(sql); - for (var i in data.sqldata){ - $("#sender").append(''); - } - if (pagepref && pagepref.filter && pagepref.filter.sender && pagepref.filter.sender != ''){ - //console.log("set selection:" + pagepref.filter.sender); - $("#sender").val(pagepref.filter.sender); - } -} +// for (var i in data.sqldata){ +// $("#sender").append(''); +// } +// if (pagepref && pagepref.filter && pagepref.filter.sender && pagepref.filter.sender != ''){ +// //console.log("set selection:" + pagepref.filter.sender); +// $("#sender").val(pagepref.filter.sender); +// } +// } -function load_receipients(){ - var sql = "select distinct (receipient.company) as receipient from invoicepositions left join accounts receipient on (invoicepositions.id_receipient=receipient.id) order by receipient.company;"; - $("#receipient").html(''); - var data = appdb.dbquery(sql); +// function load_receipients(){ +// var sql = "select distinct (receipient.company) as receipient from invoicepositions left join accounts receipient on (invoicepositions.id_receipient=receipient.id) order by receipient.company;"; +// $("#receipient").html(''); +// var data = appdb.dbquery(sql); - for (var i in data.sqldata){ - $("#receipient").append(''); - } - if (pagepref && pagepref.filter && pagepref.filter.receipient && pagepref.filter.receipient != ''){ - //console.log("set selection:" + pagepref.filter.receipient); - $("#receipient").val(pagepref.filter.receipient); - } -} +// for (var i in data.sqldata){ +// $("#receipient").append(''); +// } +// if (pagepref && pagepref.filter && pagepref.filter.receipient && pagepref.filter.receipient != ''){ +// //console.log("set selection:" + pagepref.filter.receipient); +// $("#receipient").val(pagepref.filter.receipient); +// } +// } -function load_dateranges(){ - var sql = "select strftime('%Y',bookingdate) as daterange, 'strftime(''%Y'',bookingdate)' as filter from invoicepositions where bookingdate is not null group by daterange union select strftime('%Y %m',bookingdate) as daterange , 'strftime(''%Y %m'',bookingdate)' as filter from invoicepositions where bookingdate is not null group by daterange union select strftime('%Y Q',bookingdate) || (((CAST(strftime('%m',bookingdate) AS INT) -1 ) / 3) +1) as daterange ,'strftime(''%Y Q'',bookingdate) || (((CAST(strftime(''%m'',bookingdate) AS INT) -1 ) / 3) +1)' as filter from invoicepositions where bookingdate is not null group by daterange order by daterange desc;"; - $("#daterange").html(''); - var data = appdb.dbquery(sql); +// function load_dateranges(){ +// var sql = "select strftime('%Y',bookingdate) as daterange, 'strftime(''%Y'',bookingdate)' as filter from invoicepositions where bookingdate is not null group by daterange union select strftime('%Y %m',bookingdate) as daterange , 'strftime(''%Y %m'',bookingdate)' as filter from invoicepositions where bookingdate is not null group by daterange union select strftime('%Y Q',bookingdate) || (((CAST(strftime('%m',bookingdate) AS INT) -1 ) / 3) +1) as daterange ,'strftime(''%Y Q'',bookingdate) || (((CAST(strftime(''%m'',bookingdate) AS INT) -1 ) / 3) +1)' as filter from invoicepositions where bookingdate is not null group by daterange order by daterange desc;"; +// $("#daterange").html(''); +// var data = appdb.dbquery(sql); - for (var i in data.sqldata){ - $("#daterange").append(''); - } -} +// for (var i in data.sqldata){ +// $("#daterange").append(''); +// } +// } -function setfilter(id,field){ - console.log("setFilter"); - if (pagepref['filter'] === undefined){ - pagepref['filter'] = {}; - } - if ($("#" + id + " :selected").val() != ""){ - pagepref['filter'][field] = $("#" + id + " :selected").val(); - } - else { - delete pagepref['filter'][field]; - $("#" + id + "").val($("#"+ id +" option:first").val()); - } - parent.usersystem.setPreference('bookings',pagepref); - loadtable(); -} +// function setfilter(id,field){ +// console.log("setFilter"); +// if (pagepref['filter'] === undefined){ +// pagepref['filter'] = {}; +// } +// if ($("#" + id + " :selected").val() != ""){ +// pagepref['filter'][field] = $("#" + id + " :selected").val(); +// } +// else { +// delete pagepref['filter'][field]; +// $("#" + id + "").val($("#"+ id +" option:first").val()); +// } +// parent.usersystem.setPreference('bookings',pagepref); +// loadtable(); +// } -function booking_new(){ - parent.browserapp.loadmodulepage('bookings','form_booking',{"id":null}); -} +// function booking_new(){ +// parent.browserapp.loadmodulepage('bookings','form_booking',{"id":null}); +// } -function booking_edit(){ - //var inv_id= getTableSelectionID(); - if (inv_id){ - parent.browserapp.loadmodulepage('bookings','form_booking',{"id":inv_id}); - } +// function booking_edit(){ +// //var inv_id= getTableSelectionID(); +// if (inv_id){ +// parent.browserapp.loadmodulepage('bookings','form_booking',{"id":inv_id}); +// } -} +// } -function booking_delete(){ +// function booking_delete(){ -} +// } -function booking_duplicate(){ +// function booking_duplicate(){ -} +// } -function setselection(id){ - if (shiftdown === true){ - if ($("#" + id).hasClass('highlight')){ - $("#" + id).removeClass('highlight'); - selection.splice($.inArray(id, selection),1); - }else { - $("#" + id).addClass('highlight'); - selection.push(id); - } - } else { - $("#" + id).addClass('highlight').siblings().removeClass('highlight'); - selection = [id]; - } -} +// function setselection(id){ +// if (shiftdown === true){ +// if ($("#" + id).hasClass('highlight')){ +// $("#" + id).removeClass('highlight'); +// selection.splice($.inArray(id, selection),1); +// }else { +// $("#" + id).addClass('highlight'); +// selection.push(id); +// } +// } else { +// $("#" + id).addClass('highlight').siblings().removeClass('highlight'); +// selection = [id]; +// } +// } diff --git a/CGI/tmpl/app/invoicejournal/module/sales/index.tt b/CGI/tmpl/app/invoicejournal/module/sales/index.tt index 2d1ee8a..f1f2ea1 100644 --- a/CGI/tmpl/app/invoicejournal/module/sales/index.tt +++ b/CGI/tmpl/app/invoicejournal/module/sales/index.tt @@ -1,148 +1,20 @@ - - -

- - - - - - - -

- - - - - - - - - - - -

			Beschreibung	- -	Betrag

- - -

- geplant -

- -

â¬

- -

- verschickt -

- -

â¬

- -

- bezahlt -

- -

â¬

- -

- Ã¼berfÃ¤llig -

- -

â¬

- -

- Total -

- -

â¬

- -

+[% PROCESS macro/fields.tt %] +

+ +

\ No newline at end of file +

+[% INCLUDE "block/dlgdataload.tt" %] +[% INCLUDE "block/dlgdeleterow.tt" %] +[% INCLUDE "block/dlgmessage.tt" %] + \ No newline at end of file diff --git a/CGI/tmpl/app/rpinas/appbutton.tt b/CGI/tmpl/app/rpinas/appbutton.tt new file mode 100644 index 0000000..201e02c --- /dev/null +++ b/CGI/tmpl/app/rpinas/appbutton.tt @@ -0,0 +1 @@ +

RPInas \ No newline at end of file diff --git a/CGI/tmpl/app/rpinas/index.tt b/CGI/tmpl/app/rpinas/index.tt new file mode 100644 index 0000000..d15d27e --- /dev/null +++ b/CGI/tmpl/app/rpinas/index.tt @@ -0,0 +1,89 @@ + + + + + + + + + + + + + Creorga + + + + + + + +

+ +

+ + +

+ + [% IF creorga.modules.staff.menu %] + + [% END %] +

+ +

+ [% IF creorga.modules.creche.menu %] + + [% END %] + + +

+ +

+ + +

+ +

+ + + +

+ + + + + + + + + + + diff --git a/CGI/tmpl/skeleton/module.tt b/CGI/tmpl/skeleton/module.tt index 9d15a22..957d81d 100644 --- a/CGI/tmpl/skeleton/module.tt +++ b/CGI/tmpl/skeleton/module.tt @@ -20,7 +20,7 @@ - + [% #INCLUDE "module/$module/css.tt" %]