From 4e1e50e1af408cc1010ba423ce5033d72f9e7636 Mon Sep 17 00:00:00 2001 From: Kilian Saffran Date: Fri, 5 Apr 2019 09:05:37 +0200 Subject: [PATCH] misc --- db/cashbox.sqlite.dev.full.sql | Bin 9710 -> 6864 bytes db/temp.sql | 64 ++++++++++++++++++++++ server/htdocs/index.html | 63 +++++++++++---------- server/htdocs/js/cashbox.js | 94 ++++++++++++++++++++++++++------ server/htdocs/js/cookie.js | 19 +++++++ server/htdocs/js/webdatabase.js | 86 +++++++++++++++++++++++++++++ 6 files changed, 279 insertions(+), 47 deletions(-) create mode 100644 db/temp.sql create mode 100644 server/htdocs/js/cookie.js create mode 100755 server/htdocs/js/webdatabase.js diff --git a/db/cashbox.sqlite.dev.full.sql b/db/cashbox.sqlite.dev.full.sql index 1352a95fd4cbf3696b49e14f77b0fd307c6eab1a..d02eb9c07729ef1b5677efa67252b878d3590b0d 100644 GIT binary patch delta 148 zcmaFoeZh2t1=Hj%Mz_f}%m$MiWThsrU_LTgjrGA~0k(q4+t`*&PGR?$TqY1T*@nYw z@&pd2$!B;XCMR(Eu&XmTF=R5ln7p4eadH^f5;&iiI~=GlV)7?$pUECPeqgo=ug~Nv nUN4}!sL3IGUXxbb__Kg&q$Y2YGTF=`@roA!O%pUF literal 9710 zcmeI2+in_19LDFimHGy~SVgL^)sO<_*eVyWuxTWpWIJi^ER1oAl3<6$soaO^8&rL> zw!d#?$CzC&VA*Z38m)F`nf=e{o9};^8UFrj-yE2>d0}>V2IkD1n~52kk$Gdr=GeUD z{mR7Vx!E%j*AM0^^QGyS9wlCyT}m9;^1J4c@*%%oBDtH$g?#Igf5cOgZAxz2_Y2df z-l2KVJvLLWD|5knjNFE8;|uz5YD@LZ&y;>+P$O6^~_Jg~_0Dfe&GenIUcM%E|2qF)Yq zp&=YL?dUg`;yR`L31hn-k}>5qPT@1M^D~4GLwe?C;WO3&e4SXvU7A6H)nevq9*@CM zr7kI*WpF;XW2+qlW<%^A*x4CT&-m6_hV(~TqIRTRL86D-*YoFk5i`S!j}B9 z!Ezg0)uYUYDVUn6m@O=Fhi7P7rbtemyf$wQ-l|+h@_VMl_aZsUYm-yuZu0DqQ=+D) z^y3wEiyZ}OKZj#exGH-z#tsEs8`N=*UFjne&}!fE%KbXD{T)$eh@G0RuWX*t(o^Hp zSxaTxT7@2zZSPBrqsXrs^_S@1_q>&ORvFWLodtS+ZW$Moj$vMbcAaOsAExqaRr=AS zM_aU8xJ3~+~of^EzhLOXZ)I=&(h{MshTQaS^`U-&X8P3{p`WEHkbHS zX3XMO9lT`yobER4TZQqId6O=eL0fTWgj@ugWlAqYbH`#ex&wydqcEK3&?0*c*#3y)Z&oP5sI>E^0-yrl_$;hKCFRUn_o4HSOvMPr3=wZ>8e&M6OeOp zq2la$w8X2egkMV68!g3r@`(|siD9z*vhyxNkp~c3@)NR(@}a_1GSXVv%Q9&%g+T%I zvuMTGz~57nj|(lar^49u?81^FNQGQ_tAT_=OMXCpRz5>9M~kQQRNv)Uvf3ywsZ%`-ZzLeM@A9-IAPp(} zt39tt>YHbiPuG)GvRNg@Cy(f&3!xEm7cD9-&&9<;sBYO6QASvbPqK|sYU~9xPy2X^ zZ+#RT^V{vxrR|u!LM`#3N*@NPE_0$i6wQocoQGM3$`1&gka3F-;*8c);*t0y4b?iL z!7VGM2v>e0;#-3fTCa+MX&!mJJX*3-ZXNIJ*A@MrFXMUT({)Bo5n7$`OXn1M2^Z~- z%+~JWn^pp4i>X`Li&xTGMR?l3&T8Lc)U;FkEw?z>#}9}L@h8SHf7g9#d#N3hK6)~x zzi$6Tv4QsW^Y+}`&Sl=7eRdzy$q#H);r9&FyY)_HwqKoB%ls~DR!XtVvfWO%i@A8G zbJZPDkAkzw`8%xIqm9w96N~j*o{RQlV>^Z^_Dg&2X{>I3Rl8c}2XNM%tUUJpRmZ%$ z?3~_};SRGtn61L|+qEP+D_$#Zo&w}a-B%a>YnFe2iQYHpZ0_?pP(J4zbKNPXPBbsD zdrn91bDAj~zgd?~E_KGDbJ;A*($cZ{Krfcd`E%E-m4(z zc_-G#=*k5#dcY~l{^Zp3j`GUM?&&PRpQXFs>00v32ln(xXGiI|dQK#>>{L52 zKbarx7)5$rN9_baUjx1%-l>oM3Z!sn*sYKYt{vCbIG zM=r~7NK3DVMY_~F<8ixRU4~0usnzhwEB*Lz@-fUZZPGd<9pU@3_rc89vChaX^2CdA ZTU2s2)E3q7sW98)|4Tb~v!ldz{{y(8R?z?e diff --git a/db/temp.sql b/db/temp.sql new file mode 100644 index 0000000..4dffa9d --- /dev/null +++ b/db/temp.sql @@ -0,0 +1,64 @@ +CREATE TABLE config ( + id TEXT, + value TEXT, + primary key (id) +); +insert into config (id,value) VALUES ('cardpayement_enabled','1'); +insert into config (id,value) VALUES ('checkout_grouping','1'); +DROP TABLE accounts; +CREATE TABLE accounts ( + id TEXT, + name TEXT, + type TEXT, + clientnumber text, + prename TEXT, + surname TEXT, + address TEXT, + zip TEXT, + city TEXT, + country TEXT, + phone TEXT, + email text, + description TEXT, + location TEXT, + modified DATETIME defaults CURRENT_TIMESTAMP, + created DATETIME defaults CURRENT_TIMESTAMP, + primary key (id) +); +CREATE TRIGGER trg_accounts_upd UPDATE ON accounts + BEGIN + UPDATE accounts SET modified=CURRENT_TIMESTAMP WHERE id = NEW.id; + END; + + +CREATE TABLE tables ( + id TEXT, + name TEXT, + seats integer, + primary key (id) +); +DROP TABLE products; +CREATE TABLE products ( + id TEXT, + name TEXT, + specification TEXT, + netamount REAL, + grossamount REAL, + vatpercent REAL, + visible BOOLEAN, + productgroup TEXT, + primary key (id) +); +INSERT INTO "products" VALUES('523FB3C9-562A-7644-9E0C-664A94984B60','Softdrink (Cola, Fanta, Sprite)',NULL,1.4,1.4,NULL,1,'Boissons'); +INSERT INTO "products" VALUES('BE438932-ECDB-DF46-B0D8-5F1A4E2A8E77','Rosport Bleu',NULL,1.4,1.4,NULL,1,'Boissons'); +INSERT INTO "products" VALUES('272B688C-FC90-D344-BC93-F4C4C0E78183','Vittel',NULL,1.2,1.2,NULL,NULL,'Boissons'); +INSERT INTO "products" VALUES('9DF50B2D-8F58-CA4A-9F58-00E71138C80C','BiÃ¨re (Bouteille) Bofferding',NULL,2.0,2.0,NULL,1,'Boissons'); +INSERT INTO "products" VALUES('E6AAD31B-B6E9-BE47-B221-4315ABFEF81D','BiÃ¨re (Mini) Bofferding',NULL,2.2,2.2,NULL,1,'Boissons'); +INSERT INTO "products" VALUES('77D2A8A5-A1FE-704B-AF52-99817B25B7C7','Pol Fabire brut',NULL,4.2,4.2,NULL,1,'Boissons'); +INSERT INTO "products" VALUES('8D03C7EF-A773-6247-A0E3-057FA355B263','Cellier rouge',NULL,2.3,2.3,NULL,1,'Boissons'); +INSERT INTO "products" VALUES('EA1AFD8A-F839-5C47-9050-5EFF8229D12E','Cellier rosâÂ®',NULL,2.3,2.3,NULL,1,'Boissons'); +INSERT INTO "products" VALUES('242C42D6-3CC6-5147-8C68-C5F954B140B7','Vin blanc (Rivaner / Elbling)',NULL,4.0,4.0,NULL,1,'Boissons'); + +ALTER TABLE "transactions" add id_station TEXT; + +INSERT INTO "tables" (id) VALUES (lower(hex(randomblob(4))) || '-' || lower(hex(randomblob(2))) || '-4' || substr(lower(hex(randomblob(2))),2) || '-' || substr('89ab',abs(random()) % 4 + 1, 1) || substr(lower(hex(randomblob(2))),2) || '-' || lower(hex(randomblob(6)))) \ No newline at end of file diff --git a/server/htdocs/index.html b/server/htdocs/index.html index e10e46c..83f2033 100644 --- a/server/htdocs/index.html +++ b/server/htdocs/index.html @@ -9,34 +9,48 @@ +

