diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj
index f4fa70bc..f63d8617 100644
--- a/Logic/Logic.csproj
+++ b/Logic/Logic.csproj
@@ -246,6 +246,8 @@
+
+
diff --git a/Logic/Support/LogEntries/FinancialActionBase.cs b/Logic/Support/LogEntries/FinancialActionBase.cs
index 01c69a3a..c44269f7 100644
--- a/Logic/Support/LogEntries/FinancialActionBase.cs
+++ b/Logic/Support/LogEntries/FinancialActionBase.cs
@@ -15,6 +15,9 @@ namespace Swarmops.Logic.Support.LogEntries
public string Description { get; set; }
public int OwnerPersonId { get; set; }
public string OwnerPersonName { get; set; }
+ ///
+ /// Always in UTC
+ ///
public DateTime DateTime { get; set; }
}
}
\ No newline at end of file
diff --git a/Logic/Support/LogEntries/MembershipActionBase.cs b/Logic/Support/LogEntries/MembershipActionBase.cs
new file mode 100644
index 00000000..b3a90df6
--- /dev/null
+++ b/Logic/Support/LogEntries/MembershipActionBase.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Swarmops.Logic.Support.LogEntries
+{
+ [Serializable]
+ public class MembershipActionBase: LogEntryBase
+ {
+ public MembershipActionBase()
+ {
+ // do not call public ctor directly. Intended for serialization only.
+ }
+
+ public int MembershipId { get; set; }
+ ///
+ /// Always in UTC
+ ///
+ public DateTime DateTime { get; set; }
+ public int ActingPersonId { get; set; }
+ }
+}
diff --git a/Logic/Support/LogEntries/PersonAddedLogEntry.cs b/Logic/Support/LogEntries/PersonAddedLogEntry.cs
new file mode 100644
index 00000000..97246ff8
--- /dev/null
+++ b/Logic/Support/LogEntries/PersonAddedLogEntry.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Swarmops.Logic.Swarm;
+
+namespace Swarmops.Logic.Support.LogEntries
+{
+ [Serializable]
+ public class PersonAddedLogEntry: MembershipActionBase
+ {
+ [Obsolete("Do not call empty ctor directly. Intended for serialization only.", true)]
+ public PersonAddedLogEntry()
+ {
+ // Do not call empty ctor directly. Intended for serialization only.
+ }
+
+ public PersonAddedLogEntry (Membership membership, Person actingPerson)
+ {
+ DateTime = System.DateTime.UtcNow;
+ MembershipId = membership.Identity;
+ ActingPersonId = actingPerson.Identity;
+ }
+ }
+}
diff --git a/Site5/App_Code/FieldValidation.cs b/Site5/App_Code/FieldValidation.cs
index 605bc7a8..8ea166f2 100644
--- a/Site5/App_Code/FieldValidation.cs
+++ b/Site5/App_Code/FieldValidation.cs
@@ -58,34 +58,8 @@ public class FieldValidation : WebService
[WebMethod]
- public bool IsAmountValid (string amount)
+ public bool IsDateValid (string input)
{
- CultureInfo culture = GetUserCulture();
-
- // Try to parse the string we got as a double
-
- try
- {
- Double.Parse (HttpUtility.UrlDecode (amount), NumberStyles.Number, culture);
- return true;
- }
- catch (Exception)
- {
- }
-
- return false;
- }
-
- [WebMethod]
- public bool AreDocumentsUploaded (string guidString)
- {
- Documents documents = Documents.RecentFromDescription (guidString);
-
- if (documents.Count == 0)
- {
- return false;
- }
-
- return true;
+
}
}
\ No newline at end of file
diff --git a/Site5/App_GlobalResources/Pages.Swarm.resx b/Site5/App_GlobalResources/Pages.Swarm.resx
index b43f6955..441be6ac 100644
--- a/Site5/App_GlobalResources/Pages.Swarm.resx
+++ b/Site5/App_GlobalResources/Pages.Swarm.resx
@@ -120,6 +120,9 @@
A valid city is required.
+
+ Provide a valid date or leave this field empty.
+
A valid email is required.
diff --git a/Site5/Automation/FieldValidation.aspx.cs b/Site5/Automation/FieldValidation.aspx.cs
index 289f0793..199d49b2 100644
--- a/Site5/Automation/FieldValidation.aspx.cs
+++ b/Site5/Automation/FieldValidation.aspx.cs
@@ -1,7 +1,9 @@
using System;
using System.Collections.Generic;
+using System.Globalization;
using System.Web.Services;
using Swarmops.Logic.Structure;
+using Swarmops.Logic.Support;
namespace Swarmops.Frontend.Automation
{
@@ -11,6 +13,15 @@ namespace Swarmops.Frontend.Automation
{
}
+ [WebMethod]
+ public static bool IsDateValid (string input)
+ {
+ AuthenticationData authenticationData = GetAuthenticationDataAndCulture(); // sets culture
+
+ DateTime dummyResult;
+ return DateTime.TryParse (input, out dummyResult);
+ }
+
[WebMethod]
public static void TestFoo (string input)
{
@@ -19,6 +30,42 @@ namespace Swarmops.Frontend.Automation
System.Diagnostics.Trace.WriteLine (input);
}
+
+ [WebMethod]
+ public bool IsAmountValid(string amount)
+ {
+ AuthenticationData authData = GetAuthenticationDataAndCulture(); // sets culture
+
+ // Try to parse the string we got as a double
+
+ try
+ {
+ Double.Parse(amount, NumberStyles.Number);
+ return true;
+ }
+ catch (Exception)
+ {
+ }
+
+ return false;
+ }
+
+ [WebMethod]
+ public bool AreDocumentsUploaded(string guidString)
+ {
+ Documents documents = Documents.RecentFromDescription(guidString);
+
+ if (documents.Count == 0)
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+
+
+
[WebMethod]
public static PostalCodesCities GetPostalCodesCities (string countryCode)
{
diff --git a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx
index 583e2a3c..2865a7a0 100644
--- a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx
+++ b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx
@@ -31,12 +31,9 @@
});
-
-
-
function validateFields() {
var isValid = true;
-
+
isValid = validateTextField('#<%=this.TextAccount.ClientID %>', "") && isValid;
if ($('#<%=this.ComboBudgets.ClientID %>_DropBudgets').combotree('tree').tree('getSelected') == null) {
@@ -55,14 +52,17 @@
isValid = validateTextField('#<%=this.TextPurpose.ClientID %>', "") && isValid;
+ var jsonData = {};
+ jsonData.amount = $('#<%=this.TextAmount.ClientID %>').val();
+
$.ajax({
type: "POST",
- url: "/Automation/FieldValidation.asmx/IsAmountValid",
- data: "{'amount': '" + escape($('#<%=this.TextAmount.ClientID %>').val()) + "'}",
+ url: "/Automation/FieldValidation.aspx/IsAmountValid",
+ data: $.toJSON(jsonData),
contentType: "application/json; charset=utf-8",
dataType: "json",
- async: false, // blocks until function returns - race conditions otherwise
- success: function (msg) {
+ async: false, // blocks until function returns - race conditions otherwise
+ success: function(msg) {
if (msg.d != true) {
isValid = false;
$('#TextAmount').addClass("entryError");
@@ -74,7 +74,7 @@
$.ajax({
type: "POST",
- url: "/Automation/FieldValidation.asmx/AreDocumentsUploaded",
+ url: "/Automation/FieldValidation.aspx/AreDocumentsUploaded",
data: "{'guidString': '<%=this.FileUpload.GuidString %>'}",
contentType: "application/json; charset=utf-8",
dataType: "json",
diff --git a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs
index 677362a0..2c10e459 100644
--- a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs
+++ b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs
@@ -104,6 +104,8 @@ namespace Swarmops.Frontend.Pages.v5.Financial
}
EasyUIControlsUsed = EasyUIControl.Tree;
+ IncludedControlsUsed = IncludedControl.JsonParameters;
+ ;
}
diff --git a/Site5/Pages/v5/Financial/FileExpenseClaim.aspx b/Site5/Pages/v5/Financial/FileExpenseClaim.aspx
index 7f3da5d9..942bb8a2 100644
--- a/Site5/Pages/v5/Financial/FileExpenseClaim.aspx
+++ b/Site5/Pages/v5/Financial/FileExpenseClaim.aspx
@@ -49,10 +49,13 @@
isValid = validateTextField('#<%=this.TextPurpose.ClientID %>', "") && isValid;
+ var jsonData = {};
+ jsonData.amount = $('#<%=this.TextAmount.ClientID %>').val();
+
$.ajax({
type: "POST",
- url: "/Automation/FieldValidation.asmx/IsAmountValid",
- data: "{'amount': '" + escape($('#<%=this.TextAmount.ClientID %>').val()) + "'}",
+ url: "/Automation/FieldValidation.aspx/IsAmountValid",
+ data: $.toJSON(jsonData),
contentType: "application/json; charset=utf-8",
dataType: "json",
async: false, // blocks until function returns - race conditions otherwise
@@ -68,7 +71,7 @@
$.ajax({
type: "POST",
- url: "/Automation/FieldValidation.asmx/AreDocumentsUploaded",
+ url: "/Automation/FieldValidation.aspx/AreDocumentsUploaded",
data: "{'guidString': '<%=this.FileUpload.GuidString %>'}",
contentType: "application/json; charset=utf-8",
dataType: "json",
diff --git a/Site5/Pages/v5/Financial/RequestCashAdvance.aspx b/Site5/Pages/v5/Financial/RequestCashAdvance.aspx
index 9070b2bc..7ba74aa7 100644
--- a/Site5/Pages/v5/Financial/RequestCashAdvance.aspx
+++ b/Site5/Pages/v5/Financial/RequestCashAdvance.aspx
@@ -19,10 +19,13 @@
isValid = validateTextField('#<%=this.TextPurpose.ClientID %>', "") && isValid;
+ var jsonData = {};
+ jsonData.amount = $('#<%=this.TextAmount.ClientID %>').val();
+
$.ajax({
type: "POST",
- url: "/Automation/FieldValidation.asmx/IsAmountValid",
- data: "{'amount': '" + escape($('#<%=this.TextAmount.ClientID %>').val()) + "'}",
+ url: "/Automation/FieldValidation.aspx/IsAmountValid",
+ data: $.toJSON(jsonData),
contentType: "application/json; charset=utf-8",
dataType: "json",
async: false, // blocks until function returns - race conditions otherwise
diff --git a/Site5/Pages/v5/Swarm/AddPerson.aspx b/Site5/Pages/v5/Swarm/AddPerson.aspx
index 4542d065..3548bb06 100644
--- a/Site5/Pages/v5/Swarm/AddPerson.aspx
+++ b/Site5/Pages/v5/Swarm/AddPerson.aspx
@@ -137,6 +137,29 @@
isValid = ValidateTextField('#<%= TextMail.ClientID %>', "") && isValid;
isValid = ValidateTextField('#<%= TextName.ClientID %>', "") && isValid; // TODO: Actually validate geography?
+ var dateFieldContents = $('#<%= TextDateOfBirth.ClientID%>').val();
+ if (dateFieldContents.length > 0) {
+
+ alert('testing');
+
+ $.ajax({
+ type: "POST",
+ url: "/Automation/FieldValidation.aspx/IsDateValid",
+ data: "{'amount': '" + escape($('#<%=this.TextAmount.ClientID %>').val()) + "'}",
+ contentType: "application/json; charset=utf-8",
+ dataType: "json",
+ async: false, // blocks until function returns - race conditions otherwise
+ success: function (msg) {
+ if (msg.d != true) {
+ isValid = false;
+ $('#TextAmount').addClass("entryError");
+ alertify.error("");
+ $('#<%=this.TextAmount.ClientID %>').focus();
+ }
+ }
+ });
+ }
+
return isValid;
}
diff --git a/Site5/Pages/v5/Swarm/AddPerson.aspx.cs b/Site5/Pages/v5/Swarm/AddPerson.aspx.cs
index 9348a291..e3ea41c8 100644
--- a/Site5/Pages/v5/Swarm/AddPerson.aspx.cs
+++ b/Site5/Pages/v5/Swarm/AddPerson.aspx.cs
@@ -111,14 +111,7 @@ namespace Swarmops.Frontend.Pages.v5.Swarm
OutboundComm.CreateMembershipLetter (ParticipantMailType.MemberAddedWelcome, newMembership, CurrentUser);
- // Person.Create()
-
- // Send notify
-
- // "Welcome to Swarmops. Your password is:\r\n\r\n" + randomPassword;
-
- // Send password in mail
-
+ // TODO: LOG
// Clear form and make way for next person