From 16e17964dae85d3a6925d0aee4ec1ad01034487c Mon Sep 17 00:00:00 2001 From: Kilian Saffran Date: Sun, 24 Feb 2019 22:26:52 +0100 Subject: [PATCH] edit settings --- js/mainapp.js | 3 ++ modules/invoices/form_invoice.js | 2 +- modules/invoices/index.html | 2 +- modules/settings/form_datastore.js | 8 ++++ modules/settings/index.html | 7 +-- modules/settings/index.js | 69 ++++++++++++++++++++++++++- modules/settings/lib/datastore.js | 11 +++-- modules/settings/lib/emailtemplate.js | 14 ++++++ modules/settings/lib/printtemplate.js | 14 ++++++ 9 files changed, 119 insertions(+), 11 deletions(-) create mode 100644 modules/settings/lib/emailtemplate.js create mode 100644 modules/settings/lib/printtemplate.js diff --git a/js/mainapp.js b/js/mainapp.js index c20f490..145c9d6 100644 --- a/js/mainapp.js +++ b/js/mainapp.js @@ -41,6 +41,9 @@ var browserapp = { $("#globaldatasets").append(''); } }, + currentdataset: function(){ + return $("#globaldatasets :selected").val(); + }, loaddataset: function(){ var gdset = $("#globaldatasets :selected").val(); if (gdset == ""){ diff --git a/modules/invoices/form_invoice.js b/modules/invoices/form_invoice.js index 21bffa5..e98ccbc 100644 --- a/modules/invoices/form_invoice.js +++ b/modules/invoices/form_invoice.js @@ -5,7 +5,7 @@ function initpage(){ branding: false, menubar:false, statusbar: false, - plugins: 'searchreplace autolink directionality visualblocks visualchars advlist lists textcolor colorpicker textpattern', + plugins: 'searchreplace autolink directionality visualblocks visualchars advlist lists textpattern', toolbar: 'bold italic underline strikethrough forecolor backcolor | link | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat', image_advtab: true, language: 'de', diff --git a/modules/invoices/index.html b/modules/invoices/index.html index 2a40eb3..f6c0642 100644 --- a/modules/invoices/index.html +++ b/modules/invoices/index.html @@ -40,7 +40,7 @@ Sender Referenz Status - Betrag + Betrag diff --git a/modules/settings/form_datastore.js b/modules/settings/form_datastore.js index 6bd237f..8aaa4ea 100644 --- a/modules/settings/form_datastore.js +++ b/modules/settings/form_datastore.js @@ -1,6 +1,14 @@ function initpage(){ console.log("ID:" + mpref.cfg.id); if (mpref.cfg.id){ + loadform(); + } +} +function loadform(){ + var pref = parent.usersystem.getPreference(mpref.cfg.id); + console.log(pref); + for (var i in pref){ + $("#" + i).val(pref[i]); } } diff --git a/modules/settings/index.html b/modules/settings/index.html index bf73115..205c241 100644 --- a/modules/settings/index.html +++ b/modules/settings/index.html @@ -26,19 +26,20 @@
- +
- - + + +
Name Database ServerFilepath Type VPNVerbundenVerbunden
diff --git a/modules/settings/index.js b/modules/settings/index.js index 543d6ec..3bc9e74 100644 --- a/modules/settings/index.js +++ b/modules/settings/index.js @@ -1,4 +1,71 @@ +var winh = Math.max(document.documentElement.clientHeight, window.innerHeight || 0); +var tblh = winh-54; + function initpage(){ console.log(parent.usersystem.getsysinfo()); + loadtable(); //parent.usersystem.setProperty("testproperty",{id:"TEST"}); -} \ No newline at end of file +} + +function loadtable(){ + + var connected=parent.browserapp.currentdataset(); + + var localds = parent.usersystem.getLocalDataSets(); + console.log(localds); + for (var i in localds){ + var prop = parent.usersystem.getPreference(localds[i]); + console.log("PROP"); + console.log(connected +"<=>"+ localds[i]); + + console.log(prop); + var row = '' + + '' + + ''+prop.name+'' + + ''+prop.dbfile+'' + + ''+prop.server+'' + + ''+prop.type+'' + + ''+prop.vpn+'' + + ''+ + ''; + $("#tbl_datasets").append(row); + + //$("#globaldatasets").append(''); + } + $('#tbl_datasets').bootstrapTable({ + pagination: false, + search: false, + height: tblh, + clickToSelect: true + }); +} + +// function settings_edit(){ +// var settings_id= getTableSelectionID(); +// if (settings_id){ +// parent.browserapp.loadmodulepage('settings','form_datastore',{"id":settings_id}); +// } + +// } + +function getTableSelectionID(){ + var sel = $('#tbl_datasets').bootstrapTable('getSelections'); + var id = null; + + if (sel){ id=sel[0]._id; } + console.log("Selected ID:" + id); + return id; + } + + function getTableSelectionIDs(){ + var sel = $('#tbl_datasets').bootstrapTable('getSelections'); + var ids = []; + if (sel){ + for (var s in sel){ + ids.push(s._id); + } + } + return ids; + } + + \ No newline at end of file diff --git a/modules/settings/lib/datastore.js b/modules/settings/lib/datastore.js index 22563c3..834821a 100644 --- a/modules/settings/lib/datastore.js +++ b/modules/settings/lib/datastore.js @@ -2,11 +2,12 @@ var datastore = { new: function(){ parent.browserapp.loadmodulepage('settings','form_datastore',{"id":""}); }, - edit: function(name){ - - }, - load: function(name){ - + edit: function(){ + var settings_id= getTableSelectionID(); + console.log(settings_id); + if (settings_id){ + parent.browserapp.loadmodulepage('settings','form_datastore',{"id":settings_id}); + } }, delete: function(){ diff --git a/modules/settings/lib/emailtemplate.js b/modules/settings/lib/emailtemplate.js new file mode 100644 index 0000000..8cbb4ec --- /dev/null +++ b/modules/settings/lib/emailtemplate.js @@ -0,0 +1,14 @@ +var emailtemplate = { + new: function(){ + + }, + edit: function(){ + + }, + duplicate: function(){ + + }, + delete: function(){ + + } +} \ No newline at end of file diff --git a/modules/settings/lib/printtemplate.js b/modules/settings/lib/printtemplate.js new file mode 100644 index 0000000..6ca67db --- /dev/null +++ b/modules/settings/lib/printtemplate.js @@ -0,0 +1,14 @@ +var printtemplate = { + new: function(){ + + }, + edit: function(){ + + }, + duplicate: function(){ + + }, + delete: function(){ + + } +} -- 2.39.5