- + + + + + + +

Selection Type Commande
Selection
- Tables + Tables +
+ Commandes
- Clients + Nouvelle Commande
+ Nom du Serveur +

Tables
- Table 1 -
- Table 2 -
- Table 3 -
- Table 4 -

- + - + + \ No newline at end of file diff --git a/server/htdocs/js/cashbox.js b/server/htdocs/js/cashbox.js index c06e4ed..0193078 100644 --- a/server/htdocs/js/cashbox.js +++ b/server/htdocs/js/cashbox.js @@ -1,33 +1,91 @@ +var cdata = {stationname:null,command:null,table:{id:null,name:null},products:[]}; +var cpanel = 'pnlhome'; $( document ).ready(function() { console.log("reload load page"); - panelhome(); + console.log("Stationname:" + stationname) + if (cdata.stationname == null){ + cdata.stationname = getCookie('stationname'); + if (cdata.stationname == ""){ + loadpanel('pnlstation'); + } else { + loadpanel('pnlhome'); + } + }else{ + loadpanel('pnlhome'); + } + console.log('Stationname:' + stationname); }); -function panelhome(){ - console.log("load home"); - $("#pnlhome").show(); + +function get_stationname(){ + cdata.stationname = getCookie('stationname'); + if (stationname == ''){ + loadpanel('pnlstation'); + } +} + +function set_stationname(){ + var stn = $("#stationname").val(); + if (stn != ""){ + cdata.stationname = stn; + setCookie('stationname',stn); + loadpanel('pnlhome'); + } + +} + +function loadpanel(pnlname){ + console.log("load Panel "+ pnlname); + $("#" + cpanel).hide(); + eval("get" + pnlname + "data();"); + console.log("show Panel "+ pnlname); + $("#"+ pnlname).show(); + cpanel=pnlname; +} + +function newcommand(){ + cdata = {stationname:getCookie('stationname'),command:null,table:{id:null,name:null},products:[]}; + //cdata = {stationname:getCookie('stationname'),command:null,table:null,products:[]}; + loadpanel('pnltable'); } -function paneltables(){ - console.log("load Tables"); - $(".cashboxpanel").hide(); - $("#pnltables").show(); +function getpnlstationdata(){ + console.log('set Stationname'); + $("#stationname").val(getCookie('stationname')); } -function panelclients(){ - console.log("load Clients"); - $(".cashboxpanel").hide(); - $("#pnlclients").show(); +function getpnlproductsdata(){ + } -function panelcommands(type,id){ - $(".cashboxpanel").hide(); - $("#pnlcommands").show(); +function getpnlcommandsdata(){ + $("#head_commandtable").html(cdata.table.name); + var commands = appdb.dbquery("select id,modified,status,payedamount,grossamount from transactions where id_table='"+cdata.table.nid+"'"); } -function panelproducts(){ +function getpnltablesdata(){ + var tbldata = appdb.dbquery("select id,name from tables;"); + $('#tbl_tables > tbody').html(""); + console.log("OBJ" + tbldata.sqldata.length); + if (tbldata.sqldata){ + + for (var i in tbldata.sqldata){ + console.log(i); + var row = '' + + ''+tbldata.sqldata[i].name+' ' + + ''; + $('#tbl_tables > tbody').append(row); + } + } + +} + +function getpnlhomedata(){ } -function panelopencommand(){ +function loadtable(tblid,tblname){ + cdata.table.id=tblid; + cdata.table.name=tblname; + loadpanel('pnlcommands'); +} -} \ No newline at end of file diff --git a/server/htdocs/js/cookie.js b/server/htdocs/js/cookie.js new file mode 100644 index 0000000..bd0ee56 --- /dev/null +++ b/server/htdocs/js/cookie.js @@ -0,0 +1,19 @@ +function getCookie(cname) { + var name = cname + "="; + var decodedCookie = decodeURIComponent(document.cookie); + var ca = decodedCookie.split(';'); + for(var i = 0; i