Datenbank-Einstellungen

+ Ãbersicht Rechnungen Konten @@ -46,10 +49,6 @@ -<<<<<<< HEAD - -======= ->>>>>>> a9365519985ea97014e0a4cf9a311126d1151e59 \ No newline at end of file diff --git a/js/app.js b/js/app.js index d534f87..8dcd62f 100644 --- a/js/app.js +++ b/js/app.js @@ -1,42 +1,50 @@ - -// $("#menu-toggle").click(function(e) { -// e.preventDefault(); -// $("#wrapper").toggleClass("toggled"); -// }); - $( document ).ready(function() { console.log( "Main ready!" ); browserapp.loadmodule("overview"); + browserapp.getdatasets(); console.log("After module load!"); }); console.log(navigator.platform); console.log(location.protocol); var browserapp = { -loadmodule: function(modulename){ - var appdata = browserapp.getconfig(); - var params = "?"; - for (var i in appdata){ - params += "&" + i +"=" + encodeURIComponent(appdata[i]); - } - console.log("modules/"+modulename+"/index.html"+params); - $("#moduleframe").attr("src","modules/"+modulename+"/index.html"+ params); -}, -loadmodulepage: function(modulename,page,pageparams = null){ - var appdata = browserapp.getconfig(); - var params = "?"; - for (var i in appdata){ - params += "&" + i +"=" + encodeURIComponent(appdata[i]); - } - if (pageparams){ - for (var i in pageparams){ - params += "&" + i +"=" + encodeURIComponent(pageparams[i]); + loadmodule: function(modulename){ + var appdata = browserapp.getconfig(); + var params = "?"; + for (var i in appdata){ + params += "&" + i +"=" + encodeURIComponent(appdata[i]); + } + console.log("modules/"+modulename+"/index.html"+params); + $("#moduleframe").attr("src","modules/"+modulename+"/index.html"+ params); + }, + loadmodulepage: function(modulename,page,pageparams = null){ + var appdata = browserapp.getconfig(); + var params = "?"; + for (var i in appdata){ + params += "&" + i +"=" + encodeURIComponent(appdata[i]); + } + if (pageparams){ + for (var i in pageparams){ + + params += "&" + i +"=" + encodeURIComponent(pageparams[i]); + } + } + //console.log("modules/"+modulename+"/index.html"+params); + $("#moduleframe").attr("src","modules/"+modulename+"/"+ page +".html"+ params); + }, + getconfig:function (){ + var cdata = usersystem.getPreference("currentdataset"); + if ((cdata) && (cdata.name)){ + + } + return {dbfile:"invoicejournal",serviceurl:"http://localhost:6060/"}; + }, + getdatasets(){ + var ds = usersystem.getLocalDataSets(); + for (var i in ds){ + $("#globaldatasets").append(''); } + } - //console.log("modules/"+modulename+"/index.html"+params); - $("#moduleframe").attr("src","modules/"+modulename+"/"+ page +".html"+ params); -}, -getconfig:function (){ - return {dbfile:"invoicejournal",serviceurl:"http://localhost:6060/"}; -} + } \ No newline at end of file diff --git a/main.js b/main.js index d3f65ea..40e1e4e 100644 --- a/main.js +++ b/main.js @@ -15,10 +15,10 @@ 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"]; + parameters = ["/Users/kilian/Workspace/dks_server/dkslocalserver.pl"]; } mainWindow = new BrowserWindow({ diff --git a/modules/settings/datastore.js b/modules/settings/datastore.js new file mode 100644 index 0000000..22563c3 --- /dev/null +++ b/modules/settings/datastore.js @@ -0,0 +1,45 @@ +var datastore = { + new: function(){ + parent.browserapp.loadmodulepage('settings','form_datastore',{"id":""}); + }, + edit: function(name){ + + }, + load: function(name){ + + }, + delete: function(){ + + }, + import: function(){ + + }, + export: function(){ + + }, + test: function(){ + + }, + save: function(){ + var dts ={}; + $("input,select").each(function(){ + var inp = $(this); + //console.log(inp); + dts[inp.attr("id")] = inp.val(); + }); + console.log(dts); + console.log(mpref); + if (mpref.cfg.id == ""){ + var keyname = dts['name'].toLowerCase(); + console.log(keyname); + keyname = keyname.replace(/[^a-z0-9-_]/g,""); + console.log(keyname); + mpref.cfg.id = "db."+ keyname; + } + if (dts.name){ + console.log("Before save:" + mpref.cfg.id); + parent.usersystem.setPreference(mpref.cfg.id,dts); + } + + } +} \ No newline at end of file diff --git a/modules/settings/form_datastore.html b/modules/settings/form_datastore.html new file mode 100644 index 0000000..417221e --- /dev/null +++ b/modules/settings/form_datastore.html @@ -0,0 +1,216 @@ + + + + + + + + + + +Datenbank-Einstellungen + + + +

+ Name +

+ +

+ Verbindung +

+ Verbindungs-Typ +

+ +

+ Server +

+ +

+ Datenbank +

+ +

+ VPN +

+ +

+ Standard Werte +

+ Mehrwert-Steuer(%) +

+ +

+ WÃ¤hrung (Symbol) +

+ +

+ E-Mail Server +

+ Email-Server +

+ +

+ Port +

+ +

+ VerschlÃ¼sselung +

+ +

+ Login +

+ +

+ Passwort +

+ +

+ + + + + + + + + +

	Name	Typ	Standard

+ +

+ + + + + + + + + +

	Name	Versender	Typ	Standard

+ +

+ + + + + + + + + + + + \ No newline at end of file diff --git a/modules/settings/form_datastore.js b/modules/settings/form_datastore.js new file mode 100644 index 0000000..6bd237f --- /dev/null +++ b/modules/settings/form_datastore.js @@ -0,0 +1,6 @@ +function initpage(){ + console.log("ID:" + mpref.cfg.id); + if (mpref.cfg.id){ + + } +} diff --git a/modules/settings/index.html b/modules/settings/index.html index 51a0078..78ecc38 100644 --- a/modules/settings/index.html +++ b/modules/settings/index.html @@ -15,13 +15,31 @@

- - -

+ + + + + + +