diff --git a/Site/Pages/v5/Financial/FileExpenseClaim.aspx b/Site/Pages/v5/Financial/FileExpenseClaim.aspx
index 03150b71..1f9596fc 100644
--- a/Site/Pages/v5/Financial/FileExpenseClaim.aspx
+++ b/Site/Pages/v5/Financial/FileExpenseClaim.aspx
@@ -133,6 +133,27 @@
$('#expensifyDataGrid').datagrid({});
$('#expensifyDataGrid').datagrid('loadData', result.Data);
+ // Fill in documents (hidden)
+
+
+
+ // Enable document viewing
+
+ $('#divDocumentsHidden').html(result.Documents);
+
+ $("a.FancyBox_Gallery").fancybox({
+ 'overlayShow': true,
+ 'transitionIn': 'fade',
+ 'transitionOut': 'fade',
+ 'type': 'image',
+ 'opacity': true
+ });
+
+ $(".LocalViewDox").click(function () {
+ $("a.FancyBox_Gallery[rel='" + $(this).attr("firstDocId") + "']").first().click();
+ });
+
+
} else {
// Make a brutal transition to failure view
@@ -266,6 +287,8 @@
+
+
diff --git a/Site/Pages/v5/Financial/FileExpenseClaim.aspx.cs b/Site/Pages/v5/Financial/FileExpenseClaim.aspx.cs
index 7b27d04e..78a8e456 100644
--- a/Site/Pages/v5/Financial/FileExpenseClaim.aspx.cs
+++ b/Site/Pages/v5/Financial/FileExpenseClaim.aspx.cs
@@ -512,7 +512,15 @@ namespace Swarmops.Frontend.Pages.v5.Financial
List outputRecords = new List();
string doxString =
- "
";
+ "
";
+
+ string editString =
+ "
";
+
+ string docString =
+ "";
+
+ string documentsAll = String.Empty;
foreach (ExpensifyRecord record in recordList)
{
@@ -522,17 +530,23 @@ namespace Swarmops.Frontend.Pages.v5.Financial
CreatedDateTime = record.Timestamp.ToString("MMM dd"),
Amount = (record.AmountCents / 100.0).ToString("N2"),
AmountVat = (record.VatCents / 100.0).ToString("N2"),
- Actions = String.Format(doxString, "D" + documents[0].Identity.ToString(CultureInfo.InvariantCulture)) + " | ",
+ Actions = String.Format(doxString, "D" + record.Documents[0].Identity.ToString(CultureInfo.InvariantCulture)) + " " + String.Format(editString, record.Guid),
Guid = record.Guid
});
- // TODO: ADD DOCUMENTS TO SOMETHING
+ foreach (Document document in record.Documents)
+ {
+ documentsAll += String.Format(docString, document.Identity,
+ document.ClientFileName.Replace("\"", "'"),
+ "D" + record.Documents[0].Identity.ToString(CultureInfo.InvariantCulture));
+ }
}
AjaxCallExpensifyUploadResult result = new AjaxCallExpensifyUploadResult
{
Success = true,
- Data = outputRecords.ToArray()
+ Data = outputRecords.ToArray(),
+ Documents = documentsAll
};
GuidCache.Set("Results-" + guidFiles, result);
@@ -743,7 +757,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial
{
public string ErrorType { get; set; }
public ExpensifyOutputRecord[] Data { get; set; }
- public string FancyBoxDocuments { get; set; }
+ public string Documents { get; set; }
}