diff --git a/Site5/Pages/v5/Finance/Json-ExpensableBudgetsTree.aspx b/Site5/Pages/v5/Finance/Json-ExpensableBudgetsTree.aspx new file mode 100644 index 00000000..042c9386 --- /dev/null +++ b/Site5/Pages/v5/Finance/Json-ExpensableBudgetsTree.aspx @@ -0,0 +1 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Json-ExpensableBudgetsTree.aspx.cs" Inherits="Pages_v5_Finance_Json_ExpensableBudgetsTree" %> \ No newline at end of file diff --git a/Site5/Pages/v5/Finance/Json-ExpensableBudgetsTree.aspx.cs b/Site5/Pages/v5/Finance/Json-ExpensableBudgetsTree.aspx.cs new file mode 100644 index 00000000..7b535523 --- /dev/null +++ b/Site5/Pages/v5/Finance/Json-ExpensableBudgetsTree.aspx.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Activizr.Logic.Financial; +using Activizr.Logic.Pirates; +using Activizr.Logic.Security; +using Activizr.Logic.Structure; + +public partial class Pages_v5_Finance_Json_ExpensableBudgetsTree : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + // Current authentication + + string identity = HttpContext.Current.User.Identity.Name; + string[] identityTokens = identity.Split(','); + + string userIdentityString = identityTokens[0]; + string organizationIdentityString = identityTokens[1]; + + int currentUserId = Convert.ToInt32(userIdentityString); + int currentOrganizationId = Convert.ToInt32(organizationIdentityString); + + Person currentUser = Person.FromIdentity(currentUserId); + Authority authority = currentUser.GetAuthority(); + Organization currentOrganization = Organization.FromIdentity(currentOrganizationId); + + // Get accounts + + FinancialAccounts accounts = currentOrganization.FinancialAccounts.ExpensableAccounts; + + // Build tree (there should be a template for this) + + Dictionary> treeMap = new Dictionary>(); + + foreach (FinancialAccount account in accounts) + { + if (!treeMap.ContainsKey(account.ParentIdentity)) + { + treeMap[account.ParentIdentity] = new List(); + } + + treeMap[account.ParentIdentity].Add(account); + } + + Response.ContentType = "application/json"; + + Response.Output.WriteLine(RecurseTreeMap (treeMap, 0)); + + Response.End(); + } + + private string RecurseTreeMap (Dictionary> treeMap, int node) + { + List elements = new List(); + + foreach (FinancialAccount account in treeMap[node]) + { + string element = string.Format("\"id\":{0},\"text\":\"{1}\"", account.Identity, + account.Name.Replace("\"", "'")); + + if (treeMap.ContainsKey(account.Identity)) + { + element += ",\"children\":" + RecurseTreeMap(treeMap, account.Identity); + } + + elements.Add("{" + element + "}"); + } + + return "[" + String.Join(",", elements.ToArray()) + "]"; + + } +} \ No newline at end of file diff --git a/Site5/Pages/v5/Finance/RequestCashAdvance.aspx b/Site5/Pages/v5/Finance/RequestCashAdvance.aspx index ce256063..8fccaaf5 100644 --- a/Site5/Pages/v5/Finance/RequestCashAdvance.aspx +++ b/Site5/Pages/v5/Finance/RequestCashAdvance.aspx @@ -1,14 +1,15 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="RequestCashAdvance.aspx.cs" Inherits="Pages_v5_Finance_RequestCashAdvance" %> - + +
 
 
-  
+  
 
 
 
diff --git a/Site5/Pages/v5/Finance/RequestCashAdvance.aspx.cs b/Site5/Pages/v5/Finance/RequestCashAdvance.aspx.cs index dde1d41e..8dbbaac7 100644 --- a/Site5/Pages/v5/Finance/RequestCashAdvance.aspx.cs +++ b/Site5/Pages/v5/Finance/RequestCashAdvance.aspx.cs @@ -24,18 +24,6 @@ public partial class Pages_v5_Finance_RequestCashAdvance : PageV5Base this.TextAccount.Text = this.CurrentUser.BankAccount; this.TextAmount.Text = 0.ToString("N2"); this.TextAmount.Focus(); - - // Prime budget dropdown - - this.DropBudgets.Items.Clear(); - this.DropBudgets.Items.Add(new ListItem(Resources.Global.Global_DropInits_SelectFinancialAccount, "0")); - - FinancialAccounts accounts = this.CurrentOrganization.FinancialAccounts.ExpensableAccounts; - - foreach (FinancialAccount account in accounts) - { - this.DropBudgets.Items.Add(new ListItem(account.Name, account.Identity.ToString(CultureInfo.InvariantCulture))); - } } } } \ No newline at end of file diff --git a/Site5/Style/style-v5.css b/Site5/Style/style-v5.css index 015171a6..d5b1a644 100644 --- a/Site5/Style/style-v5.css +++ b/Site5/Style/style-v5.css @@ -431,6 +431,11 @@ span.loginalphabetasign top: -2px; left: -2px; box-shadow: 2px 2px 4px #7F5500; + background: #FFC34D; + background: -moz-linear-gradient(top, #FFD580, #FFC34D); + background: -webkit-linear-gradient(top, #FFD580, #FFC34D); + background: linear-gradient(top, #FFD580, #FFC34D); + } @@ -521,11 +526,16 @@ span.loginalphabetasign padding: 0px 10px 0px 15px; } -.entryFields input:not(.buttonAccentColor), .entryFields textarea, .entryFields select +.entryFields input:not(.buttonAccentColor), .entryFields textarea { width: 300px; } +.entryFields select { + width: 330px; + background: white; +} + .entryFields input:not(.buttonAccentColor):focus, .entryFields textarea:focus, .entryFields select:focus { background: #F0F6FF;