From a650a75ea90a563c64b0c8670839fcbef9b7fd7a Mon Sep 17 00:00:00 2001 From: "kilian@dks-pc1" Date: Fri, 3 Apr 2020 08:20:02 +0200 Subject: [PATCH] v20200402 --- server/CGI/index.cgi | 3 +- server/CGI/tmpl/lang/de.tt | 1 + server/CGI/tmpl/lists/invoicedirection.tt | 8 +- server/CGI/tmpl/lists/invoicetypes.tt | 10 +- server/CGI/tmpl/lists/receipientlist.tt | 3 + server/CGI/tmpl/lists/reportlist.tt | 6 + server/CGI/tmpl/lists/senderlist.tt | 3 + server/CGI/tmpl/lists/status.tt | 10 + server/CGI/tmpl/macro/fields.tt | 19 +- server/CGI/tmpl/module/addresses.tt | 2 +- server/CGI/tmpl/module/invoices.tt | 2 +- server/CGI/tmpl/module/invoices/invoice.js | 46 ++++ server/CGI/tmpl/module/invoices/invoice.tt | 208 ++++++++++++------ server/CGI/tmpl/skeleton/index.tt | 4 +- server/htdocs/css/w3pro.css | 7 +- server/htdocs/img/icons/Apps.svg | 1 + server/htdocs/img/icons/Apps_white.svg | 5 + .../img/icons/Banking_Transaction_white.svg | 8 +- server/htdocs/img/icons/Bill2_white.svg | 8 +- server/htdocs/img/icons/Bookings2_white.svg | 8 +- server/htdocs/img/icons/Box_white.svg | 18 +- server/htdocs/img/icons/Contacts_white.svg | 8 +- server/htdocs/img/icons/Email.svg | 18 +- server/htdocs/img/icons/Email_white.svg | 18 +- server/htdocs/img/icons/Folder_white.svg | 8 +- server/htdocs/img/icons/In_red.svg | 8 +- server/htdocs/img/icons/Out_green.svg | 8 +- server/htdocs/img/icons/PDF_white.svg | 30 +-- server/htdocs/img/icons/Preview_white.svg | 8 +- server/htdocs/img/icons/Print_white.svg | 16 +- server/htdocs/img/icons/Product2_white.svg | 8 +- server/htdocs/img/icons/ViewPDF_white.svg | 8 +- server/htdocs/img/icons/download_white.svg | 12 +- server/htdocs/js/app.js | 104 +++++---- 34 files changed, 406 insertions(+), 228 deletions(-) create mode 100644 server/CGI/tmpl/lists/receipientlist.tt create mode 100644 server/CGI/tmpl/lists/reportlist.tt create mode 100644 server/CGI/tmpl/lists/senderlist.tt create mode 100644 server/CGI/tmpl/module/invoices/invoice.js create mode 100644 server/htdocs/img/icons/Apps.svg create mode 100644 server/htdocs/img/icons/Apps_white.svg diff --git a/server/CGI/index.cgi b/server/CGI/index.cgi index eb38d04..c6ecdf1 100644 --- a/server/CGI/index.cgi +++ b/server/CGI/index.cgi @@ -76,8 +76,9 @@ for (my $i=0;$i<$absnum;$i++){ if ($vars->{page} !~ /\.tt$/) { $skl = "skeleton/file.tt"; } else { - $vars->{page} = 'module/'.$vars->{page}; + } +$vars->{page} = 'module/'.$vars->{page}; $vars->{appname} = 'invoicejournal'; $vars->{pagename} = basename($vars->{page}); $vars->{pagename} =~ s/\.tt$//; diff --git a/server/CGI/tmpl/lang/de.tt b/server/CGI/tmpl/lang/de.tt index b6cc858..8349303 100644 --- a/server/CGI/tmpl/lang/de.tt +++ b/server/CGI/tmpl/lang/de.tt @@ -28,6 +28,7 @@ print => "drucken", send => "senden", create => "erstellen", + apps => "Apps" address => "Adresse", zip => "PLZ", city => "Ort", diff --git a/server/CGI/tmpl/lists/invoicedirection.tt b/server/CGI/tmpl/lists/invoicedirection.tt index 53e84a2..0833344 100644 --- a/server/CGI/tmpl/lists/invoicedirection.tt +++ b/server/CGI/tmpl/lists/invoicedirection.tt @@ -1,4 +1,8 @@ [% invoicedirection = { - "out" => {value => "out", text => "Eingang",class => ""}, - "in" => {value => "in", text => "Ausgang",class=>""} + "out" => {value => "out", text => "Ausgang",class => ""}, + "in" => {value => "in", text => "Eingang",class=>""} +} %] +[% invoicedirectionlist = { + "0" => {value => "out", text => "Ausgang",class => ""}, + "1" => {value => "in", text => "Eingang",class=>""} } %] \ No newline at end of file diff --git a/server/CGI/tmpl/lists/invoicetypes.tt b/server/CGI/tmpl/lists/invoicetypes.tt index ed5e413..972a986 100644 --- a/server/CGI/tmpl/lists/invoicetypes.tt +++ b/server/CGI/tmpl/lists/invoicetypes.tt @@ -1,7 +1,7 @@ [% invoicetypes = { - "invoice" => {value => "invoice", text => "Rechnung",class => ""}, - "creditnote" => {value => "creditnote", text => "Gutschrift",class => ""}, - "salary" = {value => "salary", text => "Gehalt",class => ""}, - "taxes" => {value => "taxes", text => "Steuern",class => ""}, - "payroll" => {value => "payroll", text => "Lohnkosten",class => ""} + "0" => {value => "invoice", text => "Rechnung",class => ""}, + "1" => {value => "creditnote", text => "Gutschrift",class => ""}, + "2" = {value => "salary", text => "Gehalt",class => ""}, + "3" => {value => "taxes", text => "Steuern",class => ""}, + "4" => {value => "payroll", text => "Lohnkosten",class => ""} } %] \ No newline at end of file diff --git a/server/CGI/tmpl/lists/receipientlist.tt b/server/CGI/tmpl/lists/receipientlist.tt new file mode 100644 index 0000000..4608210 --- /dev/null +++ b/server/CGI/tmpl/lists/receipientlist.tt @@ -0,0 +1,3 @@ +[% FOREACH qreceip = dksdb.query("select id as value, receipient as text from addresses order by receipient;") %] +[% receipientlist.${qreceip.item('text')} = qreceip %] +[% END %] diff --git a/server/CGI/tmpl/lists/reportlist.tt b/server/CGI/tmpl/lists/reportlist.tt new file mode 100644 index 0000000..44b8160 --- /dev/null +++ b/server/CGI/tmpl/lists/reportlist.tt @@ -0,0 +1,6 @@ +[% emptyval = '' %] +[% reportlist.${emptyval} = { value => '', text => '' } %] + +[% FOREACH qreport = dksdb.query("select id as value, name as text from reports order by name;") %] +[% reportlist.${qreport.item('text')} = qreport %] +[% END %] diff --git a/server/CGI/tmpl/lists/senderlist.tt b/server/CGI/tmpl/lists/senderlist.tt new file mode 100644 index 0000000..dd88b03 --- /dev/null +++ b/server/CGI/tmpl/lists/senderlist.tt @@ -0,0 +1,3 @@ +[% FOREACH qsenders = dksdb.query("select id as value, receipient as text from addresses where ijgroup='1' order by receipient;") %] +[% senderlist.${qsenders.item('text')} = qsenders %] +[% END %] diff --git a/server/CGI/tmpl/lists/status.tt b/server/CGI/tmpl/lists/status.tt index f7a0789..c8d7f08 100644 --- a/server/CGI/tmpl/lists/status.tt +++ b/server/CGI/tmpl/lists/status.tt @@ -6,4 +6,14 @@ "overdue" => {value => "overdue","text" => "überfällig", class=> "w3-text-red"}, "payed" => {value => "payed","text" => 'bezahlt', class=> "w3-text-green"}, "canceled" => {value => "canceled","text" => "storniert", class=> "w3-text-grey"} + } %] + +[% statuslist = { + "0" => {value => "preparation", "text"=> "Vorbereitung", class=> "w3-text-black"}, + "1" => {value => "planned","text" => "geplant", class=> "w3-text-blue"}, + "2" => {value => "received","text" => "erhalten", class=> "w3-text-purple"}, + "3" => {value => "sended","text" => "verschickt", class=> "w3-text-orange"}, + "4" => {value => "overdue","text" => "überfällig", class=> "w3-text-red"}, + "5" => {value => "payed","text" => 'bezahlt', class=> "w3-text-green"}, + "6" => {value => "canceled","text" => "storniert", class=> "w3-text-grey"} } %] \ No newline at end of file diff --git a/server/CGI/tmpl/macro/fields.tt b/server/CGI/tmpl/macro/fields.tt index 19c3894..63907da 100644 --- a/server/CGI/tmpl/macro/fields.tt +++ b/server/CGI/tmpl/macro/fields.tt @@ -1,24 +1,25 @@ -[% MACRO inputhidden(column,table,ident,value) BLOCK -%] - +[% MACRO inputhidden(column,table,id,value,ident) BLOCK -%] + [% END -%] -[% MACRO inputbox(column,table,id,title,type,classes,style,state,ivalue,plhold) BLOCK -%] +[% MACRO inputbox(column,table,id,title,type,classes,style,state,ivalue,plhold,blurevent) BLOCK -%]
[% IF title %][% END %] - +
[% END -%] -[% MACRO selectbox(column,table,id,title,type,classes,style,state,value,plhold,xoptions) BLOCK -%] +[% MACRO selectbox(column,table,id,title,type,classes,style,state,svalue,plhold,xoptions,changeevent,blurevent) BLOCK -%] [% IF state == 'readonly' || state == 'disabled' %] - [% inputbox(column,table,id,title,'text',classes,style,state,value,plhold) %] + [% inputbox(column,table,id,title,'text',classes,style,state,svalue,plhold) %] [% ELSE %]
[% IF title %][% END %] - 0 %][% state %][% END %] onblur="record.savefield(this);[% IF blurevent%]blurevent[% END %]" onchange="[% IF changeevent %]changeevent[% END %]"> + [% IF xoptions %] - [% FOREACH opt IN xoptions %] - + [% FOREACH key IN xoptions.keys.sort %] + [% END %] [% END %] diff --git a/server/CGI/tmpl/module/addresses.tt b/server/CGI/tmpl/module/addresses.tt index 2f729a8..2b4ca2b 100644 --- a/server/CGI/tmpl/module/addresses.tt +++ b/server/CGI/tmpl/module/addresses.tt @@ -32,7 +32,7 @@ [% FOREACH adr = dksdb.query("select * from addresses order by receipient;") %] - + [% adr.clientnumber %] [% adr.receipient %] [% adr.address %]
[% adr.country %] [% adr.zip %] [% adr.city %] diff --git a/server/CGI/tmpl/module/invoices.tt b/server/CGI/tmpl/module/invoices.tt index 50d9936..182b967 100644 --- a/server/CGI/tmpl/module/invoices.tt +++ b/server/CGI/tmpl/module/invoices.tt @@ -36,7 +36,7 @@ from invoices inv left join bookings bk on (inv.id=bk.id_invoice) group by inv.id order by inv.invoicedate desc")%] [% FOREACH inv = qinv.execute() %] - + [% inv.invoicedate %] [% IF inv.direction == 'out' %][% ELSE %][% END %] diff --git a/server/CGI/tmpl/module/invoices/invoice.js b/server/CGI/tmpl/module/invoices/invoice.js new file mode 100644 index 0000000..919969d --- /dev/null +++ b/server/CGI/tmpl/module/invoices/invoice.js @@ -0,0 +1,46 @@ +// function initmodule(){ + var invoice = { + changeReceipient: function(){ + + }, + changeSender: function(){ + + }, + addBooking: function(){ + + }, + deleteBooking: function(){ + + }, + editBooking: function(){ + + }, + deleteBooking: function(){ + + }, + addProduct: function(){ + + }, + changedStatus: function(){ + + }, + changedInvoicedate: function(){ + + }, + changedDirection: function(){ + + }, + createPDF: function(){ + + }, + openPDF: function(){ + + }, + sendEmail: function(){ + + }, + ImportPDF: function(){ + + } + } +// } diff --git a/server/CGI/tmpl/module/invoices/invoice.tt b/server/CGI/tmpl/module/invoices/invoice.tt index 1c6755f..6839851 100644 --- a/server/CGI/tmpl/module/invoices/invoice.tt +++ b/server/CGI/tmpl/module/invoices/invoice.tt @@ -4,138 +4,199 @@ [% PROCESS lists/status.tt %] [% PROCESS lists/invoicetypes.tt %] [% PROCESS lists/invoicedirection.tt %] -[% qinv =dksdb.query("select * from invoices where id='${params.id}';") %] -[% inv = qadr.get_all() %] +[% PROCESS lists/senderlist.tt %] +[% PROCESS lists/receipientlist.tt %] +[% PROCESS lists/reportlist.tt %] +[% USE Dumper %] +[% qinv =dksdb.query("select inv.* +,printf('%.2f',sum(round(bk.quantity * bk.unitamount,2))) as netamount +,printf('%.2f',sum(round(round(bk.quantity * bk.unitamount,2) * bk.taxpercent,2))) as vatamount +,printf('%.2f',sum(round(bk.quantity * bk.unitamount,2)) + sum(round(round(bk.quantity * bk.unitamount,2) * bk.taxpercent,2))) as grossamount +from invoices inv left join bookings bk on (inv.id=bk.id_invoice) where inv.id = '${params.id}'") %] +[% qbook =dksdb.prepare("SELECT id, id_invoice, id_product, producttype, sku, replace(quantity,'.',',') as quantity, replace(printf('%.2f',coalesce(unitamount,0.0)),'.',',') as unitamount, unit,name, description, taxamount,taxpercent +,replace(printf('%.2f',taxpercent * 100),'.',',') as vatpercent +,replace(printf('%.2f',round(quantity * unitamount,2)),'.',',') as netamount +,replace(printf('%.2f',round(case when taxpercent is not null then round(quantity * unitamount,2) * taxpercent else coalesce(taxamount,0.00 ) end,2)),'.',',') as vatamount +,replace(printf('%.2f',round(quantity * unitamount,2) + round(case when taxpercent is not null then round(quantity * unitamount,2) * taxpercent else coalesce(taxamount,0.00 ) end,2)),'.',',') as grossamount +from bookings where id_invoice = '${params.id}';") %] +[% inv = qinv.get_all() %]
[% lbl.invoice %]
-
[% selectbox('status','invoices','','','','','','','','','Status') %]
- - - - - - - + + + + +
- -
+ [% #Dumper.dump(senderlist) %] +
+ [% inputhidden('id','invoices',inv.0.id,inv.0.id,'') %] + [% inputhidden('pdffile','invoices',inv.0.id,inv.0.pdffile,'') %]
-
+
-
- [% selectbox('direction','invoices','','Richtung','','','','','','','') %] +
+ [% selectbox('direction','invoices',inv.0.id,'Richtung','','','','',inv.0.direction,'',invoicedirectionlist,'invoice.changeDirection(this);','') %]
-
+
- [% selectbox('invoicetype','invoices','','Typ','','','','','','','') %] -
-
- [% reports = [ - {value => "dks-deutsch", text =>"DKS Deutsch",class => ""}, - {value => "sitc-deutsch", text => "Saffran IT - Deutsch",class => ""} - ] %] - [% selectbox('id_template','invoices','','Vorlage','','','','','','',reports) %] + [% selectbox('invoicetype','invoices',inv.0.id,'Typ','','','','',inv.0.invoicetype,'',invoicetypes,'','') %]
+ +
+
+
+ + [% selectbox('id_template','invoices',inv.0.id,'Vorlage','','','','',inv.0.id_template,'',reportlist) %] +
-
- [% inputbox('invoicedate','invoices','','Datum','date','','','','','') %] +
+ [% inputbox('invoicedate','invoices',inv.0.id,'Datum','date','','','',inv.0.invoicedate,'') %]
-
- [% inputbox('deadlinedate','invoices','','Tage','number','','','','','') %] +
+ [% inputbox('deadlinedays','invoices',inv.0.id,'Tage','number','','','',inv.0.deadlinedays,'') %]
-
- [% inputbox('deadlinedate','invoices','','Fälligkeit','date','','','','','') %] +
+ [% inputbox('deadlinedate','invoices',inv.0.id,'Fälligkeit','date','','','',inv.0.deadlinedate,'') %]
+
+
+ [% inputbox('reminderdates','invoices',inv.0.id,'Mahnungsdaten','text','','','',inv.0.reminderdates,'') %] +
+ +
+
+
+ [% inputbox('byear','invoices',inv.0.id,'G.Jahr','number','','','',inv.0.bussinessyear,'') %] +
+ +
+
+
+
- [% inputbox('reference','invoices','','Referenz','text','','','','','') %] + [% selectbox('id_sender','invoices',inv.0.id,'Sender','','','','',inv.0.id_sender,'',senderlist) %] +
+
+
+
+ [% inputbox('sendername','invoices',inv.0.id,'Name','text','','','',inv.0.sendername,'') %]
-
-
- [% inputbox('reminderdates','invoices','','Mahnungsdaten','text','','','','','') %] +
+ [% inputbox('senderaddress','invoices',inv.0.id,'Adresse','text','','','',inv.0.senderaddress,'') %] +
-
- [% inputbox('byear','invoices','','G.Jahr','text','','')%] +
+
+ [% inputbox('sendercountry','invoices',inv.0.id,'Land','text','','','',inv.0.sendercountry,'') %] +
+
+ [% inputbox('senderzip','invoices',inv.0.id,'PLZ','text','','','',inv.0.senderzip,'') %] +
+
+ [% inputbox('sendercity','invoices',inv.0.id,'Ort','text','','','',inv.0.sendercity,'') %]
- +
+
+ [% inputbox('reference','invoices',inv.0.id,'Referenz','text','','','',inv.0.reference,'') %] +
+
-
+
+
+
+ [% selectbox('id_receipient','invoices',inv.0.id,'Empfänger','','','','',inv.0.id_receipient,'',receipientlist) %] +
+
-
- [% inputbox('receipientname','invoices','','Empfänger','','','','','','','') %] +
+ [% inputbox('receipientname','invoices',inv.0.id,'Name','text','','','',inv.0.receipientname,'') %]
-
- [% inputbox('receipientaddress','invoices','','Adresse','','','','','','','') %] +
+ [% inputbox('receipientaddress','invoices',inv.0.id,'Adresse','text','','','',inv.0.receipientaddress,'') %]
-
- [% inputbox('receipientcountry','invoices','','Land','','','','','','','') %] +
+ [% inputbox('receipientcountry','invoices',inv.0.id,'Land','text','','','',inv.0.receipientcountry,'') %]
-
- [% inputbox('receipientzip','invoices','','PLZ','','','','','','','') %] +
+ [% inputbox('receipientzip','invoices',inv.0.id,'PLZ','text','','','',inv.0.receipientzip,'') %]
-
- [% inputbox('receipientcity','invoices','','Ort','','','','','','','') %] +
+ [% inputbox('receipientcity','invoices',inv.0.id,'Ort','text','','','',inv.0.receipientcity,'') %]
+
+ [% inputbox('clientnumber','invoices',inv.0.id,'Kunden-Nummer','text','','','',inv.0.clientnumber,'') %] +
+
+ [% inputbox('vatid','invoices',inv.0.id,'USt.-Id','text','','','',inv.0.receipientvatid,'') %] +
-
- [% inputbox('netamount','invoices','','Netto','currency','w3-large','','readonly','00000.00','') %] - [% inputbox('vatamount','invoices','','MwSt','currency','','','readonly','0000.00','') %] - [% inputbox('grossamount','invoices','','Brutto','currency','','','readonly','000000.00','') %] - [% inputbox('payedamount','invoices','','Bezahlt','currency','','','','000000.00','') %] +
+ [% selectbox('status','invoices',inv.0.id,'Status','','','','',inv.0.status,'',statuslist,'invoice.changedStatus(this);') %] + [% inputbox('netamount','invoices',inv.0.id,'Netto','currency','w3-large','','readonly',inv.0.netamount,'') %] + [% inputbox('vatamount','invoices',inv.0.id,'MwSt','currency','','','readonly',inv.0.vatamount,'') %] + [% inputbox('grossamount','invoices',inv.0.id,'Brutto','currency','','','readonly',inv.0.grossamount,'') %] + [% inputbox('payedamount','invoices',inv.0.id,'Bezahlt','currency','','','',inv.0.payedamount,'invoice.setPayed(this);') %]
[% lbl.bookings %]
- - - + - - + +
- [% cols = { sku => 80 , quantity =>40,unit=>100,description => 500, vat => 80, netamount => 100 }%] - + [% cols = { sku => 80 , quantity =>40,unit=>100,unitamount => 100,description => 500, vat => 90,vatpercent => 90, netamount => 100, grossamount => 120}%] +
- - + + + + + + - - [% WHILE i < 10 %] - - - - - - + + [% FOREACH bk = qbook.execute() %] + + + + + + + + + + - [% i = i + 1 %] [% END %] @@ -143,3 +204,4 @@
SKUQuProduct/DienstleistungName/ BeschreibungAnz.EinheitEinheitspreisMwSt.(%) MwSt. NettoBrutto
SKU-001
1 E-mail
Product/Dienstleistung
000,00€
00000,00€
[% bk.sku %][% bk.name %]
[% bk.desciption %]		[% bk.quantity %][% bk.unit %][% bk.unitamount %]€[% bk.vatpercent %]%[% bk.vatamount %]€[% bk.netamount %]€[% bk.grossamount %]€
+ diff --git a/server/CGI/tmpl/skeleton/index.tt b/server/CGI/tmpl/skeleton/index.tt index f3e3235..7e6ce35 100644 --- a/server/CGI/tmpl/skeleton/index.tt +++ b/server/CGI/tmpl/skeleton/index.tt @@ -19,6 +19,7 @@
Invoice Journal
+ @@ -36,6 +37,7 @@ - +
+
\ No newline at end of file diff --git a/server/htdocs/css/w3pro.css b/server/htdocs/css/w3pro.css index 46eff30..1f36915 100644 --- a/server/htdocs/css/w3pro.css +++ b/server/htdocs/css/w3pro.css @@ -287,6 +287,7 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0} display: block; color: #000; padding: 4px; + padding-right: 20px; width: 100%; max-width: 100%; box-sizing: border-box; @@ -400,10 +401,14 @@ input[type=number]::-webkit-outer-spin-button { } input[type=date]::-webkit-inner-spin-button, -input[type=dater]::-webkit-outer-spin-button { +input[type=date]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; } +input[type=date]::-webkit-clear-button{ + -webkit-appearance: none; + margin: 0; +} /* .mceContentBody { diff --git a/server/htdocs/img/icons/Apps.svg b/server/htdocs/img/icons/Apps.svg new file mode 100644 index 0000000..cc7d380 --- /dev/null +++ b/server/htdocs/img/icons/Apps.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/server/htdocs/img/icons/Apps_white.svg b/server/htdocs/img/icons/Apps_white.svg new file mode 100644 index 0000000..74de289 --- /dev/null +++ b/server/htdocs/img/icons/Apps_white.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/server/htdocs/img/icons/Banking_Transaction_white.svg b/server/htdocs/img/icons/Banking_Transaction_white.svg index e59f26f..24ec72a 100644 --- a/server/htdocs/img/icons/Banking_Transaction_white.svg +++ b/server/htdocs/img/icons/Banking_Transaction_white.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/server/htdocs/img/icons/Bill2_white.svg b/server/htdocs/img/icons/Bill2_white.svg index d9fd285..f66fe86 100644 --- a/server/htdocs/img/icons/Bill2_white.svg +++ b/server/htdocs/img/icons/Bill2_white.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/server/htdocs/img/icons/Bookings2_white.svg b/server/htdocs/img/icons/Bookings2_white.svg index f2e0838..63b6bf3 100644 --- a/server/htdocs/img/icons/Bookings2_white.svg +++ b/server/htdocs/img/icons/Bookings2_white.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/server/htdocs/img/icons/Box_white.svg b/server/htdocs/img/icons/Box_white.svg index 035f607..a943303 100644 --- a/server/htdocs/img/icons/Box_white.svg +++ b/server/htdocs/img/icons/Box_white.svg @@ -1,9 +1,9 @@ - - - - - - - + + + + + + + diff --git a/server/htdocs/img/icons/Contacts_white.svg b/server/htdocs/img/icons/Contacts_white.svg index 06c0c86..0a082d5 100644 --- a/server/htdocs/img/icons/Contacts_white.svg +++ b/server/htdocs/img/icons/Contacts_white.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/server/htdocs/img/icons/Email.svg b/server/htdocs/img/icons/Email.svg index d7cbfaf..0aa4133 100644 --- a/server/htdocs/img/icons/Email.svg +++ b/server/htdocs/img/icons/Email.svg @@ -1,9 +1,9 @@ - - - - - - - + + + + + + + diff --git a/server/htdocs/img/icons/Email_white.svg b/server/htdocs/img/icons/Email_white.svg index e25faca..06b5b07 100644 --- a/server/htdocs/img/icons/Email_white.svg +++ b/server/htdocs/img/icons/Email_white.svg @@ -1,9 +1,9 @@ - - - - - - - + + + + + + + diff --git a/server/htdocs/img/icons/Folder_white.svg b/server/htdocs/img/icons/Folder_white.svg index bf24904..de55dc9 100644 --- a/server/htdocs/img/icons/Folder_white.svg +++ b/server/htdocs/img/icons/Folder_white.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/server/htdocs/img/icons/In_red.svg b/server/htdocs/img/icons/In_red.svg index 2719d6e..705c299 100644 --- a/server/htdocs/img/icons/In_red.svg +++ b/server/htdocs/img/icons/In_red.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/server/htdocs/img/icons/Out_green.svg b/server/htdocs/img/icons/Out_green.svg index e03e87a..1c03e1c 100644 --- a/server/htdocs/img/icons/Out_green.svg +++ b/server/htdocs/img/icons/Out_green.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/server/htdocs/img/icons/PDF_white.svg b/server/htdocs/img/icons/PDF_white.svg index 816c7c2..d59b81e 100644 --- a/server/htdocs/img/icons/PDF_white.svg +++ b/server/htdocs/img/icons/PDF_white.svg @@ -1,15 +1,15 @@ - - - - - - - + + + + + + + diff --git a/server/htdocs/img/icons/Preview_white.svg b/server/htdocs/img/icons/Preview_white.svg index 082713a..1ba2c0e 100644 --- a/server/htdocs/img/icons/Preview_white.svg +++ b/server/htdocs/img/icons/Preview_white.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/server/htdocs/img/icons/Print_white.svg b/server/htdocs/img/icons/Print_white.svg index 44366b8..392cf6b 100644 --- a/server/htdocs/img/icons/Print_white.svg +++ b/server/htdocs/img/icons/Print_white.svg @@ -1,8 +1,8 @@ - - - - - + + + + + diff --git a/server/htdocs/img/icons/Product2_white.svg b/server/htdocs/img/icons/Product2_white.svg index dd64d1d..1ae22e7 100644 --- a/server/htdocs/img/icons/Product2_white.svg +++ b/server/htdocs/img/icons/Product2_white.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/server/htdocs/img/icons/ViewPDF_white.svg b/server/htdocs/img/icons/ViewPDF_white.svg index b3e047a..e10bab0 100644 --- a/server/htdocs/img/icons/ViewPDF_white.svg +++ b/server/htdocs/img/icons/ViewPDF_white.svg @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/server/htdocs/img/icons/download_white.svg b/server/htdocs/img/icons/download_white.svg index a7f9734..757a68d 100644 --- a/server/htdocs/img/icons/download_white.svg +++ b/server/htdocs/img/icons/download_white.svg @@ -1,6 +1,6 @@ - - - - - + + + + + diff --git a/server/htdocs/js/app.js b/server/htdocs/js/app.js index 7d27642..f0914d2 100644 --- a/server/htdocs/js/app.js +++ b/server/htdocs/js/app.js @@ -1,3 +1,5 @@ + + var app = { dataset: null, getpage: function(modulepage,data) { @@ -10,49 +12,72 @@ var app = { req.reqdata("POST","page.cgi",rdata,app.loadpage); }, loadpage: function(data){ - document.getElementById("mainapp").innerHTML = data; + if (table){ + table.selection = null; + } + document.getElementById("modulescripts").innerHTML =""; + document.getElementById("mainapp").innerHTML = ''; + app.addmoduledata(data); + document.getElementById("mainapp").insertAdjacentHTML('afterbegin',data); + var re = '\