diff --git a/Site5/Controls/v5/Swarm/ComboPeople.ascx b/Site5/Controls/v5/Swarm/ComboPeople.ascx index 3ddd80c1..b47a2cf1 100644 --- a/Site5/Controls/v5/Swarm/ComboPeople.ascx +++ b/Site5/Controls/v5/Swarm/ComboPeople.ascx @@ -5,15 +5,16 @@ $('#<%=this.ClientID %>_DropPeople').combobox({ animate: true, height: 30, - loader: autoCompleteLoader, + loader: <%=this.ClientID %>_autoCompleteLoader, mode: 'remote', valueField: 'id', textField: 'name', - formatter: formatItem, + formatter: <%=this.ClientID %>_formatItem, onSelect: function (person) { + // update avatar when person selected - + $.ajax({ url: '/Automation/Json-GetPersonAvatar.aspx', dataType: 'json', @@ -28,6 +29,13 @@ error.apply(this, arguments); } }); + + // call owner, if we have a callback + + <% if (!String.IsNullOrEmpty(this.OnClientSelect)) { + Response.Write (this.OnClientSelect + "(person.id);"); + } %> + } }); @@ -58,7 +66,7 @@ }); }); - var autoCompleteLoader = function(param,success,error){ + var <%=this.ClientID %>_autoCompleteLoader = function(param,success,error){ var q = param.q || ''; if (q.length < 3) { success (new Array()); @@ -81,7 +89,7 @@ return false; }; - function formatItem(row) + function <%=this.ClientID %>_formatItem(row) { var s = '' + row.name + ''; return s; diff --git a/Site5/Controls/v5/Swarm/ComboPeople.ascx.cs b/Site5/Controls/v5/Swarm/ComboPeople.ascx.cs index b8c36857..528ff5c5 100644 --- a/Site5/Controls/v5/Swarm/ComboPeople.ascx.cs +++ b/Site5/Controls/v5/Swarm/ComboPeople.ascx.cs @@ -17,6 +17,8 @@ namespace Swarmops.Controls.Financial public Person Selected { set; protected get; } + public string OnClientSelect { set; protected get; } + public bool NobodySelected { set; protected get; } } } \ No newline at end of file diff --git a/Site5/Pages/v5/Ledgers/AccountPlan.aspx b/Site5/Pages/v5/Ledgers/AccountPlan.aspx index ffd8f083..28dbbf27 100644 --- a/Site5/Pages/v5/Ledgers/AccountPlan.aspx +++ b/Site5/Pages/v5/Ledgers/AccountPlan.aspx @@ -179,7 +179,7 @@ contentType: "application/json; charset=utf-8", dataType: "json", success: function(msg) { // TODO: This needs four return values - changed, broken and changed, invalid, or not changed. Also, formatted number - if (msg.d.Result == "Invalid" || msg.d.Result == "NoPermission") { + if (msg.d.Result == 3 || msg.d.Result == 4) { // Invalid or NoPermission $('#TextAccountBudget').css('background-color', '#FFA0A0'); alertify.error("There was an error attempting to set your proposed budget."); // TODO: Localize } else { // msg.d.Result should be Changed here @@ -208,6 +208,29 @@ $('#divModalCover').fadeIn(); } + function onOwnerChange(personId) { + $('span#<%= DropOwner.ClientID %>_SpanPeople span input.combo-text').css('background-color', '#FFFFE0'); + $.ajax({ + type: "POST", + url: "AccountPlan.aspx/SetAccountOwner", + data: "{'accountId':'" + escape(accountId) + "','newOwnerId':'" + escape(personId) + "'}", + contentType: "application/json; charset=utf-8", + dataType: "json", + success: function(msg) { + if (msg.d) { // all went ok + $('span#<%= DropOwner.ClientID %>_SpanPeople span input.combo-text').css('background-color', '#E0FFE0'); + accountDirty = true; + } else { + $('span#<%= DropOwner.ClientID %>_SpanPeople span input.combo-text').css('background-color', '#FFA0A0'); + // TODO: Reset combo box + alertify.error("There was an error setting the budget owner."); // TODO: Localize + } + $('span#<%= DropOwner.ClientID %>_SpanPeople span input.combo-text').animate({ backgroundColor: "#FFFFFF" }, 250); + } + }); + } + + var currentYear = <%=DateTime.Today.Year %>; var modalAccountName = ""; @@ -216,6 +239,8 @@ var accountType = ''; var accountDirty = false; + +