Work in progress on Mass Message

This commit is contained in:
Rick Falkvinge
2016-12-19 21:24:59 +01:00
parent da9eb4c122
commit b08ccaabeb
6 changed files with 126 additions and 18 deletions
+72
View File
@@ -1140,6 +1140,42 @@ namespace Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Officer.
/// </summary>
internal static string Global_Officer_Female {
get {
return ResourceManager.GetString("Global_Officer_Female", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Officer.
/// </summary>
internal static string Global_Officer_Male {
get {
return ResourceManager.GetString("Global_Officer_Male", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Officer.
/// </summary>
internal static string Global_Officer_Neutral {
get {
return ResourceManager.GetString("Global_Officer_Neutral", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Officers.
/// </summary>
internal static string Global_Officer_Plural {
get {
return ResourceManager.GetString("Global_Officer_Plural", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to On.
/// </summary>
@@ -1374,6 +1410,42 @@ namespace Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Volunteer.
/// </summary>
internal static string Global_Volunteer_Female {
get {
return ResourceManager.GetString("Global_Volunteer_Female", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Volunteer.
/// </summary>
internal static string Global_Volunteer_Male {
get {
return ResourceManager.GetString("Global_Volunteer_Male", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Volunteer.
/// </summary>
internal static string Global_Volunteer_Neutral {
get {
return ResourceManager.GetString("Global_Volunteer_Neutral", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Volunteers.
/// </summary>
internal static string Global_Volunteer_Plural {
get {
return ResourceManager.GetString("Global_Volunteer_Plural", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Finish.
/// </summary>
+24
View File
@@ -866,4 +866,28 @@
<data name="Master_EditPerson_PleaseEnable2FA" xml:space="preserve">
<value>If you can, please enable BitID two-factor authentication.</value>
</data>
<data name="Global_Officer_Female" xml:space="preserve">
<value>Officer</value>
</data>
<data name="Global_Officer_Male" xml:space="preserve">
<value>Officer</value>
</data>
<data name="Global_Officer_Neutral" xml:space="preserve">
<value>Officer</value>
</data>
<data name="Global_Officer_Plural" xml:space="preserve">
<value>Officers</value>
</data>
<data name="Global_Volunteer_Female" xml:space="preserve">
<value>Volunteer</value>
</data>
<data name="Global_Volunteer_Male" xml:space="preserve">
<value>Volunteer</value>
</data>
<data name="Global_Volunteer_Neutral" xml:space="preserve">
<value>Volunteer</value>
</data>
<data name="Global_Volunteer_Plural" xml:space="preserve">
<value>Volunteers</value>
</data>
</root>
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="Swarmops.Frontend.Controls.Base.DropDown" Codebehind="DropDown.ascx.cs" %>
<%@ Control Language="C#" AutoEventWireup="true" Inherits="Swarmops.Frontend.Controls.Base.DropDown" CodeFile="DropDown.ascx.cs" %>
<%@ Import Namespace="System.Threading" %>
<script language="javascript" type="text/javascript">
+24 -12
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" Inherits="Swarmops.Frontend.Pages.Comms.SendMassMessage" Codebehind="SendMassMessage.aspx.cs" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" Inherits="Swarmops.Frontend.Pages.Comms.SendMassMessage" CodeFile="SendMassMessage.aspx.cs" %>
<%@ Register src="~/Controls/v5/UI/ExternalScripts.ascx" tagname="ExternalScripts" tagprefix="Swarmops5" %>
<%@ Register src="~/Controls/v5/Base/ComboGeographies.ascx" tagname="ComboGeographies" tagprefix="Swarmops5" %>
@@ -18,16 +18,9 @@
var selectedGeographyId = 1; // TODO: SET ROOT GEOGRAPHY BY AUTHORITY/ACCESS
function onGeographyChange(newGeographyId) {
$.ajax({
type: "POST",
url: "/Pages/v5/Comms/SendMassMessage.aspx/GetRecipientCount",
data: "{'recipientTypeId': '" + $('#<%=this.DropRecipientClasses.ClientID %>').val() + "', 'geographyId':'" + newGeographyId + "'}",
contentType: "application/json; charset=utf-8",
dataType: "json",
success: function (msg) {
$('#spanRecipientCount').text(msg.d);
}
});
var recipientClass = $('#<%=this.DropRecipientClasses.ClientID %>').val();
updateRecipientCount(recipientClass, newGeographyId);
selectedGeographyId = newGeographyId;
}
@@ -41,12 +34,31 @@
return false;
}
function onRecipientChange(newRecipientClass) {
updateRecipientCount(newRecipientClass, selectedGeographyId);
}
function updateRecipientCount(recipientClass, geography) {
var jsonData = {
recipientTypeId: recipientClass,
geographyId: geography
};
SwarmopsJS.ajaxCall
("/Pages/v5/Comms/SendMassMessage.aspx/GetRecipientCount",
jsonData,
function(result) {
$('#spanRecipientCount').text(result);
});
}
</script>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="PlaceHolderMain" Runat="Server">
<div class="entryFields" style="padding-top:4px">
<asp:DropDownList runat="server" ID="DropRecipientClasses"/><br/>
<Swarmops5:DropDown runat="server" ID="DropRecipientClasses" OnClientChange="onRecipientChange"/>&thinsp;<br/>
<Swarmops5:ComboGeographies ID="ComboGeographies" runat="server" OnClientSelect="onGeographyChange" />&thinsp;<br/>
</div>
<div class="entryLabels" style="padding-top:10px">
+4 -4
View File
@@ -36,11 +36,11 @@ namespace Swarmops.Frontend.Pages.Comms
this.DropRecipientClasses.Items.Clear();
this.DropRecipientClasses.Items.Add (new ListItem (Global.Global_SelectOne, "0"));
this.DropRecipientClasses.Items.Add (new ListItem ("[Regulars]", "1"));
this.DropRecipientClasses.Items.Add (new ListItem ("[Agents]", "2"));
this.DropRecipientClasses.Items.Add (new ListItem (Participant.Localized(CurrentOrganization.RegularLabel, TitleVariant.Plural), "1"));
this.DropRecipientClasses.Items.Add (new ListItem (Participant.Localized(CurrentOrganization.ActivistLabel, TitleVariant.Plural), "2"));
// TODO: Room for dynamic membership types here
this.DropRecipientClasses.Items.Add (new ListItem ("Officers", "101"));
this.DropRecipientClasses.Items.Add (new ListItem ("Volunteers", "102"));
this.DropRecipientClasses.Items.Add (new ListItem (Global.Global_Officer_Plural, "101"));
this.DropRecipientClasses.Items.Add (new ListItem (Global.Global_Volunteer_Plural, "102"));
this.ButtonSend.Text = Resources.Pages.Comms.SendMassMessage_SendMessage;
this.ButtonTest.Text = Resources.Pages.Comms.SendMassMessage_TestMessage;
+1 -1
View File
@@ -19,7 +19,7 @@ namespace Swarmops.Frontend.Pages.Comms {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList DropRecipientClasses;
protected global::Swarmops.Frontend.Controls.Base.DropDown DropRecipientClasses;
/// <summary>
/// ComboGeographies control.