Trying some changes

This commit is contained in:
Rick Falkvinge
2012-01-14 04:20:22 +00:00
parent 935f455500
commit 1bdbcaae83
4 changed files with 200 additions and 8 deletions
@@ -0,0 +1,27 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeFile="PersonDetailPopup.ascx.cs" Inherits="Controls_v5_PersonDetailPopup" %>
<%@ Register Src="~/Controls/v5/Pirates/ComboPerson.ascx" TagName="ComboPerson" TagPrefix="act5" %>
<asp:UpdatePanel ID="UpdateSetter" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<div style="width:96px;height:96px;float:right"><asp:Image ID="ImageAvatar" runat="server" Height="96" Width="96" AlternateText="Avatar" /></div>
<div style="padding:10px;overflow:hidden">
<asp:Panel ID="PanelRead" runat="server" Visible="true">
<span style="line-height:150%"><asp:Label ID="LabelPersonName" runat="server" /><br /><asp:Label ID="LabelPersonIdentity" runat="server" /></span><br /><br /><asp:LinkButton runat="server" Text="Set new owner..." ID="ButtonSetNewOwner" Onclick="ButtonSetNewOwner_Click" />
</asp:Panel>
<asp:Panel ID="PanelWrite" runat="server" Visible="false">
<span style="line-height:150%"><asp:Label ID="LabelWriteLabel" runat="server" Text="Set new owner:" /><br /><act5:ComboPerson ID="PersonNewOwner" runat="server" OnSelectedPersonChanged="PersonNewOwner_SelectedPersonChanged" /></span><br />
<div style="float:right"><asp:LinkButton ID="ButtonConfirmPerson" runat="server" Text="Confirm" OnClick="ButtonConfirmPerson_Click" Visible="false" /></div>
<asp:LinkButton ID="ButtonCancel" runat="server" Text="Cancel" OnClick="ButtonCancel_Click" />
</asp:Panel>
</div>
</ContentTemplate>
<Triggers>
<asp:AsyncPostBackTrigger ControlID="ButtonSetNewOwner" EventName="Click" />
<asp:AsyncPostBackTrigger ControlID="PersonNewOwner" EventName="SelectedPersonChanged" />
<asp:AsyncPostBackTrigger ControlID="ButtonCancel" EventName="Click" />
<asp:PostBackTrigger ControlID="ButtonConfirmPerson" />
</Triggers>
</asp:UpdatePanel>
@@ -0,0 +1,150 @@
using System;
using System.Collections;
using System.Configuration;
using System.Data;
using System.Web;
using System.Web.Security;
using System.Web.UI;
using System.Web.UI.HtmlControls;
using System.Web.UI.WebControls;
using System.Web.UI.WebControls.WebParts;
using Activizr.Logic.Financial;
using Activizr.Logic.Pirates;
using Activizr.Logic.Security;
using Telerik.Web.UI;
public partial class Controls_v5_PersonDetailPopup : ControlV5Base
{
protected void Page_Load(object sender, EventArgs e)
{
object personId = ViewState[this.ClientID + "_PersonId"];
if (personId != null)
{
_person = Person.FromIdentity((int) personId);
}
this.LabelPersonName.Style[HtmlTextWriterStyle.FontSize] = "20px";
this.PersonNewOwner.Width = 167;
}
private Person _person;
private Authority _authority;
public Person Person
{
get
{
if (_person == null)
{
return this.PersonNewOwner.SelectedPerson;
}
return _person;
}
set
{
_person = value;
// this.PersonNewOwner.SelectedPerson = _person;
if (value != null)
{
ViewState[this.ClientID + "_PersonId"] = value.Identity;
this.ImageAvatar.ImageUrl = _person.GetSecureAvatarLink(96);
this.LabelPersonName.Text = _person.Name;
this.LabelPersonIdentity.Text = "#" + _person.Identity.ToString();
}
else
{
ViewState[this.ClientID + "_PersonId"] = null;
this.ImageAvatar.ImageUrl = "https://pirateweb.net/Images/Public/Fugue/icons-shadowless/cross.png";
this.LabelPersonIdentity.Text = "#";
this.LabelPersonName.Text = "Nobody";
}
}
}
/*
public Authority Authority
{
set
{
_authority = value;
this.PersonNewOwner.Authority = value;
}
}*/
public FinancialAccount Account
{
set
{
_account = value;
}
}
private FinancialAccount _account;
protected void ButtonSetNewOwner_Click(object sender, EventArgs e)
{
this.PanelRead.Visible = false;
this.PanelWrite.Visible = true;
this.PersonNewOwner.Focus();
}
public void Reset()
{
this.PanelWrite.Visible = false;
this.PanelRead.Visible = true;
this.ButtonConfirmPerson.Visible = false;
this.PersonNewOwner.SelectedPerson = null;
if (ViewState[this.ClientID + "_PersonId"] == null)
{
this.ImageAvatar.ImageUrl = "https://pirateweb.net/Images/Public/Fugue/icons-shadowless/cross.png";
}
else
{
this.ImageAvatar.ImageUrl = Person.FromIdentity((int) ViewState[this.ClientID + "_PersonId"]).GetSecureAvatarLink(96);
}
}
protected void PersonNewOwner_SelectedPersonChanged(object sender, EventArgs e)
{
this.ImageAvatar.ImageUrl = this.PersonNewOwner.SelectedPerson.GetSecureAvatarLink(96);
this.ButtonConfirmPerson.Visible = true;
}
protected void ButtonConfirmPerson_Click(object sender, EventArgs e)
{
if (this._account == null)
{
throw new InvalidOperationException("Can't set owner for null account");
}
this._account.Owner = this.PersonNewOwner.SelectedPerson;
this._person = this.PersonNewOwner.SelectedPerson;
if (PersonChanged != null)
{
PersonChanged(this, new EventArgs());
}
this.LabelPersonName.Text = _person.Name;
this.LabelPersonIdentity.Text = "#" + _person.Identity.ToString();
Reset();
}
protected void ButtonCancel_Click(object sender, EventArgs e)
{
Reset();
}
public event EventHandler PersonChanged;
}
+8 -4
View File
@@ -1,18 +1,22 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="SetRootBudgets.aspx.cs" Inherits="Pages_v5_Ledgers_SetRootBudgets" %>
<%@ Register src="~/Controls/v5/Pirates/PersonDetailPopup.ascx" tagName="PersonDetailPopup" tagPrefix="act5" %>
<asp:Content ID="Content1" ContentPlaceHolderID="PlaceHolderHead" Runat="Server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="PlaceHolderMain" Runat="Server">
<h2><asp:Label ID="LabelRootBudgetHeader" Text="Root Budgets For Org [LOC]" runat="server" /></h2>
<h2><asp:Label ID="LabelRootBudgetHeader" Text="Root Budgets For Org [LOC]" runat="server" /><div style="float:right"><asp:DropDownList ID="DropYears" runat="server" AutoPostBack="true" OnSelectedIndexChanged="DropYears_SelectedIndexChanged" /></div></h2>
<div class="entrylabels" style="margin-right:30px;width:200px">
<strong><asp:Label ID="LabelYear" Text="Year [LOC]" runat="server" /></strong><br/>
<strong><asp:Label ID="LabelAccountHeader" Text="Account [LOC]" runat="server" /></strong><br/>
<asp:Repeater ID="RepeaterAccountNames" runat="server" OnItemDataBound="RepeaterAccountNames_ItemDataBound" ><ItemTemplate><asp:Label ID="LabelAccountName" runat="server" Text="Unset Account Name" /> <em>(<asp:Label ID="LabelAccountType" runat="server" Text="Type [LOC]" />)</em><br /></ItemTemplate></asp:Repeater>
</div>
<div class="entryfields">
<strong><asp:DropDownList ID="DropYears" runat="server" AutoPostBack="true" OnSelectedIndexChanged="DropYears_SelectedIndexChanged" /></strong>&nbsp;<br/>
<asp:Repeater ID="RepeaterAccountBudgets" OnItemDataBound="RepeaterAccountBudgets_ItemDataBound" runat="server"><ItemTemplate><asp:TextBox ID="TextBudget" runat="server" Text="Not set" />&nbsp;<br/></ItemTemplate></asp:Repeater>
<strong>Budget, Owner [LOC]</strong><br/>
<asp:Repeater ID="RepeaterAccountBudgets" OnItemDataBound="RepeaterAccountBudgets_ItemDataBound" runat="server"><ItemTemplate><asp:TextBox ID="TextBudget" runat="server" Text="Not set" />&nbsp;<span style="border-bottom: dashed 1px #808080;cursor:pointer"><asp:Label ID="LabelBudgetOwner" runat="server" /></span><asp:HiddenField ID="HiddenAccountId" runat="server" /><telerik:RadToolTip ID="ToolTip" runat="server" AnimationDuration="150" AutoCloseDelay="200000" ShowDelay="0"
EnableShadow="true" HideDelay="1" Width="288px" Height="96px" HideEvent="ManualClose" OffsetX="30" OffsetY="0"
RelativeTo="Element" Animation="Slide" Position="TopCenter" ShowCallout="true" TargetControlID="LabelBudgetOwner" RenderInPageRoot="true" ShowEvent="OnClick"
Skin="Telerik"><act5:PersonDetailPopup runat="server" ID="PersonDetail" /></telerik:RadToolTip><br/></ItemTemplate></asp:Repeater>
</div>
<div style="clear:both"></div>
+15 -4
View File
@@ -18,7 +18,7 @@ public partial class Pages_v5_Ledgers_SetRootBudgets : PageV5Base
if (!Page.IsPostBack)
{
FinancialAccounts accounts = GetRootLevelAccounts();
FinancialAccounts accounts = GetRootLevelResultAccounts();
int currentYear = DateTime.Today.Year;
_year = currentYear;
@@ -83,19 +83,30 @@ public partial class Pages_v5_Ledgers_SetRootBudgets : PageV5Base
textBudget.Text = String.Format("{0:N0}", account.GetBudgetCents(_year)/100);
textBudget.Style[HtmlTextWriterStyle.TextAlign] = "right";
textBudget.Style[HtmlTextWriterStyle.Width] = "150px";
textBudget.Style[HtmlTextWriterStyle.Width] = "80px";
Label labelOwnerName = (Label) e.Item.FindControl("LabelBudgetOwner");
if (account.Owner == null)
{
labelOwnerName.Text = "None [LOC]";
}
else
{
labelOwnerName.Text = account.Owner.Formal;
}
}
protected void DropYears_SelectedIndexChanged(object sender, EventArgs e)
{
FinancialAccounts accounts = GetRootLevelAccounts();
FinancialAccounts accounts = GetRootLevelResultAccounts();
this.RepeaterAccountBudgets.DataSource = accounts;
this.RepeaterAccountBudgets.DataBind();
}
private FinancialAccounts GetRootLevelAccounts()
private FinancialAccounts GetRootLevelResultAccounts()
{
FinancialAccounts allAccounts = FinancialAccounts.ForOrganization(_currentOrganization, FinancialAccountType.Result);