From 9afd8f405525b932e894b4d51e0f3ddc3b3d8caa Mon Sep 17 00:00:00 2001 From: Kilian Saffran Date: Wed, 6 Mar 2019 06:53:02 +0100 Subject: [PATCH] db and products --- db.cashboxdev.json | 1 + db/cashbox.sqlite.dev.full.sql | Bin 0 -> 9710 bytes db/cashbox.sqlite.schema.sql | Bin 0 -> 4904 bytes js/moduleglobal.js | 13 ++++++++++++- main.js | 2 +- modules/products/index.html | 2 +- modules/products/index.js | 24 +++++++++++------------- modules/products/lib/group.js | 14 -------------- modules/products/lib/product.js | 20 ++++++++++++++++++++ modules/settings/index.html | 2 +- renderer.js | 5 ++++- 11 files changed, 51 insertions(+), 32 deletions(-) create mode 100644 db.cashboxdev.json create mode 100644 db/cashbox.sqlite.dev.full.sql create mode 100644 db/cashbox.sqlite.schema.sql delete mode 100644 modules/products/lib/group.js diff --git a/db.cashboxdev.json b/db.cashboxdev.json new file mode 100644 index 0000000..8489aa0 --- /dev/null +++ b/db.cashboxdev.json @@ -0,0 +1 @@ +{"name":"CashBox Dev","type":"local","server":"localhost","dbfile":"cashbox","vpn":"","vat":"0,17","currency":"€","mailserver":"","mailencryption":"","mailport":"","maillogin":"","mailpassword":""} \ No newline at end of file diff --git a/db/cashbox.sqlite.dev.full.sql b/db/cashbox.sqlite.dev.full.sql new file mode 100644 index 0000000000000000000000000000000000000000..1352a95fd4cbf3696b49e14f77b0fd307c6eab1a GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/db/cashbox.sqlite.schema.sql b/db/cashbox.sqlite.schema.sql new file mode 100644 index 0000000000000000000000000000000000000000..3b7d1372b5f62da13357f91b8b8ba1e2bf68dbb5 GIT binary patch literal 4904 zcmeHLT~FIE6uqxZ+JEpPNN9gx;-O>JKw@QrBKB5gZD0|Qg}Na1&u=@&j$1d0oruEL z3RI;{ll$R&ea^9yKfe#RcUkma*7Yvh8~!^?YyCe`ZFDy!I#i|Keq;g;%dKY-Hm0d^-=jYP1&cwVQ$b$u36-_ z?=CFkLMvFEf7X7CHH3Q(%be=I#M&%%DHLV3r**3w8QNHC*%xPMS0=kIOj;OEZPD@* zTu#9Fn-*(rYM23&oQ-O){JYG{z1DKI+;&|cw|0y+Jnv4AJH95g$C)4U>ZSl8@9j_m zi>(CM>aqei*IGxfQx9KJLssi*#=lmBdoY$5qn7e%?QO5y?J2AoI}U$OVW{(6ho>&a zrm@xThU^;wz8xsAvf5RkeeDkKg}I9OvG}aT-RCv%T<2%iTFX5~(QfD7Vbm?(p8u+E XCit$Sd6wghh~c9fA7T;y4;%ghLrLdt literal 0 HcmV?d00001 diff --git a/js/moduleglobal.js b/js/moduleglobal.js index 5efb098..20b0b17 100644 --- a/js/moduleglobal.js +++ b/js/moduleglobal.js @@ -20,5 +20,16 @@ var mpref ={ //apppref.getpreference(page); //appdb.dbfile = this.cfg.dbfile; appdb.url = decodeURIComponent(this.cfg.serviceurl) + 'sqlite/' + decodeURIComponent(this.cfg.dbfile); + }, + formatvalue(value){ + var valret = value; + var isnumber= new RegExp("^[0-9]*,[0-9]*$"); + if (value == ''){ + valret = null; + } else if (isnumber.test(value)){ + valret = value.replace(",","."); + } + return valret; } -} \ No newline at end of file +} + diff --git a/main.js b/main.js index f49e854..56cf9c1 100644 --- a/main.js +++ b/main.js @@ -15,7 +15,7 @@ function createWindow () { var parameters = []; if (os.platform() == "win32"){ executablePath = "C:\\Strawberry\\perl\\bin\\perl.exe"; - parameters = ["C:\\Users\\ksaff\\Workspace\\DKSService\\dkslocalserver.pl"]; + parameters = ["C:\\Users\\ksaff\\Workspace\\dks_server\\dkslocalserver.pl"]; } else { //os.platform() == "darwin" executablePath = "/Users/kilian/perl5/perlbrew/perls/perl-5.28.1/bin/perl"; parameters = ["/Users/kilian/Workspace/DKSService/dkslocalserver.pl"]; diff --git a/modules/products/index.html b/modules/products/index.html index 3c12976..9ddaea9 100644 --- a/modules/products/index.html +++ b/modules/products/index.html @@ -45,7 +45,7 @@ - + diff --git a/modules/products/index.js b/modules/products/index.js index 903fc88..02e802b 100644 --- a/modules/products/index.js +++ b/modules/products/index.js @@ -1,5 +1,3 @@ -import { on } from "cluster"; - var winh = Math.max(document.documentElement.clientHeight, window.innerHeight || 0); var tblh = winh-54; @@ -9,9 +7,9 @@ function initpage(){ loadtable(); } -$("input,select").on('focusout',function(){ - console.log($(this).attr("id")); -}); +// $("input,select").on('focusout',function(){ +// console.log("TEST"); +// }); function loaddatalist_productgroup(){ var sql = "select productgroup from products where productgroup is not null group by productgroup;"; @@ -34,15 +32,15 @@ function loadtable(){ var data = appdb.dbquery(sql); console.log(data.sqldata); - $('#tbl_products').html(""); + $('#tbl_products > tbody').html(""); for (var i in data.sqldata){ var row = ''+ - '' + - '
' + - '' + - '' + - '' + - '' + + '' + + '
' + + '' + + '' + + '' + + '' + ''; $("#tbl_products").append(row); } @@ -103,4 +101,4 @@ function getTableSelectionIDs(){ } } return ids; -} \ No newline at end of file +} diff --git a/modules/products/lib/group.js b/modules/products/lib/group.js deleted file mode 100644 index b6ece23..0000000 --- a/modules/products/lib/group.js +++ /dev/null @@ -1,14 +0,0 @@ -var group = { - new: function(){ - - }, - edit: function(){ - - }, - delete: function(){ - - }, - duplicate: function(){ - - } -} \ No newline at end of file diff --git a/modules/products/lib/product.js b/modules/products/lib/product.js index 0a4334f..798d63d 100644 --- a/modules/products/lib/product.js +++ b/modules/products/lib/product.js @@ -1,4 +1,24 @@ var product = { + savevalue: function(obj){ + console.log(obj.type); + var savevalue= mpref.formatvalue(obj.value); + if (obj.type == "checkbox"){ + if (obj.checked){ + savevalue='1'; + } else { + savevalue=null; + } + } + if (savevalue==null){ + savevalue='null'; + }else { + savevalue="'"+ savevalue+"'"; + } + var ds = obj.id.split("-"); + var sql = "update " + ds[0]+" set "+ds[1]+ "="+savevalue+" where id='"+obj.parentNode.parentNode.id+"';"; + console.log(sql); + appdb.dbexec(sql); + }, import: function(){ }, diff --git a/modules/settings/index.html b/modules/settings/index.html index 631f384..3a37071 100644 --- a/modules/settings/index.html +++ b/modules/settings/index.html @@ -24,7 +24,7 @@ -
+
diff --git a/renderer.js b/renderer.js index 596f3dc..866763e 100644 --- a/renderer.js +++ b/renderer.js @@ -4,9 +4,11 @@ const os = require('os'); var usersystem = { profilepath: function(){ var ppath=""; + console.log(os.platform()); + console.log(os.homedir()); if (os.platform() == "darwin"){ ppath = os.homedir() + '/Library/Application Support/cashbox/'; - } else if (os.platform() == "Win32") { + } else if (os.platform() == "win32") { ppath = os.homedir() + '/AppData/Roaming/cashbox/'; } return ppath; @@ -51,6 +53,7 @@ var usersystem = { }, getLocalDataSets: function(){ var datasets =[]; + console.log(this.profilepath()); var files = fs.readdirSync(this.profilepath()); files.forEach(function(file) { if (file.match('db\..*\.json')){ -- 2.39.5