Work on Expensify

This commit is contained in:
Rick Falkvinge
2018-03-03 12:39:54 +01:00
parent 3e2043b939
commit b05da299ed
2 changed files with 8 additions and 1 deletions
@@ -99,6 +99,10 @@
<%=this.CurrencyModalExpensifyAmountVat.ClientID%>_initialize(result.AmountVat);
$('#textModalExpensifyDescription').val(result.Description);
<%=this.DialogEditExpenseClaim.ClientID%>_open();
$('#imgModalDocument').attr('src', '/Pages/v5/Support/StreamUpload.aspx?DocId={0}');
$('#imgModalDocument').attr('data-zoom-image', '/Pages/v5/Support/StreamUpload.aspx?DocId={0}&hq=1');
$('.zoomContainer').destroy();
$('#imgModalDocument').elevateZoom();
}
});
}
@@ -323,6 +327,7 @@
<Swarmops5:ModalDialog ID="DialogEditExpenseClaim" runat="server">
<DialogCode>
<h2>Editing Expense Claim</h2>
<div class="elementFloatFar" style="width: 200px;padding:10px"><img id="imgModalDocument" style="border: 2px solid #888; width:100%"/></div>
<div class="entryFields">
<div class="stacked-input-control"><input type="text" id="textModalExpensifyDescription" /></div>
<Swarmops5:ComboBudgets ID="DropBudgets" ListType="Expensable" runat="server"/>
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Net;
using System.Text.RegularExpressions;
using System.Threading;
@@ -594,6 +595,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial
Amount = (recordList[index].AmountCents / 100.0).ToString("N2"),
AmountVat = (recordList[index].VatCents / 100.0).ToString("N2"),
Description = recordList[index].Description,
DocumentId = recordList[index].Documents.First().Identity,
Guid = recordGuid,
ExistNext = (index < recordList.Count - 1? true: false),
Success = true
@@ -802,7 +804,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial
public string Amount { get; set; }
public string AmountVat { get; set; }
public string Description { get; set; }
public string DocumentId { get; set; }
public int DocumentId { get; set; }
public string Guid { get; set; }
public bool ExistNext { get; set; }
}