Create Tx completed
This commit is contained in:
@@ -20,7 +20,7 @@ Goal #3, _functional software to assist civil liberties resistances in repressiv
|
||||
Release schedule
|
||||
----------------
|
||||
|
||||
Stable releases are built every six months, at the end of every calendar half-year. Sprints are built every two weeks. Internal builds are built all the time and can be tested at http://dev.swarmops.com/ which doesn't require a login.
|
||||
Stable releases are built every six months, at the end of every calendar half-year. Sprints are built every two weeks. Internal builds are built all the time and can be tested at http://sandbox.swarmops.com/ which doesn't require a login.
|
||||
|
||||
This is the plan, at least. "Stable" is a somewhat wide definition at the moment. Rather, Swarmops has a few functions to go to enter Open Beta stage.
|
||||
|
||||
@@ -30,7 +30,7 @@ Countdown to Open Beta
|
||||
|
||||
The features missing for the Open Beta, with some sort of feature-completeness, are these:
|
||||
|
||||
- [ ] enter ledger transactions manually
|
||||
- [x] enter ledger transactions manually
|
||||
- [ ] send invoices (and receive payment in bitcoin)
|
||||
- [ ] delegate budgets
|
||||
- [ ] self-signup mails
|
||||
|
||||
+63
@@ -897,6 +897,69 @@ namespace Resources.Pages {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Create Transaction.
|
||||
/// </summary>
|
||||
internal static string InspectLedgers_CreateTransactionButton {
|
||||
get {
|
||||
return ResourceManager.GetString("InspectLedgers_CreateTransactionButton", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Date and time of transaction (UTC).
|
||||
/// </summary>
|
||||
internal static string InspectLedgers_CreateTransactionDateTime {
|
||||
get {
|
||||
return ResourceManager.GetString("InspectLedgers_CreateTransactionDateTime", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Transaction Description.
|
||||
/// </summary>
|
||||
internal static string InspectLedgers_CreateTransactionDescription {
|
||||
get {
|
||||
return ResourceManager.GetString("InspectLedgers_CreateTransactionDescription", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Creating New Transaction.
|
||||
/// </summary>
|
||||
internal static string InspectLedgers_CreateTransactionDialogHeader {
|
||||
get {
|
||||
return ResourceManager.GetString("InspectLedgers_CreateTransactionDialogHeader", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Account of first transaction row.
|
||||
/// </summary>
|
||||
internal static string InspectLedgers_CreateTransactionFirstAccount {
|
||||
get {
|
||||
return ResourceManager.GetString("InspectLedgers_CreateTransactionFirstAccount", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Amount of first transaction row.
|
||||
/// </summary>
|
||||
internal static string InspectLedgers_CreateTransactionFirstAmount {
|
||||
get {
|
||||
return ResourceManager.GetString("InspectLedgers_CreateTransactionFirstAmount", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Add new transaction.
|
||||
/// </summary>
|
||||
internal static string InspectLedgers_CreateTransactionSidebar {
|
||||
get {
|
||||
return ResourceManager.GetString("InspectLedgers_CreateTransactionSidebar", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Viewing/Editing Transaction #<span id="spanModalTransactionId">67890</span>.
|
||||
/// </summary>
|
||||
|
||||
@@ -812,4 +812,28 @@
|
||||
<value>Profit to date ({0})</value>
|
||||
<comment>The {0} is the year of the report</comment>
|
||||
</data>
|
||||
<data name="InspectLedgers_CreateTransactionButton" xml:space="preserve">
|
||||
<value>Create Transaction</value>
|
||||
<comment>Text on button for executing create</comment>
|
||||
</data>
|
||||
<data name="InspectLedgers_CreateTransactionDateTime" xml:space="preserve">
|
||||
<value>Date and time of transaction (UTC)</value>
|
||||
</data>
|
||||
<data name="InspectLedgers_CreateTransactionDescription" xml:space="preserve">
|
||||
<value>Transaction Description</value>
|
||||
</data>
|
||||
<data name="InspectLedgers_CreateTransactionDialogHeader" xml:space="preserve">
|
||||
<value>Creating New Transaction</value>
|
||||
<comment>Header of dialog</comment>
|
||||
</data>
|
||||
<data name="InspectLedgers_CreateTransactionFirstAccount" xml:space="preserve">
|
||||
<value>Account of first transaction row</value>
|
||||
</data>
|
||||
<data name="InspectLedgers_CreateTransactionFirstAmount" xml:space="preserve">
|
||||
<value>Amount of first transaction row</value>
|
||||
</data>
|
||||
<data name="InspectLedgers_CreateTransactionSidebar" xml:space="preserve">
|
||||
<value>Add new transaction</value>
|
||||
<comment>Option in sidebar</comment>
|
||||
</data>
|
||||
</root>
|
||||
@@ -13,7 +13,7 @@
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
|
||||
$('#spanActionAddTransaction').click(function() {
|
||||
$('#divActionAddTransaction').click(function() {
|
||||
if (canWriteRows) {
|
||||
<%=this.DialogCreateTx.ClientID%>_open();
|
||||
<%=this.TextCreateTxAmount.ClientID%>_initialize('');
|
||||
@@ -112,7 +112,6 @@
|
||||
$("#buttonCreateTransaction").css("visibility", "visible");
|
||||
console.log(result);
|
||||
if (result.Success) {
|
||||
alert("New transaction has identity " + result.ObjectIdentity);
|
||||
<%=this.DialogCreateTx.ClientID%>_close();
|
||||
onInspectTransaction(result.ObjectIdentity);
|
||||
}
|
||||
@@ -398,19 +397,19 @@
|
||||
|
||||
<Swarmops5:ModalDialog ID="DialogCreateTx" runat="server">
|
||||
<DialogCode>
|
||||
<h2><asp:Label runat="server" ID="LabelCreateTxDialogHeader">Creating Transaction</asp:Label></h2>
|
||||
<h2><asp:Label runat="server" ID="LabelCreateTxDialogHeader">Creating Transaction XYZ</asp:Label></h2>
|
||||
<div class="entryFields">
|
||||
<Swarmops5:AjaxTextBox ID="TextCreateTxDateTime" runat="server"/>
|
||||
<Swarmops5:AjaxTextBox ID="TextCreateTxDescription" runat="server"/>
|
||||
<Swarmops5:ComboBudgets ID="DropBudgetsCreateTx" ListType="All" runat="server"/>
|
||||
<Swarmops5:CurrencyTextBox ID="TextCreateTxAmount" runat="server"/>
|
||||
<input type="button" id="buttonCreateTransaction" class="NoInputFocus buttonAccentColor" value="Create XYZ"/>
|
||||
<input type="button" id="buttonCreateTransaction" class="NoInputFocus buttonAccentColor" value="<%= this.Localized_CreateTx %>"/>
|
||||
</div>
|
||||
<div class="entryLabels">
|
||||
Date and Time XYZ<br/>
|
||||
Description XYZ<br/>
|
||||
First transaction row's account<br/>
|
||||
First transaction row's amount
|
||||
<asp:Label runat="server" ID="LabelAddTxDateTime" Text="DateTime XYZ"/><br/>
|
||||
<asp:Label runat="server" ID="LabelAddTxDescription" Text="Description XYZ"/><br/>
|
||||
<asp:Label runat="server" ID="LabelAddTxFirstRowAccount" Text="Account XYZ"/><br/>
|
||||
<asp:Label runat="server" ID="LabelAddTxFirstRowAmount" Text="Amount XYZ"/>
|
||||
</div>
|
||||
</DialogCode>
|
||||
</Swarmops5:ModalDialog>
|
||||
@@ -422,7 +421,14 @@
|
||||
<asp:Content ID="Content3" ContentPlaceHolderID="PlaceHolderSide" Runat="Server">
|
||||
<asp:Panel runat="server" ID="PanelCreateTxVisible">
|
||||
<h2 class="blue">ACTIONS<span class="arrow"></span></h2>
|
||||
<div class="box"><span id="spanActionAddTransaction">Add Transaction</span></div>
|
||||
<div class="box">
|
||||
<div class="content">
|
||||
<div class="link-row-encaps" id="divActionAddTransaction">
|
||||
<div class="link-row-icon" style="background-image:url('/Images/Icons/iconshock-invoice-32px.png'); background-position: -1px -1px; background-size: 16px 16px"></div>
|
||||
<asp:Label runat="server" ID="LabelAddTransaction" Text="Add Transaction XYZ"></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</asp:Panel>
|
||||
</asp:Content>
|
||||
|
||||
@@ -108,6 +108,14 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
|
||||
LiteralEditHeader.Text = Resources.Pages.Ledgers.InspectLedgers_InspectingTransactionX;
|
||||
}
|
||||
|
||||
this.LabelCreateTxDialogHeader.Text = Resources.Pages.Ledgers.InspectLedgers_CreateTransactionDialogHeader;
|
||||
this.LabelAddTxDateTime.Text = Resources.Pages.Ledgers.InspectLedgers_CreateTransactionDateTime;
|
||||
this.LabelAddTxDescription.Text = Resources.Pages.Ledgers.InspectLedgers_CreateTransactionDescription;
|
||||
this.LabelAddTxFirstRowAccount.Text = Resources.Pages.Ledgers.InspectLedgers_CreateTransactionFirstAccount;
|
||||
this.LabelAddTxFirstRowAmount.Text = Resources.Pages.Ledgers.InspectLedgers_CreateTransactionFirstAmount;
|
||||
|
||||
this.LabelAddTransaction.Text = Resources.Pages.Ledgers.InspectLedgers_CreateTransactionSidebar;
|
||||
|
||||
// Access helpers to JavaScript (these don't actually determine access, but help in UI prettiness)
|
||||
|
||||
this.LiteralAuditAccess.Text =
|
||||
@@ -466,7 +474,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
|
||||
}
|
||||
|
||||
double amount = Double.Parse(amountString);
|
||||
Int64 amountCents = (Int64) ((amount + 0.005)*100); // safeguard against double rounding errors
|
||||
Int64 amountCents = (Int64) (amount *100);
|
||||
|
||||
DateTime txTime = DateTime.Parse(dateTimeString);
|
||||
|
||||
@@ -485,7 +493,13 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public string Localized_CreateTx
|
||||
{
|
||||
get { return Resources.Pages.Ledgers.InspectLedgers_CreateTransactionButton; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -354,6 +354,42 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers {
|
||||
/// </remarks>
|
||||
protected global::Swarmops.Frontend.Controls.Financial.CurrencyTextBox TextCreateTxAmount;
|
||||
|
||||
/// <summary>
|
||||
/// LabelAddTxDateTime control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelAddTxDateTime;
|
||||
|
||||
/// <summary>
|
||||
/// LabelAddTxDescription control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelAddTxDescription;
|
||||
|
||||
/// <summary>
|
||||
/// LabelAddTxFirstRowAccount control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelAddTxFirstRowAccount;
|
||||
|
||||
/// <summary>
|
||||
/// LabelAddTxFirstRowAmount control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelAddTxFirstRowAmount;
|
||||
|
||||
/// <summary>
|
||||
/// PanelCreateTxVisible control.
|
||||
/// </summary>
|
||||
@@ -362,5 +398,14 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers {
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Panel PanelCreateTxVisible;
|
||||
|
||||
/// <summary>
|
||||
/// LabelAddTransaction control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelAddTransaction;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user