From e963cd91d586f1846891b4f1e2c77d7f8e54e37b Mon Sep 17 00:00:00 2001 From: Timothy Washington Date: Sun, 13 Dec 2009 14:42:14 -0500 Subject: [PATCH] -- adding modal dialog back to accounts.html --- webkell/accounts.html | 4 + webkell/javascript/bkeeping.js | 163 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 163 insertions(+), 4 deletions(-) diff --git a/webkell/accounts.html b/webkell/accounts.html index aa680e4..ad45c88 100644 --- a/webkell/accounts.html +++ b/webkell/accounts.html @@ -240,6 +240,10 @@ + +

2008-2009 bkeeping Software, Inc. | All Rights Reserved diff --git a/webkell/javascript/bkeeping.js b/webkell/javascript/bkeeping.js index aa07055..2da34e4 100644 --- a/webkell/javascript/bkeeping.js +++ b/webkell/javascript/bkeeping.js @@ -148,6 +148,41 @@ var ENTRY_ROW = '

' + '
${balance}
' + '
' + '
'; + +var AE_ACCOUNT = ["Add/Edit Account", '' + + '' + + '' + + '' + + '' + +/* + '' + + '' + + '' + + '' + +*/ + '' + + '' + + '' + + '' + + '
' + + 'Name' + + '' + + '' + + '
' + + 'Number' + + '' + + '' + + '
' + + 'Type' + + '' + + '' + + '
']; + /* ********* */ @@ -158,7 +193,15 @@ var _DIALOG_FIRST = true; var bkeeping = { // session ACTIVE_SESSION: null, - + + cache: + { + user: null, + accounts: [], + journals: [], + entries: [] + }, + /* logging */ debug: function(message) { @@ -731,11 +774,123 @@ var bkeeping = { var ret = new this.RegisterCommand(username, password, firstname, lastname, email, country, true).run(); }, - addAccount: function() + deleteThing: function(thingtype, id) { - + var goAhead = function(id) + { + $('#bkeeping_dialog').dialog("close"); + var ret = new this.RemoveCommand(thingtype, function(id) { alert(thingtype + " " + id + " removed"); }.bind(this, id), {'id': id}).run(); + }.bind(this, id); + bkeeping.showDialog("Are you sure you want to delete " + thingtype + " " + id + "?"); + $('#bkeeping_dialog').dialog('option', 'buttons', { "CANCEL": function() { $(this).dialog("close"); }, "DELETE": goAhead }); + return true; }, + addedEdited: function(jsonData) + { + bkeeping.debug("addedEdited: returned jsonData:"); + bkeeping.debug(jsonData); + alert('Recored added/edited. Reloading UI to display updates.'); + var loc = document.location.href; + if (loc.indexOf('?') != -1) + { + loc = loc.substring(0, loc.indexOf('?')); + } + if (!DEBUG) + { + document.location.href = loc + '?timestamp=' + new Date().getTime(); + } + }, + + wrapFormAsObj: function() + { + var pars = {}; + var fields = $(".data_field"); + for (var i = 0; i < fields.length; i++) + { + var field = fields[i]; + var n = field.id.substring(field.id.lastIndexOf('_') + 1); + var v = $(field).val(); + bkeeping.debug('wrapFormAsObj: found ' + n + '/' + v); + pars[n] = v; + } + return pars; + }, + + getAccountsAsOptionsList: function() + { + // we have to assume they're cached, coz this is a synchronous call + var html = ""; + var accounts = bkeeping.cache.accounts; + for (var i = 0; i < accounts.length; i++) + { + var id = accounts[i].account.id; + var nam = accounts[i].account.name; + if (id) + { + html += ''; + } + } + return html; + }, + + getCounterWeight: function(type) + { + switch (type) + { + case "asset": + return "debit"; + case "expense": + return "debit"; + case "liability": + return "credit"; + case "revenue": + return "credit"; + default: + return "credit"; + } + }, + + getCurrentDate: function() + { + var d = new Date(); + var day = d.getDate(); + var month = d.getMonth() + 1; + var year = d.getFullYear(); + if (day < 10) { day = '0' + day; } + if (month < 10) { month = '0' + month; } + return day + '' + month + '' + year; + }, + + addEditThing: function(thingtype, id) // id is null on adds + { + // raise correct form + var x = eval("AE_" + thingtype.toUpperCase()); + var form = x[1]; + // could be vars: + form = form.parse_vars({accounts:bkeeping.getAccountsAsOptionsList()}); + bkeeping.showModalDialog(form); + $('#bkeeping_dialog').dialog('option', 'title', x[0]); + var goAhead = function(thingtype, id) + { + var type = id ? this.EditCommand : this.AddCommand; + var pars = this.wrapFormAsObj(); + pars['date'] = bkeeping.getCurrentDate(); + pars['id'] = id; + pars['jid'] = bkeeping._displayed_journal; + $('#bkeeping_dialog').dialog("close"); + var ret = new type(thingtype, this.addedEdited, pars).run(); + }.bind(this, thingtype, id); + $('#bkeeping_dialog').dialog('option', 'buttons', { "CANCEL": function() { $(this).dialog("close"); }, "SAVE": goAhead }); + return true; + }, + + + addAccount: function() + { + return bkeeping.addEditThing("account", null); + }, + editAccount: function() { @@ -1455,7 +1610,7 @@ var bkeeping = { bkeeping.ACTIVE_SESSION = new bkeeping.Session(); // load from cookie if present if (!$("#bkeeping_dialog").length) { - // $("body").append(DIALOG_HOLDER); + $("body").append(DIALOG_HOLDER); } //bkeeping.page_init(); // initializations related to the page we're on //bkeeping.page_loader_init(); // initializations defined on the page we're on -- 2.11.4.GIT