diff --git a/Backend/Backend.csproj b/Backend/Backend.csproj index 1a85d821..a7dcafe3 100644 --- a/Backend/Backend.csproj +++ b/Backend/Backend.csproj @@ -84,7 +84,7 @@ Logic - {C540570C-20E0-4979-84EB-8833810DDDF6} + {c540570c-20e0-4979-84eb-8833810dddf6} Utility diff --git a/Backend/CommsTransmitter.cs b/Backend/CommsTransmitter.cs index a8c1a87c..835e1b97 100644 --- a/Backend/CommsTransmitter.cs +++ b/Backend/CommsTransmitter.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Swarmops.Logic.Communications; using Swarmops.Logic.Communications.Transmission; diff --git a/Backend/Program.cs b/Backend/Program.cs index 194c746a..3cc12850 100644 --- a/Backend/Program.cs +++ b/Backend/Program.cs @@ -1,33 +1,14 @@ using System; -using System.Collections.Generic; -using System.Configuration; -using System.IO; -using System.Text; using System.Threading; -using System.Net; -using System.Net.Mail; - -using Swarmops.Basic; -using Swarmops.Basic.Enums; +using Mono.Unix; +using Mono.Unix.Native; using Swarmops.Database; using Swarmops.Logic.Communications; using Swarmops.Logic.Communications.Transmission; -using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; -using System.Diagnostics; -using Swarmops.Logic.Special.Sweden; using Swarmops.Logic.Support; using Swarmops.Utility; using Swarmops.Utility.BotCode; -using Swarmops.Utility.Financial; using Swarmops.Utility.Mail; -using Swarmops.Utility.Special; -using Swarmops.Utility.Special.Sweden; - -using Mono.Unix; -using Mono.Unix.Native; - namespace Swarmops.Backend { diff --git a/Backend/Properties/AssemblyInfo.cs b/Backend/Properties/AssemblyInfo.cs index 5ecf3188..7dd20906 100644 --- a/Backend/Properties/AssemblyInfo.cs +++ b/Backend/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Basic/Config.cs b/Basic/Config.cs index ea1a4ff2..5b35e4e0 100644 --- a/Basic/Config.cs +++ b/Basic/Config.cs @@ -1,7 +1,5 @@ using System; using System.Configuration; -using System.Collections.Generic; -using System.Text; namespace Swarmops.Basic { @@ -11,7 +9,7 @@ namespace Swarmops.Basic { get { - string portString = ConfigurationSettings.AppSettings["SmtpPort"]; + string portString = ConfigurationManager.AppSettings["SmtpPort"]; if (String.IsNullOrEmpty(portString)) { @@ -26,7 +24,7 @@ namespace Swarmops.Basic { get { - string smtpHost = ConfigurationSettings.AppSettings["SmtpHost"]; + string smtpHost = ConfigurationManager.AppSettings["SmtpHost"]; if (String.IsNullOrEmpty(smtpHost)) { diff --git a/Basic/Diagnostics/Logging.cs b/Basic/Diagnostics/Logging.cs index 966f5a37..6953ec64 100644 --- a/Basic/Diagnostics/Logging.cs +++ b/Basic/Diagnostics/Logging.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Text; namespace Swarmops.Basic.Diagnostics { diff --git a/Basic/Enums/AutoMailType.cs b/Basic/Enums/AutoMailType.cs index c64930f1..e8cbad1a 100644 --- a/Basic/Enums/AutoMailType.cs +++ b/Basic/Enums/AutoMailType.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { public enum AutoMailType diff --git a/Basic/Enums/CommunicationType.cs b/Basic/Enums/CommunicationType.cs index 7fc03e42..2a322634 100644 --- a/Basic/Enums/CommunicationType.cs +++ b/Basic/Enums/CommunicationType.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { public enum CommunicationType diff --git a/Basic/Enums/DocumentType.cs b/Basic/Enums/DocumentType.cs index b7569290..4bf8c85c 100644 --- a/Basic/Enums/DocumentType.cs +++ b/Basic/Enums/DocumentType.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { public enum DocumentType diff --git a/Basic/Enums/EventTypeSource.cs b/Basic/Enums/EventTypeSource.cs index dc4ea603..7fdf9616 100644 --- a/Basic/Enums/EventTypeSource.cs +++ b/Basic/Enums/EventTypeSource.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { public enum EventType diff --git a/Basic/Enums/ExpenseEventType.cs b/Basic/Enums/ExpenseEventType.cs index acca6c1b..31909540 100644 --- a/Basic/Enums/ExpenseEventType.cs +++ b/Basic/Enums/ExpenseEventType.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { public enum ExpenseEventType diff --git a/Basic/Enums/ExternalIdentityType.cs b/Basic/Enums/ExternalIdentityType.cs index 322cf0a0..d2e6efae 100644 --- a/Basic/Enums/ExternalIdentityType.cs +++ b/Basic/Enums/ExternalIdentityType.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { public enum ExternalIdentityType diff --git a/Basic/Enums/FinancialAccountType.cs b/Basic/Enums/FinancialAccountType.cs index 4acfdbf5..e143c5c0 100644 --- a/Basic/Enums/FinancialAccountType.cs +++ b/Basic/Enums/FinancialAccountType.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { public enum FinancialAccountType diff --git a/Basic/Enums/GeographyLevel.cs b/Basic/Enums/GeographyLevel.cs index 83bb17df..53502ff7 100644 --- a/Basic/Enums/GeographyLevel.cs +++ b/Basic/Enums/GeographyLevel.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { public enum GeographyLevel diff --git a/Basic/Enums/InvalidMembershipType.cs b/Basic/Enums/InvalidMembershipType.cs index 7afbbaa6..c36fc033 100644 --- a/Basic/Enums/InvalidMembershipType.cs +++ b/Basic/Enums/InvalidMembershipType.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { public enum InvalidMembershipType diff --git a/Basic/Enums/MailAuthorType.cs b/Basic/Enums/MailAuthorType.cs index ff79a7c9..3a0989ed 100644 --- a/Basic/Enums/MailAuthorType.cs +++ b/Basic/Enums/MailAuthorType.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; + namespace Swarmops.Basic.Enums { public enum MailAuthorType diff --git a/Basic/Enums/MembershipPaymentStatus.cs b/Basic/Enums/MembershipPaymentStatus.cs index 842d17ce..9092f0cb 100644 --- a/Basic/Enums/MembershipPaymentStatus.cs +++ b/Basic/Enums/MembershipPaymentStatus.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { /// diff --git a/Basic/Enums/OrganizationFinancialAccountType.cs b/Basic/Enums/OrganizationFinancialAccountType.cs index fe7c6683..e63eefd2 100644 --- a/Basic/Enums/OrganizationFinancialAccountType.cs +++ b/Basic/Enums/OrganizationFinancialAccountType.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Swarmops.Basic.Enums +namespace Swarmops.Basic.Enums { public enum OrganizationFinancialAccountType { diff --git a/Basic/Enums/OutboundCommPriority.cs b/Basic/Enums/OutboundCommPriority.cs index 6a8a3dad..45d57f84 100644 --- a/Basic/Enums/OutboundCommPriority.cs +++ b/Basic/Enums/OutboundCommPriority.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Swarmops.Basic.Enums +namespace Swarmops.Basic.Enums { public enum OutboundCommPriority { diff --git a/Basic/Enums/PaymentCodeIssueType.cs b/Basic/Enums/PaymentCodeIssueType.cs index bd85a801..ff654d8a 100644 --- a/Basic/Enums/PaymentCodeIssueType.cs +++ b/Basic/Enums/PaymentCodeIssueType.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { public enum PaymentCodeIssueType diff --git a/Basic/Enums/PersonGender.cs b/Basic/Enums/PersonGender.cs index 18aa9e3f..3e94806e 100644 --- a/Basic/Enums/PersonGender.cs +++ b/Basic/Enums/PersonGender.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { public enum PersonGender diff --git a/Basic/Enums/PersonOptionalDataKey.cs b/Basic/Enums/PersonOptionalDataKey.cs index a141d7bb..30adb12f 100644 --- a/Basic/Enums/PersonOptionalDataKey.cs +++ b/Basic/Enums/PersonOptionalDataKey.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Enums { public enum PersonOptionalDataKey diff --git a/Basic/Enums/RoleTypeClass.cs b/Basic/Enums/RoleTypeClass.cs index 913737ca..3fb75335 100644 --- a/Basic/Enums/RoleTypeClass.cs +++ b/Basic/Enums/RoleTypeClass.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Text; namespace Swarmops.Basic.Enums { diff --git a/Basic/Interfaces/IEmailPerson.cs b/Basic/Interfaces/IEmailPerson.cs index 1bdce640..f9011d21 100644 --- a/Basic/Interfaces/IEmailPerson.cs +++ b/Basic/Interfaces/IEmailPerson.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Interfaces { public interface IEmailPerson : IHasIdentity diff --git a/Basic/Interfaces/IHandleProvider.cs b/Basic/Interfaces/IHandleProvider.cs index 3b592d27..465bbf97 100644 --- a/Basic/Interfaces/IHandleProvider.cs +++ b/Basic/Interfaces/IHandleProvider.cs @@ -1,10 +1,6 @@ using System; -using System.Text; -using Swarmops.Basic.Exceptions; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Enums; - namespace Swarmops.Basic.Interfaces { public interface IHandleProvider diff --git a/Basic/Interfaces/IHasIdentities.cs b/Basic/Interfaces/IHasIdentities.cs index 4197e1ed..11cc8d04 100644 --- a/Basic/Interfaces/IHasIdentities.cs +++ b/Basic/Interfaces/IHasIdentities.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Interfaces { public interface IHasIdentities diff --git a/Basic/Interfaces/IHasIdentity.cs b/Basic/Interfaces/IHasIdentity.cs index 336b9b28..d8000474 100644 --- a/Basic/Interfaces/IHasIdentity.cs +++ b/Basic/Interfaces/IHasIdentity.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Interfaces { public interface IHasIdentity diff --git a/Basic/Properties/AssemblyInfo.cs b/Basic/Properties/AssemblyInfo.cs index aa93b3e4..4b4c19b6 100644 --- a/Basic/Properties/AssemblyInfo.cs +++ b/Basic/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; // // General Information about an assembly is controlled through the following diff --git a/Basic/Strings.cs b/Basic/Strings.cs index 187053a3..c7e72853 100644 --- a/Basic/Strings.cs +++ b/Basic/Strings.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic { public class Strings diff --git a/Basic/Types/BasicAddressValidationRun.cs b/Basic/Types/BasicAddressValidationRun.cs index e6ebb615..97c4be30 100644 --- a/Basic/Types/BasicAddressValidationRun.cs +++ b/Basic/Types/BasicAddressValidationRun.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types @@ -12,10 +9,8 @@ namespace Swarmops.Basic.Types this.validationRunId = validationRunId; } - private int validationRunId; - private bool complete; - private int addressCount; - + private readonly int validationRunId; + public int Identity { get { return this.validationRunId; } diff --git a/Basic/Types/BasicBallot.cs b/Basic/Types/BasicBallot.cs index 8408b6a7..bc3427f8 100644 --- a/Basic/Types/BasicBallot.cs +++ b/Basic/Types/BasicBallot.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicChurnDataPoint.cs b/Basic/Types/BasicChurnDataPoint.cs index 6e6c7a48..4860d3d5 100644 --- a/Basic/Types/BasicChurnDataPoint.cs +++ b/Basic/Types/BasicChurnDataPoint.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; namespace Swarmops.Basic.Enums diff --git a/Basic/Types/BasicCity.cs b/Basic/Types/BasicCity.cs index 0d01e9ad..bf7cf3b7 100644 --- a/Basic/Types/BasicCity.cs +++ b/Basic/Types/BasicCity.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicCommunicationTurnaround.cs b/Basic/Types/BasicCommunicationTurnaround.cs index 6a090107..5b5da053 100644 --- a/Basic/Types/BasicCommunicationTurnaround.cs +++ b/Basic/Types/BasicCommunicationTurnaround.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicCountry.cs b/Basic/Types/BasicCountry.cs index dd513a19..9b9662b4 100644 --- a/Basic/Types/BasicCountry.cs +++ b/Basic/Types/BasicCountry.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; - namespace Swarmops.Basic.Types { [Serializable] diff --git a/Basic/Types/BasicCurrency.cs b/Basic/Types/BasicCurrency.cs index 73ac3c98..c29a1849 100644 --- a/Basic/Types/BasicCurrency.cs +++ b/Basic/Types/BasicCurrency.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicDocument.cs b/Basic/Types/BasicDocument.cs index 0b5c2723..b048c4e6 100644 --- a/Basic/Types/BasicDocument.cs +++ b/Basic/Types/BasicDocument.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; diff --git a/Basic/Types/BasicElection.cs b/Basic/Types/BasicElection.cs index 1c7bf022..e7698740 100644 --- a/Basic/Types/BasicElection.cs +++ b/Basic/Types/BasicElection.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicExceptionLog.cs b/Basic/Types/BasicExceptionLog.cs index c2e163f0..739e63d9 100644 --- a/Basic/Types/BasicExceptionLog.cs +++ b/Basic/Types/BasicExceptionLog.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; namespace Swarmops.Basic.Types { diff --git a/Basic/Types/BasicExpenseClaim.cs b/Basic/Types/BasicExpenseClaim.cs index 9ff25275..6edf78eb 100644 --- a/Basic/Types/BasicExpenseClaim.cs +++ b/Basic/Types/BasicExpenseClaim.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicExternalActivity.cs b/Basic/Types/BasicExternalActivity.cs index 3802c9f6..0d52a54f 100644 --- a/Basic/Types/BasicExternalActivity.cs +++ b/Basic/Types/BasicExternalActivity.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; diff --git a/Basic/Types/BasicExternalCredential.cs b/Basic/Types/BasicExternalCredential.cs index a27fa1a7..2bb25d43 100644 --- a/Basic/Types/BasicExternalCredential.cs +++ b/Basic/Types/BasicExternalCredential.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicExternalIdentity.cs b/Basic/Types/BasicExternalIdentity.cs index 4081eba4..70435fe7 100644 --- a/Basic/Types/BasicExternalIdentity.cs +++ b/Basic/Types/BasicExternalIdentity.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; diff --git a/Basic/Types/BasicGeography.cs b/Basic/Types/BasicGeography.cs index 78aa3ec0..3415baa9 100644 --- a/Basic/Types/BasicGeography.cs +++ b/Basic/Types/BasicGeography.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicGeographyDesignation.cs b/Basic/Types/BasicGeographyDesignation.cs index aa6efc27..9c777ddc 100644 --- a/Basic/Types/BasicGeographyDesignation.cs +++ b/Basic/Types/BasicGeographyDesignation.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicInboundInvoice.cs b/Basic/Types/BasicInboundInvoice.cs index d9c3767d..5ba85e54 100644 --- a/Basic/Types/BasicInboundInvoice.cs +++ b/Basic/Types/BasicInboundInvoice.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicInternalPoll.cs b/Basic/Types/BasicInternalPoll.cs index 3a2facd0..7c9019f3 100644 --- a/Basic/Types/BasicInternalPoll.cs +++ b/Basic/Types/BasicInternalPoll.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicInternalPollCandidate.cs b/Basic/Types/BasicInternalPollCandidate.cs index 447da03f..85c62ae5 100644 --- a/Basic/Types/BasicInternalPollCandidate.cs +++ b/Basic/Types/BasicInternalPollCandidate.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicInternalPollVote.cs b/Basic/Types/BasicInternalPollVote.cs index 5dad6ecd..74248a2d 100644 --- a/Basic/Types/BasicInternalPollVote.cs +++ b/Basic/Types/BasicInternalPollVote.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicInternalPollVoteDetail.cs b/Basic/Types/BasicInternalPollVoteDetail.cs index f5016303..4f409c3f 100644 --- a/Basic/Types/BasicInternalPollVoteDetail.cs +++ b/Basic/Types/BasicInternalPollVoteDetail.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Types { public class BasicInternalPollVoteDetail diff --git a/Basic/Types/BasicInternalPollVoter.cs b/Basic/Types/BasicInternalPollVoter.cs index 33dfa055..91a635a8 100644 --- a/Basic/Types/BasicInternalPollVoter.cs +++ b/Basic/Types/BasicInternalPollVoter.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; namespace Swarmops.Basic.Types { diff --git a/Basic/Types/BasicMailTemplate.cs b/Basic/Types/BasicMailTemplate.cs index 668b88f9..f77121d4 100644 --- a/Basic/Types/BasicMailTemplate.cs +++ b/Basic/Types/BasicMailTemplate.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicMediaCategory.cs b/Basic/Types/BasicMediaCategory.cs index 04c08d34..566ad175 100644 --- a/Basic/Types/BasicMediaCategory.cs +++ b/Basic/Types/BasicMediaCategory.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicMediaEntry.cs b/Basic/Types/BasicMediaEntry.cs index 3d6acc05..103bcb84 100644 --- a/Basic/Types/BasicMediaEntry.cs +++ b/Basic/Types/BasicMediaEntry.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicMediaKeyword.cs b/Basic/Types/BasicMediaKeyword.cs index 9fb421ae..ec0154a1 100644 --- a/Basic/Types/BasicMediaKeyword.cs +++ b/Basic/Types/BasicMediaKeyword.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicMedium.cs b/Basic/Types/BasicMedium.cs index 54f9d2c8..e5f6ce0f 100644 --- a/Basic/Types/BasicMedium.cs +++ b/Basic/Types/BasicMedium.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; diff --git a/Basic/Types/BasicMembership.cs b/Basic/Types/BasicMembership.cs index e94e2ef6..3b90b808 100644 --- a/Basic/Types/BasicMembership.cs +++ b/Basic/Types/BasicMembership.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicMembershipPaymentStatus.cs b/Basic/Types/BasicMembershipPaymentStatus.cs index eb5a3fb2..bc9c9706 100644 --- a/Basic/Types/BasicMembershipPaymentStatus.cs +++ b/Basic/Types/BasicMembershipPaymentStatus.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicNewsletter.cs b/Basic/Types/BasicNewsletter.cs index 14a38f94..7cf57a4f 100644 --- a/Basic/Types/BasicNewsletter.cs +++ b/Basic/Types/BasicNewsletter.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicNewsletterFeed.cs b/Basic/Types/BasicNewsletterFeed.cs index 76559214..21a6c480 100644 --- a/Basic/Types/BasicNewsletterFeed.cs +++ b/Basic/Types/BasicNewsletterFeed.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Types { public class BasicNewsletterFeed diff --git a/Basic/Types/BasicNewsletterTemplate.cs b/Basic/Types/BasicNewsletterTemplate.cs index e274595f..363b8128 100644 --- a/Basic/Types/BasicNewsletterTemplate.cs +++ b/Basic/Types/BasicNewsletterTemplate.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Types { public class BasicNewsletterTemplate diff --git a/Basic/Types/BasicObjectOptionalData.cs b/Basic/Types/BasicObjectOptionalData.cs index 84071719..84231566 100644 --- a/Basic/Types/BasicObjectOptionalData.cs +++ b/Basic/Types/BasicObjectOptionalData.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicOrganization.cs b/Basic/Types/BasicOrganization.cs index 12abf766..2552f6b0 100644 --- a/Basic/Types/BasicOrganization.cs +++ b/Basic/Types/BasicOrganization.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicOutboundInvoice.cs b/Basic/Types/BasicOutboundInvoice.cs index e7f44e1b..96ecb3d3 100644 --- a/Basic/Types/BasicOutboundInvoice.cs +++ b/Basic/Types/BasicOutboundInvoice.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicOutboundInvoiceItem.cs b/Basic/Types/BasicOutboundInvoiceItem.cs index 96cd8d86..c75c5f91 100644 --- a/Basic/Types/BasicOutboundInvoiceItem.cs +++ b/Basic/Types/BasicOutboundInvoiceItem.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicOutboundMail.cs b/Basic/Types/BasicOutboundMail.cs index 9c787d1a..cc3d5492 100644 --- a/Basic/Types/BasicOutboundMail.cs +++ b/Basic/Types/BasicOutboundMail.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; diff --git a/Basic/Types/BasicOutboundMailRecipient.cs b/Basic/Types/BasicOutboundMailRecipient.cs index 07da7d0a..1bfc13da 100644 --- a/Basic/Types/BasicOutboundMailRecipient.cs +++ b/Basic/Types/BasicOutboundMailRecipient.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicPWEvent.cs b/Basic/Types/BasicPWEvent.cs index 452b2dd1..44eddc4d 100644 --- a/Basic/Types/BasicPWEvent.cs +++ b/Basic/Types/BasicPWEvent.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; namespace Swarmops.Basic.Types { diff --git a/Basic/Types/BasicPWLog.cs b/Basic/Types/BasicPWLog.cs index 57c78d6b..540f1c94 100644 --- a/Basic/Types/BasicPWLog.cs +++ b/Basic/Types/BasicPWLog.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; namespace Swarmops.Basic.Types { diff --git a/Basic/Types/BasicPaperLetter.cs b/Basic/Types/BasicPaperLetter.cs index 258f3ae4..d69ed4a2 100644 --- a/Basic/Types/BasicPaperLetter.cs +++ b/Basic/Types/BasicPaperLetter.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; diff --git a/Basic/Types/BasicParley.cs b/Basic/Types/BasicParley.cs index 40fcc45a..d23261f1 100644 --- a/Basic/Types/BasicParley.cs +++ b/Basic/Types/BasicParley.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicParleyAttendee.cs b/Basic/Types/BasicParleyAttendee.cs index 9fbd7df7..89a0be3d 100644 --- a/Basic/Types/BasicParleyAttendee.cs +++ b/Basic/Types/BasicParleyAttendee.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicParleyOption.cs b/Basic/Types/BasicParleyOption.cs index 4c7f55c1..778d7077 100644 --- a/Basic/Types/BasicParleyOption.cs +++ b/Basic/Types/BasicParleyOption.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicPayment.cs b/Basic/Types/BasicPayment.cs index d63dbc04..6b15e245 100644 --- a/Basic/Types/BasicPayment.cs +++ b/Basic/Types/BasicPayment.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicPaymentCode.cs b/Basic/Types/BasicPaymentCode.cs index 9770ad47..73ba05d0 100644 --- a/Basic/Types/BasicPaymentCode.cs +++ b/Basic/Types/BasicPaymentCode.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; diff --git a/Basic/Types/BasicPaymentGroup.cs b/Basic/Types/BasicPaymentGroup.cs index 65c60170..654c86fb 100644 --- a/Basic/Types/BasicPaymentGroup.cs +++ b/Basic/Types/BasicPaymentGroup.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicPaymentInformation.cs b/Basic/Types/BasicPaymentInformation.cs index bbbd749d..b2d2879c 100644 --- a/Basic/Types/BasicPaymentInformation.cs +++ b/Basic/Types/BasicPaymentInformation.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - - namespace Swarmops.Basic.Types { public class BasicPaymentInformation diff --git a/Basic/Types/BasicPayout.cs b/Basic/Types/BasicPayout.cs index acda3ee9..92d61745 100644 --- a/Basic/Types/BasicPayout.cs +++ b/Basic/Types/BasicPayout.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicPayrollAdjustment.cs b/Basic/Types/BasicPayrollAdjustment.cs index fa58a3a9..6d860de9 100644 --- a/Basic/Types/BasicPayrollAdjustment.cs +++ b/Basic/Types/BasicPayrollAdjustment.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicPayrollItem.cs b/Basic/Types/BasicPayrollItem.cs index 3d23e3d0..09dd0c0b 100644 --- a/Basic/Types/BasicPayrollItem.cs +++ b/Basic/Types/BasicPayrollItem.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicPermission.cs b/Basic/Types/BasicPermission.cs index b82dbdd4..9d2b8006 100644 --- a/Basic/Types/BasicPermission.cs +++ b/Basic/Types/BasicPermission.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicPerson.cs b/Basic/Types/BasicPerson.cs index 903eeef3..17e67740 100644 --- a/Basic/Types/BasicPerson.cs +++ b/Basic/Types/BasicPerson.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; - namespace Swarmops.Basic.Types { diff --git a/Basic/Types/BasicPersonRole.cs b/Basic/Types/BasicPersonRole.cs index 06a1817d..8782d112 100644 --- a/Basic/Types/BasicPersonRole.cs +++ b/Basic/Types/BasicPersonRole.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; diff --git a/Basic/Types/BasicPostalCode.cs b/Basic/Types/BasicPostalCode.cs index 94fc6c1c..414e87dd 100644 --- a/Basic/Types/BasicPostalCode.cs +++ b/Basic/Types/BasicPostalCode.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; namespace Swarmops.Basic.Types { diff --git a/Basic/Types/BasicRefund.cs b/Basic/Types/BasicRefund.cs index 32d3c155..fac6383c 100644 --- a/Basic/Types/BasicRefund.cs +++ b/Basic/Types/BasicRefund.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicReporter.cs b/Basic/Types/BasicReporter.cs index 0cd0bc76..7bd972e6 100644 --- a/Basic/Types/BasicReporter.cs +++ b/Basic/Types/BasicReporter.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicSalary.cs b/Basic/Types/BasicSalary.cs index 288eaa8c..859dec0e 100644 --- a/Basic/Types/BasicSalary.cs +++ b/Basic/Types/BasicSalary.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicSupplier.cs b/Basic/Types/BasicSupplier.cs index 05b8f7cd..0e4a6968 100644 --- a/Basic/Types/BasicSupplier.cs +++ b/Basic/Types/BasicSupplier.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicSwarmopsLogEntry.cs b/Basic/Types/BasicSwarmopsLogEntry.cs index 9888e046..82a55339 100644 --- a/Basic/Types/BasicSwarmopsLogEntry.cs +++ b/Basic/Types/BasicSwarmopsLogEntry.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicUptakeGeography.cs b/Basic/Types/BasicUptakeGeography.cs index c03b3e9c..72664fe5 100644 --- a/Basic/Types/BasicUptakeGeography.cs +++ b/Basic/Types/BasicUptakeGeography.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Basic.Types { diff --git a/Basic/Types/BasicVolunteer.cs b/Basic/Types/BasicVolunteer.cs index 7eab4f93..cd40e63d 100644 --- a/Basic/Types/BasicVolunteer.cs +++ b/Basic/Types/BasicVolunteer.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types diff --git a/Basic/Types/BasicVolunteerRole.cs b/Basic/Types/BasicVolunteerRole.cs index b608f3f2..5b37bb7a 100644 --- a/Basic/Types/BasicVolunteerRole.cs +++ b/Basic/Types/BasicVolunteerRole.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; diff --git a/Basic/Types/Communications/BasicAutoMail.cs b/Basic/Types/Communications/BasicAutoMail.cs index 73352ac3..d489049d 100644 --- a/Basic/Types/Communications/BasicAutoMail.cs +++ b/Basic/Types/Communications/BasicAutoMail.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; diff --git a/Basic/Types/Communications/BasicOutboundComm.cs b/Basic/Types/Communications/BasicOutboundComm.cs index cf350012..0595620b 100644 --- a/Basic/Types/Communications/BasicOutboundComm.cs +++ b/Basic/Types/Communications/BasicOutboundComm.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; diff --git a/Basic/Types/Communications/BasicOutboundCommRecipient.cs b/Basic/Types/Communications/BasicOutboundCommRecipient.cs index 834f2826..3b8895c6 100644 --- a/Basic/Types/Communications/BasicOutboundCommRecipient.cs +++ b/Basic/Types/Communications/BasicOutboundCommRecipient.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Interfaces; +using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types.Communications { diff --git a/Basic/Types/Financial/BasicFinancialTransactionTagSet.cs b/Basic/Types/Financial/BasicFinancialTransactionTagSet.cs index fe3e6192..73a5c1a3 100644 --- a/Basic/Types/Financial/BasicFinancialTransactionTagSet.cs +++ b/Basic/Types/Financial/BasicFinancialTransactionTagSet.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Interfaces; +using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types.Financial { diff --git a/Basic/Types/Financial/BasicFinancialTransactionTagSetType.cs b/Basic/Types/Financial/BasicFinancialTransactionTagSetType.cs index 13a64026..79cfe098 100644 --- a/Basic/Types/Financial/BasicFinancialTransactionTagSetType.cs +++ b/Basic/Types/Financial/BasicFinancialTransactionTagSetType.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Interfaces; +using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types.Financial { diff --git a/Basic/Types/Financial/BasicFinancialTransactionTagType.cs b/Basic/Types/Financial/BasicFinancialTransactionTagType.cs index 6b92524c..44e30bca 100644 --- a/Basic/Types/Financial/BasicFinancialTransactionTagType.cs +++ b/Basic/Types/Financial/BasicFinancialTransactionTagType.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Interfaces; +using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types.Financial { diff --git a/Basic/Types/GeographyWithPeople.cs b/Basic/Types/GeographyWithPeople.cs index 19a22293..1f843245 100644 --- a/Basic/Types/GeographyWithPeople.cs +++ b/Basic/Types/GeographyWithPeople.cs @@ -1,9 +1,5 @@ using System; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Types; -using System.Collections.Generic; - namespace Swarmops.Basic.Types { [Serializable] diff --git a/Basic/Types/Governance/BasicMeeting.cs b/Basic/Types/Governance/BasicMeeting.cs index 88153d67..063ef154 100644 --- a/Basic/Types/Governance/BasicMeeting.cs +++ b/Basic/Types/Governance/BasicMeeting.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types.Governance diff --git a/Basic/Types/Governance/BasicMotion.cs b/Basic/Types/Governance/BasicMotion.cs index 6e6c794f..0a82728c 100644 --- a/Basic/Types/Governance/BasicMotion.cs +++ b/Basic/Types/Governance/BasicMotion.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types.Governance diff --git a/Basic/Types/Governance/BasicMotionAmendment.cs b/Basic/Types/Governance/BasicMotionAmendment.cs index 1ab2ccf5..5d60d4dc 100644 --- a/Basic/Types/Governance/BasicMotionAmendment.cs +++ b/Basic/Types/Governance/BasicMotionAmendment.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; namespace Swarmops.Basic.Types.Governance diff --git a/Basic/Types/Security/BasicAuthority.cs b/Basic/Types/Security/BasicAuthority.cs index 43112b55..e86f5e9b 100644 --- a/Basic/Types/Security/BasicAuthority.cs +++ b/Basic/Types/Security/BasicAuthority.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; namespace Swarmops.Basic.Types.Security { diff --git a/Basic/Types/XmlSerializableDictionary.cs b/Basic/Types/XmlSerializableDictionary.cs index 43fa2686..a018fff4 100644 --- a/Basic/Types/XmlSerializableDictionary.cs +++ b/Basic/Types/XmlSerializableDictionary.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; using System.Xml.Serialization; [XmlRoot("dictionary")] diff --git a/BuildFiles/Building/CSharpFormat.dll b/BuildFiles/Building/CSharpFormat.dll new file mode 100644 index 00000000..97fe56d1 Binary files /dev/null and b/BuildFiles/Building/CSharpFormat.dll differ diff --git a/BuildFiles/Building/ICSharpCode.SharpZipLib.dll b/BuildFiles/Building/ICSharpCode.SharpZipLib.dll new file mode 100644 index 00000000..e829ebf4 Binary files /dev/null and b/BuildFiles/Building/ICSharpCode.SharpZipLib.dll differ diff --git a/BuildFiles/Building/NPlot.dll b/BuildFiles/Building/NPlot.dll new file mode 100644 index 00000000..148e6d08 Binary files /dev/null and b/BuildFiles/Building/NPlot.dll differ diff --git a/BuildFiles/Building/NetReflector.dll b/BuildFiles/Building/NetReflector.dll new file mode 100644 index 00000000..ca51e289 Binary files /dev/null and b/BuildFiles/Building/NetReflector.dll differ diff --git a/BuildFiles/Rodemeyer.MsBuildToCCnet.dll b/BuildFiles/Building/Rodemeyer.MsBuildToCCnet.dll similarity index 100% rename from BuildFiles/Rodemeyer.MsBuildToCCnet.dll rename to BuildFiles/Building/Rodemeyer.MsBuildToCCnet.dll diff --git a/BuildFiles/Building/SciLexer.dll b/BuildFiles/Building/SciLexer.dll new file mode 100644 index 00000000..42d022a6 Binary files /dev/null and b/BuildFiles/Building/SciLexer.dll differ diff --git a/BuildFiles/Building/ScintillaNet.dll b/BuildFiles/Building/ScintillaNet.dll new file mode 100644 index 00000000..dfd4be33 Binary files /dev/null and b/BuildFiles/Building/ScintillaNet.dll differ diff --git a/BuildFiles/Building/ccnet.config b/BuildFiles/Building/ccnet.config new file mode 100644 index 00000000..030cff05 --- /dev/null +++ b/BuildFiles/Building/ccnet.config @@ -0,0 +1,351 @@ + + + + + + + + + + C:\Lab\Swarmops\build + C:\Lab\Swarmops\artifact + http://build.swarmops.com/server/auxiliary/project/Swarmops/ViewLatestBuildReport.aspx + + + git://github.com/Swarmops/Swarmops + master + true + true + true + git + false + false + false + Build {0} + Build-{0} + Swarmops Build + builds@swarmops.com + c:\Lab\Swarmops\build + 180000 + + + + + + + + 5 + 0 + 0 + false + + + + + + + + C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe + C:\Lab\Swarmops\build + Backend\Backend.csproj + /p:Configuration=Release + Build + 1200 + C:\Program Files (x86)\CruiseControl.NET\server\Rodemeyer.MsBuildToCCnet.dll + + + + + + C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe + C:\Lab\Swarmops\build + Interface\Interface.csproj + /p:Configuration=Release + Build + 1200 + C:\Program Files (x86)\CruiseControl.NET\server\Rodemeyer.MsBuildToCCnet.dll + + + + + + + C:\Lab\Swarmops\build\Site5-Deployment + \\swarmops-dev\builddrop\swarmops\internal\frontend + false + true + false + + + + C:\Lab\Swarmops\build\Backend\bin\Release + \\swarmops-dev\builddrop\swarmops\internal\backend + false + true + false + + + + + + cmd.exe + /c echo %CCNetLabel% > \\swarmops-dev\builddrop\swarmops\internal\BuildIdentity.txt + + + + cmd.exe + /c git rev-parse HEAD > \\swarmops-dev\builddrop\swarmops\internal\CommitIdentity.txt + + + + cmd.exe + /c git log -3 --pretty="%h: %B" > \\swarmops-dev\builddrop\swarmops\internal\CommitMessage.txt + + + + cmd.exe + /c echo %CCNetLabel% > \\swarmops-dev\builddrop\swarmops\internal\BuildDropped.txt + + + + + + + + + + + + + + + + + + + + + builds@swarmops.com + 192.168.80.204 + + + + + + + + + + + Failed + Fixed + Success + + + + + Always + + + + + Failed + Fixed + + + + + + xsl\header.xsl + xsl\msbuild2ccnet.xsl + xsl\unittests.xsl + xsl\fxcop-summary_1_36.xsl + xsl\modifications.xsl + xsl\fxcop-report_1_36.xsl + + + + + + + + + + + + + + + C:\Lab\Swarmops\sprint + C:\Lab\Swarmops\artifact-sprint + http://build.swarmops.com/server/auxiliary/project/Swarmops/ViewLatestBuildReport.aspx + + + git://github.com/Swarmops/Swarmops + sprint + true + true + true + git + false + false + false + Build {0} + Build-{0} + Swarmops Build + builds@swarmops.com + c:\Lab\Swarmops\sprint + 180000 + + + + + + + + 5 + 0 + 0 + false + + + + + + + + C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe + C:\Lab\Swarmops\sprint + Backend\Backend.csproj + /p:Configuration=Release + Build + 1200 + C:\Program Files (x86)\CruiseControl.NET\server\Rodemeyer.MsBuildToCCnet.dll + + + + + + C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe + C:\Lab\Swarmops\sprint + Interface\Interface.csproj + /p:Configuration=Release + Build + 1200 + C:\Program Files (x86)\CruiseControl.NET\server\Rodemeyer.MsBuildToCCnet.dll + + + + + + + C:\Lab\Swarmops\sprint\Site5-Deployment + \\swarmops-dev\builddrop\swarmops\sprint\frontend + false + true + false + + + + C:\Lab\Swarmops\sprint\Backend\bin\Release + \\swarmops-dev\builddrop\swarmops\sprint\backend + false + true + false + + + + + + cmd.exe + /c echo %CCNetLabel% > \\swarmops-dev\builddrop\swarmops\sprint\BuildIdentity.txt + + + + cmd.exe + /c git rev-parse HEAD > \\swarmops-dev\builddrop\swarmops\sprint\CommitIdentity.txt + + + + + + cmd.exe + /c echo %CCNetLabel% > \\swarmops-dev\builddrop\swarmops\sprint\BuildDropped.txt + + + + + + + + + + + + + + + + + + + + + builds@swarmops.com + 192.168.80.204 + + + + + + + + + + + Failed + Fixed + Success + + + + + Always + + + + + Failed + Fixed + + + + + + xsl\header.xsl + xsl\msbuild2ccnet.xsl + xsl\unittests.xsl + xsl\fxcop-summary_1_36.xsl + xsl\modifications.xsl + xsl\fxcop-report_1_36.xsl + + + + + + + + + diff --git a/BuildFiles/ccnet.exe.config b/BuildFiles/Building/ccnet.exe.config similarity index 97% rename from BuildFiles/ccnet.exe.config rename to BuildFiles/Building/ccnet.exe.config index ebbffa0c..0b161015 100644 --- a/BuildFiles/ccnet.exe.config +++ b/BuildFiles/Building/ccnet.exe.config @@ -1,160 +1,160 @@ - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BuildFiles/ccservice.exe.config b/BuildFiles/Building/ccservice.exe.config similarity index 97% rename from BuildFiles/ccservice.exe.config rename to BuildFiles/Building/ccservice.exe.config index 49d7de52..17f1a615 100644 --- a/BuildFiles/ccservice.exe.config +++ b/BuildFiles/Building/ccservice.exe.config @@ -1,155 +1,155 @@ - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BuildFiles/Building/edtFTPnet.dll b/BuildFiles/Building/edtFTPnet.dll new file mode 100644 index 00000000..40646a1c Binary files /dev/null and b/BuildFiles/Building/edtFTPnet.dll differ diff --git a/BuildFiles/Building/log4net.dll b/BuildFiles/Building/log4net.dll new file mode 100644 index 00000000..ffc57e11 Binary files /dev/null and b/BuildFiles/Building/log4net.dll differ diff --git a/BuildFiles/Building/xsl/AlternativeNUnitDetails.xsl b/BuildFiles/Building/xsl/AlternativeNUnitDetails.xsl new file mode 100644 index 00000000..fd2f5d90 --- /dev/null +++ b/BuildFiles/Building/xsl/AlternativeNUnitDetails.xsl @@ -0,0 +1,380 @@ + + + + + + + + +
+ + + + + + + +
+ + toggleDiv('img- + + ',' + + ') + + + clickable + + + Toggle display of Tests contained within this assembly + + img- + + + +   + + + + + +  -  + +  tests ( + +  passed,  + +  failed,  + +  didn't run) +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + display:none; + + + + +
Test FixtureResultsPasses
+ + + toggleTr('img- + + ',' + + ') + + + clickable + + + Toggle display of the tests within this text fixture + + img- + + + + + + + + + + + +
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + +   + + + + + +
+ [ + + ] +
+
+
+ + + + +
+
+ +
+
+ + +
+ + + + + + + + ignored + + + failed + + + succeeded + + + unknown + + + + + + + + + + + + The test wasn't run + + + The test failed + + + The test suceeded + + + + + + + + + + + + + + +
+ + width: + + px; + + + + + + + +   +
+
+
+ + + + + + + + + + + + ( + + / + + ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/BuildFiles/Building/xsl/AntsPerformanceCallTree.xslt b/BuildFiles/Building/xsl/AntsPerformanceCallTree.xslt new file mode 100644 index 00000000..bbdf1434 --- /dev/null +++ b/BuildFiles/Building/xsl/AntsPerformanceCallTree.xslt @@ -0,0 +1,102 @@ + + + + + + + +

ANTS Performance: Call Tree

+
+
+ + +
+
+ + +
+
+ + + +
+ + +
+ +
+ + +
+
+ .() +
+
+
+
+
+ Hit count: +
+
+ Time: + + ms + + + ms + +
+
+ Percentage: + + % + + + % + +
+
+ Percentage (with children): + + % + + + % + +
+
+ +
+
+
diff --git a/BuildFiles/Building/xsl/AntsPerformanceMethods.xslt b/BuildFiles/Building/xsl/AntsPerformanceMethods.xslt new file mode 100644 index 00000000..5b7af5db --- /dev/null +++ b/BuildFiles/Building/xsl/AntsPerformanceMethods.xslt @@ -0,0 +1,102 @@ + + + + + + + +

ANTS Performance: All Methods

+
+
+ + +
+
+ + +
+
+ + + +
+ + +
+ + + + + + + + + + + + + + + + + +
ClassMethodHit CountTimePercentagePercentage (with children)TimePercentagePercentage (with children)
+
+ + + + + + + + () + + + + + + ms + + + % + + + % + + + ms + + + % + + + % + + + +
diff --git a/BuildFiles/Building/xsl/AntsPerformanceTopMethods.xslt b/BuildFiles/Building/xsl/AntsPerformanceTopMethods.xslt new file mode 100644 index 00000000..46b71c2d --- /dev/null +++ b/BuildFiles/Building/xsl/AntsPerformanceTopMethods.xslt @@ -0,0 +1,100 @@ + + + + + + + +

ANTS Performance: Top Methods

+
+ + +
+
+ + +
+ + + +
+ + +
+ + + + + + + + + + + + + + + + + +
ClassMethodHit CountTimePercentagePercentage (with children)TimePercentagePercentage (with children)
+
+ + + + + + + + () + + + + + + ms + + + % + + + % + + + ms + + + % + + + % + + + +
diff --git a/BuildFiles/Building/xsl/CodeItRight.xsl b/BuildFiles/Building/xsl/CodeItRight.xsl new file mode 100644 index 00000000..0e291a07 --- /dev/null +++ b/BuildFiles/Building/xsl/CodeItRight.xsl @@ -0,0 +1,190 @@ + + + + + + + + + +

CodeIt.Right Analysis Report

+ + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + +
+
+ + + + + + + + + + + +
+ Solution: + + +
+ Analysis Date/Time: + + +
+ + + + + + + + + + + + + + + + +
ProjectFileItemLine #TypeViolationCategorySeverity
+
+ + + + projectData + cir-violation cir- + + + + + + + + + + + + + + + + + + + + + + + + + + + link + buildStatus cir-hidden cir- + +
+ + : + +
+
+ +
+
+ Corrections: +
+
    + +
  1. + +
  2. +
    +
+ + +
+
diff --git a/BuildFiles/Building/xsl/CodeItRightSummary.xsl b/BuildFiles/Building/xsl/CodeItRightSummary.xsl new file mode 100644 index 00000000..b7b6978f --- /dev/null +++ b/BuildFiles/Building/xsl/CodeItRightSummary.xsl @@ -0,0 +1,93 @@ + + + + + + + + + +

CodeIt.Right Analysis Summary

+ + + +
+
+ + + + + + + +
+ Solution: + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProjectErrorsWarningsOtherTotal
+ + + + + + + + + +
+
+
diff --git a/BuildFiles/Building/xsl/MBUnitDetails.xsl b/BuildFiles/Building/xsl/MBUnitDetails.xsl new file mode 100644 index 00000000..da657a5e --- /dev/null +++ b/BuildFiles/Building/xsl/MBUnitDetails.xsl @@ -0,0 +1,599 @@ + + + + + + + + + s + + + + + + ms + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+
+ + + + + + + + + + + + +
+ position:relative;background-color:#DDDDDD;border-color:black;width:px;height:px; + + +
+ position:absolute;top:0px;left:0px;height:px;background-color:lightgreen;font-size:1px;width: + + + + px; +
+
+ + +
+ position:absolute;top:0px;left: + + + + px;height:px;background-color:red;font-size:1px;width: + + + + px; +
+
+ + +
+ position:absolute;top:0px;left: + + + + px;height:px;background-color:blueviolet;font-size:1px;width: + + + + px; +
+
+ + +
+ position:absolute;top:0px;left: + + + + px;height:px;background-color:orange;font-size:1px;width: + + + + px; +
+
+
+ position:absolute;top:0px;left:px;height:px;font-size:px;font-family:Verdana;/////
+
+
+ + + test, + success, + failures, + skipped, + ignored, + asserts + + + + + + + + + + + + + + /images/Populator.png + + + + + + + /images/Fixture.png + + + + + + + /images/Category.png + + + + + + + /images/Test.png + + + + + + as + + + + + ex + + + + +
+ + +
+
+ + + + + + + + + +
+ MbUnit Tests run: + tests, + success, + failure, + ignored, + skipped, + s +
+ + +
+ +
+
+ +
+
+ + + + + + + + +
Total + + + 100 + 14 + + +
+
+ + + + + + + #Assembly + + + + + + + + 100 + 12 + + + + + + + + + + + + + + + + # + . + + + + . + + + + + + 100 + 10 + + + + + + + + + + + + + + failureOdd + failureEven + + + + + + +
+
+
+ + + + + + + + +

Assembly + + +

+
    +
  • Full Name:
  • +
  • Results: + + + +
  • +
  • Duration: + + + +
  • +
+ + + + + +
Assembly SetUp and TearDown
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + . + + + + + + + + + + + + + + + . + + ( + + ) + + + + Fixture SetUp and TearDown + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + successEven + failureEven + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + successOdd + successEven + + + + + failureOdd + failureEven + + + + + skippedOdd + skippedEven + + + + + ignoreOdd + ignoreEvent + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + +
+ + +
+
+ + +
+ + + + Type: + + + + + + Message: + + + + + + Source: + + + + + + + : + + + + + + + StackTrace: +
+
+					
+				
+ + + +
+ + + + + + + Console Output + + + + + Console Error + + + + + + + + + + + + +
+
+
+ + +
+
+
diff --git a/BuildFiles/Building/xsl/MBUnitSummary.xsl b/BuildFiles/Building/xsl/MBUnitSummary.xsl new file mode 100644 index 00000000..7b7b3ea3 --- /dev/null +++ b/BuildFiles/Building/xsl/MBUnitSummary.xsl @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Tests run: , Failures: , Not run: , Time: seconds +
No Tests Run
This project doesn't have any tests
All Tests Passed
+ Unit Test Failure and Error Details () +
+ Warning Details () +
+
+ + + + + + unittests-oddrow + + Error + + + + + + + + + unittests-oddrow + + Failure + + + + + + + + + unittests-oddrow + + Warning + + + + + + + + + + + +
+
+ + Test: + + + Type: + Message: + + + +

+                        
+                    
+ + +
+ + + Type: + Message: + + + +

+                        
+                    
+ + +
+ +
+
+ + + + + + + + + + + + +
+ Test: + Type:Failure + Message: + + + +
+ + +
+ + + Test: + Type:Warning + Message: + + + +

+                            
+                        
+ + +
+ +
+
+ + + + + + + + + + + + +
+ Test: + Type:Failure + Message: + + + +
+ + +
+ + + Test: + Type:Warning + Message: + + + +

+                            
+                        
+ + +
+ +
+
+ + + + + + + + + +
+ + + +
+ + + +
+
+ +
+ diff --git a/BuildFiles/Building/xsl/Metrics.xsl b/BuildFiles/Building/xsl/Metrics.xsl new file mode 100644 index 00000000..6f2486cd --- /dev/null +++ b/BuildFiles/Building/xsl/Metrics.xsl @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + +
+ Microsoft Metrics +
ItemMaintainability IndexCyclomatic ComplexityClass CouplingInheritance DepthLines Of Code
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/BuildFiles/Building/xsl/MetricsSummary.xsl b/BuildFiles/Building/xsl/MetricsSummary.xsl new file mode 100644 index 00000000..6d177e5b --- /dev/null +++ b/BuildFiles/Building/xsl/MetricsSummary.xsl @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + +
+ Microsoft Metrics +
ModuleMaintainability IndexCyclomatic ComplexityClass CouplingInheritance DepthLines Of Code
+
+ + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/BuildFiles/Building/xsl/ModificationHistory.xsl b/BuildFiles/Building/xsl/ModificationHistory.xsl new file mode 100644 index 00000000..991e8ecc --- /dev/null +++ b/BuildFiles/Building/xsl/ModificationHistory.xsl @@ -0,0 +1,161 @@ + + + + + + + + + +

Modification History

+ + + + + +
+
+ + + + + + + + + + + + + + + + + + + + toggleTr('img- + + ',' + + ') + + + clickable + + + Toggle display of the changes within this build + + img- + + + + + +      + + +   + Label : + +     Changed Files: + + + +      + + + + +      + +  --  + + + + + + + + + + + + display:none; + + + + + + + + section-oddrow + + + section-evenrow + + + + + + + + +
+ /
+ + +
+
+ + + + + + + + + + #339900 + + + #FF0000 + + + + + + +
\ No newline at end of file diff --git a/BuildFiles/Building/xsl/MsTestCover2010.xsl b/BuildFiles/Building/xsl/MsTestCover2010.xsl new file mode 100644 index 00000000..f74b4fa0 --- /dev/null +++ b/BuildFiles/Building/xsl/MsTestCover2010.xsl @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + +

Code Coverage Summary (MsTest)

+ + + + + +
highCoverage >= %
mediumCoverage >= %
bad < %
+ +
+ + + + + + + + + + + + + + + + + +
AssemblyBlocks CoveredBlocks Not CoveredCoverage
+ + + + + + + + + text-align: right; border-right: 1px solid #649cc0; border-bottom: 1px solid #649cc0; width: 100; font-weight: bold; + + background-color:#86ed60; + background-color:#ffff99; + background-color:#eb4848; + + + + + % + + + 0.00% + +
+ +
+ +
+ + +

+ +

+
    + +
+
+ + + + + + +
  • + + + chc + cmc + cbc + + + + + % + 0.00% + + + +
    +
  • + +
    + + + + + + % + 0.00% + + mhc + mmc + mbc + + + + + + +
    \ No newline at end of file diff --git a/BuildFiles/Building/xsl/MsTestReport.xsl b/BuildFiles/Building/xsl/MsTestReport.xsl new file mode 100644 index 00000000..7d490a72 --- /dev/null +++ b/BuildFiles/Building/xsl/MsTestReport.xsl @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Tests run: , Failures: , Inconclusive: +
    + + + + + + + + + + + + + +
    + Passed: + + +
    + Failed: + + +
    + Inconclusive: + + +
    +
    + + + + + + + + + + + +
    + PASSED + + FAILED +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    CodeMethodClassMessageDuration
    P F I ? + + + + + + + +
    +
    +
    + +
    diff --git a/BuildFiles/Building/xsl/MsTestReport2008.xsl b/BuildFiles/Building/xsl/MsTestReport2008.xsl new file mode 100644 index 00000000..135e5fd8 --- /dev/null +++ b/BuildFiles/Building/xsl/MsTestReport2008.xsl @@ -0,0 +1,257 @@ + + + + + + + + + +

    + Test Run: +

    + +

    Summary

    +

    + Designated outcome : + + + + + + + + + + + + +

    + + + + + + + + + + + + + + + + + + + + + + +
    Number of TestsPassedFailedInconclusiveAbortedTimeoutStarted atStopped at
    + + + + + + + + + + + + + + + + + + + +
    + + + +

    Errors and Warnings

    + + +
    +
    + + + + + +
    + + + + +
    +         
    +       
    + + +
    + + +

    Test Results

    + + + + + + + + + + +
    Test List NameTest NameTest ResultTest Duration
    +
    + + + + +
    + Composite Test :
    + + + + + + + + + + + + + + + +
    PassedFailedInconclusiveAbortedTimeout
    + + + + + + + + + +
    + +
    + + + + + + + End of composite test : + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    diff --git a/BuildFiles/Building/xsl/MsTestReport2010.xsl b/BuildFiles/Building/xsl/MsTestReport2010.xsl new file mode 100644 index 00000000..81881d52 --- /dev/null +++ b/BuildFiles/Building/xsl/MsTestReport2010.xsl @@ -0,0 +1,417 @@ + + + + + + + + + + + +

    + Test Run: +

    + +

    Summary

    +

    + Designated outcome : + + + + + + + + + + + + +

    + + + + + + + + + + + + + + + + + + + + + + + + +
    Number of TestsPassedFailedInconclusiveAbortedTimeoutUnknownStarted atStopped at
    + + + + + + + + + + + + + + + + + + + + + +
    + + + +

    Errors and Warnings

    + + +
    +
    + + + + + + + +

    Failed tests

    + + + + + + + + + + + + + + + + + +
    Test List NameTest NameTest ResultTest DurationClass NameCategory
    +
    + + +

    Longest running tests

    + +
      + + + +
    1. -
    2. +
      +
      +
    + + + + + +
    + + + + + + + + + + +

    Test Results

    + + + + + + + + + + + + + +
    Test List NameTest NameTest ResultTest DurationClass NameTest Categories
    +
    + + + + +
    + + Composite Test : + +
    + + + + + + + + + + + + + + + +
    PassedFailedInconclusiveAbortedTimeout
    + + + + + + + + + +
    + +
    + + + + + + + End of composite test : + + +
    + + + + + + + + + + + + , + + + + + + + + + + + + + Passed + + + Failed + + + Inconclusive + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    + + + + + + + + + + + + + + + + +
    + diff --git a/BuildFiles/Building/xsl/MsTestSummary.xsl b/BuildFiles/Building/xsl/MsTestSummary.xsl new file mode 100644 index 00000000..07a62689 --- /dev/null +++ b/BuildFiles/Building/xsl/MsTestSummary.xsl @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Tests run: + Failures: + Inconclusive: +
    All tests passed.
    +
    +
    + + + + + + + + F + + + I + + + ? + + + + . + + + + + + +
    diff --git a/BuildFiles/Building/xsl/MsTestSummary2008.xsl b/BuildFiles/Building/xsl/MsTestSummary2008.xsl new file mode 100644 index 00000000..5ae43654 --- /dev/null +++ b/BuildFiles/Building/xsl/MsTestSummary2008.xsl @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Tests run: + Failures: + Inconclusive: +
    All tests passed.Total count: Passed count:
    +
    +
    + + + + + + F + + + I + + + ? + + + + + + + + + + +
    diff --git a/BuildFiles/Building/xsl/MsTestSummary2010.xsl b/BuildFiles/Building/xsl/MsTestSummary2010.xsl new file mode 100644 index 00000000..5ae43654 --- /dev/null +++ b/BuildFiles/Building/xsl/MsTestSummary2010.xsl @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Tests run: + Failures: + Inconclusive: +
    All tests passed.Total count: Passed count:
    +
    +
    + + + + + + F + + + I + + + ? + + + + + + + + + + +
    diff --git a/BuildFiles/Building/xsl/NAnt.xsl b/BuildFiles/Building/xsl/NAnt.xsl new file mode 100644 index 00000000..4fa455fc --- /dev/null +++ b/BuildFiles/Building/xsl/NAnt.xsl @@ -0,0 +1,93 @@ + + + + + + + + + + +

    Build Failed (click to see error)

    +
    + +

    Build Succeeded

    +
    +
    + +
    + +

    Log does not contain any Xml output from NAnt.

    +

    Please make sure that NAnt is executed using the XmlLogger (use the argument: -logger:NAnt.Core.XmlLogger).

    +
    +
    +
    + + +
    + +
    + + +

    + : +

    + +
    + + + + + + + + + error + + + warning + + + [] + + + +
    +
    + + + + + + + + +
    + Build Error:
    +
    + +
    +			
    +		
    +
    +
    + + +
    + Internal Error:
    +
    + +
    +			
    +		
    +
    +
    + + + in + line: + col:
    +
    + + +
    diff --git a/BuildFiles/Building/xsl/NAntTiming.xsl b/BuildFiles/Building/xsl/NAntTiming.xsl new file mode 100644 index 00000000..05a8a5a0 --- /dev/null +++ b/BuildFiles/Building/xsl/NAntTiming.xsl @@ -0,0 +1,118 @@ + + + + + + + +
    +

    NAnt Build Timing Report

    + + + + + + + +

    Log does not contain any Xml output from NAnt.

    +

    Please make sure that NAnt is executed using the XmlLogger (use the argument: -logger:NAnt.Core.XmlLogger).

    +
    +
    +
    +
    + + +
    +

    Summary

    + + + + + + + +
    Total Build Time:
    +
    + +
    +

    Details

    + + + + + + + + + + + + +
    TargetDuration
    +
    +
    + + + + + + + + Toggle to see tasks in this target + + img- + + + toggleDiv('img-','') +   + / + +
    + + + + + display:none; + +
      + + + +
    +
    + + + + + +
    + + +
  • -
  • +
    + + + + + + : + : + +
    \ No newline at end of file diff --git a/BuildFiles/NCover.xsl b/BuildFiles/Building/xsl/NCover.xsl similarity index 96% rename from BuildFiles/NCover.xsl rename to BuildFiles/Building/xsl/NCover.xsl index 1ff949cb..5a1245d4 100644 --- a/BuildFiles/NCover.xsl +++ b/BuildFiles/Building/xsl/NCover.xsl @@ -1,71 +1,71 @@ - - - - - - - - - - - - - - - - - - - -
    - - - NCover - Test Coverage: - 0]) div count(//coverage/module/method/seqpnt)) * 100)"/>% -
    -
    - Untested Code: -
    -
    - -
    -
    - - -
    - -
    - - -
    - . -
    - - -
    -

    - - - - - - - - Line: - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
    + + + NCover - Test Coverage: + 0]) div count(//coverage/module/method/seqpnt)) * 100)"/>% +
    +
    + Untested Code: +
    +
    + +
    +
    + + +
    + +
    + + +

    + . +
    + + +
    +

    + + + + + + + + Line: + + + + + + + + + + + + + + + + diff --git a/BuildFiles/NCoverExplorer.xsl b/BuildFiles/Building/xsl/NCoverExplorer.xsl similarity index 97% rename from BuildFiles/NCoverExplorer.xsl rename to BuildFiles/Building/xsl/NCoverExplorer.xsl index d232fd4b..4b9ad523 100644 --- a/BuildFiles/NCoverExplorer.xsl +++ b/BuildFiles/Building/xsl/NCoverExplorer.xsl @@ -1,491 +1,491 @@ - - - - - - - - - - Generated by NCoverExplorer (see http://www.kiwidude.com/blog/) - - - - - -
    -
    - - - - - - - - - - - - - Unvisited Functions - Unvisited SeqPts - - - - - Function Coverage - Coverage - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -

    NCoverExplorer Coverage Report -   

    - - - - - - - - - - - - - - - -
    Report generated on: at 
    NCoverExplorer version:
    Filtering / Sorting: / 
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Project Statistics:Files: NCLOC:
    Classes:  
    Functions:Unvisited:
    Seq Pts:Unvisited:
    -
    - - -
    - - - - - - - - -   - - - Project - Acceptable - - - - - - - - - - - - - - - - - - - - - - - - - True - - - - - - - - - -   - - - Modules - Acceptable - - - - - - - - - - - True - - - - - - - - - -   - - - Module - Acceptable - Unvisited SeqPts - Coverage - - - - - - - - - - Namespaces - - - - - - - - - - - - - - - - - - - - -   - - - Module - Acceptable - - - - - - - - - - - - Namespace / Classes - - - - - - - - - padding-left:20px;font-weight:bold - - - - - - - - - padding-left:30px - 160 - - - - - - - - - - -   - - - Namespaces - Unvisited SeqPts - Coverage - - - - - - - - - False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - padding-left:20px - 180 - - - - - - - - - - - - - - - - - - -   - - - Excluded From Coverage Results - All Code Within - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - . - - - . - - graphBarSatisfactory - graphBarNotVisited - - - - .
    -
    -
    + + + + + + + + + + Generated by NCoverExplorer (see http://www.kiwidude.com/blog/) + + + + + +
    +
    + + + + + + + + + + + + + Unvisited Functions + Unvisited SeqPts + + + + + Function Coverage + Coverage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +

    NCoverExplorer Coverage Report -   

    + + + + + + + + + + + + + + + +
    Report generated on: at 
    NCoverExplorer version:
    Filtering / Sorting: / 
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Project Statistics:Files: NCLOC:
    Classes:  
    Functions:Unvisited:
    Seq Pts:Unvisited:
    +
    + + +
    + + + + + + + + +   + + + Project + Acceptable + + + + + + + + + + + + + + + + + + + + + + + + + True + + + + + + + + + +   + + + Modules + Acceptable + + + + + + + + + + + True + + + + + + + + + +   + + + Module + Acceptable + Unvisited SeqPts + Coverage + + + + + + + + + + Namespaces + + + + + + + + + + + + + + + + + + + + +   + + + Module + Acceptable + + + + + + + + + + + + Namespace / Classes + + + + + + + + + padding-left:20px;font-weight:bold + + + + + + + + + padding-left:30px + 160 + + + + + + + + + + +   + + + Namespaces + Unvisited SeqPts + Coverage + + + + + + + + + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + padding-left:20px + 180 + + + + + + + + + + + + + + + + + + +   + + + Excluded From Coverage Results + All Code Within + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + . + + + . + + graphBarSatisfactory + graphBarNotVisited + + + + .
    +
    +
    diff --git a/BuildFiles/NCoverExplorerSummary.xsl b/BuildFiles/Building/xsl/NCoverExplorerSummary.xsl similarity index 96% rename from BuildFiles/NCoverExplorerSummary.xsl rename to BuildFiles/Building/xsl/NCoverExplorerSummary.xsl index 66ed9c81..ce00bbcc 100644 --- a/BuildFiles/NCoverExplorerSummary.xsl +++ b/BuildFiles/Building/xsl/NCoverExplorerSummary.xsl @@ -1,126 +1,126 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - NCoverExplorer Code Coverage Summary: -
    - Module -
    -
    - Coverage % -
    -
    - Acceptance % -
    -
    - Verdict -
    -  Total - - % - - % - - - FAIL - - - PASS - -
     
    - Unvisited Sequence Points: - - - - Files: - - -
    - Total Sequence Points: - - - - Classes - - -
    - Non Comment Lines: - - - - Functions: - - -
    -
    - - - - - - section-oddrow - - - - - - % - - - % - - - - FAIL - - - PASS - - - - -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + NCoverExplorer Code Coverage Summary: +
    + Module +
    +
    + Coverage % +
    +
    + Acceptance % +
    +
    + Verdict +
    +  Total + + % + + % + + + FAIL + + + PASS + +
     
    + Unvisited Sequence Points: + + + + Files: + + +
    + Total Sequence Points: + + + + Classes + + +
    + Non Comment Lines: + + + + Functions: + + +
    +
    + + + + + + section-oddrow + + + + + + % + + + % + + + + FAIL + + + PASS + + + + +
    diff --git a/BuildFiles/NCoverSummary.xsl b/BuildFiles/Building/xsl/NCoverSummary.xsl similarity index 97% rename from BuildFiles/NCoverSummary.xsl rename to BuildFiles/Building/xsl/NCoverSummary.xsl index 34699fbe..9955715e 100644 --- a/BuildFiles/NCoverSummary.xsl +++ b/BuildFiles/Building/xsl/NCoverSummary.xsl @@ -1,30 +1,30 @@ - - - - - - - - - - - - - - - - - - - -
    - NCover results: -
    - Covered lines: - - Uncovered lines: - - Total coverage: % -
    -
    -
    + + + + + + + + + + + + + + + + + + + +
    + NCover results: +
    + Covered lines: + + Uncovered lines: + + Total coverage: % +
    +
    +
    diff --git a/BuildFiles/Building/xsl/ReportGenerator.xsl b/BuildFiles/Building/xsl/ReportGenerator.xsl new file mode 100644 index 00000000..78687258 --- /dev/null +++ b/BuildFiles/Building/xsl/ReportGenerator.xsl @@ -0,0 +1,266 @@ + + + + + + + + + +

    + Code Coverage Report +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Generated on: + + +
    + Parser: + + +
    + Assemblies: + + +
    + Files: + + +
    + Coverage: + + +
    + Covered lines: + + +
    + Coverable lines: + + +
    + Total lines: + + +
    +

    + Assemblies +

    +

    + Collapse all classes | Expand all classes +

    + + + + + + + + + + + + + + + + + + + + + + +
    + + + Details +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Assembly: + + +
    + Classes: + + +
    + Coverage: + + % +
    + Covered lines: + + +
    + Coverable lines: + + +
    + Total lines: + + +
    +
    +
    + % + + + + + + + +
    +   + +   +
    +
    + + Details +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Class: + + +
    + Coverage: + + % +
    + Covered lines: + + +
    + Coverable lines: + + +
    + Total lines: + + +
    +
    +
    + % + + + + + + + + + + + + + + + + + +
    +   + +   + +   + +   +
    +
    +
    +
    diff --git a/BuildFiles/Building/xsl/ReportGeneratorSummary.xsl b/BuildFiles/Building/xsl/ReportGeneratorSummary.xsl new file mode 100644 index 00000000..26d6b117 --- /dev/null +++ b/BuildFiles/Building/xsl/ReportGeneratorSummary.xsl @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Code Coverage Summary +
    + Module +
    +
    + Coverage % +
    +
    + Acceptance % +
    +
    + Verdict +
    + Total + + + + 95% + + + + FAIL + + + PASS + + +
     
    + Covered lines: + + + + Assemblies: + + +
    + Coverable lines: + + + + Files: + + +
    + Total Lines: + + + +   + +   +
    +
    + + + + + + section-oddrow + + + + + + % + + + 80% + + + + + FAIL + + + PASS + + + + + +
    diff --git a/BuildFiles/Building/xsl/ShfbReport.xsl b/BuildFiles/Building/xsl/ShfbReport.xsl new file mode 100644 index 00000000..5527ebcf --- /dev/null +++ b/BuildFiles/Building/xsl/ShfbReport.xsl @@ -0,0 +1,115 @@ + + + + + + + + + + +
    + + +
    +
    + + + + + + + + + + + + + + +
    Build Log
    Project File:
    Build Started:
    Collapse AllExpand All
    Collapse All + Expand All
    +
    + + + + + + + + + - +

    +
    +          
    +        
    +
    + + +
    + + + + + + + +
    diff --git a/BuildFiles/Building/xsl/ShfbSummary.xsl b/BuildFiles/Building/xsl/ShfbSummary.xsl new file mode 100644 index 00000000..4d2ac683 --- /dev/null +++ b/BuildFiles/Building/xsl/ShfbSummary.xsl @@ -0,0 +1,53 @@ + + + + + + + + + + +
    + +
    +
    + + + + + + + + + + +
    Build Log
    Project File:
    Build Started:
    +
    + + + + + + + + +
    diff --git a/BuildFiles/Building/xsl/SimianReport.xsl b/BuildFiles/Building/xsl/SimianReport.xsl new file mode 100644 index 00000000..dc372954 --- /dev/null +++ b/BuildFiles/Building/xsl/SimianReport.xsl @@ -0,0 +1,97 @@ + + + + + + + + + +
    + + + + + +
    Simian Report
    +
    +
    + + + + Configuration + + + + + + + + + + + + + + + Results + + + + Summary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + +
    + + + + + + + + + + + + + + + + +
    diff --git a/BuildFiles/Building/xsl/SimianSummary.xsl b/BuildFiles/Building/xsl/SimianSummary.xsl new file mode 100644 index 00000000..fa323cff --- /dev/null +++ b/BuildFiles/Building/xsl/SimianSummary.xsl @@ -0,0 +1,56 @@ + + + + + + + + + + +
    + + + + + + + + +
    Simian Summary
    Configuration
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + Results + + + + + + + + + + + + + +
    diff --git a/BuildFiles/Building/xsl/StatisticsGraphs.xsl b/BuildFiles/Building/xsl/StatisticsGraphs.xsl new file mode 100644 index 00000000..bc1ddb91 --- /dev/null +++ b/BuildFiles/Building/xsl/StatisticsGraphs.xsl @@ -0,0 +1,282 @@ + + + + + + + + + + + CruiseControl Summary Graphs - Written by Eden Ridgway + + + + + + + + + + + + + + + + + + + +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {'BuildLabel' : '', 'Status' : '', '' : '', 'Date': ' '}, + +
    diff --git a/BuildFiles/Building/xsl/StyleCopReport.xsl b/BuildFiles/Building/xsl/StyleCopReport.xsl new file mode 100644 index 00000000..b11b8c24 --- /dev/null +++ b/BuildFiles/Building/xsl/StyleCopReport.xsl @@ -0,0 +1,49 @@ + + + + + +
    + + +
    StyleCop Report
    + + +
    No StyleCop information in build logs.
    +
    +
    + +
    +
    + + +
    + + + error + + + success + + + Number of Violations: +
    +
      + + + +
    1. +
      + +
    2. +
      +
    +
    + +
    diff --git a/BuildFiles/Building/xsl/StyleCopSummary.xsl b/BuildFiles/Building/xsl/StyleCopSummary.xsl new file mode 100644 index 00000000..da6878fe --- /dev/null +++ b/BuildFiles/Building/xsl/StyleCopSummary.xsl @@ -0,0 +1,35 @@ + + + + + + +
    + + + + + + + +
    StyleCop Report
    + +
    +
    +
    + + + +
    + Number of Violations: + +
    +
    +
    +
    diff --git a/BuildFiles/UnitTestDetails.xsl b/BuildFiles/Building/xsl/UnitTestDetails.xsl similarity index 97% rename from BuildFiles/UnitTestDetails.xsl rename to BuildFiles/Building/xsl/UnitTestDetails.xsl index d74e3fb0..47589d2f 100644 --- a/BuildFiles/UnitTestDetails.xsl +++ b/BuildFiles/Building/xsl/UnitTestDetails.xsl @@ -1,259 +1,259 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - Suites run: , - Tests run: , - Failures: , - Not run: , - Time: seconds -
    No Tests Run
    This project doesn't have any tests
    All Tests Passed
    - Unit Test Failure and Error Details () -
    - Warning Details () -
    -
    - - - - - - section-oddrow - - Error - - - - - - - - - section-oddrow - - Failure - - - - - - - - - section-oddrow - - Success - - - - - - - - - - - section-oddrow - - Warning - - - - - - - - - - - Test: - - - Type:Error - Message: - - - -
    
    -                        
    -                    
    - - -
    - - - Type:Failure - Message: - - - -
    
    -                        
    -                    
    - - -
    - -
    - -
    -
    - - - - - - - - - Test: - Type:Failure - Message: - - - -
    - - -
    - - - Test: - Type:Warning - Message: - - -
    - -
    -
    - - - - - - - - - -
    - - - -
    - - - -
    -
    - -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Suites run: , + Tests run: , + Failures: , + Not run: , + Time: seconds +
    No Tests Run
    This project doesn't have any tests
    All Tests Passed
    + Unit Test Failure and Error Details () +
    + Warning Details () +
    +
    + + + + + + section-oddrow + + Error + + + + + + + + + section-oddrow + + Failure + + + + + + + + + section-oddrow + + Success + + + + + + + + + + + section-oddrow + + Warning + + + + + + + + + + + Test: + + + Type:Error + Message: + + + +
    
    +                        
    +                    
    + + +
    + + + Type:Failure + Message: + + + +
    
    +                        
    +                    
    + + +
    + +
    + +
    +
    + + + + + + + + + Test: + Type:Failure + Message: + + + +
    + + +
    + + + Test: + Type:Warning + Message: + + +
    + +
    +
    + + + + + + + + + +
    + + + +
    + + + +
    +
    + +
    diff --git a/BuildFiles/Building/xsl/ant.xsl b/BuildFiles/Building/xsl/ant.xsl new file mode 100644 index 00000000..e002e05c --- /dev/null +++ b/BuildFiles/Building/xsl/ant.xsl @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + +
    + + http://jakarta.apache.org + + + Apache Ant +
    + + + +

    + + + + + + + +

    +
    + Copyright © 2000-2002, Apache Software Foundation +
    +
    + + +
    + + + + + + failed + complete + + + + + + + + + + + + + +
    Build FailedBuild CompleteTotal Time:
    + +
    + See the stacktrace. +
    +
    + + + + + +
    ant.file
    ant.version
    java.version
    os.name
    + +

    Build events

    + + + + + + + +
    targettaskmessage
    +

    + + + +

    Error details

    + + +
    +
    +
    + +

    +
    + + + + + + + a + b + + + [ ] + + + + + + +
    diff --git a/BuildFiles/Building/xsl/compile-msbuild.xsl b/BuildFiles/Building/xsl/compile-msbuild.xsl new file mode 100644 index 00000000..626b6f6b --- /dev/null +++ b/BuildFiles/Building/xsl/compile-msbuild.xsl @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + +
    + Errors () +
    + +
    +
    + + + + + + + + +
    + Warnings () +
    + +
    +
    +
    + + +
    + + (,): + + error: +
    +
    + + +
    + + (,): + + warning : +
    +
    +
    diff --git a/BuildFiles/Building/xsl/compile.xsl b/BuildFiles/Building/xsl/compile.xsl new file mode 100644 index 00000000..de58a52a --- /dev/null +++ b/BuildFiles/Building/xsl/compile.xsl @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + +
    Errors: ()
    +
    + + + + +
    Warnings: ()
    +
    +
    +
    + + + + + +
    \ No newline at end of file diff --git a/BuildFiles/Building/xsl/console.xsl b/BuildFiles/Building/xsl/console.xsl new file mode 100644 index 00000000..fe22395a --- /dev/null +++ b/BuildFiles/Building/xsl/console.xsl @@ -0,0 +1,23 @@ + + + + + + + + + color:red; + +
    +
    + + +

    Console Log

    +

    +

    +			
    +		
    +

    +
    + +
    \ No newline at end of file diff --git a/BuildFiles/Building/xsl/cruisecontrol.css b/BuildFiles/Building/xsl/cruisecontrol.css new file mode 100644 index 00000000..12b6bc83 --- /dev/null +++ b/BuildFiles/Building/xsl/cruisecontrol.css @@ -0,0 +1,32 @@ +body, table, form, input, td, th, p, textarea, select +{ + font-family: verdana, helvetica, arial; + font-size: 11px; +} + +a:hover { color:#FC0; } + +.main-panel { color:#FC0; } + +.link { color:#FFF; text-decoration:none; } +.link-failed { color:#F30; text-decoration:none; } +.buildresults-header { color: #FFF; font-weight: bold; } +.buildresults-data { color: #9F3; } +.buildresults-data-failed { color: #F30; } + +.stylesection { margin-left: 4px; } +.header-title { font-size:12px; color:#000; font-weight:bold; padding-bottom:10pt; } +.header-label { font-weight:bold; } +.header-data { color:#000; } +.header-data-error { color:#000; white-space:pre; } + +.section-table { margin-top:10px; } +.sectionheader { background-color:#006; color:#FFF; } +.section-data { font-size:9px; color:#000; } +.section-oddrow { background-color:#F0F7FF; } +.section-evenrow { background-color:#FFF; } +.section-error { font-size:9px; color:#F30; white-space:pre; } + +.warning { color: darkorange; } +.error { color:red } +.pluginLinks { float:right; margin-top:10px; padding:10px; background-color:#000066; color:White } \ No newline at end of file diff --git a/BuildFiles/Building/xsl/dupfinder-summary.xsl b/BuildFiles/Building/xsl/dupfinder-summary.xsl new file mode 100644 index 00000000..e4b352fc --- /dev/null +++ b/BuildFiles/Building/xsl/dupfinder-summary.xsl @@ -0,0 +1,31 @@ + + + + + + + +

    Duplicate Finder Analysis

    + +
    + +

    Log does not contain any XML output from DupFinder.

    +
    +
    +
    + + +
    + +
    + +
    +
    +
    + files processed + - + duplicates found +
    +
    +
    +
    \ No newline at end of file diff --git a/BuildFiles/Building/xsl/dupfinder.xsl b/BuildFiles/Building/xsl/dupfinder.xsl new file mode 100644 index 00000000..2aae21bc --- /dev/null +++ b/BuildFiles/Building/xsl/dupfinder.xsl @@ -0,0 +1,55 @@ + + + + + + + +

    Duplicate Finder Analysis

    +
    + +
    + +

    Log does not contain any XML output from DupFinder.

    +
    +
    +
    + + +
    + +
    + +
    +
    +
    + files processed + - + duplicates found +
    +
    + +
    + Duplicate of length at: +
    +
      + +
    • + Line starting in +
    • +
      +
    + +
    + +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/BuildFiles/Building/xsl/emma.xsl b/BuildFiles/Building/xsl/emma.xsl new file mode 100644 index 00000000..c2da7787 --- /dev/null +++ b/BuildFiles/Building/xsl/emma.xsl @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + +
    + + + EMMA - Test Coverage: + % +
    +
    + Package breakdown: +
    +
    +
    + + + + + + + + + + + +
    Line Coverage %Package
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + +
    \ No newline at end of file diff --git a/BuildFiles/fit.xsl b/BuildFiles/Building/xsl/fit.xsl similarity index 97% rename from BuildFiles/fit.xsl rename to BuildFiles/Building/xsl/fit.xsl index 2d693ca4..d285304b 100644 --- a/BuildFiles/fit.xsl +++ b/BuildFiles/Building/xsl/fit.xsl @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - - - - -
    - Acceptance Tests: -
    test results
    -
    -
    + + + + + + + + + + + + + + + + + + + +
    + Acceptance Tests: +
    test results
    +
    +
    \ No newline at end of file diff --git a/BuildFiles/Building/xsl/fitnesse.xsl b/BuildFiles/Building/xsl/fitnesse.xsl new file mode 100644 index 00000000..f68ae4b0 --- /dev/null +++ b/BuildFiles/Building/xsl/fitnesse.xsl @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + fiterror + fitignore + fail + pass + + + + + + + + +
    +
    + FitNesse Summary -- Test Pages: + right, wrong, + ignored, exceptions + Assertions: + right, + wrong, + ignored, + exceptions +
    + + + + + + fiterror + fitignore + fail + pass + + +
    + + right, wrong, + ignored, exceptions + + + img + javascript:toggleDiv('img', 'fitDetails'); +   + + Export Details + javascript:exportDivToNewWindow('fitDetails'); +   + +
    + + fitDetails +
    + +
    +
    +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/BuildFiles/fxcop-report_1_36.xsl b/BuildFiles/Building/xsl/fxcop-report_1_36.xsl similarity index 96% rename from BuildFiles/fxcop-report_1_36.xsl rename to BuildFiles/Building/xsl/fxcop-report_1_36.xsl index 1004f7ce..ccd10a27 100644 --- a/BuildFiles/fxcop-report_1_36.xsl +++ b/BuildFiles/Building/xsl/fxcop-report_1_36.xsl @@ -1,409 +1,409 @@ - - - - - - - - -
    - - - -
    -
    - - -
    -
    - FxCop : -
    -
    -
    -
    -
    - Assemblies checked:
    - Warnings:
    - Critical Warnings:
    - Errors:
    - Critical Errors:
    - Total Messages:
    -
    -
    - - - - - - - - - - - - - - - - - -
    AssemblyTypesWarningsErrorsTotal Messages
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    LocationFix CategoryCertaintyRule
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % - - -
    - - -
    + + + + + + + + +
    + + + +
    +
    + + +
    +
    + FxCop : +
    +
    +
    +
    +
    + Assemblies checked:
    + Warnings:
    + Critical Warnings:
    + Errors:
    + Critical Errors:
    + Total Messages:
    +
    +
    + + + + + + + + + + + + + + + + + +
    AssemblyTypesWarningsErrorsTotal Messages
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    LocationFix CategoryCertaintyRule
    + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + % + + +
    + + +
    \ No newline at end of file diff --git a/BuildFiles/fxcop-summary_1_36.xsl b/BuildFiles/Building/xsl/fxcop-summary_1_36.xsl similarity index 98% rename from BuildFiles/fxcop-summary_1_36.xsl rename to BuildFiles/Building/xsl/fxcop-summary_1_36.xsl index bbb3ab37..1e975e07 100644 --- a/BuildFiles/fxcop-summary_1_36.xsl +++ b/BuildFiles/Building/xsl/fxcop-summary_1_36.xsl @@ -1,40 +1,40 @@ - - - - - - - - - - - - - - - - - -
    - FxCop Messages: , Warning Messages: , Error Messages: -
    -
    - -
    - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +
    + FxCop Messages: , Warning Messages: , Error Messages: +
    +
    + +
    + + + + + + + + + + + + + + + +
    \ No newline at end of file diff --git a/BuildFiles/Building/xsl/gendarme-report-ccnet.xsl b/BuildFiles/Building/xsl/gendarme-report-ccnet.xsl new file mode 100644 index 00000000..c740017b --- /dev/null +++ b/BuildFiles/Building/xsl/gendarme-report-ccnet.xsl @@ -0,0 +1,289 @@ + + + + + + + +
    + + + +
    +
    + + + + : defects + + + + +

    + + + : + + +

      +
    • None
    • +
    + + +
    + + +

    + + + +

    Gendarme Report

    +

    + Produced on UTC. +

    + + +

    + Summary +

    +

    + Gendarme found potential defects using rules. +

    +

    +

    + List of assemblies analyzed + [show] +

    + +

    +

    +

    + List of rules used + [show] +

    + +

    +

    + Reported Defects +

    +

    + +

    + .  + + +   + [hide] +

    +
    + Problem: +

    + +

    + + Solution: +

    + +

    + + + defect(s) found: + + + +

    + Target: 
    + Assembly: 
    + + +
    + Severity:   + Confidence: 
    + + Location: 
    +
    + + Source: 
    +
    + + Details: 
    +
    +
    +
    + + Go to description + +

    +
    +
    +
    + +

    +
    + diff --git a/BuildFiles/Building/xsl/gendarme-summary-ccnet.xsl b/BuildFiles/Building/xsl/gendarme-summary-ccnet.xsl new file mode 100644 index 00000000..98760af6 --- /dev/null +++ b/BuildFiles/Building/xsl/gendarme-summary-ccnet.xsl @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + +
    + Gendarme Report: found potential defects using rules. +
    +
    +
    + + + + + + + + + + + +
    diff --git a/BuildFiles/header.xsl b/BuildFiles/Building/xsl/header.xsl similarity index 97% rename from BuildFiles/header.xsl rename to BuildFiles/Building/xsl/header.xsl index a74bb693..88210cbe 100644 --- a/BuildFiles/header.xsl +++ b/BuildFiles/Building/xsl/header.xsl @@ -1,84 +1,84 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    BUILD EXCEPTION
    Error Message:
    BUILD FAILED
    BUILD SUCCESSFUL
    Project:
    Date of build:
    Running time:
    Integration Request: - -
    - Reason for Force Build: - - -
    -
    - - - - - - Last changed: - - - - - Link to issue: - - - - - Last log entry: - - - - -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    BUILD EXCEPTION
    Error Message:
    BUILD FAILED
    BUILD SUCCESSFUL
    Project:
    Date of build:
    Running time:
    Integration Request: + +
    + Reason for Force Build: + + +
    +
    + + + + + + Last changed: + + + + + Link to issue: + + + + + Last log entry: + + + + +
    diff --git a/BuildFiles/xsl/modifications.xsl b/BuildFiles/Building/xsl/modifications.xsl similarity index 97% rename from BuildFiles/xsl/modifications.xsl rename to BuildFiles/Building/xsl/modifications.xsl index fd04d196..3d2edb37 100644 --- a/BuildFiles/xsl/modifications.xsl +++ b/BuildFiles/Building/xsl/modifications.xsl @@ -1,63 +1,63 @@ - - - - - - - - - - - - - - - - - - - - - - -
    -
    MODIFICATIONS SINCE LAST BUILD () -
    None since last build.
    -
    - - - - - - section-oddrow - - - section-evenrow - - - - - - - - - - - - / - - - - - / - - - - - - - - - -
    + + + + + + + + + + + + + + + + + + + + + + +
    +
    MODIFICATIONS SINCE LAST BUILD () +
    None since last build.
    +
    + + + + + + section-oddrow + + + section-evenrow + + + + + + + + + + + + / + + + + + / + + + + + + + + + +
    diff --git a/BuildFiles/Building/xsl/modificationsByChangeNumber.xsl b/BuildFiles/Building/xsl/modificationsByChangeNumber.xsl new file mode 100644 index 00000000..329be399 --- /dev/null +++ b/BuildFiles/Building/xsl/modificationsByChangeNumber.xsl @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Modifications since last build () +
    + Hide All Files + + Show All Files +
    + + + + + + + + + + +
    + + + + + + + Files +
    + +
    Hide Files +
    + + + + + + section-evenrow + + + section-oddrow + + + + + + +
    + + + + + +
    +
    +
    +
    \ No newline at end of file diff --git a/BuildFiles/Building/xsl/msbuild.xsl b/BuildFiles/Building/xsl/msbuild.xsl new file mode 100644 index 00000000..eae2200f --- /dev/null +++ b/BuildFiles/Building/xsl/msbuild.xsl @@ -0,0 +1,174 @@ + + + + + + + + + + + +

    Log does not contain any XML output from MSBuild.

    +

    + Please make sure that MSBuild is executed using the XmlLogger + (use the argument: /logger:Kobush.Build.Logging.XmlLogger,Kobush.Build.dll). +

    +
    +
    +
    + + + + + + + + + + + + + + + +
    + Build started +
    + +
    + + + Build FAILED + + + Build succeeded + + +
    + + + + + +
    + Error(s) +
    +
    + Warning(s) +
    +
    + Time elapsed +
    +
    + + +
    + Project "" + + + ( target(s)): + + + (default targets): + + +
    + + +
    + Done building project " + + + + " -- FAILED. +
    +
    +
    + + + + + + + + + + + + + + + + + + +
    + Target "": +
    + +
    + +
    +
    + +
    + Done building target "" -- FAILED. +
    +
    +
    + + +
    + Task "": +
    + +
    + +
    +
    +
    + Done executing task "" + -- FAILED. +
    +
    + + + + + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    +
    +
    + + +
    + +  (,):  + + error :  +
    +
    + + +
    + +  (,):  + + warning :  +
    +
    +
    diff --git a/BuildFiles/xsl/msbuild2ccnet.xsl b/BuildFiles/Building/xsl/msbuild2ccnet.xsl similarity index 97% rename from BuildFiles/xsl/msbuild2ccnet.xsl rename to BuildFiles/Building/xsl/msbuild2ccnet.xsl index 06ff3fef..9189b6a4 100644 --- a/BuildFiles/xsl/msbuild2ccnet.xsl +++ b/BuildFiles/Building/xsl/msbuild2ccnet.xsl @@ -1,53 +1,53 @@ - - - - - - - - - - - - - -
    -
    BUILD NOTES - - - ( ERRORS) - - - ( WARNINGS) - - - (CLEAN BUILD) - - -
    Juchuu !!!
    -
    - - - - - Project : - - - - - - error - warning - - - - - - - - : - in
    -
    - - -
    + + + + + + + + + + + + + +
    +
    BUILD NOTES + + + ( ERRORS) + + + ( WARNINGS) + + + (CLEAN BUILD) + + +
    Juchuu !!!
    +
    + + + + + Project : + + + + + + error + warning + + + + + + + + : + in
    +
    + + +
    diff --git a/BuildFiles/Building/xsl/ndependreport-ccnet.v2.xsl b/BuildFiles/Building/xsl/ndependreport-ccnet.v2.xsl new file mode 100644 index 00000000..bdac2ac3 --- /dev/null +++ b/BuildFiles/Building/xsl/ndependreport-ccnet.v2.xsl @@ -0,0 +1,1158 @@ + + + + + + + + + + + + + +
    + +
    +
    + + +
    NDepend Report
    +

    + +
    + To get explanations concerning these metrics, go to the NDepend home page. +
    +

    +

    + +
    Application Metrics
    +
    + +
    Assemblies Metrics
    +
    + +
    VisualNDepend View
    +
    + +
    Assemblies Abstracness vs. Instability
    +
    + +
    Assemblies Dependencies
    +
    + +
    Assemblies Dependencies Diagram
    +
    + +
    Assemblies build order
    +
    + +
    NDepend information and warnings
    +
    + +
    CQL Queries and Constraints
    +
    + +
    Types Metrics
    +
    + +

    +

    + +
    Application Metrics
    +
    +

    + +

    +

    + +
    Assemblies Metrics
    +
    +

    + +

    +

    + +
    VisualNDepend View
    +
    +

    + + ../../RetrieveFile.aspx?file=VisualNDependView.png&label= + +

    +

    + +
    Assemblies Abstracness vs. Instability
    +
    +

    + + ../../RetrieveFile.aspx?file=AbstractnessVSInstability.png&label= + +

    +

    + +
    Assemblies Dependencies
    +
    +

    + +

    +

    + +
    Assemblies Dependencies Diagram
    +
    +

    +
    Blue : Assemblies of your application.
    +
    Yellow : Framework assemblies referenced by assemblies of your application.
    + + ../../RetrieveFile.aspx?file=ComponentDependenciesDiagram.png&label= + +

    +

    + +
    Assemblies build order
    +
    +

    + + + + + +
    At least one cycle exists in the assemblies dependencies. The build order cannot be computed.
    +
    +
    +

    +

    + +
    NDepend information and warnings
    +
    +

    + +

    +

    + +
    CQL Queries and Constraints
    +
    +

    + +

    +

    + +
    Types Metrics
    +
    +

    + +

    + +
    + + +
    + Application name: + + +
    +
    + This report has been built on: + + +
    +
    + + + + + + + + + +
    TypeUses...Is used by...
    +

    +
    + + + + + + + + + + + + + + + + + + - + + + + + + + + + - + + + + + + + + + + # + + + ; + + + + + + + + # + + + ; + + + + + + +
    + +
    +
    + +
    + WARNING: +
    +
    + +
    + ERROR: +
    +
    +
    + + + +
    + +
    +
    +
    + + + + + + + + + +
    AssemblyDepends on...Is referenced by...
    +

    +
    + + + + + + + + + + + + + + + + + + - + + + + + + + + + - + + + + + + + + + + # + + + ; + + + + + + + + # + + + ; + + + + +
    + Number of assemblies: + + +
    +
    + Number of types: + + +
    +
    + Number of classes: + + +
    +
    + Number of abstract classes: + + +
    +
    + Number of interfaces: + + +
    +
    + Number of value types: + + +
    +
    + Number of exception classes: + + +
    +
    + Number of attribute classes: + + +
    +
    + Number of delegate classes: + + +
    +
    + Number of enumerations classes: + + +
    +
    + Number of generic type definitions: + + +
    +
    + Number of generic method definitions: + + +
    +
    + Number of IL instructions: + + +
    +
    + Percentage of public types: + + % +
    +
    + Percentage of public methods: + + % +
    +
    + Percentage of classes with at least one public field: + + % +
    +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Stat# OccurrencesAvgStdDevMax
    +

    +

    +
    + + + + + Properties on Interfaces + + + Interfaces + + + + + + + + + + + properties on + + + + + + + + Methods on Interfaces + + + Interfaces + + + + + + + + + + + methods on + + + + + + + + Arguments on Methods on Interfaces + + + Methods + + + + + + + + + + + arguments on + + + + + + + + Public Properties on Classes + + + Classes + + + + + + + + + + + public properties on + + + + + + + + Public Methods on Classes + + + Classes + + + + + + + + + + + public methods on + + + + + + + + Arguments on Public Methods on Classes + + + Methods + + + + + + + + + + + arguments on + + + + + + + + + IL Instructions in non-abstract Methods + + + Methods + + + + + + + + + + + IL instructions in + + + + + + + + Number of IL Instructions par non-abstract Types + + + Types + + + + + + + + + + + IL instructions in + + + + + + + + + Cyclomatic complexity on non abstract Methods + + + Methods + + + + + + + + + CC = + + for + + + + + + + + Response for Types (IL instructions) + + + Types + + + + + + + + + RFT = + + IL instructions on + + + + + + + +
    rft: Response For Type
    +
    + +
    lcom: Lack of Cohesion Of Methods of a class
    +
    + +
    CC: Cyclomatic Complexity
    +
    + +
    Ca: Afferent Coupling
    +
    + +
    Ce: Efferent Coupling
    +
    + +
    ABC: Association Between Classes
    +
    + +
    NOC: Number Of Children
    +
    + +
    DIT: Depth in Inheritence Tree
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    Type + rank + + lcom + + lcom(HS) + + CC + + Ca + + Ce + + ABC + # Instance Methods# Static Methods# Prop# Fld# ILInst + NOC + + DIT + Namespace
    +

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Assembly# Types# Abstract Types# IL Inst + Afferent Coupling + + Efferent Coupling + + Relational Cohesion + + Instability + + Abstractness + + Distance +
    +

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + {} All CQL queries compile and all CQL contraints are satisfied. +
    +
    + +
    + {} Some CQL constraints are not satisfied. +
    +
    + +
    + {} Some CQL queries don't compile. +
    +
    +
    +
    + + + + + +
    +
    + + +
    + WARNING: The following CQL constraint is not satisfied. on tested match the condition. --> Group {} +
    +
    + +
    + ERROR: The following CQL query doesn't compile. Description: --> Group {} +
    +
    +
    +
    +          
    +        
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + Full Name
    + + + + + + + + + +
    +
    +
    + +
    +
    +
    + +
    + diff --git a/BuildFiles/Building/xsl/nunitv2.xsl b/BuildFiles/Building/xsl/nunitv2.xsl new file mode 100644 index 00000000..53e31727 --- /dev/null +++ b/BuildFiles/Building/xsl/nunitv2.xsl @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + +

    + + + + + + + + + + + + + + + + + + + + + + +
    TotalErrorsFailuresNot runInconclusiveIgnoredSkippedInvalidDuration
    + + + + +

    Errors and Failures

    + + + + + + + + +
    Test DurationTest ResultTest Name
    +
    + + +

    Longest running tests

    +
      + + + +
    1. -
    2. +
      +
      +
    + +

    Test Overview

    + + + + + + +
    Test DurationTest ResultTest Name
    + +
    + + + + + + + + + + + + + + + + Not Run + + + + + Passed + + + Failed + + + + + + + + + + + + + + + + + + +
    \ No newline at end of file diff --git a/BuildFiles/Building/xsl/statistics.xsl b/BuildFiles/Building/xsl/statistics.xsl new file mode 100644 index 00000000..23677355 --- /dev/null +++ b/BuildFiles/Building/xsl/statistics.xsl @@ -0,0 +1,120 @@ + + + + + +

    Note: Only builds ran with the statistics publisher enabled will appear on this page!

    + + + + + + + + + + + + +

    + Today is + //
    + + + + + + + + + + + + + + + + + + + + + + +
    Integration SummaryFor todayOverall
    Total Builds
    Number of Successful
    Number of Failed
    + +
    + + + + + + + + +
    Succesfull build rate : % + + + +
    +

    +
    + + + + + + + + + + + + + + + + pass + unknown + fail + + + + + + section-oddrow + + + section-evenrow + + + + + + + + + +
    Build LabelStatus + +
    + + + + + +
    +
    +
    + + \ No newline at end of file diff --git a/BuildFiles/Building/xsl/tests.xsl b/BuildFiles/Building/xsl/tests.xsl new file mode 100644 index 00000000..66983b77 --- /dev/null +++ b/BuildFiles/Building/xsl/tests.xsl @@ -0,0 +1,263 @@ + + + + + + + +
    + +

    NUnit Test Results

    +
    +

    Summary

    + + + + + + + + + + + + + + + + + + + + + + + +
    Assemblies tested:
    Tests executed:
    Passes:
    Fails:
    Ignored:
    +
    +
    +

    Assembly Test Details:

    + +
    +
    +
    + + + + + + + + + + + +
    + + + + Failed tests: + + + + + Ignored tests: + + + + + + + + + img + javascript:toggleDiv('img', 'divDetails'); +   +
    +
    + divDetails +
    + + + + + + + + + + + + + + + + + + +
    Test FixtureStatusProgress
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + imgTestCase_ + javascript:toggleDiv('imgTestCase_', 'divTest_'); + + + + + + + + + + + + + + + + + + + + + + +
    + % +   + + % +   + + % +   +
    + +
    + divTest_ + + + + +
    +
    + + + + (/) + + +
    + + + + + section-oddrow + + + + + + + + + + + + + + + + + + section-oddrow + + + + + + + + + + +
    +
    +
    +					
    +				
    + + +
    + + + + + section-oddrow + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    \ No newline at end of file diff --git a/BuildFiles/Building/xsl/timing.xsl b/BuildFiles/Building/xsl/timing.xsl new file mode 100644 index 00000000..ec2777e2 --- /dev/null +++ b/BuildFiles/Building/xsl/timing.xsl @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + +
    + Test Timing +
    +
    + + + + + unittests-oddrow + + + + + + + + + + + not run + + + + + + +
    + + \ No newline at end of file diff --git a/BuildFiles/xsl/unittests.xsl b/BuildFiles/Building/xsl/unittests.xsl similarity index 97% rename from BuildFiles/xsl/unittests.xsl rename to BuildFiles/Building/xsl/unittests.xsl index 0a2d1c15..0fa851be 100644 --- a/BuildFiles/xsl/unittests.xsl +++ b/BuildFiles/Building/xsl/unittests.xsl @@ -1,144 +1,144 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    UNIT TESTING
    Suites run: - , Tests run: - , Failures: - , Not run: - , Time: - seconds
    WARNING: NO TESTS RUN
    This project doesn't have any tests. Write some?
    ALL TESTS PASSED
    -
    - - - - - - - ERROR - - - - - - - - - FAIL - - - - - - - oddrow - - - - - PASS - - - - - - - - - WARN - - -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    UNIT TESTING
    Suites run: + , Tests run: + , Failures: + , Not run: + , Time: + seconds
    WARNING: NO TESTS RUN
    This project doesn't have any tests. Write some?
    ALL TESTS PASSED
    +
    + + + + + + + ERROR + + + + + + + + + FAIL + + + + + + + oddrow + + + + + PASS + + + + + + + + + WARN + + +
    diff --git a/BuildFiles/Building/xsl/vil.xsl b/BuildFiles/Building/xsl/vil.xsl new file mode 100644 index 00000000..42ec8216 --- /dev/null +++ b/BuildFiles/Building/xsl/vil.xsl @@ -0,0 +1,70 @@ + + + + + + + + Metrics Report + + + + + + + + + +
    Metric report
    + + +
    + + +
    + +
    + + +
    + +
    + + +
    + + + + + + + + + + + +
    +
    + + + + + + + + +
    Assemblies:
    +
    + + + + + + + +
    \ No newline at end of file diff --git a/BuildFiles/ccnet.config b/BuildFiles/ccnet.config deleted file mode 100755 index 5ad8a53b..00000000 --- a/BuildFiles/ccnet.config +++ /dev/null @@ -1,220 +0,0 @@ - - - - C:\Lab\Swarmops\build - C:\Lab\Swarmops\artifact - http://build.swarmops.com/server/auxiliary/project/Swarmops/ViewLatestBuildReport.aspx - - - git://github.com/Swarmops/Swarmops - master - true - true - true - git - false - false - false - Build {0} - Build-{0} - Swarmops Build - builds@swarmops.com - c:\Lab\Swarmops\build - 180000 - - - - - - - - - - 5 - 0 - 0 - false - - - - - - - - - - - - - C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe - C:\Lab\Swarmops\build - Backend\Backend.csproj - /p:Configuration=Release - Build - 1200 - C:\Program Files (x86)\CruiseControl.NET\server\Rodemeyer.MsBuildToCCnet.dll - - - - - - C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe - C:\Lab\Swarmops\build - Interface\Interface.csproj - /p:Configuration=Release - Build - 1200 - C:\Program Files (x86)\CruiseControl.NET\server\Rodemeyer.MsBuildToCCnet.dll - - - - C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319\aspnet_compiler.exe - C:\Lab\Swarmops\build - -u -v / -p Site5 Site5-Deployment/ - - - - C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools\aspnet_merge.exe - C:\Lab\Swarmops\build - Site5-Deployment -o Swarmops.Site.dll - - - - - - - cmd.exe - /c echo %CCNetLabel% > C:\Lab\Swarmops\build\Site5-Deployment\BuildIdentity.txt - - - - cmd.exe - /c git rev-parse HEAD > C:\Lab\Swarmops\build\Site5-Deployment\CommitIdentity.txt - - - - C:\Lab\Swarmops\build\Site5-Deployment - \\swarmops-dev\builddrop\frontend - false - true - false - - - - C:\Lab\Swarmops\build\Backend\bin\Release - \\swarmops-dev\builddrop\backend - false - true - false - - - - - - - - - - - - cmd.exe - /c echo %CCNetLabel% > \\swarmops-dev\builddrop\BuildDropped.txt - - - - - - - - - - - - - - - - - - - - - - - builds@swarmops.com - 192.168.80.204 - - - - - - - - - - - - Failed - Fixed - Success - - - - - Always - - - - - Failed - Fixed - - - - - - xsl\header.xsl - xsl\msbuild2ccnet.xsl - xsl\unittests.xsl - xsl\fxcop-summary_1_36.xsl - xsl\modifications.xsl - xsl\fxcop-report_1_36.xsl - - - - - - - - diff --git a/BuildFiles/modifications.xsl b/BuildFiles/modifications.xsl deleted file mode 100644 index ab03c07a..00000000 --- a/BuildFiles/modifications.xsl +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
    - MODIFICATIONS SINCE LAST BUILD () -
    None since last build.
    -
    - - - - - - section-oddrow - - - section-evenrow - - - - - - - - - - - - / - - - - - / - - - - - - - - - -
    diff --git a/BuildFiles/msbuild2ccnet.xsl b/BuildFiles/msbuild2ccnet.xsl deleted file mode 100644 index 6aa32d19..00000000 --- a/BuildFiles/msbuild2ccnet.xsl +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - -
    - BUILD NOTES - - - ( ERRORS) - - - ( WARNINGS) - - - (CLEAN BUILD) - - -
    Juchuu !!!
    -
    - - - - - Project : - - - - - - error - warning - - - - - - - - : - in
    -
    - - -
    diff --git a/BuildFiles/unittests.xsl b/BuildFiles/unittests.xsl deleted file mode 100644 index 0a2d1c15..00000000 --- a/BuildFiles/unittests.xsl +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    UNIT TESTING
    Suites run: - , Tests run: - , Failures: - , Not run: - , Time: - seconds
    WARNING: NO TESTS RUN
    This project doesn't have any tests. Write some?
    ALL TESTS PASSED
    -
    - - - - - - - ERROR - - - - - - - - - FAIL - - - - - - - oddrow - - - - - PASS - - - - - - - - - WARN - - -
    diff --git a/BuildFiles/xsl/header.xsl b/BuildFiles/xsl/header.xsl deleted file mode 100644 index a74bb693..00000000 --- a/BuildFiles/xsl/header.xsl +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    BUILD EXCEPTION
    Error Message:
    BUILD FAILED
    BUILD SUCCESSFUL
    Project:
    Date of build:
    Running time:
    Integration Request: - -
    - Reason for Force Build: - - -
    -
    - - - - - - Last changed: - - - - - Link to issue: - - - - - Last log entry: - - - - -
    diff --git a/Console/AssemblyInfo.cs b/Console/AssemblyInfo.cs index 2096caf9..e9eaa935 100644 --- a/Console/AssemblyInfo.cs +++ b/Console/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; // // General Information about an assembly is controlled through the following diff --git a/Console/Console.cs b/Console/Console.cs index 4cb1d46d..5f674350 100644 --- a/Console/Console.cs +++ b/Console/Console.cs @@ -1,29 +1,18 @@ using System; -using System.Collections; using System.Collections.Generic; -using System.Data; -using System.Data.SqlClient; -using System.Text; -using System.Text.RegularExpressions; using System.IO; -using System.Web; -using System.Web.Mail; +using System.Text; using Swarmops.Basic.Enums; -using Swarmops.Basic; -using Swarmops.Logic.Communications; -using Swarmops.Logic.Communications.Transmission; -using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; -using Swarmops.Utility; -using Swarmops.Utility.Server; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Communications; +using Swarmops.Logic.Communications.Transmission; using Swarmops.Logic.Governance; using Swarmops.Logic.Special.Sweden; +using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; using Swarmops.Utility.BotCode; -using Swarmops.Utility.Mail; using Swarmops.Utility.Special.Sweden; /* diff --git a/Console/DotNetChartingCrack.cs b/Console/DotNetChartingCrack.cs index 0ef5a69b..f023a38b 100644 --- a/Console/DotNetChartingCrack.cs +++ b/Console/DotNetChartingCrack.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.IO; using System.Security.Cryptography; using System.Text; diff --git a/Database/Configuration.cs b/Database/Configuration.cs index 35fa53dc..3584997f 100644 --- a/Database/Configuration.cs +++ b/Database/Configuration.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; using System.Web; using System.Xml.Serialization; @@ -131,7 +129,8 @@ namespace Swarmops.Database // Dev console process - return "database.config"; // Each dev needs to set the working directory to the Console directory when debugging + // Each dev needs to set the working directory to the Console directory when debugging + // return "database.config"; } } } diff --git a/Database/Database-Activists.cs b/Database/Database-Activists.cs index c61b7821..9bdfc6e2 100644 --- a/Database/Database-Activists.cs +++ b/Database/Database-Activists.cs @@ -2,10 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; - -using Swarmops.Basic.Types; -using Swarmops.Basic.Enums; namespace Swarmops.Database { diff --git a/Database/Database-Attribute.cs b/Database/Database-Attribute.cs index 7e9ee41f..bbd9a86a 100644 --- a/Database/Database-Attribute.cs +++ b/Database/Database-Attribute.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; namespace Swarmops.Database.Attributes { diff --git a/Database/Database-AutoMails.cs b/Database/Database-AutoMails.cs index 0ec68ca6..07e9c8f8 100644 --- a/Database/Database-AutoMails.cs +++ b/Database/Database-AutoMails.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Data; using System.Data.Common; using Swarmops.Basic.Enums; diff --git a/Database/Database-Ballots.cs b/Database/Database-Ballots.cs index 9b6b6353..9b3e4bed 100644 --- a/Database/Database-Ballots.cs +++ b/Database/Database-Ballots.cs @@ -2,11 +2,8 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-CashAdvances.cs b/Database/Database-CashAdvances.cs index 25ae1d91..91f269d5 100644 --- a/Database/Database-CashAdvances.cs +++ b/Database/Database-CashAdvances.cs @@ -2,9 +2,6 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; namespace Swarmops.Database diff --git a/Database/Database-ChurnData.cs b/Database/Database-ChurnData.cs index 29b5fc01..568cc618 100644 --- a/Database/Database-ChurnData.cs +++ b/Database/Database-ChurnData.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; diff --git a/Database/Database-CommunicationTurnarounds.cs b/Database/Database-CommunicationTurnarounds.cs index 5e279536..dae1b8ed 100644 --- a/Database/Database-CommunicationTurnarounds.cs +++ b/Database/Database-CommunicationTurnarounds.cs @@ -2,11 +2,8 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-Conditions.cs b/Database/Database-Conditions.cs index 529c59ce..ea18f3b8 100644 --- a/Database/Database-Conditions.cs +++ b/Database/Database-Conditions.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Collections.Generic; using Swarmops.Basic.Interfaces; using Swarmops.Database.Attributes; diff --git a/Database/Database-ConnectionsCommands.cs b/Database/Database-ConnectionsCommands.cs index 8badca64..4f0f5c5f 100644 --- a/Database/Database-ConnectionsCommands.cs +++ b/Database/Database-ConnectionsCommands.cs @@ -1,13 +1,10 @@ using System; -using System.Collections.Generic; +using System.Configuration; using System.Data; using System.Data.Common; using System.Security; using System.Text; - -using MySql.Data; using MySql.Data.MySqlClient; -using System.Configuration; namespace Swarmops.Database { diff --git a/Database/Database-Constructors.cs b/Database/Database-Constructors.cs index 076dec2a..2a0046a0 100644 --- a/Database/Database-Constructors.cs +++ b/Database/Database-Constructors.cs @@ -1,11 +1,7 @@ using System; -using System.Collections.Generic; -using System.Data; using System.Data.Common; -using System.Configuration; using System.IO; using System.Web; -using MySql.Data; using Swarmops.Basic.Diagnostics; namespace Swarmops.Database diff --git a/Database/Database-Countries.cs b/Database/Database-Countries.cs index be78b896..1bd45a65 100644 --- a/Database/Database-Countries.cs +++ b/Database/Database-Countries.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-Currencies.cs b/Database/Database-Currencies.cs index 9a8f12df..9387ad0c 100644 --- a/Database/Database-Currencies.cs +++ b/Database/Database-Currencies.cs @@ -2,11 +2,8 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-Documents.cs b/Database/Database-Documents.cs index 80f0315a..1a00979f 100644 --- a/Database/Database-Documents.cs +++ b/Database/Database-Documents.cs @@ -2,11 +2,10 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; using MySql.Data.MySqlClient; +using Swarmops.Basic.Enums; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-ExceptionLog.cs b/Database/Database-ExceptionLog.cs index 1d21c22d..1abe53a0 100644 --- a/Database/Database-ExceptionLog.cs +++ b/Database/Database-ExceptionLog.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-Expenses.cs b/Database/Database-Expenses.cs index 182b1cd3..1f52658d 100644 --- a/Database/Database-Expenses.cs +++ b/Database/Database-Expenses.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; diff --git a/Database/Database-ExternalActivities.cs b/Database/Database-ExternalActivities.cs index ab459b75..abc0fa74 100644 --- a/Database/Database-ExternalActivities.cs +++ b/Database/Database-ExternalActivities.cs @@ -3,10 +3,8 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-ExternalIdentities.cs b/Database/Database-ExternalIdentities.cs index 40c92236..097a1f68 100644 --- a/Database/Database-ExternalIdentities.cs +++ b/Database/Database-ExternalIdentities.cs @@ -1,8 +1,8 @@ using System; -using System.Data.Common; -using Swarmops.Basic.Enums; using System.Collections.Generic; using System.Data; +using System.Data.Common; +using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-FinancialTransactionTagSetTypes.cs b/Database/Database-FinancialTransactionTagSetTypes.cs index 86489e8e..b4928ba4 100644 --- a/Database/Database-FinancialTransactionTagSetTypes.cs +++ b/Database/Database-FinancialTransactionTagSetTypes.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; using System.Globalization; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types.Financial; namespace Swarmops.Database diff --git a/Database/Database-FinancialTransactionTagSets.cs b/Database/Database-FinancialTransactionTagSets.cs index 0e4e42ba..695b654b 100644 --- a/Database/Database-FinancialTransactionTagSets.cs +++ b/Database/Database-FinancialTransactionTagSets.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; using System.Globalization; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types.Financial; namespace Swarmops.Database diff --git a/Database/Database-FinancialTransactionTagTypes.cs b/Database/Database-FinancialTransactionTagTypes.cs index d412106f..3227657d 100644 --- a/Database/Database-FinancialTransactionTagTypes.cs +++ b/Database/Database-FinancialTransactionTagTypes.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; using System.Globalization; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types.Financial; namespace Swarmops.Database diff --git a/Database/Database-FinancialTransactionTags.cs b/Database/Database-FinancialTransactionTags.cs index 17dfe2f0..f25c1248 100644 --- a/Database/Database-FinancialTransactionTags.cs +++ b/Database/Database-FinancialTransactionTags.cs @@ -3,9 +3,6 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; using System.Globalization; -using System.Text; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Types.Financial; namespace Swarmops.Database { diff --git a/Database/Database-FinancialValidations.cs b/Database/Database-FinancialValidations.cs index 165936cc..387c98a9 100644 --- a/Database/Database-FinancialValidations.cs +++ b/Database/Database-FinancialValidations.cs @@ -3,11 +3,8 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-Financials.cs b/Database/Database-Financials.cs index 1a41b06b..3681e7e7 100644 --- a/Database/Database-Financials.cs +++ b/Database/Database-Financials.cs @@ -5,7 +5,6 @@ using System.Data.Common; using System.Globalization; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; // This is the first part of Database to fully use MySql. diff --git a/Database/Database-FlatData.cs b/Database/Database-FlatData.cs index 971372ce..f71be63f 100644 --- a/Database/Database-FlatData.cs +++ b/Database/Database-FlatData.cs @@ -1,11 +1,6 @@ -using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; - -using Swarmops.Basic.Types; -using Swarmops.Basic.Enums; namespace Swarmops.Database { diff --git a/Database/Database-InboundInvoices.cs b/Database/Database-InboundInvoices.cs index 9555b343..8cc6793f 100644 --- a/Database/Database-InboundInvoices.cs +++ b/Database/Database-InboundInvoices.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; // This is the first part of Database to fully use MySql. diff --git a/Database/Database-Initialization.cs b/Database/Database-Initialization.cs index 821dfcf4..77b1d3a6 100644 --- a/Database/Database-Initialization.cs +++ b/Database/Database-Initialization.cs @@ -1,10 +1,6 @@ -using System.Text; -using System.Data; -using System; -using System.Collections.Generic; +using System; using System.Data; using System.Data.Common; -using System.Text; namespace Swarmops.Database { diff --git a/Database/Database-InternalPollCandidates.cs b/Database/Database-InternalPollCandidates.cs index 01be350d..274c1bd0 100644 --- a/Database/Database-InternalPollCandidates.cs +++ b/Database/Database-InternalPollCandidates.cs @@ -2,11 +2,8 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-InternalPollVotes.cs b/Database/Database-InternalPollVotes.cs index 6e207eb4..9f5d3573 100644 --- a/Database/Database-InternalPollVotes.cs +++ b/Database/Database-InternalPollVotes.cs @@ -2,11 +2,8 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-InternalPolls.cs b/Database/Database-InternalPolls.cs index 4ef4e0a8..6e345e6a 100644 --- a/Database/Database-InternalPolls.cs +++ b/Database/Database-InternalPolls.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-MailTemplates.cs b/Database/Database-MailTemplates.cs index 4c56d298..9777399e 100644 --- a/Database/Database-MailTemplates.cs +++ b/Database/Database-MailTemplates.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-Media.cs b/Database/Database-Media.cs index 8889a71a..1b5f710b 100644 --- a/Database/Database-Media.cs +++ b/Database/Database-Media.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; diff --git a/Database/Database-Meetings.cs b/Database/Database-Meetings.cs index ce18296b..73817e65 100644 --- a/Database/Database-Meetings.cs +++ b/Database/Database-Meetings.cs @@ -2,11 +2,8 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types.Governance; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-MotionAmendments.cs b/Database/Database-MotionAmendments.cs index 2cc90cd9..c2e89387 100644 --- a/Database/Database-MotionAmendments.cs +++ b/Database/Database-MotionAmendments.cs @@ -2,11 +2,8 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types.Governance; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-Motions.cs b/Database/Database-Motions.cs index 6aec1cab..28efe89a 100644 --- a/Database/Database-Motions.cs +++ b/Database/Database-Motions.cs @@ -2,11 +2,8 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types.Governance; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-Optimizations.cs b/Database/Database-Optimizations.cs index 24b15cf8..d6b38495 100644 --- a/Database/Database-Optimizations.cs +++ b/Database/Database-Optimizations.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; -using System.Data; using System.Data.Common; using Swarmops.Basic.Enums; -using Swarmops.Basic.Types; - // This file contains odd functions that are optimizations of very specific cases, that would otherwise // require remodeling of the data model and/or very expensive database operations. diff --git a/Database/Database-OptionalData.cs b/Database/Database-OptionalData.cs index 49388455..946fbd6d 100644 --- a/Database/Database-OptionalData.cs +++ b/Database/Database-OptionalData.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; diff --git a/Database/Database-OrganizationFinancialAccounts.cs b/Database/Database-OrganizationFinancialAccounts.cs index 35bb93c6..5a5aa625 100644 --- a/Database/Database-OrganizationFinancialAccounts.cs +++ b/Database/Database-OrganizationFinancialAccounts.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Data; +using System.Data; using System.Data.Common; -using System.Text; using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; -using Swarmops.Basic.Types; namespace Swarmops.Database { diff --git a/Database/Database-OutboundCommRecipients.cs b/Database/Database-OutboundCommRecipients.cs index 3076bad6..5108da64 100644 --- a/Database/Database-OutboundCommRecipients.cs +++ b/Database/Database-OutboundCommRecipients.cs @@ -2,9 +2,6 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Communications; namespace Swarmops.Database diff --git a/Database/Database-OutboundComms.cs b/Database/Database-OutboundComms.cs index ae97fe08..42131723 100644 --- a/Database/Database-OutboundComms.cs +++ b/Database/Database-OutboundComms.cs @@ -2,9 +2,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; using Swarmops.Basic.Enums; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Communications; namespace Swarmops.Database diff --git a/Database/Database-OutboundInvoices.cs b/Database/Database-OutboundInvoices.cs index bef5300d..85af8c7c 100644 --- a/Database/Database-OutboundInvoices.cs +++ b/Database/Database-OutboundInvoices.cs @@ -2,10 +2,8 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-OutboundMailRecipients.cs b/Database/Database-OutboundMailRecipients.cs index 229a0d91..a5fb8ad6 100644 --- a/Database/Database-OutboundMailRecipients.cs +++ b/Database/Database-OutboundMailRecipients.cs @@ -1,8 +1,6 @@ -using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-OutboundPhoneMessages.cs b/Database/Database-OutboundPhoneMessages.cs index 58cc0178..ff510f65 100644 --- a/Database/Database-OutboundPhoneMessages.cs +++ b/Database/Database-OutboundPhoneMessages.cs @@ -1,10 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Data.Common; - -using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-ParleyAttendees.cs b/Database/Database-ParleyAttendees.cs index 821096f0..7c2ca039 100644 --- a/Database/Database-ParleyAttendees.cs +++ b/Database/Database-ParleyAttendees.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-ParleyOptions.cs b/Database/Database-ParleyOptions.cs index b7fb2305..368eee3a 100644 --- a/Database/Database-ParleyOptions.cs +++ b/Database/Database-ParleyOptions.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-Parleys.cs b/Database/Database-Parleys.cs index 12b6d8ac..02547bf3 100644 --- a/Database/Database-Parleys.cs +++ b/Database/Database-Parleys.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-PaymentCodes.cs b/Database/Database-PaymentCodes.cs index 80f1d325..7487fc05 100644 --- a/Database/Database-PaymentCodes.cs +++ b/Database/Database-PaymentCodes.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-PaymentGroups.cs b/Database/Database-PaymentGroups.cs index bf51fbed..69120283 100644 --- a/Database/Database-PaymentGroups.cs +++ b/Database/Database-PaymentGroups.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-Payments.cs b/Database/Database-Payments.cs index 0a41592b..9dfb7819 100644 --- a/Database/Database-Payments.cs +++ b/Database/Database-Payments.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-Payouts.cs b/Database/Database-Payouts.cs index 331e070a..743d02c4 100644 --- a/Database/Database-Payouts.cs +++ b/Database/Database-Payouts.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; using System.Globalization; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; diff --git a/Database/Database-Payroll.cs b/Database/Database-Payroll.cs index 37b3d643..89e9bb07 100644 --- a/Database/Database-Payroll.cs +++ b/Database/Database-Payroll.cs @@ -2,11 +2,8 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-PayrollAdjustments.cs b/Database/Database-PayrollAdjustments.cs index dcec1777..e2064184 100644 --- a/Database/Database-PayrollAdjustments.cs +++ b/Database/Database-PayrollAdjustments.cs @@ -2,11 +2,8 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-Permissions.cs b/Database/Database-Permissions.cs index aefb451a..1d894df6 100644 --- a/Database/Database-Permissions.cs +++ b/Database/Database-Permissions.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using System.Text; +using System.Data; using System.Data.Common; using Swarmops.Basic.Enums; -using System.Data; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-PirateWebLog.cs b/Database/Database-PirateWebLog.cs index 869bbad8..2968aba0 100644 --- a/Database/Database-PirateWebLog.cs +++ b/Database/Database-PirateWebLog.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-PostalCodes.cs b/Database/Database-PostalCodes.cs index ae52c5f6..9d20c899 100644 --- a/Database/Database-PostalCodes.cs +++ b/Database/Database-PostalCodes.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Data; +using System.Collections.Generic; using System.Data.Common; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; // This is the first part of Database to fully use MySql. diff --git a/Database/Database-PostalCodesCities.cs b/Database/Database-PostalCodesCities.cs index 6fda34df..3d0ade86 100644 --- a/Database/Database-PostalCodesCities.cs +++ b/Database/Database-PostalCodesCities.cs @@ -1,8 +1,7 @@ using System; +using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Collections.Generic; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-Refunds.cs b/Database/Database-Refunds.cs index 8ce316eb..1b9024a8 100644 --- a/Database/Database-Refunds.cs +++ b/Database/Database-Refunds.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-Reporters.cs b/Database/Database-Reporters.cs index 0f03149d..6264985e 100644 --- a/Database/Database-Reporters.cs +++ b/Database/Database-Reporters.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; namespace Swarmops.Database diff --git a/Database/Database-Salaries.cs b/Database/Database-Salaries.cs index 1e10bf3c..8c0297d8 100644 --- a/Database/Database-Salaries.cs +++ b/Database/Database-Salaries.cs @@ -2,11 +2,8 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-SwarmopsLog.cs b/Database/Database-SwarmopsLog.cs index c5b5b0b9..054eadd2 100644 --- a/Database/Database-SwarmopsLog.cs +++ b/Database/Database-SwarmopsLog.cs @@ -2,11 +2,8 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-TaxLevels.cs b/Database/Database-TaxLevels.cs index 9e2eb3c2..b90e7e2e 100644 --- a/Database/Database-TaxLevels.cs +++ b/Database/Database-TaxLevels.cs @@ -2,7 +2,6 @@ using System; using System.Data; using System.Data.Common; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Database-TemporaryIdentities.cs b/Database/Database-TemporaryIdentities.cs index 5833a75e..50179573 100644 --- a/Database/Database-TemporaryIdentities.cs +++ b/Database/Database-TemporaryIdentities.cs @@ -1,7 +1,6 @@ using System; using System.Data; using System.Data.Common; -using Swarmops.Basic.Types; namespace Swarmops.Database { diff --git a/Database/Database-Tests.cs b/Database/Database-Tests.cs index 7b502894..fe516450 100644 --- a/Database/Database-Tests.cs +++ b/Database/Database-Tests.cs @@ -2,8 +2,6 @@ using System.Data; using System.Data.Common; using System.Diagnostics; -using MySql.Data; -using MySql.Data.MySqlClient; namespace Swarmops.Database { diff --git a/Database/Database-UrlTranslations.cs b/Database/Database-UrlTranslations.cs index 9136e212..e63c754e 100644 --- a/Database/Database-UrlTranslations.cs +++ b/Database/Database-UrlTranslations.cs @@ -2,10 +2,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; - -using Swarmops.Basic.Types; -using Swarmops.Basic.Enums; namespace Swarmops.Database { diff --git a/Database/Database-Volunteers.cs b/Database/Database-Volunteers.cs index e4dce717..d44b4b81 100644 --- a/Database/Database-Volunteers.cs +++ b/Database/Database-Volunteers.cs @@ -2,11 +2,9 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; - namespace Swarmops.Database { public partial class SwarmDb diff --git a/Database/Properties/AssemblyInfo.cs b/Database/Properties/AssemblyInfo.cs index 81868828..aeb08f3d 100644 --- a/Database/Properties/AssemblyInfo.cs +++ b/Database/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; // // General Information about an assembly is controlled through the following diff --git a/Interface/Collections/ExpensePayouts.cs b/Interface/Collections/ExpensePayouts.cs index 0245b930..37e37d5b 100644 --- a/Interface/Collections/ExpensePayouts.cs +++ b/Interface/Collections/ExpensePayouts.cs @@ -1,10 +1,8 @@ -using System; using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; using Swarmops.Interface.Objects; +using Swarmops.Logic.Financial; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Interface.Collections { diff --git a/Interface/DataObjects/ExpensePayoutsDataObject.cs b/Interface/DataObjects/ExpensePayoutsDataObject.cs index a14a5bec..3b0fd138 100644 --- a/Interface/DataObjects/ExpensePayoutsDataObject.cs +++ b/Interface/DataObjects/ExpensePayoutsDataObject.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Text; using Swarmops.Interface.Collections; using Swarmops.Interface.Objects; diff --git a/Interface/DataObjects/ListPersonDataSource.cs b/Interface/DataObjects/ListPersonDataSource.cs index 5ec9c589..d5938801 100644 --- a/Interface/DataObjects/ListPersonDataSource.cs +++ b/Interface/DataObjects/ListPersonDataSource.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using System.Web; -using Swarmops.Logic.Swarm; -using Swarmops.Basic.Types; -using Swarmops.Basic.Enums; -using Swarmops.Logic.Structure; using System.Reflection; +using Swarmops.Basic.Enums; +using Swarmops.Basic.Types; +using Swarmops.Logic.Swarm; /// /// Summary description for ListPersonDataSource diff --git a/Interface/DataObjects/OrganizationRolesDataObject.cs b/Interface/DataObjects/OrganizationRolesDataObject.cs index ac044724..87d39007 100644 --- a/Interface/DataObjects/OrganizationRolesDataObject.cs +++ b/Interface/DataObjects/OrganizationRolesDataObject.cs @@ -1,13 +1,10 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Text; using Swarmops.Basic.Enums; -using Swarmops.Interface.Collections; -using Swarmops.Interface.Objects; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; using Swarmops.Basic.Types; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Interface.DataObjects { diff --git a/Interface/Localization/LocalizationManager.cs b/Interface/Localization/LocalizationManager.cs index df172fb6..faedca90 100644 --- a/Interface/Localization/LocalizationManager.cs +++ b/Interface/Localization/LocalizationManager.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace Swarmops.Interface.Localization { public class LocalizationManager diff --git a/Interface/Objects/ExpensePayout.cs b/Interface/Objects/ExpensePayout.cs index cd65af39..3d5e0e34 100644 --- a/Interface/Objects/ExpensePayout.cs +++ b/Interface/Objects/ExpensePayout.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; using Swarmops.Basic.Interfaces; - +using Swarmops.Logic.Financial; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Interface.Objects { diff --git a/Interface/Objects/MainMenuItem.cs b/Interface/Objects/MainMenuItem.cs index 97e486ce..97060288 100644 --- a/Interface/Objects/MainMenuItem.cs +++ b/Interface/Objects/MainMenuItem.cs @@ -1,12 +1,6 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Web; -using System.Web.UI.WebControls; using System.Xml.Serialization; -using Swarmops.Logic.Security; - namespace Swarmops.Interface.Objects { diff --git a/Interface/Objects/OrganizationMetadata.cs b/Interface/Objects/OrganizationMetadata.cs index 535d532c..c6d20f25 100644 --- a/Interface/Objects/OrganizationMetadata.cs +++ b/Interface/Objects/OrganizationMetadata.cs @@ -1,7 +1,5 @@ using System; using System.Drawing; -using System.Collections.Generic; -using System.Text; using System.Web; namespace Swarmops.Interface.Objects diff --git a/Interface/PersonIcon.cs b/Interface/PersonIcon.cs index 96a0a1ca..e4af343c 100644 --- a/Interface/PersonIcon.cs +++ b/Interface/PersonIcon.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Security; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Interface { diff --git a/Interface/PirateWebMapProvider.cs b/Interface/PirateWebMapProvider.cs index f0441628..cf35a1b0 100644 --- a/Interface/PirateWebMapProvider.cs +++ b/Interface/PirateWebMapProvider.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; using System.Collections.Specialized; -using System.Text; using System.Web; - namespace Swarmops.Interface { public class PirateWebMapProvider: XmlSiteMapProvider diff --git a/Interface/Properties/AssemblyInfo.cs b/Interface/Properties/AssemblyInfo.cs index 49e08ea5..e1ad67dc 100644 --- a/Interface/Properties/AssemblyInfo.cs +++ b/Interface/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Interface/RssWriter.cs b/Interface/RssWriter.cs index 1230aa27..f51ff230 100644 --- a/Interface/RssWriter.cs +++ b/Interface/RssWriter.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Xml; -using System.IO; // Class to write out RSS // Expected Usage: diff --git a/Logic/App_GlobalResources/nl/Logic.Communications.Transmission.NotificationPayload.nl.resx b/Logic/App_GlobalResources/nl/Logic.Communications.Transmission.NotificationPayload.nl.resx new file mode 100644 index 00000000..c3677795 --- /dev/null +++ b/Logic/App_GlobalResources/nl/Logic.Communications.Transmission.NotificationPayload.nl.resx @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Logic/App_GlobalResources/nl/Logic.Financial.FinancialTransactionTagSetTypesStock.nl.resx b/Logic/App_GlobalResources/nl/Logic.Financial.FinancialTransactionTagSetTypesStock.nl.resx new file mode 100644 index 00000000..04e70c23 --- /dev/null +++ b/Logic/App_GlobalResources/nl/Logic.Financial.FinancialTransactionTagSetTypesStock.nl.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + diff --git a/Logic/App_GlobalResources/nl/Logic.Swarm.DashboardTodos.nl.resx b/Logic/App_GlobalResources/nl/Logic.Swarm.DashboardTodos.nl.resx new file mode 100644 index 00000000..121a5035 --- /dev/null +++ b/Logic/App_GlobalResources/nl/Logic.Swarm.DashboardTodos.nl.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + diff --git a/Logic/Cache/GeographyCache.cs b/Logic/Cache/GeographyCache.cs index c45c8275..67f59ec6 100644 --- a/Logic/Cache/GeographyCache.cs +++ b/Logic/Cache/GeographyCache.cs @@ -1,9 +1,8 @@ using System; -using Swarmops.Logic.Structure; using System.Collections.Generic; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Structure; namespace Swarmops.Logic.Cache { diff --git a/Logic/Cache/GuidCache.cs b/Logic/Cache/GuidCache.cs index 1f67040b..f4e05b77 100644 --- a/Logic/Cache/GuidCache.cs +++ b/Logic/Cache/GuidCache.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Collections; namespace Swarmops.Logic.Cache { diff --git a/Logic/Cache/MailTemplateCache.cs b/Logic/Cache/MailTemplateCache.cs index eb5dbef4..7105ceb9 100644 --- a/Logic/Cache/MailTemplateCache.cs +++ b/Logic/Cache/MailTemplateCache.cs @@ -1,9 +1,8 @@ using System; -using Swarmops.Logic.Structure; using System.Collections.Generic; -using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Structure; namespace Swarmops.Logic.Cache { diff --git a/Logic/Cache/OrganizationCache.cs b/Logic/Cache/OrganizationCache.cs index 557e12e0..7365cb36 100644 --- a/Logic/Cache/OrganizationCache.cs +++ b/Logic/Cache/OrganizationCache.cs @@ -1,8 +1,8 @@ using System; -using Swarmops.Logic.Structure; using System.Collections.Generic; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Structure; namespace Swarmops.Logic.Cache { diff --git a/Logic/Communications/AutoMail.cs b/Logic/Communications/AutoMail.cs index 6707ce68..a868535f 100644 --- a/Logic/Communications/AutoMail.cs +++ b/Logic/Communications/AutoMail.cs @@ -1,8 +1,8 @@ using Swarmops.Basic.Enums; using Swarmops.Basic.Types.Communications; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Communications { diff --git a/Logic/Communications/CommunicationTurnaround.cs b/Logic/Communications/CommunicationTurnaround.cs index 32550e1a..7220af44 100644 --- a/Logic/Communications/CommunicationTurnaround.cs +++ b/Logic/Communications/CommunicationTurnaround.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Communications { diff --git a/Logic/Communications/CommunicationTurnarounds.cs b/Logic/Communications/CommunicationTurnarounds.cs index e7e5d97d..2bd2e87d 100644 --- a/Logic/Communications/CommunicationTurnarounds.cs +++ b/Logic/Communications/CommunicationTurnarounds.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Structure; diff --git a/Logic/Communications/ICommsRenderer.cs b/Logic/Communications/ICommsRenderer.cs index 5baad32b..aa2d2ef2 100644 --- a/Logic/Communications/ICommsRenderer.cs +++ b/Logic/Communications/ICommsRenderer.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Communications diff --git a/Logic/Communications/ICommsResolver.cs b/Logic/Communications/ICommsResolver.cs index c0269f41..929cc12e 100644 --- a/Logic/Communications/ICommsResolver.cs +++ b/Logic/Communications/ICommsResolver.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Swarmops.Logic.Communications +namespace Swarmops.Logic.Communications { public interface ICommsResolver { diff --git a/Logic/Communications/ICommsTransmitter.cs b/Logic/Communications/ICommsTransmitter.cs index 6634c6b3..471b0e35 100644 --- a/Logic/Communications/ICommsTransmitter.cs +++ b/Logic/Communications/ICommsTransmitter.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Logic.Communications.Transmission; +using Swarmops.Logic.Communications.Transmission; using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Communications diff --git a/Logic/Communications/MailTemplate.cs b/Logic/Communications/MailTemplate.cs index 66c638d7..4d142726 100644 --- a/Logic/Communications/MailTemplate.cs +++ b/Logic/Communications/MailTemplate.cs @@ -1,10 +1,8 @@ -using Swarmops.Basic.Enums; -using Swarmops.Logic.Swarm; -using System.Collections.Generic; -using HtmlAgilityPack; -using System.Text.RegularExpressions; using System; +using System.Collections.Generic; +using System.Text.RegularExpressions; using System.Web; +using HtmlAgilityPack; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Cache; diff --git a/Logic/Communications/NewsletterFeed.cs b/Logic/Communications/NewsletterFeed.cs index a6ac85dc..2314abce 100644 --- a/Logic/Communications/NewsletterFeed.cs +++ b/Logic/Communications/NewsletterFeed.cs @@ -1,4 +1,3 @@ -using System; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Communications/OutboundComm.cs b/Logic/Communications/OutboundComm.cs index a8fe7478..f51aea58 100644 --- a/Logic/Communications/OutboundComm.cs +++ b/Logic/Communications/OutboundComm.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types.Communications; using Swarmops.Database; diff --git a/Logic/Communications/OutboundCommRecipient.cs b/Logic/Communications/OutboundCommRecipient.cs index 1b01f47a..7ee687da 100644 --- a/Logic/Communications/OutboundCommRecipient.cs +++ b/Logic/Communications/OutboundCommRecipient.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Types.Communications; +using Swarmops.Basic.Types.Communications; using Swarmops.Database; using Swarmops.Logic.Swarm; diff --git a/Logic/Communications/OutboundCommRecipients.cs b/Logic/Communications/OutboundCommRecipients.cs index 434db6c6..3f168cdb 100644 --- a/Logic/Communications/OutboundCommRecipients.cs +++ b/Logic/Communications/OutboundCommRecipients.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Types.Communications; +using Swarmops.Basic.Types.Communications; using Swarmops.Database; using Swarmops.Logic.Support; diff --git a/Logic/Communications/OutboundCommTransmitException.cs b/Logic/Communications/OutboundCommTransmitException.cs index eabb9819..b1eedac6 100644 --- a/Logic/Communications/OutboundCommTransmitException.cs +++ b/Logic/Communications/OutboundCommTransmitException.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Swarmops.Logic.Communications { diff --git a/Logic/Communications/OutboundComms.cs b/Logic/Communications/OutboundComms.cs index afd6273e..6ee9d699 100644 --- a/Logic/Communications/OutboundComms.cs +++ b/Logic/Communications/OutboundComms.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Types.Communications; +using Swarmops.Basic.Types.Communications; using Swarmops.Database; using Swarmops.Logic.Support; diff --git a/Logic/Communications/OutboundMail.cs b/Logic/Communications/OutboundMail.cs index 2c2a3e1e..2125f1d5 100644 --- a/Logic/Communications/OutboundMail.cs +++ b/Logic/Communications/OutboundMail.cs @@ -1,19 +1,13 @@ using System; -using System.Text.RegularExpressions; -using System.Web; -using HtmlAgilityPack; -using System.Resources; -using System.Reflection; -using System.Globalization; -using Swarmops.Logic.Support; using System.Collections.Generic; +using System.Text.RegularExpressions; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Media; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Communications { diff --git a/Logic/Communications/OutboundMailRecipient.cs b/Logic/Communications/OutboundMailRecipient.cs index d93aed20..7184bec8 100644 --- a/Logic/Communications/OutboundMailRecipient.cs +++ b/Logic/Communications/OutboundMailRecipient.cs @@ -1,4 +1,3 @@ -using System; using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Communications/PaperLetter.cs b/Logic/Communications/PaperLetter.cs index f21840a2..e7759dc4 100644 --- a/Logic/Communications/PaperLetter.cs +++ b/Logic/Communications/PaperLetter.cs @@ -1,12 +1,10 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Communications { diff --git a/Logic/Communications/PaperLetters.cs b/Logic/Communications/PaperLetters.cs index dd4e28d7..857e2b2f 100644 --- a/Logic/Communications/PaperLetters.cs +++ b/Logic/Communications/PaperLetters.cs @@ -1,11 +1,8 @@ -using System; using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Support; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Communications { diff --git a/Logic/Communications/PhoneMessageReceiver.cs b/Logic/Communications/PhoneMessageReceiver.cs index 92e5e805..c0f5e3d3 100644 --- a/Logic/Communications/PhoneMessageReceiver.cs +++ b/Logic/Communications/PhoneMessageReceiver.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; -using System.Text; using System.Net.Mail; +using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Communications { diff --git a/Logic/Communications/PhoneMessageTransmitter.cs b/Logic/Communications/PhoneMessageTransmitter.cs index 595be68a..04a9bce3 100644 --- a/Logic/Communications/PhoneMessageTransmitter.cs +++ b/Logic/Communications/PhoneMessageTransmitter.cs @@ -1,10 +1,10 @@ using System; using System.IO; using System.Net; +using System.Security.Cryptography.X509Certificates; using System.Text; using System.Text.RegularExpressions; using System.Web; -using System.Security.Cryptography.X509Certificates; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Support; @@ -246,8 +246,10 @@ namespace Swarmops.Logic.Communications // buffer för inläsning var buf = new byte[8092]; +#pragma warning disable 618 // ServicePointManager.CertificatePolicy is obsoleted, but is the only thing that works on both windows and mono. //Needed to avoid errors from homegrown SSL cert. + ICertificatePolicy oldPolicy = ServicePointManager.CertificatePolicy; ServicePointManager.CertificatePolicy = new HTTPSender(); @@ -263,6 +265,7 @@ namespace Swarmops.Logic.Communications var response = (HttpWebResponse)request.GetResponse(); responseOut = response; ServicePointManager.CertificatePolicy = oldPolicy; +#pragma warning restore 618 // läs in dataströmmen via responsmetoden Stream resStream = response.GetResponseStream(); diff --git a/Logic/Communications/Transmission/NotificationPayload.cs b/Logic/Communications/Transmission/NotificationPayload.cs index 10742a05..f03c0663 100644 --- a/Logic/Communications/Transmission/NotificationPayload.cs +++ b/Logic/Communications/Transmission/NotificationPayload.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Resources; -using System.Text; -using System.Globalization; using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Communications.Transmission diff --git a/Logic/Communications/Transmission/PayloadBase.cs b/Logic/Communications/Transmission/PayloadBase.cs index fd78d081..44f1bd9f 100644 --- a/Logic/Communications/Transmission/PayloadBase.cs +++ b/Logic/Communications/Transmission/PayloadBase.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; using System.Xml.Serialization; using Swarmops.Logic.Support; diff --git a/Logic/Communications/Transmission/PayloadEnvelope.cs b/Logic/Communications/Transmission/PayloadEnvelope.cs index 0e9f7650..49f406d2 100644 --- a/Logic/Communications/Transmission/PayloadEnvelope.cs +++ b/Logic/Communications/Transmission/PayloadEnvelope.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Swarmops.Logic.Support; namespace Swarmops.Logic.Communications.Transmission diff --git a/Logic/Communications/TypedMailTemplate.cs b/Logic/Communications/TypedMailTemplate.cs index 684e48cb..77290983 100644 --- a/Logic/Communications/TypedMailTemplate.cs +++ b/Logic/Communications/TypedMailTemplate.cs @@ -1,20 +1,19 @@ using System; using System.Collections.Generic; -using System.Text; using System.Globalization; -using System.Web; -using System.Reflection; -using Swarmops.Basic.Types; -using System.Xml.Serialization; using System.IO; +using System.Reflection; +using System.Text; using System.Text.RegularExpressions; +using System.Web; +using System.Xml.Serialization; using HtmlAgilityPack; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; using Swarmops.Logic.Media; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Communications { diff --git a/Logic/DashboardTasks/TaskAdvanceDebt.cs b/Logic/DashboardTasks/TaskAdvanceDebt.cs index 2d7f6bb7..6e735747 100644 --- a/Logic/DashboardTasks/TaskAdvanceDebt.cs +++ b/Logic/DashboardTasks/TaskAdvanceDebt.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Globalization; -using System.Text; namespace Swarmops.Logic.DashboardTasks { diff --git a/Logic/DashboardTasks/TaskAttestationLate.cs b/Logic/DashboardTasks/TaskAttestationLate.cs index e7ecdc7c..a21208dd 100644 --- a/Logic/DashboardTasks/TaskAttestationLate.cs +++ b/Logic/DashboardTasks/TaskAttestationLate.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Financial; namespace Swarmops.Logic.DashboardTasks diff --git a/Logic/DashboardTasks/TaskBase.cs b/Logic/DashboardTasks/TaskBase.cs index 2e88c435..699f07bc 100644 --- a/Logic/DashboardTasks/TaskBase.cs +++ b/Logic/DashboardTasks/TaskBase.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; namespace Swarmops.Logic.DashboardTasks { diff --git a/Logic/DashboardTasks/TaskExpenseClaim.cs b/Logic/DashboardTasks/TaskExpenseClaim.cs index 1d7584f8..276d0438 100644 --- a/Logic/DashboardTasks/TaskExpenseClaim.cs +++ b/Logic/DashboardTasks/TaskExpenseClaim.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Financial; namespace Swarmops.Logic.DashboardTasks diff --git a/Logic/DashboardTasks/TaskGroup.cs b/Logic/DashboardTasks/TaskGroup.cs index 23f1e8f4..ddbe284f 100644 --- a/Logic/DashboardTasks/TaskGroup.cs +++ b/Logic/DashboardTasks/TaskGroup.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Support; namespace Swarmops.Logic.DashboardTasks diff --git a/Logic/DashboardTasks/TaskInboundInvoice.cs b/Logic/DashboardTasks/TaskInboundInvoice.cs index 3eb09779..e942ede5 100644 --- a/Logic/DashboardTasks/TaskInboundInvoice.cs +++ b/Logic/DashboardTasks/TaskInboundInvoice.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Financial; namespace Swarmops.Logic.DashboardTasks diff --git a/Logic/DashboardTasks/TaskPayout.cs b/Logic/DashboardTasks/TaskPayout.cs index 9349a3b6..67b4c002 100644 --- a/Logic/DashboardTasks/TaskPayout.cs +++ b/Logic/DashboardTasks/TaskPayout.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Financial; namespace Swarmops.Logic.DashboardTasks diff --git a/Logic/DashboardTasks/TaskReceiptValidation.cs b/Logic/DashboardTasks/TaskReceiptValidation.cs index 9a3b6fb8..cd2f9a68 100644 --- a/Logic/DashboardTasks/TaskReceiptValidation.cs +++ b/Logic/DashboardTasks/TaskReceiptValidation.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Financial; namespace Swarmops.Logic.DashboardTasks diff --git a/Logic/DashboardTasks/TaskSalary.cs b/Logic/DashboardTasks/TaskSalary.cs index 41b7a7d0..df090d29 100644 --- a/Logic/DashboardTasks/TaskSalary.cs +++ b/Logic/DashboardTasks/TaskSalary.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Financial; namespace Swarmops.Logic.DashboardTasks diff --git a/Logic/DashboardTasks/TaskVolunteer.cs b/Logic/DashboardTasks/TaskVolunteer.cs index f242b23f..24fdfe78 100644 --- a/Logic/DashboardTasks/TaskVolunteer.cs +++ b/Logic/DashboardTasks/TaskVolunteer.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Swarm; namespace Swarmops.Logic.DashboardTasks diff --git a/Logic/DashboardTasks/Tasks.cs b/Logic/DashboardTasks/Tasks.cs index 5a80d95d..d796b082 100644 --- a/Logic/DashboardTasks/Tasks.cs +++ b/Logic/DashboardTasks/Tasks.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; -using System.Text; +using Swarmops.Basic.Enums; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Security; using Swarmops.Logic.Structure; -using Swarmops.Basic.Enums; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.DashboardTasks { diff --git a/Logic/DataObjects/ExpensesDataObject.cs b/Logic/DataObjects/ExpensesDataObject.cs index 9acbdca4..990ce56d 100644 --- a/Logic/DataObjects/ExpensesDataObject.cs +++ b/Logic/DataObjects/ExpensesDataObject.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.DataObjects { diff --git a/Logic/DataObjects/GeographyWithPeopleDataObject.cs b/Logic/DataObjects/GeographyWithPeopleDataObject.cs index 0f09bf8a..5be752d1 100644 --- a/Logic/DataObjects/GeographyWithPeopleDataObject.cs +++ b/Logic/DataObjects/GeographyWithPeopleDataObject.cs @@ -1,9 +1,7 @@ -using System.ComponentModel; -using Swarmops.Logic.Structure; -using Swarmops.Logic.Swarm; -using System; using System.Collections.Generic; +using System.ComponentModel; using Swarmops.Database; +using Swarmops.Logic.Structure; namespace Swarmops.Logic.DataObjects { diff --git a/Logic/DataObjects/MembershipsDataObject.cs b/Logic/DataObjects/MembershipsDataObject.cs index 9656d76d..3b520e84 100644 --- a/Logic/DataObjects/MembershipsDataObject.cs +++ b/Logic/DataObjects/MembershipsDataObject.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -using Swarmops.Logic.Swarm; using Swarmops.Database; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.DataObjects { diff --git a/Logic/DataObjects/OrganizationDataObject.cs b/Logic/DataObjects/OrganizationDataObject.cs index c6edb636..9816aebd 100644 --- a/Logic/DataObjects/OrganizationDataObject.cs +++ b/Logic/DataObjects/OrganizationDataObject.cs @@ -1,11 +1,8 @@ -using System.ComponentModel; -using Swarmops.Logic.Structure; -using Swarmops.Logic.Swarm; using System; using System.Collections.Generic; -using Swarmops.Basic.Types; -using System.Collections.ObjectModel; +using System.ComponentModel; using System.Web; +using Swarmops.Logic.Structure; namespace Swarmops.Logic.DataObjects { diff --git a/Logic/DataObjects/PeopleDataObject.cs b/Logic/DataObjects/PeopleDataObject.cs index 74126d9e..55fb7bd3 100644 --- a/Logic/DataObjects/PeopleDataObject.cs +++ b/Logic/DataObjects/PeopleDataObject.cs @@ -1,7 +1,7 @@ -using System.ComponentModel; -using Swarmops.Logic.Swarm; using System; using System.Collections.Generic; +using System.ComponentModel; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.DataObjects { diff --git a/Logic/DataObjects/RolesDataObject.cs b/Logic/DataObjects/RolesDataObject.cs index 9b66614b..1df62497 100644 --- a/Logic/DataObjects/RolesDataObject.cs +++ b/Logic/DataObjects/RolesDataObject.cs @@ -1,10 +1,10 @@ using System; using System.ComponentModel; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Security; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Basic.Types.Security; +using Swarmops.Logic.Security; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.DataObjects { diff --git a/Logic/Financial/BankDataReaders/SEPaymentsBankgiroReader.cs b/Logic/Financial/BankDataReaders/SEPaymentsBankgiroReader.cs index 26e9aa71..9a8d3064 100644 --- a/Logic/Financial/BankDataReaders/SEPaymentsBankgiroReader.cs +++ b/Logic/Financial/BankDataReaders/SEPaymentsBankgiroReader.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Swarmops.Logic.Financial.BankDataReaders +namespace Swarmops.Logic.Financial.BankDataReaders { // ReSharper disable once InconsistentNaming class SEPaymentsBankgiroReader: IBankDataPaymentsReader diff --git a/Logic/Financial/BankDataReaders/TabSeparatedValuesReader.cs b/Logic/Financial/BankDataReaders/TabSeparatedValuesReader.cs index 347f753e..1f20998a 100644 --- a/Logic/Financial/BankDataReaders/TabSeparatedValuesReader.cs +++ b/Logic/Financial/BankDataReaders/TabSeparatedValuesReader.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; namespace Swarmops.Logic.Financial.BankDataReaders { diff --git a/Logic/Financial/CashAdvance.cs b/Logic/Financial/CashAdvance.cs index 1cdddecd..f1c1c29b 100644 --- a/Logic/Financial/CashAdvance.cs +++ b/Logic/Financial/CashAdvance.cs @@ -1,16 +1,13 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types.Financial; using Swarmops.Database; using Swarmops.Logic.Communications; using Swarmops.Logic.Communications.Transmission; +using Swarmops.Logic.Structure; using Swarmops.Logic.Support; using Swarmops.Logic.Support.LogEntries; using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/CashAdvances.cs b/Logic/Financial/CashAdvances.cs index fc79a60a..939cd1c1 100644 --- a/Logic/Financial/CashAdvances.cs +++ b/Logic/Financial/CashAdvances.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using Swarmops.Basic.Types.Financial; using Swarmops.Database; using Swarmops.Logic.Structure; diff --git a/Logic/Financial/Currency.cs b/Logic/Financial/Currency.cs index 9684d842..1d4a771b 100644 --- a/Logic/Financial/Currency.cs +++ b/Logic/Financial/Currency.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Financial/ExpenseClaim.cs b/Logic/Financial/ExpenseClaim.cs index 4749010f..2ceaa670 100644 --- a/Logic/Financial/ExpenseClaim.cs +++ b/Logic/Financial/ExpenseClaim.cs @@ -5,10 +5,10 @@ using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Communications; using Swarmops.Logic.Communications.Transmission; -using Swarmops.Logic.Support.LogEntries; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Support.LogEntries; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/ExpenseClaims.cs b/Logic/Financial/ExpenseClaims.cs index 622143ce..fd997b94 100644 --- a/Logic/Financial/ExpenseClaims.cs +++ b/Logic/Financial/ExpenseClaims.cs @@ -1,11 +1,10 @@ using System; -using System.Collections.Generic; using System.Linq; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/ExternalBankData.cs b/Logic/Financial/ExternalBankData.cs index c591c78d..de0d4060 100644 --- a/Logic/Financial/ExternalBankData.cs +++ b/Logic/Financial/ExternalBankData.cs @@ -2,8 +2,6 @@ using System.Collections.Generic; using System.Globalization; using System.IO; -using System.Linq; -using System.Text; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; diff --git a/Logic/Financial/ExternalBankDataProfile.cs b/Logic/Financial/ExternalBankDataProfile.cs index b1e28091..970329f7 100644 --- a/Logic/Financial/ExternalBankDataProfile.cs +++ b/Logic/Financial/ExternalBankDataProfile.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using Swarmops.Logic.Structure; namespace Swarmops.Logic.Financial diff --git a/Logic/Financial/ExternalBankDataRecord.cs b/Logic/Financial/ExternalBankDataRecord.cs index 56b18429..8ea28239 100644 --- a/Logic/Financial/ExternalBankDataRecord.cs +++ b/Logic/Financial/ExternalBankDataRecord.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Text; using Swarmops.Logic.Security; namespace Swarmops.Logic.Financial diff --git a/Logic/Financial/FinancialAccount.cs b/Logic/Financial/FinancialAccount.cs index 52d77dde..e7f80bbc 100644 --- a/Logic/Financial/FinancialAccount.cs +++ b/Logic/Financial/FinancialAccount.cs @@ -1,12 +1,11 @@ using System; using Swarmops.Basic.Enums; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; using Swarmops.Database; using Swarmops.Logic.Interfaces; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { @@ -80,7 +79,7 @@ namespace Swarmops.Logic.Financial public Int64 GetBudgetCents (int year) { - return (Int64) (GetBudget(year)*100); + return (Int64) (SwarmDb.GetDatabaseForReading().GetFinancialAccountBudget(this.Identity, year)*100); } public Int64[] GetBudgetMonthly (int year) diff --git a/Logic/Financial/FinancialAccountRow.cs b/Logic/Financial/FinancialAccountRow.cs index 1b58c19b..866258f6 100644 --- a/Logic/Financial/FinancialAccountRow.cs +++ b/Logic/Financial/FinancialAccountRow.cs @@ -1,4 +1,3 @@ -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; namespace Swarmops.Logic.Financial diff --git a/Logic/Financial/FinancialAccountRows.cs b/Logic/Financial/FinancialAccountRows.cs index 81a8cf52..88a9bc1f 100644 --- a/Logic/Financial/FinancialAccountRows.cs +++ b/Logic/Financial/FinancialAccountRows.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; namespace Swarmops.Logic.Financial diff --git a/Logic/Financial/FinancialAccounts.cs b/Logic/Financial/FinancialAccounts.cs index 4f7d8445..a4c9690a 100644 --- a/Logic/Financial/FinancialAccounts.cs +++ b/Logic/Financial/FinancialAccounts.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; using Swarmops.Basic.Enums; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/FinancialTransaction.cs b/Logic/Financial/FinancialTransaction.cs index 50c2a449..8cb38e2a 100644 --- a/Logic/Financial/FinancialTransaction.cs +++ b/Logic/Financial/FinancialTransaction.cs @@ -2,12 +2,11 @@ using System; using System.Collections.Generic; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/FinancialTransactionRow.cs b/Logic/Financial/FinancialTransactionRow.cs index f294b3c5..f0d9abed 100644 --- a/Logic/Financial/FinancialTransactionRow.cs +++ b/Logic/Financial/FinancialTransactionRow.cs @@ -1,5 +1,4 @@ using System; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; using Swarmops.Database; diff --git a/Logic/Financial/FinancialTransactionRows.cs b/Logic/Financial/FinancialTransactionRows.cs index 139ba8b8..ba885c96 100644 --- a/Logic/Financial/FinancialTransactionRows.cs +++ b/Logic/Financial/FinancialTransactionRows.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Swarmops.Basic.Enums; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; namespace Swarmops.Logic.Financial diff --git a/Logic/Financial/FinancialTransactionTagSet.cs b/Logic/Financial/FinancialTransactionTagSet.cs index 066f9cad..8d3b7e38 100644 --- a/Logic/Financial/FinancialTransactionTagSet.cs +++ b/Logic/Financial/FinancialTransactionTagSet.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Types.Financial; +using Swarmops.Basic.Types.Financial; using Swarmops.Database; namespace Swarmops.Logic.Financial diff --git a/Logic/Financial/FinancialTransactionTagSetType.cs b/Logic/Financial/FinancialTransactionTagSetType.cs index 4a020c3c..d0de2d07 100644 --- a/Logic/Financial/FinancialTransactionTagSetType.cs +++ b/Logic/Financial/FinancialTransactionTagSetType.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Logic.Interfaces; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/FinancialTransactionTagSetTypesStock.cs b/Logic/Financial/FinancialTransactionTagSetTypesStock.cs index 93520ed2..dacd471c 100644 --- a/Logic/Financial/FinancialTransactionTagSetTypesStock.cs +++ b/Logic/Financial/FinancialTransactionTagSetTypesStock.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Swarmops.Logic.Financial +namespace Swarmops.Logic.Financial { public enum FinancialTransactionTagSetTypesStock { diff --git a/Logic/Financial/FinancialTransactionTagSets.cs b/Logic/Financial/FinancialTransactionTagSets.cs index 9fc52296..9d435ccc 100644 --- a/Logic/Financial/FinancialTransactionTagSets.cs +++ b/Logic/Financial/FinancialTransactionTagSets.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Types.Financial; +using Swarmops.Basic.Types.Financial; using Swarmops.Database; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; diff --git a/Logic/Financial/FinancialTransactionTagType.cs b/Logic/Financial/FinancialTransactionTagType.cs index 376df7cb..896c6c90 100644 --- a/Logic/Financial/FinancialTransactionTagType.cs +++ b/Logic/Financial/FinancialTransactionTagType.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Types.Financial; +using Swarmops.Basic.Types.Financial; using Swarmops.Database; namespace Swarmops.Logic.Financial diff --git a/Logic/Financial/FinancialTransactionTagTypes.cs b/Logic/Financial/FinancialTransactionTagTypes.cs index 955898e2..91cb4382 100644 --- a/Logic/Financial/FinancialTransactionTagTypes.cs +++ b/Logic/Financial/FinancialTransactionTagTypes.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Types.Financial; +using Swarmops.Basic.Types.Financial; using Swarmops.Database; using Swarmops.Logic.Support; diff --git a/Logic/Financial/FinancialTransactions.cs b/Logic/Financial/FinancialTransactions.cs index 32fd01b4..a8f210ad 100644 --- a/Logic/Financial/FinancialTransactions.cs +++ b/Logic/Financial/FinancialTransactions.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Generic; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; using Swarmops.Database; using Swarmops.Logic.Structure; diff --git a/Logic/Financial/FinancialValidation.cs b/Logic/Financial/FinancialValidation.cs index 59ee09fb..27822029 100644 --- a/Logic/Financial/FinancialValidation.cs +++ b/Logic/Financial/FinancialValidation.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; using Swarmops.Logic.Swarm; diff --git a/Logic/Financial/FinancialValidations.cs b/Logic/Financial/FinancialValidations.cs index 421eb8d0..9ec29054 100644 --- a/Logic/Financial/FinancialValidations.cs +++ b/Logic/Financial/FinancialValidations.cs @@ -1,13 +1,10 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; -using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/IAttestable.cs b/Logic/Financial/IAttestable.cs index f6f23e24..9edd4e56 100644 --- a/Logic/Financial/IAttestable.cs +++ b/Logic/Financial/IAttestable.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial diff --git a/Logic/Financial/IBankDataAccountStatementReader.cs b/Logic/Financial/IBankDataAccountStatementReader.cs index 0f569eb0..2ee67c0c 100644 --- a/Logic/Financial/IBankDataAccountStatementReader.cs +++ b/Logic/Financial/IBankDataAccountStatementReader.cs @@ -1,5 +1,4 @@ using System.IO; -using Swarmops.Logic.Financial.BankDataReaders; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/ISummable.cs b/Logic/Financial/ISummable.cs index fa817327..e52c511e 100644 --- a/Logic/Financial/ISummable.cs +++ b/Logic/Financial/ISummable.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Enums; +using Swarmops.Basic.Enums; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/IValidatable.cs b/Logic/Financial/IValidatable.cs index d002f8b4..6f8b50a8 100644 --- a/Logic/Financial/IValidatable.cs +++ b/Logic/Financial/IValidatable.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial diff --git a/Logic/Financial/InboundInvoice.cs b/Logic/Financial/InboundInvoice.cs index ee5007ef..336ce095 100644 --- a/Logic/Financial/InboundInvoice.cs +++ b/Logic/Financial/InboundInvoice.cs @@ -1,15 +1,14 @@ using System; using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Communications; using Swarmops.Logic.Communications.Transmission; -using Swarmops.Logic.Support.LogEntries; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Support.LogEntries; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/InboundInvoices.cs b/Logic/Financial/InboundInvoices.cs index 42934a10..1f9d6c8d 100644 --- a/Logic/Financial/InboundInvoices.cs +++ b/Logic/Financial/InboundInvoices.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Structure; diff --git a/Logic/Financial/OrganizationFinancialAccounts.cs b/Logic/Financial/OrganizationFinancialAccounts.cs index 04e31312..b2a2e855 100644 --- a/Logic/Financial/OrganizationFinancialAccounts.cs +++ b/Logic/Financial/OrganizationFinancialAccounts.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Database; using Swarmops.Logic.Structure; diff --git a/Logic/Financial/OutboundInvoice.cs b/Logic/Financial/OutboundInvoice.cs index 8fca0b3d..fd17c0f2 100644 --- a/Logic/Financial/OutboundInvoice.cs +++ b/Logic/Financial/OutboundInvoice.cs @@ -1,13 +1,11 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Security; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/OutboundInvoiceItem.cs b/Logic/Financial/OutboundInvoiceItem.cs index 4373ab99..521f7086 100644 --- a/Logic/Financial/OutboundInvoiceItem.cs +++ b/Logic/Financial/OutboundInvoiceItem.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Financial/OutboundInvoiceItems.cs b/Logic/Financial/OutboundInvoiceItems.cs index d986dd68..6ad3242a 100644 --- a/Logic/Financial/OutboundInvoiceItems.cs +++ b/Logic/Financial/OutboundInvoiceItems.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Support; diff --git a/Logic/Financial/OutboundInvoices.cs b/Logic/Financial/OutboundInvoices.cs index 306ee082..66d26e92 100644 --- a/Logic/Financial/OutboundInvoices.cs +++ b/Logic/Financial/OutboundInvoices.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Structure; diff --git a/Logic/Financial/Payment.cs b/Logic/Financial/Payment.cs index d35a9e1f..320a75ee 100644 --- a/Logic/Financial/Payment.cs +++ b/Logic/Financial/Payment.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; using System.IO; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/PaymentGroup.cs b/Logic/Financial/PaymentGroup.cs index 318c31d0..f4964e0f 100644 --- a/Logic/Financial/PaymentGroup.cs +++ b/Logic/Financial/PaymentGroup.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/PaymentGroups.cs b/Logic/Financial/PaymentGroups.cs index bdc4d1ca..4d12024a 100644 --- a/Logic/Financial/PaymentGroups.cs +++ b/Logic/Financial/PaymentGroups.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Structure; diff --git a/Logic/Financial/PaymentInformation.cs b/Logic/Financial/PaymentInformation.cs index 764e8ac7..495efe35 100644 --- a/Logic/Financial/PaymentInformation.cs +++ b/Logic/Financial/PaymentInformation.cs @@ -1,7 +1,4 @@ -using System; using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Support; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Financial/Payments.cs b/Logic/Financial/Payments.cs index eb255309..a8b220a2 100644 --- a/Logic/Financial/Payments.cs +++ b/Logic/Financial/Payments.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Support; diff --git a/Logic/Financial/Payout.cs b/Logic/Financial/Payout.cs index dbdfdf93..83a053d1 100644 --- a/Logic/Financial/Payout.cs +++ b/Logic/Financial/Payout.cs @@ -1,17 +1,16 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; using Swarmops.Database; using Swarmops.Logic.Communications; using Swarmops.Logic.Communications.Transmission; -using Swarmops.Logic.Support.LogEntries; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Support.LogEntries; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { @@ -35,7 +34,7 @@ namespace Swarmops.Logic.Financial // TODO: Create in database - return payout; + // return payout; } private Payout (BasicPayout basic): diff --git a/Logic/Financial/Payouts.cs b/Logic/Financial/Payouts.cs index 82cc0b6e..d14680c8 100644 --- a/Logic/Financial/Payouts.cs +++ b/Logic/Financial/Payouts.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/Payroll.cs b/Logic/Financial/Payroll.cs index f9235e0c..9b306db8 100644 --- a/Logic/Financial/Payroll.cs +++ b/Logic/Financial/Payroll.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Structure; diff --git a/Logic/Financial/PayrollAdjustment.cs b/Logic/Financial/PayrollAdjustment.cs index 315919c0..65c93a49 100644 --- a/Logic/Financial/PayrollAdjustment.cs +++ b/Logic/Financial/PayrollAdjustment.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Financial/PayrollAdjustments.cs b/Logic/Financial/PayrollAdjustments.cs index 880fd700..359b0fcc 100644 --- a/Logic/Financial/PayrollAdjustments.cs +++ b/Logic/Financial/PayrollAdjustments.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Support; diff --git a/Logic/Financial/PayrollItem.cs b/Logic/Financial/PayrollItem.cs index 3a678804..32ebd962 100644 --- a/Logic/Financial/PayrollItem.cs +++ b/Logic/Financial/PayrollItem.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/Refund.cs b/Logic/Financial/Refund.cs index 3cbc9788..b11c780d 100644 --- a/Logic/Financial/Refund.cs +++ b/Logic/Financial/Refund.cs @@ -1,12 +1,10 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Financial { diff --git a/Logic/Financial/Salaries.cs b/Logic/Financial/Salaries.cs index b340d635..b971bd17 100644 --- a/Logic/Financial/Salaries.cs +++ b/Logic/Financial/Salaries.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Structure; diff --git a/Logic/Financial/Salary.cs b/Logic/Financial/Salary.cs index 36e6bfb2..6c1dec39 100644 --- a/Logic/Financial/Salary.cs +++ b/Logic/Financial/Salary.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; using System.Globalization; -using System.Text; -using Swarmops.Logic.Structure; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Financial/StockBankDataReaders.cs b/Logic/Financial/StockBankDataReaders.cs index d7ae0d31..943d6981 100644 --- a/Logic/Financial/StockBankDataReaders.cs +++ b/Logic/Financial/StockBankDataReaders.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Swarmops.Logic.Financial +namespace Swarmops.Logic.Financial { // ReSharper disable InconsistentNaming class StockBankDataReaders diff --git a/Logic/Financial/TaxLevels.cs b/Logic/Financial/TaxLevels.cs index 5d1eb33e..4cc8ae3b 100644 --- a/Logic/Financial/TaxLevels.cs +++ b/Logic/Financial/TaxLevels.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Database; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; diff --git a/Logic/Financial/YearlyReport.cs b/Logic/Financial/YearlyReport.cs index 17aae848..4a9ad479 100644 --- a/Logic/Financial/YearlyReport.cs +++ b/Logic/Financial/YearlyReport.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using Swarmops.Basic.Types; using Swarmops.Basic.Enums; using Swarmops.Logic.Structure; diff --git a/Logic/Governance/Ballot.cs b/Logic/Governance/Ballot.cs index 1dcf0fa6..e9690ac2 100644 --- a/Logic/Governance/Ballot.cs +++ b/Logic/Governance/Ballot.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Governance { diff --git a/Logic/Governance/Ballots.cs b/Logic/Governance/Ballots.cs index 7b79dcb4..673f750a 100644 --- a/Logic/Governance/Ballots.cs +++ b/Logic/Governance/Ballots.cs @@ -1,11 +1,9 @@ -using System; using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Governance { diff --git a/Logic/Governance/Election.cs b/Logic/Governance/Election.cs index 1bb64898..38b3cf57 100644 --- a/Logic/Governance/Election.cs +++ b/Logic/Governance/Election.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Governance { diff --git a/Logic/Governance/Meeting.cs b/Logic/Governance/Meeting.cs index 717ae353..1ebf1464 100644 --- a/Logic/Governance/Meeting.cs +++ b/Logic/Governance/Meeting.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types.Governance; using Swarmops.Database; diff --git a/Logic/Governance/MeetingElection.cs b/Logic/Governance/MeetingElection.cs index 36543433..c2d9ef6a 100644 --- a/Logic/Governance/MeetingElection.cs +++ b/Logic/Governance/MeetingElection.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Governance { diff --git a/Logic/Governance/MeetingElectionCandidate.cs b/Logic/Governance/MeetingElectionCandidate.cs index 40f8f8d8..96cb2ed3 100644 --- a/Logic/Governance/MeetingElectionCandidate.cs +++ b/Logic/Governance/MeetingElectionCandidate.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Swarm; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Governance { diff --git a/Logic/Governance/MeetingElectionCandidates.cs b/Logic/Governance/MeetingElectionCandidates.cs index 7d8fd6ca..d423eca2 100644 --- a/Logic/Governance/MeetingElectionCandidates.cs +++ b/Logic/Governance/MeetingElectionCandidates.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Support; diff --git a/Logic/Governance/MeetingElectionVote.cs b/Logic/Governance/MeetingElectionVote.cs index 3247a073..5de46dd0 100644 --- a/Logic/Governance/MeetingElectionVote.cs +++ b/Logic/Governance/MeetingElectionVote.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Security; +using Swarmops.Logic.Structure; namespace Swarmops.Logic.Governance { diff --git a/Logic/Governance/MeetingElectionVoter.cs b/Logic/Governance/MeetingElectionVoter.cs index f04c52ff..3df0b37b 100644 --- a/Logic/Governance/MeetingElectionVoter.cs +++ b/Logic/Governance/MeetingElectionVoter.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Swarm; using Swarmops.Basic.Types; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Governance { diff --git a/Logic/Governance/MeetingElectionVoters.cs b/Logic/Governance/MeetingElectionVoters.cs index ff319213..b3e00335 100644 --- a/Logic/Governance/MeetingElectionVoters.cs +++ b/Logic/Governance/MeetingElectionVoters.cs @@ -1,7 +1,4 @@ -using System; using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Support; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Governance/MeetingElectionVotes.cs b/Logic/Governance/MeetingElectionVotes.cs index 6d5d0b85..16f50496 100644 --- a/Logic/Governance/MeetingElectionVotes.cs +++ b/Logic/Governance/MeetingElectionVotes.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Support; diff --git a/Logic/Governance/MeetingElections.cs b/Logic/Governance/MeetingElections.cs index cfdeb3cc..aff64cb2 100644 --- a/Logic/Governance/MeetingElections.cs +++ b/Logic/Governance/MeetingElections.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Structure; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Structure; using Swarmops.Logic.Support; namespace Swarmops.Logic.Governance diff --git a/Logic/Governance/Motion.cs b/Logic/Governance/Motion.cs index c76e5728..781ece75 100644 --- a/Logic/Governance/Motion.cs +++ b/Logic/Governance/Motion.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Swarm; using Swarmops.Basic.Types.Governance; using Swarmops.Database; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Governance { diff --git a/Logic/Governance/MotionAmendment.cs b/Logic/Governance/MotionAmendment.cs index 0f2cb793..bf1bdc07 100644 --- a/Logic/Governance/MotionAmendment.cs +++ b/Logic/Governance/MotionAmendment.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Swarm; using Swarmops.Basic.Types.Governance; using Swarmops.Database; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Governance { diff --git a/Logic/Governance/MotionAmendments.cs b/Logic/Governance/MotionAmendments.cs index f48868ac..863bdd95 100644 --- a/Logic/Governance/MotionAmendments.cs +++ b/Logic/Governance/MotionAmendments.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types.Governance; using Swarmops.Database; using Swarmops.Logic.Support; diff --git a/Logic/Governance/Motions.cs b/Logic/Governance/Motions.cs index 85d41682..a957ba0f 100644 --- a/Logic/Governance/Motions.cs +++ b/Logic/Governance/Motions.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types.Governance; using Swarmops.Database; using Swarmops.Logic.Support; diff --git a/Logic/Interfaces/TreeNode.cs b/Logic/Interfaces/TreeNode.cs index b17b2aca..ae189c56 100644 --- a/Logic/Interfaces/TreeNode.cs +++ b/Logic/Interfaces/TreeNode.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; + namespace Swarmops.Logic.Interfaces { internal interface ITreeNode diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj index 855597da..1ffc4f6f 100644 --- a/Logic/Logic.csproj +++ b/Logic/Logic.csproj @@ -347,6 +347,9 @@ ResXFileCodeGenerator Logic.Test.Designer.cs + + + @@ -365,4 +368,4 @@ - + \ No newline at end of file diff --git a/Logic/Security/Accesses.cs b/Logic/Security/Accesses.cs index a33cf7d3..27a92a6e 100644 --- a/Logic/Security/Accesses.cs +++ b/Logic/Security/Accesses.cs @@ -1,5 +1,4 @@ -using Swarmops.Basic.Enums; -using Swarmops.Logic.Structure; +using Swarmops.Logic.Structure; namespace Swarmops.Logic.Security { diff --git a/Logic/Security/Authentication.cs b/Logic/Security/Authentication.cs index 5c244d08..bdf43e3b 100644 --- a/Logic/Security/Authentication.cs +++ b/Logic/Security/Authentication.cs @@ -1,14 +1,10 @@ using System; -using System.Collections.Generic; -using Swarmops; -using Swarmops.Logic.Security.App_LocalResources; -using Swarmops.Logic.Structure; using System.Globalization; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Security { @@ -196,6 +192,8 @@ namespace Swarmops.Logic.Security /// A list of previously valid password hashes. private static string[] GenerateLegacyPasswordHashes (Person person, string password) { +// Calling Obsolete Property is valid here since we are generationg legacy hashes. +#pragma warning disable 618 if (person.PersonalNumber.Length > 0) { return new[] @@ -209,6 +207,7 @@ namespace Swarmops.Logic.Security { SHA1.Hash(password + person.Identity + "Pirate") }; +#pragma warning restore 618 } diff --git a/Logic/Security/Authority.cs b/Logic/Security/Authority.cs index 1b3600b2..917ff689 100644 --- a/Logic/Security/Authority.cs +++ b/Logic/Security/Authority.cs @@ -1,10 +1,10 @@ -using System.Collections.Generic; using System; +using System.Collections.Generic; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Basic.Types.Security; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Security { diff --git a/Logic/Security/Authorization.cs b/Logic/Security/Authorization.cs index 262ad9a1..3b658c31 100644 --- a/Logic/Security/Authorization.cs +++ b/Logic/Security/Authorization.cs @@ -1,12 +1,12 @@ -using System.Collections.Generic; using System; +using System.Collections.Generic; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Basic.Types.Security; using Swarmops.Database; using Swarmops.Logic.Cache; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Security { diff --git a/Logic/Security/BCrypt.cs b/Logic/Security/BCrypt.cs index 94cb9981..6761f4d9 100644 --- a/Logic/Security/BCrypt.cs +++ b/Logic/Security/BCrypt.cs @@ -21,8 +21,6 @@ namespace Swarmops.Logic.Security // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - [assembly: System.Reflection.AssemblyVersion("0.1")] - /// BCrypt implements OpenBSD-style Blowfish password hashing /// using the scheme described in "A Future-Adaptable Password Scheme" /// by Niels Provos and David Mazieres. diff --git a/Logic/Security/InternalLoginTicket.cs b/Logic/Security/InternalLoginTicket.cs index 6784e71c..a14e1d9a 100644 --- a/Logic/Security/InternalLoginTicket.cs +++ b/Logic/Security/InternalLoginTicket.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; namespace Swarmops.Logic.Security { diff --git a/Logic/Security/PermissionSet.cs b/Logic/Security/PermissionSet.cs index 19b90d6d..9eae89c8 100644 --- a/Logic/Security/PermissionSet.cs +++ b/Logic/Security/PermissionSet.cs @@ -1,7 +1,6 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Collections; +using System.Collections.Generic; using System.Text.RegularExpressions; using Swarmops.Basic.Enums; diff --git a/Logic/Security/PgpKey.cs b/Logic/Security/PgpKey.cs index 1e571fc6..a7aa8127 100644 --- a/Logic/Security/PgpKey.cs +++ b/Logic/Security/PgpKey.cs @@ -1,9 +1,7 @@ using System; -using System.Collections.Generic; -using System.Text; using Starksoft.Cryptography.OpenPGP; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Security { diff --git a/Logic/Special/Mail/MailServerDatabase.cs b/Logic/Special/Mail/MailServerDatabase.cs index a4dbe028..a163b80b 100644 --- a/Logic/Special/Mail/MailServerDatabase.cs +++ b/Logic/Special/Mail/MailServerDatabase.cs @@ -1,12 +1,7 @@ using System; using System.Collections.Generic; -using System.Text; -using MySql.Data.MySqlClient; - -using System.IO; using System.Data.Common; - -using Swarmops.Logic; +using MySql.Data.MySqlClient; using Swarmops.Logic.Support; namespace Swarmops.Logic.Special.Mail diff --git a/Logic/Special/Sweden/SupportDatabase.cs b/Logic/Special/Sweden/SupportDatabase.cs index dac35509..14187d9f 100644 --- a/Logic/Special/Sweden/SupportDatabase.cs +++ b/Logic/Special/Sweden/SupportDatabase.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; -using Swarmops.Logic.Communications; -using Swarmops.Logic.Swarm; using MySql.Data.MySqlClient; +using Swarmops.Logic.Communications; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Special.Sweden { diff --git a/Logic/Special/Sweden/SwedishForumDatabase.cs b/Logic/Special/Sweden/SwedishForumDatabase.cs index 925cca97..0d6ff04e 100644 --- a/Logic/Special/Sweden/SwedishForumDatabase.cs +++ b/Logic/Special/Sweden/SwedishForumDatabase.cs @@ -4,16 +4,16 @@ using System.Configuration; using System.Data; using System.Data.SqlClient; using System.IO; +using System.Net; using System.Net.Security; using System.Security.Cryptography.X509Certificates; using System.Text; using System.Web; -using Swarmops.Logic.Swarm; -using Swarmops.Basic.Enums; using MySql.Data.MySqlClient; -using System.Net; using Swarmops.Basic.Diagnostics; +using Swarmops.Basic.Enums; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Special.Sweden { @@ -1019,7 +1019,11 @@ namespace Swarmops.Logic.Special.Sweden try { +#pragma warning disable 618 + // ServicePointManager.CertificatePolicy is obsoleted, but is the only thing that works on both windows and mono. + //Needed to avoid errors from homegrown SSL cert. ServicePointManager.CertificatePolicy = new ErrorIgnorerPolicy(); +#pragma warning restore 618 HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url); //string proxy = null; Encoding recieverEncoding = Encoding.GetEncoding("iso-8859-1"); diff --git a/Logic/Special/Sweden/SwedishForumHandleProvider.cs b/Logic/Special/Sweden/SwedishForumHandleProvider.cs index f97bf224..56cf38d6 100644 --- a/Logic/Special/Sweden/SwedishForumHandleProvider.cs +++ b/Logic/Special/Sweden/SwedishForumHandleProvider.cs @@ -1,10 +1,10 @@ using System; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; using Swarmops.Basic.Enums; using Swarmops.Basic.Exceptions; using Swarmops.Basic.Interfaces; using Swarmops.Database; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Special.Sweden { diff --git a/Logic/Structure/Geographies.cs b/Logic/Structure/Geographies.cs index 277f2b2a..3e5e345e 100644 --- a/Logic/Structure/Geographies.cs +++ b/Logic/Structure/Geographies.cs @@ -1,5 +1,5 @@ -using System.Collections.Generic; using System; +using System.Collections.Generic; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Structure/Geography.cs b/Logic/Structure/Geography.cs index fe2c623f..8368035e 100644 --- a/Logic/Structure/Geography.cs +++ b/Logic/Structure/Geography.cs @@ -1,6 +1,6 @@ using System; -using System.Xml.Serialization; using System.Collections.Generic; +using System.Xml.Serialization; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Structure/GeographyWithPeople.cs b/Logic/Structure/GeographyWithPeople.cs index ffa7ed8b..5e609b66 100644 --- a/Logic/Structure/GeographyWithPeople.cs +++ b/Logic/Structure/GeographyWithPeople.cs @@ -1,11 +1,5 @@ using System; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Types; -using Swarmops.Database; -using Swarmops.Logic.Interfaces; -using System.Collections.Generic; - namespace Swarmops.Logic.Structure { [Serializable] diff --git a/Logic/Structure/Organization.cs b/Logic/Structure/Organization.cs index 06ef2e3c..68f1ec4b 100644 --- a/Logic/Structure/Organization.cs +++ b/Logic/Structure/Organization.cs @@ -1,9 +1,9 @@ using System; -using System.Globalization; -using System.Collections.ObjectModel; using System.Collections.Generic; -using System.Text.RegularExpressions; +using System.Collections.ObjectModel; +using System.Globalization; using System.Text; +using System.Text.RegularExpressions; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; @@ -11,8 +11,8 @@ using Swarmops.Logic.Cache; using Swarmops.Logic.Communications; using Swarmops.Logic.Financial; using Swarmops.Logic.Interfaces; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Structure { diff --git a/Logic/Structure/OrganizationParameters.cs b/Logic/Structure/OrganizationParameters.cs index 1fefac67..779620f0 100644 --- a/Logic/Structure/OrganizationParameters.cs +++ b/Logic/Structure/OrganizationParameters.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Logic.Support; diff --git a/Logic/Structure/Organizations.cs b/Logic/Structure/Organizations.cs index 6763c09d..36629c2d 100644 --- a/Logic/Structure/Organizations.cs +++ b/Logic/Structure/Organizations.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Cache; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Structure { diff --git a/Logic/Structure/PostalCode.cs b/Logic/Structure/PostalCode.cs index 6af19a8d..f9e43763 100644 --- a/Logic/Structure/PostalCode.cs +++ b/Logic/Structure/PostalCode.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Swarmops.Basic.Types; namespace Swarmops.Logic.Structure diff --git a/Logic/Structure/PostalCodes.cs b/Logic/Structure/PostalCodes.cs index f98ff9b3..7a6e62e8 100644 --- a/Logic/Structure/PostalCodes.cs +++ b/Logic/Structure/PostalCodes.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Structure/UptakeGeography.cs b/Logic/Structure/UptakeGeography.cs index cc8e9fb9..0db7b455 100644 --- a/Logic/Structure/UptakeGeography.cs +++ b/Logic/Structure/UptakeGeography.cs @@ -1,14 +1,3 @@ -using System; -using System.Globalization; -using Swarmops.Database; -using Swarmops.Logic.Communications; -using Swarmops.Logic.Financial; -using Swarmops.Logic.Interfaces; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Cache; -using Swarmops.Basic.Enums; -using System.Collections.ObjectModel; -using System.Collections.Generic; using Swarmops.Basic.Types; namespace Swarmops.Logic.Structure diff --git a/Logic/Support/ActivistEvents.cs b/Logic/Support/ActivistEvents.cs index 8cdb5c1d..f7d8420d 100644 --- a/Logic/Support/ActivistEvents.cs +++ b/Logic/Support/ActivistEvents.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; using Swarmops.Basic.Enums; - +using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Support { diff --git a/Logic/Support/CheckDigit.cs b/Logic/Support/CheckDigit.cs index 27529e9d..3d06917a 100644 --- a/Logic/Support/CheckDigit.cs +++ b/Logic/Support/CheckDigit.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; namespace Swarmops.Logic.Support diff --git a/Logic/Support/DatabaseMaintenance.cs b/Logic/Support/DatabaseMaintenance.cs index 0842ed52..eed09204 100644 --- a/Logic/Support/DatabaseMaintenance.cs +++ b/Logic/Support/DatabaseMaintenance.cs @@ -1,14 +1,11 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Text; -using MySql.Data.MySqlClient; -using Swarmops.Logic.Swarm; -using Swarmops.Database; using System.Globalization; +using System.Net; +using MySql.Data.MySqlClient; +using Swarmops.Database; using Swarmops.Logic.Communications; using Swarmops.Logic.Communications.Transmission; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Support { diff --git a/Logic/Support/Document.cs b/Logic/Support/Document.cs index 41147a00..aca51a72 100644 --- a/Logic/Support/Document.cs +++ b/Logic/Support/Document.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Text; diff --git a/Logic/Support/Documents.cs b/Logic/Support/Documents.cs index 2b4bf78a..79e9c1dd 100644 --- a/Logic/Support/Documents.cs +++ b/Logic/Support/Documents.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Swarm; -using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Support { diff --git a/Logic/Support/Formatting.cs b/Logic/Support/Formatting.cs index 23ae1ff4..8d8072c7 100644 --- a/Logic/Support/Formatting.cs +++ b/Logic/Support/Formatting.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; using System.Text; -using Swarmops.Logic.Security; -using Swarmops.Logic.Support; using System.Text.RegularExpressions; +using Swarmops.Logic.Security; namespace Swarmops.Logic.Support { diff --git a/Logic/Support/Imagery.cs b/Logic/Support/Imagery.cs index e2dfce78..3bd6226b 100644 --- a/Logic/Support/Imagery.cs +++ b/Logic/Support/Imagery.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; using System.Drawing; using System.Drawing.Drawing2D; using System.Drawing.Imaging; -using System.Text; namespace Swarmops.Logic.Support { diff --git a/Logic/Support/LogEntries/CashAdvanceRequestedLogEntry.cs b/Logic/Support/LogEntries/CashAdvanceRequestedLogEntry.cs index 07343636..26e6c993 100644 --- a/Logic/Support/LogEntries/CashAdvanceRequestedLogEntry.cs +++ b/Logic/Support/LogEntries/CashAdvanceRequestedLogEntry.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Swarmops.Logic.Financial; using Swarmops.Logic.Swarm; diff --git a/Logic/Support/LogEntries/ExpenseClaimFiledLogEntry.cs b/Logic/Support/LogEntries/ExpenseClaimFiledLogEntry.cs index c4b8d428..aff8f71e 100644 --- a/Logic/Support/LogEntries/ExpenseClaimFiledLogEntry.cs +++ b/Logic/Support/LogEntries/ExpenseClaimFiledLogEntry.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Swarmops.Logic.Financial; using Swarmops.Logic.Swarm; diff --git a/Logic/Support/LogEntries/FinancialActionBase.cs b/Logic/Support/LogEntries/FinancialActionBase.cs index e506c7a1..8e60c2b4 100644 --- a/Logic/Support/LogEntries/FinancialActionBase.cs +++ b/Logic/Support/LogEntries/FinancialActionBase.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - namespace Swarmops.Logic.Support.LogEntries { diff --git a/Logic/Support/LogEntries/InboundInvoiceCreatedLogEntry.cs b/Logic/Support/LogEntries/InboundInvoiceCreatedLogEntry.cs index d9c8977b..0e713df2 100644 --- a/Logic/Support/LogEntries/InboundInvoiceCreatedLogEntry.cs +++ b/Logic/Support/LogEntries/InboundInvoiceCreatedLogEntry.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Swarmops.Logic.Financial; using Swarmops.Logic.Swarm; diff --git a/Logic/Support/LogEntries/PayoutCreatedLogEntry.cs b/Logic/Support/LogEntries/PayoutCreatedLogEntry.cs index 34c30bb0..473b116a 100644 --- a/Logic/Support/LogEntries/PayoutCreatedLogEntry.cs +++ b/Logic/Support/LogEntries/PayoutCreatedLogEntry.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Swarmops.Logic.Financial; using Swarmops.Logic.Structure; using Swarmops.Logic.Swarm; diff --git a/Logic/Support/ObjectOptionalData.cs b/Logic/Support/ObjectOptionalData.cs index 7c8990e4..3feb385c 100644 --- a/Logic/Support/ObjectOptionalData.cs +++ b/Logic/Support/ObjectOptionalData.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; -using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Support/PWEvents.cs b/Logic/Support/PWEvents.cs index 5e710298..c5eb5a58 100644 --- a/Logic/Support/PWEvents.cs +++ b/Logic/Support/PWEvents.cs @@ -1,5 +1,5 @@ -using Swarmops.Basic.Enums; using System.Collections.Generic; +using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Support/PWLog.cs b/Logic/Support/PWLog.cs index 594e66ad..9094efa7 100644 --- a/Logic/Support/PWLog.cs +++ b/Logic/Support/PWLog.cs @@ -1,10 +1,10 @@ using System; -using Swarmops.Logic.Swarm; -using System.Web; -using System.Net; using System.Collections.Generic; +using System.Net; +using System.Web; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Support { diff --git a/Logic/Support/Persistence.cs b/Logic/Support/Persistence.cs index 34020219..c6ffd2ab 100644 --- a/Logic/Support/Persistence.cs +++ b/Logic/Support/Persistence.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using Swarmops.Database; namespace Swarmops.Logic.Support diff --git a/Logic/Support/PilotInstallationIds.cs b/Logic/Support/PilotInstallationIds.cs index ea5f5196..cd114575 100644 --- a/Logic/Support/PilotInstallationIds.cs +++ b/Logic/Support/PilotInstallationIds.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Swarmops.Logic.Support +namespace Swarmops.Logic.Support { public class PilotInstallationIds { diff --git a/Logic/Support/QuotedPrintable.cs b/Logic/Support/QuotedPrintable.cs index fc63361a..28632f7b 100644 --- a/Logic/Support/QuotedPrintable.cs +++ b/Logic/Support/QuotedPrintable.cs @@ -1,7 +1,6 @@ using System; -using System.Collections.Generic; -using System.Text; using System.IO; +using System.Text; using System.Text.RegularExpressions; namespace Swarmops.Logic.Support diff --git a/Logic/Support/SerializableDictionary.cs b/Logic/Support/SerializableDictionary.cs index ff064af9..2166cd1d 100644 --- a/Logic/Support/SerializableDictionary.cs +++ b/Logic/Support/SerializableDictionary.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; using System.Xml.Serialization; namespace Swarmops.Logic.Support diff --git a/Logic/Support/SingularFactory.cs b/Logic/Support/SingularFactory.cs index c1f6d603..374e4c75 100644 --- a/Logic/Support/SingularFactory.cs +++ b/Logic/Support/SingularFactory.cs @@ -1,15 +1,13 @@ using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Basic.Types.Communications; -using Swarmops.Basic.Types.Financial; -using Swarmops.Logic.Communications; -using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; +using Swarmops.Basic.Types.Communications; +using Swarmops.Basic.Types.Financial; using Swarmops.Basic.Types.Governance; +using Swarmops.Logic.Communications; +using Swarmops.Logic.Financial; using Swarmops.Logic.Governance; +using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Support { diff --git a/Logic/Support/SwarmopsLog.cs b/Logic/Support/SwarmopsLog.cs index a01f4680..6c6e37b0 100644 --- a/Logic/Support/SwarmopsLog.cs +++ b/Logic/Support/SwarmopsLog.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Database; +using Swarmops.Database; using Swarmops.Logic.Swarm; namespace Swarmops.Logic.Support diff --git a/Logic/Support/SwarmopsLogEntry.cs b/Logic/Support/SwarmopsLogEntry.cs index 0968ef57..32e124e7 100644 --- a/Logic/Support/SwarmopsLogEntry.cs +++ b/Logic/Support/SwarmopsLogEntry.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Swarmops.Basic.Interfaces; +using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Swarm; diff --git a/Logic/Support/TemporaryIdentity.cs b/Logic/Support/TemporaryIdentity.cs index b8479493..438be844 100644 --- a/Logic/Support/TemporaryIdentity.cs +++ b/Logic/Support/TemporaryIdentity.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Interfaces; using Swarmops.Database; diff --git a/Logic/Swarm/AuditedPerson.cs b/Logic/Swarm/AuditedPerson.cs index 00fc56e4..5c6202a3 100644 --- a/Logic/Swarm/AuditedPerson.cs +++ b/Logic/Swarm/AuditedPerson.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Logic; using Swarmops.Basic.Enums; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; @@ -203,7 +200,7 @@ namespace Swarmops.Logic.Swarm } } - + [Obsolete("Use NationalIdNumber instead")] public virtual string PersonalNumber { get { return person.PersonalNumber; } diff --git a/Logic/Swarm/DashboardTodo.cs b/Logic/Swarm/DashboardTodo.cs index 1b00ffaf..8df4e9bb 100644 --- a/Logic/Swarm/DashboardTodo.cs +++ b/Logic/Swarm/DashboardTodo.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Swarmops.Logic.Swarm +namespace Swarmops.Logic.Swarm { public class DashboardTodo { diff --git a/Logic/Swarm/DashboardTodos.cs b/Logic/Swarm/DashboardTodos.cs index 786ac98f..46e47530 100644 --- a/Logic/Swarm/DashboardTodos.cs +++ b/Logic/Swarm/DashboardTodos.cs @@ -1,10 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Security; -using System.Text; -using Swarmops.Basic.Enums; -using Swarmops.Logic.DashboardTasks; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; using Swarmops.Logic.Structure; diff --git a/Logic/Swarm/ExternalActivities.cs b/Logic/Swarm/ExternalActivities.cs index c871cf48..65b9a0c1 100644 --- a/Logic/Swarm/ExternalActivities.cs +++ b/Logic/Swarm/ExternalActivities.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Structure; diff --git a/Logic/Swarm/ExternalActivity.cs b/Logic/Swarm/ExternalActivity.cs index 1a5bb957..5b961c76 100644 --- a/Logic/Swarm/ExternalActivity.cs +++ b/Logic/Swarm/ExternalActivity.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Swarm/ExternalIdentity.cs b/Logic/Swarm/ExternalIdentity.cs index 4a42329f..a749531b 100644 --- a/Logic/Swarm/ExternalIdentity.cs +++ b/Logic/Swarm/ExternalIdentity.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Swarm/Interfaces.cs b/Logic/Swarm/Interfaces.cs index b2b0ba57..20110da5 100644 --- a/Logic/Swarm/Interfaces.cs +++ b/Logic/Swarm/Interfaces.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Swarmops.Logic.Swarm +namespace Swarmops.Logic.Swarm { public interface IOwnerSettable { diff --git a/Logic/Swarm/Membership.cs b/Logic/Swarm/Membership.cs index 82e2c3d3..76c14c86 100644 --- a/Logic/Swarm/Membership.cs +++ b/Logic/Swarm/Membership.cs @@ -1,5 +1,4 @@ using System; -using Swarmops.Logic.Communications; using System.Collections.Generic; using System.Web; using Swarmops.Basic.Enums; diff --git a/Logic/Swarm/OfficerChain.cs b/Logic/Swarm/OfficerChain.cs index c9f11c43..84471158 100644 --- a/Logic/Swarm/OfficerChain.cs +++ b/Logic/Swarm/OfficerChain.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Basic; using Swarmops.Logic.Structure; namespace Swarmops.Logic.Swarm @@ -15,7 +11,7 @@ namespace Swarmops.Logic.Swarm } - public static OfficerChain FromOrganizationAndGeography (Organization org, Geography geo) + public new static OfficerChain FromOrganizationAndGeography (Organization org, Geography geo) { int[] concernedPeopleId = Roles.GetAllUpwardRoles(org.Identity, geo.Identity); People concernedPeople = People.FromIdentities(concernedPeopleId); @@ -31,6 +27,6 @@ namespace Swarmops.Logic.Swarm } } - private int organizationId; + private readonly int organizationId; } } diff --git a/Logic/Swarm/Parley.cs b/Logic/Swarm/Parley.cs index e3c4f83c..a17c6c4c 100644 --- a/Logic/Swarm/Parley.cs +++ b/Logic/Swarm/Parley.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; diff --git a/Logic/Swarm/ParleyAttendee.cs b/Logic/Swarm/ParleyAttendee.cs index d9e75f98..34276bdd 100644 --- a/Logic/Swarm/ParleyAttendee.cs +++ b/Logic/Swarm/ParleyAttendee.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Structure; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Swarm/ParleyAttendees.cs b/Logic/Swarm/ParleyAttendees.cs index bd548f52..82904d0e 100644 --- a/Logic/Swarm/ParleyAttendees.cs +++ b/Logic/Swarm/ParleyAttendees.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Support; diff --git a/Logic/Swarm/ParleyOption.cs b/Logic/Swarm/ParleyOption.cs index 50d80ebb..edea8e81 100644 --- a/Logic/Swarm/ParleyOption.cs +++ b/Logic/Swarm/ParleyOption.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; diff --git a/Logic/Swarm/ParleyOptions.cs b/Logic/Swarm/ParleyOptions.cs index b11acaf3..2a58b530 100644 --- a/Logic/Swarm/ParleyOptions.cs +++ b/Logic/Swarm/ParleyOptions.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Support; diff --git a/Logic/Swarm/Parleys.cs b/Logic/Swarm/Parleys.cs index 1342a1a5..3c870ee4 100644 --- a/Logic/Swarm/Parleys.cs +++ b/Logic/Swarm/Parleys.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using Swarmops.Basic.Types; using Swarmops.Database; -using Swarmops.Logic.Financial; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; diff --git a/Logic/Swarm/People.cs b/Logic/Swarm/People.cs index c32b8611..10110a29 100644 --- a/Logic/Swarm/People.cs +++ b/Logic/Swarm/People.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Swarmops.Basic.Enums; -using Swarmops.Basic.Interfaces; using Swarmops.Basic.Types; using Swarmops.Database; using Swarmops.Logic.Security; diff --git a/Logic/Swarm/Person.cs b/Logic/Swarm/Person.cs index a9c6b3b1..69314780 100644 --- a/Logic/Swarm/Person.cs +++ b/Logic/Swarm/Person.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.Drawing; using System.Globalization; using System.Text; -using Swarmops.Logic.DashboardTasks; -using Swarmops; using System.Text.RegularExpressions; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; @@ -181,7 +179,7 @@ namespace Swarmops.Logic.Swarm } - public new virtual string Mail + public virtual string Mail { get { return base.Email; } set { SwarmDb.GetDatabaseForWriting().SetPersonEmail(Identity, value); } diff --git a/Site5/App_Code/CommonV5Base.cs b/Site5/App_Code/CommonV5Base.cs index 887719b8..4319051c 100644 --- a/Site5/App_Code/CommonV5Base.cs +++ b/Site5/App_Code/CommonV5Base.cs @@ -1,7 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; +using System.Globalization; +using System.Threading; using System.Web; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; /// /// Summary description for CommonV5Base @@ -14,4 +16,92 @@ public class CommonV5Base // TODO: Add constructor logic here // } + + static public void CulturePreInit (HttpRequest request) + { + // Localization + // Set default culture (English, United States) + + string preferredCulture = "en-US"; + + // ----------- SET CULTURE ------------ + + // Does the user have a culture preference? + + if (request.Cookies["PreferredCulture"] != null) + { + // Yes, set it + preferredCulture = request.Cookies["PreferredCulture"].Value; + } + else + { + // No, determine from browser + string browserPreference = "en-US"; + if (request.UserLanguages != null && request.UserLanguages.Length > 0) + { + browserPreference = request.UserLanguages[0]; + preferredCulture = browserPreference; + } + + /* + string[] languages = (string[])Application["Cultures"]; + for (int index = 0; index < languages.Length; index++) + { + if (languages[index].StartsWith(browserPreference)) + { + preferredCulture = languages[index]; + } + }*/ + } + + try + { + Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(preferredCulture); + } + catch (Exception exception) + { + throw new Exception("Could not set culture \"" + preferredCulture + "\"", exception); + // Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; + } + + Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture; + } + + public static AuthenticationData GetAuthenticationDataAndCulture(HttpContext suppliedContext) + { + // This function is called from static page methods in AJAX calls to get + // the current set of authentication data. Static page methods cannot access + // the instance data of PageV5Base. + + AuthenticationData result = new AuthenticationData(); + + // Find various credentials + + string identity = suppliedContext.User.Identity.Name; + string[] identityTokens = identity.Split(','); + + string userIdentityString = identityTokens[0]; + string organizationIdentityString = identityTokens[1]; + + int currentUserId = Convert.ToInt32(userIdentityString); + int currentOrganizationId = Convert.ToInt32(organizationIdentityString); + + result.CurrentUser = Person.FromIdentity(currentUserId); + result.CurrentOrganization = Organization.FromIdentity(currentOrganizationId); + + CommonV5Base.CulturePreInit(HttpContext.Current.Request); // OnPreInit() isn't called in the static methods calling this fn + + /* + string userCultureString = result.CurrentUser.PreferredCulture; + + if (!string.IsNullOrEmpty(userCultureString)) + { + CultureInfo userCulture = new CultureInfo(userCultureString); // may throw on invalid database data + Thread.CurrentThread.CurrentCulture = userCulture; + Thread.CurrentThread.CurrentUICulture = userCulture; + }*/ + + return result; + } + } \ No newline at end of file diff --git a/Site5/App_Code/ControlV5Base.cs b/Site5/App_Code/ControlV5Base.cs index f1bd81bd..852de2c8 100644 --- a/Site5/App_Code/ControlV5Base.cs +++ b/Site5/App_Code/ControlV5Base.cs @@ -1,11 +1,10 @@ using System; -using System.Collections.Generic; using System.IO; using System.Web; using Swarmops.Logic.Cache; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Security; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; /// /// Summary description for ControlV5Base diff --git a/Site5/App_Code/DataV5Base.cs b/Site5/App_Code/DataV5Base.cs index c014abd2..d0143cb7 100644 --- a/Site5/App_Code/DataV5Base.cs +++ b/Site5/App_Code/DataV5Base.cs @@ -1,13 +1,10 @@ using System; -using System.Collections.Generic; using System.Globalization; -using System.Threading; using System.Web; -using System.Web.UI; -using Swarmops.Logic.Security; -using Swarmops.Logic.Swarm; using Swarmops.Basic.Enums; +using Swarmops.Logic.Security; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; /// /// Summary description for PageV5Base @@ -40,54 +37,7 @@ public class DataV5Base : System.Web.UI.Page protected override void OnPreInit(EventArgs e) { - // Localization - - // Set default culture (English, United States, but that doesn't work so fake it to GB) - - string preferredCulture = "en-GB"; - - // ----------- SET CULTURE ------------ - - // Does the user have a culture preference? - - if (Request.Cookies["PreferredCulture"] != null) - { - // Yes, set it - preferredCulture = Request.Cookies["PreferredCulture"].Value; - } - else - { - // No, determine from browser - string browserPreference = "en-GB"; - if (Request.UserLanguages != null && Request.UserLanguages.Length > 0) - { - browserPreference = Request.UserLanguages[0]; - preferredCulture = browserPreference; - } - - - /* - string[] languages = (string[])Application["Cultures"]; - for (int index = 0; index < languages.Length; index++) - { - if (languages[index].StartsWith(browserPreference)) - { - preferredCulture = languages[index]; - } - }*/ - } - - try - { - Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(preferredCulture); - } - catch (Exception exception) - { - throw new Exception("Could not set culture \"" + preferredCulture + "\"", exception); - // Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; - } - - Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture; + CommonV5Base.CulturePreInit(Request); base.OnPreInit(e); } @@ -177,44 +127,9 @@ public class DataV5Base : System.Web.UI.Page protected static AuthenticationData GetAuthenticationDataAndCulture() { - return GetAuthenticationDataAndCulture(HttpContext.Current); + return CommonV5Base.GetAuthenticationDataAndCulture(HttpContext.Current); } - protected static AuthenticationData GetAuthenticationDataAndCulture(HttpContext suppliedContext) - { - // This function is called from static page methods in AJAX calls to get - // the current set of authentication data. Static page methods cannot access - // the instance data of PageV5Base. - - AuthenticationData result = new AuthenticationData(); - - // Find various credentials - - string identity = suppliedContext.User.Identity.Name; - string[] identityTokens = identity.Split(','); - - string userIdentityString = identityTokens[0]; - string organizationIdentityString = identityTokens[1]; - - int currentUserId = Convert.ToInt32(userIdentityString); - int currentOrganizationId = Convert.ToInt32(organizationIdentityString); - - result.CurrentUser = Person.FromIdentity(currentUserId); - result.CurrentOrganization = Organization.FromIdentity(currentOrganizationId); - - string userCultureString = result.CurrentUser.PreferredCulture; - - if (!string.IsNullOrEmpty(userCultureString)) - { - CultureInfo userCulture = new CultureInfo(userCultureString); // may throw on invalid database data - Thread.CurrentThread.CurrentCulture = userCulture; - Thread.CurrentThread.CurrentUICulture = userCulture; - } - - return result; - } - - protected static string JsonSanitize (string input) { return input.Replace("\"", "\\\"").Replace(" ", " ").Trim(); diff --git a/Site5/App_Code/FieldValidation.cs b/Site5/App_Code/FieldValidation.cs index 3151aadf..d6de0e73 100644 --- a/Site5/App_Code/FieldValidation.cs +++ b/Site5/App_Code/FieldValidation.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Threading; using System.Web; using System.Web.Services; using Swarmops.Logic.Support; @@ -57,7 +54,7 @@ public class FieldValidation : System.Web.Services.WebService { { culture = CultureInfo.CreateSpecificCulture(preferredCulture); } - catch (Exception exception) + catch (Exception) { culture = CultureInfo.InvariantCulture; } diff --git a/Site5/App_Code/MasterV5Base.cs b/Site5/App_Code/MasterV5Base.cs index 6d8c9656..85fd83e0 100644 --- a/Site5/App_Code/MasterV5Base.cs +++ b/Site5/App_Code/MasterV5Base.cs @@ -1,9 +1,7 @@ using System; -using System.Collections.Generic; -using System.Web; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Security; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; /// /// Summary description for MasterV4Base diff --git a/Site5/App_Code/PageV5Base.cs b/Site5/App_Code/PageV5Base.cs index 86692e00..94882a67 100644 --- a/Site5/App_Code/PageV5Base.cs +++ b/Site5/App_Code/PageV5Base.cs @@ -1,15 +1,11 @@ using System; -using System.Collections.Generic; -using System.Globalization; -using System.Threading; using System.Web; -using System.Web.UI; +using Swarmops.Basic.Enums; using Swarmops.Database; using Swarmops.Logic.Security; +using Swarmops.Logic.Structure; using Swarmops.Logic.Support; using Swarmops.Logic.Swarm; -using Swarmops.Basic.Enums; -using Swarmops.Logic.Structure; /// /// Base class to use for all data generators (JSON, etc). It supplies identification and localization. @@ -65,54 +61,7 @@ public class PageV5Base : System.Web.UI.Page protected override void OnPreInit(EventArgs e) { - // Localization - - // Set default culture (English, United States) - - string preferredCulture = "en-US"; - - // ----------- SET CULTURE ------------ - - // Does the user have a culture preference? - - if (Request.Cookies["PreferredCulture"] != null) - { - // Yes, set it - preferredCulture = Request.Cookies["PreferredCulture"].Value; - } - else - { - // No, determine from browser - string browserPreference = "en-US"; - if (Request.UserLanguages != null && Request.UserLanguages.Length > 0) - { - browserPreference = Request.UserLanguages[0]; - preferredCulture = browserPreference; - } - - - /* - string[] languages = (string[])Application["Cultures"]; - for (int index = 0; index < languages.Length; index++) - { - if (languages[index].StartsWith(browserPreference)) - { - preferredCulture = languages[index]; - } - }*/ - } - - try - { - Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(preferredCulture); - } - catch (Exception exception) - { - throw new Exception("Could not set culture \"" + preferredCulture + "\"", exception); - // Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; - } - - Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture; + CommonV5Base.CulturePreInit(Request); base.OnPreInit(e); } @@ -174,32 +123,7 @@ public class PageV5Base : System.Web.UI.Page // the current set of authentication data. Static page methods cannot access // the instance data of PageV5Base. - AuthenticationData result = new AuthenticationData(); - - // Find various credentials - - string identity = HttpContext.Current.User.Identity.Name; - string[] identityTokens = identity.Split(','); - - string userIdentityString = identityTokens[0]; - string organizationIdentityString = identityTokens[1]; - - int currentUserId = Convert.ToInt32(userIdentityString); - int currentOrganizationId = Convert.ToInt32(organizationIdentityString); - - result.CurrentUser = Person.FromIdentity(currentUserId); - result.CurrentOrganization = Organization.FromIdentity(currentOrganizationId); - - string userCultureString = result.CurrentUser.PreferredCulture; - - if (!string.IsNullOrEmpty(userCultureString)) - { - CultureInfo userCulture = new CultureInfo(userCultureString); // may throw on invalid database data - Thread.CurrentThread.CurrentCulture = userCulture; - Thread.CurrentThread.CurrentUICulture = userCulture; - } - - return result; + return CommonV5Base.GetAuthenticationDataAndCulture(HttpContext.Current); } /// diff --git a/Site5/App_GlobalResources/Global.resx b/Site5/App_GlobalResources/Global.resx index 43e31c85..c352fd27 100644 --- a/Site5/App_GlobalResources/Global.resx +++ b/Site5/App_GlobalResources/Global.resx @@ -411,51 +411,51 @@ On On (as opposed to Off) - + Customers Gender neutral plural - + Citizens Gender neutral plural - + Activists Gender neutral plural - + Customer Female singular - + Citizen Female singular - + Activist Female singular - + Customer Gender neutral - + Citizen Gender neutral - + Activist Gender neutral - + Customer Male singular - + Citizen Male singular - + Activist Male singular @@ -495,4 +495,224 @@ Phone Somebody's telephone number. Mobile assumed. + + Activist Swarm + + + Activistship + + + Agent Corps + + + Agent + + + Agent + + + Agent + + + Agents + + + Agency + + + Ambassador Corps + + + Ambassador + + + Ambassador + + + Ambassador + + + Ambassadors + + + Ambassadorship + + + Citizens + + + Citizenship + + + Customers + + + Custom + + + Member Corps + + + Member + + + Member + + + Member + + + Members + + + Membership + + + Residents + + + Resident + + + Resident + + + Resident + + + Residents + + + Residency + + + Salesforce + + + Saleswoman + + + Salesperson + + + Salesman + + + Salespeople + + + Sales role + + + Supporters + + + Supporter + + + Supporter + + + Supporter + + + Supporters + + + Supportership + + + Custom + As in "show me the advanced options" + + + Corps + + + Conscript + + + Conscript + + + Conscript + + + Conscripts + + + I HAVE NO IDEA WHAT THIS SHOULD BE - TODO + + + Staff + + + Employee + + + Employee + + + Employee + + + Employees + + + Employment + + + Operatives + + + Operative + + + Operative + + + Operative + + + Operatives + + + NO IDEA SORRY - TODO + + + Corps + + + Regular + + + Regular + + + Regular + + + Regulars + + + I HAVE NO IDEA WHAT THIS SHOULD BE - TODO + + + Crew + + + Seaman + + + Seaman + + + Seaman + + + Seamen + + + Seamanship + \ No newline at end of file diff --git a/Site5/App_GlobalResources/Pages.Comms.resx b/Site5/App_GlobalResources/Pages.Comms.resx new file mode 100644 index 00000000..f7334025 --- /dev/null +++ b/Site5/App_GlobalResources/Pages.Comms.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Who are located in + + + Your Message + + + Send a message to a group of people in the organization. You can send the message by mail (good for newsletters and general information) or to their phones (very intrusive, and also costs a bit). + + + This message would have been sent to the recipients. For the time being, this is a mock-up interface. + + + No Recipients|One Recipient|{0:N0} Recipients + Vertical bar divides none|one|many + + + Send a mass message to all + + + Send + Keep SHORT - it's a small button. 6-7 letters max + + + Your message is now being distributed to recipients. You will be notified when transmission is complete. + + + Test + Keep SHORT- it's a small button. 6-7 letters max + + + The message has been sent to you, so you can see what it looks like before going live. + + + Send Mass Message + + \ No newline at end of file diff --git a/Site5/App_GlobalResources/nl/Controls.Pirates.nl.resx b/Site5/App_GlobalResources/nl/Controls.Pirates.nl.resx new file mode 100644 index 00000000..4b4eb257 --- /dev/null +++ b/Site5/App_GlobalResources/nl/Controls.Pirates.nl.resx @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Verander persoon... + Displayed in popup that shows an individual as owner of something + + + Verander naar: + Displayed as header above the person selector when changing person + + diff --git a/Site5/App_GlobalResources/nl/Global.nl.resx b/Site5/App_GlobalResources/nl/Global.nl.resx new file mode 100644 index 00000000..563e91ab --- /dev/null +++ b/Site5/App_GlobalResources/nl/Global.nl.resx @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Uitloggen + Causes signoff and de-authentication + + + Voorkeuren + Tooltip on hover over wrench icon + + + Kies taal + Shown as header of language list pop-up + + + Dit is een standaardpagina. Het enige item beschikbaar is bewegingsregistratie voor vergaderingen. + Temporary + + + Dit is de standaardpagina (het dashboard). In de tijd wordt dit een echt nette pagina met nummers en graphics en spullen. Voor nu, ga in plaats daarvan naar de vergadering pagina's. + Temporary display while there is no dashboard. + + + Dashboard + Title of default page + + + Werkelijke waarden + + + Werkelijke waarden (prel) + + + Werkelijke waarden vanaf vorig jaareinde + + + Boekhouding Account + + + Rekening + + + Budget + + + Voorschot + + + Kasvoorschot #{0} + + + Contant geld voorschotten {0} + + + Kosten + + + Kosten #{0} + + + Kosten {0} + + + Factuur + + + Factuur + + + Conferentie + + + Salaris + + + Salaris voor {0:yyyy-MMM} + The payout date is inserted for date, like "Salary for 2012-Aug". + + + Belasting voor salarissen {0} + + + Belasting voor salaris #{0} + + + + Jaarlijkse resultaat + + + Zo snel mogelijk + Used as time indicator for "right away" (as soon as possible) in place of dates where in a hurry + + + ANNULEREN + Displayed as cancellation link on changing something + + + Wijzigen? + Link after describing what the user is looking at, allowing a change. + + + Klik op de afbeelding om te vergroten. + Displayed where thumbnails can be enlarged modally. + + + Bevestig + Displayed as confirmation link on changing something + + + --Selecteer Begroting/Account-- + Initializer in dropdown box. + + + -- Selecteer organisatie -- + Initializer in dropdown box. + + + Ga naar... + Link after describing something. + + + Niemand + Displayed when an account/position etc is vacant + + + Eigenaar + + + Bestand wordt verwerkt... + Displayed while processing an uploaded file (along with a progress bar). + + + Bestand uploaden + Displayed on "Submit" button next to file upload controls. + + + Bestand uploaden naar Swarmops + Used as header above upload sections. + + + Selecteer a.u.b. een bestand dat u wilt uploaden. + Error message. Displayed when the used has clicked "Upload" without selecting a file to upload. + + + U bent momenteel aangemeld bij <strong>{0}</strong>. Zou u willen overstappen naar een andere organisatie? + + + Acties + List of shortcuts to likely actions + + + Geen voorgestelde acties op dit punt. + No shortcuts from this page right now. + + + Informatie + Information about current page + + + Nog te doen + List of todo items + + + Geen dringende actie items nu. + Indicator that nothing needs immediate attention + + + Actie-items komen hier. + Placeholder for future action items. Temporary. + + + Voorschotten + + + Vooruitbetalingen in contanten + + + Kosten + + + Onkostenvergoedingen + + + Facturen + + + Inkomende facturen + + + Facturen + + + Uitgaande facturen + + + N/B + + + Niet van toepassing + + + Vanaf nu + + + Vandaag + + + + Project + Tagging costs/income to projects + + + Gerelateerde + List of shortcuts to related actions to current one + + + Kosten #{0} (min voorschot #{1}) + + + Kosten #{0} (min voorschotten) + + + + + Kosten vordering #{0} door {1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/nl/Menu5.nl.resx b/Site5/App_GlobalResources/nl/Menu5.nl.resx new file mode 100644 index 00000000..004b864e --- /dev/null +++ b/Site5/App_GlobalResources/nl/Menu5.nl.resx @@ -0,0 +1,350 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Beheerder + + + Toegangscontrole lijst + + + + Geografische Boom + + + Organisatieclusters + + + Communicatie + + + Automail Tekst Aanpassen + + + Beheer Mail Inbox + + + Massa Mails + + + Beheer Papieren Inbox + + + Ontvangen Papieren Brieven + + + Beheer Reporterslijst + + + Verzend Persbericht + + + Bericht Activisten + + + Beheer Tekst Inbox + + + Financiën + + + Attest Kosten + + + Terugbetaling op Uitgaven + + + Maak een Nieuwe Aankoop + + + Gigs Assistent + + + Lijst + + + + + Binnenkomende Facturen + + + Uitgaande Facturen + + + Uitstaande Vooruitbetalingen in Cash + + + Salarissen + + + Begroting Beheren + + + Geld Uitgeven + + + Ontvangen Factuur + + + Vraag om Kasvoorschot + + + Factuur Versturen + + + Declaraties valideren + + + Zie Begroting en Actuele waarden + + + Zie Liquiditeitsprognose + + + Bestuur + + + Kandidaten + + + Maak een Stemmenlijst + + + Vergaderingen Administratie + + + Vergadering Boardadmin + + + Moties + + + Stemmen + + + Instellen van Admin-toegang (tijdelijke pagina) + + + Grootboeken + + + Account Plan + + + Grootboek nazien + + + Balans + + + Kan grootboek niet afsluiten voor {0} + + + Grootboek afsluiten voor {0} + + + + Importeer Bankgegevens + + + Salarisadministratie + + + Winst- & verliesrekening + + + + Budgetbedragen Instellen + + + Upload Bankbestanden + + + + Organisatie + + + Beschikbare Verantwoordelijkheden + + + Communicatie Sjablonen + + + Facturen + + + Massa Mails + + + Nieuwsbrieven + + + Persberichten + + + Feeds + + + Nieuwsbrieven + + + Persberichten + + + Ledenstatistieken + + + Organigram + + + Organisatie Verantwoordelijkheden + + + Organisatie Instellingen + + + Suborganisatie Boom + + + Mensen + + + Lid Toevoegen + + + Ledenlijst + + + Log Activisme + + + Beheer Conferenties + + + Beheren van Vrijwilligers + + + Nieuwe Conferentie + + + Meld jezelf aan + + + + diff --git a/Site5/App_GlobalResources/nl/Pages.Financial.nl.resx b/Site5/App_GlobalResources/nl/Pages.Financial.nl.resx new file mode 100644 index 00000000..9c775fe3 --- /dev/null +++ b/Site5/App_GlobalResources/nl/Pages.Financial.nl.resx @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/nl/Pages.Governance.nl.resx b/Site5/App_GlobalResources/nl/Pages.Governance.nl.resx new file mode 100644 index 00000000..7fe7e1b1 --- /dev/null +++ b/Site5/App_GlobalResources/nl/Pages.Governance.nl.resx @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Opgeslagen als #{0}-{1}. + Keep very short + + + Voorgestelde Beslissing + Decision to be made, amending the motion + + + Amendement Toevoegen + Used as header and page title + + + Amendement Indienen + + + Indiener + + + U verzendt een amendement aan de motie + In sidebar info box. Motion title follows in bold. + + + Motivering + Text of motion amendment (justification and rationale) + + + Amendement Titel + + + Besluiten (één per regel) + Proposed decisions, one per line + + + Motie opgeslagen als #{0}. + Keep short + + + Motie Toevoegen + Used as header and page title + + + Motie Voorleggen + + + Indiener + Original submitter (not person at keyboard) + + + U legt een motie voor aan de vergadering + Meeting name follows in bold. + + + Motie Motivering + Text of motion + + + Motie Titel + Motion title in form + + + Verkeerde vergadering? + Link to change meetings + + + Geamendeerd + + + Amendementen + + + Uitgevoerd + + + # + + + Titel + + + Lijst moties + Used as header and page title + + + Je bekijkt momenteel de moties voor de vergadering + + + Indienen... + Displayed in-grid + + + Stel een nieuw amendement voor op de motie + + + Amendement + + + Één amendement + + + {0} amendementen + + + Geen amendementen + + + Voorgestelde Aanpassing + + + Motivering + + + Voorgestelde Beslissingen + + + Discussie Thread + Label before link to forum or similar + + + Forum Thread (posts tot nog toe: {0}) + Hyperlink text + + + Motie #{0} + + + Motie Weergeven + Used as header and page title + + + Motie Motivering + + + Je bekijkt een motie die is ingediend op de vergadering + In sidebar info box. Meeting name follows in bold. + + + Aanbeveling van het bestuur + First item in dropdown box + + + + Bestuur zegt + Row header + + + Wijzigen + Row header + + + Besluit + Row header + + + # + Column header + + + Nee + Column header + + + Doel + Row header + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/nl/Pages.Init.nl.resx b/Site5/App_GlobalResources/nl/Pages.Init.nl.resx new file mode 100644 index 00000000..43313cb6 --- /dev/null +++ b/Site5/App_GlobalResources/nl/Pages.Init.nl.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Geen andere handelingen zijn mogelijk totdat de installatie voltooid is. + + + + Voltooi installatie. + + + Systeembeheerder + Displayed in lieu of logged-in-username + + + diff --git a/Site5/App_GlobalResources/nl/Pages.Ledgers.nl.resx b/Site5/App_GlobalResources/nl/Pages.Ledgers.nl.resx new file mode 100644 index 00000000..22b31f00 --- /dev/null +++ b/Site5/App_GlobalResources/nl/Pages.Ledgers.nl.resx @@ -0,0 +1,309 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + Account + + + Middelen + + + + Huidige + + + Schuld + + + Balans + Must ONLY contain A-Z, a-z characters - nothing accented! + + + Eind-XXXX + The XXXX is replaced with year number. + + + + Balans + + + Verander kwartaal 1 + + + Verander kwartaal 2 + + + Verander kwartaal 3 + + + Verander kwartaal 4 + + + Begin-XXXX + The XXXX is replaced with year number. + + + Rekening + + + Winst/Verlies voor {0} voor het jaar + The {0} is the organization name. The year number follows this string. + + + Kosten + + + WinstVerlies + Must ONLY contain A-Z, a-z characters - nothing accented! + + + Inkomsten + + + + Afgelopen jaar + + + Winst & Verlies verklaring + + + Kwartaal 1 + + + Kwartaal 2 + + + Kwartaal 3 + + + Kwartaal 4 + + + Resultaten + Footer on P&L statement + + + vanaf vorig jaareinde + Year To Date + + + + + Budgeteigenaar + Displayed above editables + + + + + + Stel nieuwe budgetten in + Text on submit button + + + + + + + + Bank download instructies + Header above instructions for generation of the bank file type selected. + + + + + + + + + + Bestand succesvol geïmporteerd + Displayed as header after successful processing + + + Bestand gesynchroniseerd, echter data is niet synchroon + Displayed as header after a good processing that ended in sync failure + + + + Fout bij importeren bestand + Displayed as header on import failure + + + + + + Upload Bank bestanden + Displayed above main content. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/nl/Pages.Security.nl.resx b/Site5/App_GlobalResources/nl/Pages.Security.nl.resx new file mode 100644 index 00000000..c291b256 --- /dev/null +++ b/Site5/App_GlobalResources/nl/Pages.Security.nl.resx @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Toegang tot deze pagina geweigerd + + + U heeft geprobeerd toegang te verkrijgen tot een pagina waar u de rechten niet voor heeft. Kijk op de hoofdpagina waarom dit zo is. + + + Toegang geweigerd + + + diff --git a/Site5/Automation/GetGeographyData.asmx b/Site5/Automation/GetGeographyData.asmx index b011e6d1..e171bf17 100644 --- a/Site5/Automation/GetGeographyData.asmx +++ b/Site5/Automation/GetGeographyData.asmx @@ -1,9 +1,6 @@ <%@ WebService Language="C#" Class="GetGeographyData" %> -using System; -using System.Web; using System.Web.Services; -using System.Web.Services.Protocols; using Swarmops.Logic.Structure; [WebService(Namespace = "http://swarmops.com/")] diff --git a/Site5/Automation/Json-ByGuid.aspx.cs b/Site5/Automation/Json-ByGuid.aspx.cs index b20e6171..99bb44cf 100644 --- a/Site5/Automation/Json-ByGuid.aspx.cs +++ b/Site5/Automation/Json-ByGuid.aspx.cs @@ -1,10 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; using System.Web.Services; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Cache; namespace Swarmops.Frontend.Automation diff --git a/Site5/Automation/Json-ExpensableBudgetsTree.aspx.cs b/Site5/Automation/Json-ExpensableBudgetsTree.aspx.cs index d53d4358..429efea2 100644 --- a/Site5/Automation/Json-ExpensableBudgetsTree.aspx.cs +++ b/Site5/Automation/Json-ExpensableBudgetsTree.aspx.cs @@ -1,14 +1,7 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; namespace Swarmops.Frontend.Automation { diff --git a/Site5/Automation/Json-FinancialAccountsTree.aspx.cs b/Site5/Automation/Json-FinancialAccountsTree.aspx.cs index d9ff9f93..a674e9cb 100644 --- a/Site5/Automation/Json-FinancialAccountsTree.aspx.cs +++ b/Site5/Automation/Json-FinancialAccountsTree.aspx.cs @@ -1,15 +1,7 @@ using System; using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Basic.Enums; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; namespace Swarmops.Frontend.Pages.v5.Financial { diff --git a/Site5/Automation/Json-GeographiesTree.aspx.cs b/Site5/Automation/Json-GeographiesTree.aspx.cs index 395f117c..1ccf346f 100644 --- a/Site5/Automation/Json-GeographiesTree.aspx.cs +++ b/Site5/Automation/Json-GeographiesTree.aspx.cs @@ -1,13 +1,6 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Security; using Swarmops.Logic.Structure; namespace Swarmops.Frontend.Automation diff --git a/Site5/Automation/Json-GetPersonAvatar.aspx.cs b/Site5/Automation/Json-GetPersonAvatar.aspx.cs index 50761b3e..d7fe867d 100644 --- a/Site5/Automation/Json-GetPersonAvatar.aspx.cs +++ b/Site5/Automation/Json-GetPersonAvatar.aspx.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Security; using Swarmops.Logic.Swarm; diff --git a/Site5/Automation/Json-SearchPeoplePattern.aspx.cs b/Site5/Automation/Json-SearchPeoplePattern.aspx.cs index 6f7056df..b6c9a54e 100644 --- a/Site5/Automation/Json-SearchPeoplePattern.aspx.cs +++ b/Site5/Automation/Json-SearchPeoplePattern.aspx.cs @@ -1,11 +1,5 @@ using System; using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Swarmops.Logic.Financial; using Swarmops.Logic.Security; using Swarmops.Logic.Swarm; diff --git a/Site5/Automation/Json-TransactionTagsTree.aspx.cs b/Site5/Automation/Json-TransactionTagsTree.aspx.cs index 16b36688..34a4666c 100644 --- a/Site5/Automation/Json-TransactionTagsTree.aspx.cs +++ b/Site5/Automation/Json-TransactionTagsTree.aspx.cs @@ -1,15 +1,7 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Text; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; namespace Swarmops.Frontend.Pages.v5.Financial { diff --git a/Site5/Automation/UploadFileHandler.ashx b/Site5/Automation/UploadFileHandler.ashx index e40af3d3..e480dd09 100644 --- a/Site5/Automation/UploadFileHandler.ashx +++ b/Site5/Automation/UploadFileHandler.ashx @@ -41,12 +41,12 @@ namespace Swarmops.Frontend.Automation #region IHttpHandler Members - public bool IsReusable + public new bool IsReusable { get { return false; } } - public void ProcessRequest (HttpContext context) + public new void ProcessRequest (HttpContext context) { context.Response.AddHeader ("Pragma", "no-cache"); context.Response.AddHeader ("Cache-Control", "private, no-cache"); @@ -133,20 +133,20 @@ namespace Swarmops.Frontend.Automation throw new NotImplementedException ( "We should never get to partial upload. If we do, something is very very unexpected and this needs to be implemented."); - using (var fs = new FileStream (fullName, FileMode.Append, FileAccess.Write)) - { - var buffer = new byte[1024]; + //using (var fs = new FileStream(fullName, FileMode.Append, FileAccess.Write)) + //{ + // var buffer = new byte[1024]; - int l = inputStream.Read (buffer, 0, 1024); - while (l > 0) - { - fs.Write (buffer, 0, l); - l = inputStream.Read (buffer, 0, 1024); - } - fs.Flush(); - fs.Close(); - } - statuses.Add (new FilesStatus (new FileInfo (fullName))); + // int l = inputStream.Read(buffer, 0, 1024); + // while (l > 0) + // { + // fs.Write(buffer, 0, l); + // l = inputStream.Read(buffer, 0, 1024); + // } + // fs.Flush(); + // fs.Close(); + //} + //statuses.Add(new FilesStatus(new FileInfo(fullName))); } // Upload entire file @@ -157,7 +157,7 @@ namespace Swarmops.Frontend.Automation HttpPostedFile file = context.Request.Files[i]; string fullName = Path.GetFileName (file.FileName); - AuthenticationData authData = GetAuthenticationDataAndCulture (context); + AuthenticationData authData = CommonV5Base.GetAuthenticationDataAndCulture (context); Person uploadingPerson = authData.CurrentUser; Organization currentOrg = authData.CurrentOrganization; diff --git a/Site5/Controls/v5/Base/ComboGeographies.ascx.cs b/Site5/Controls/v5/Base/ComboGeographies.ascx.cs index 74278262..5b58c25e 100644 --- a/Site5/Controls/v5/Base/ComboGeographies.ascx.cs +++ b/Site5/Controls/v5/Base/ComboGeographies.ascx.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Structure; namespace Swarmops.Controls.Base diff --git a/Site5/Controls/v5/Base/FileUpload.ascx.cs b/Site5/Controls/v5/Base/FileUpload.ascx.cs index 1d88c103..40265ea6 100644 --- a/Site5/Controls/v5/Base/FileUpload.ascx.cs +++ b/Site5/Controls/v5/Base/FileUpload.ascx.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; namespace Swarmops.Controls.Base { diff --git a/Site5/Controls/v5/Base/LanguageSelector.ascx b/Site5/Controls/v5/Base/LanguageSelector.ascx deleted file mode 100644 index 16cf04fa..00000000 --- a/Site5/Controls/v5/Base/LanguageSelector.ascx +++ /dev/null @@ -1,26 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="LanguageSelector.ascx.cs" Inherits="Swarmops.Controls.Base.LanguageSelector" %> - -
    - -
    - - - -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    \ No newline at end of file diff --git a/Site5/Controls/v5/Base/LanguageSelector.ascx.cs b/Site5/Controls/v5/Base/LanguageSelector.ascx.cs deleted file mode 100644 index dd2e6598..00000000 --- a/Site5/Controls/v5/Base/LanguageSelector.ascx.cs +++ /dev/null @@ -1,114 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace Swarmops.Controls.Base -{ - - public partial class LanguageSelector : System.Web.UI.UserControl - { - protected void Page_Load(object sender, EventArgs e) - { - // Localize - - this.LabelSelectLanguage.Text = Resources.Global.CurrentUserInfo_SelectLanguage.ToUpperInvariant(); - } - - protected void LinkDanish_Click(object sender, EventArgs e) - { - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("da-DK"); - FireLanguageChanged(); - } - - protected void LinkGerman_Click(object sender, EventArgs e) - { - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("de-DE"); - FireLanguageChanged(); - } - - protected void LinkEnglish_Click(object sender, EventArgs e) - { - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-GB"); - FireLanguageChanged(); - } - - protected void LinkSpanish_Click(object sender, EventArgs e) - { - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("es-ES"); - FireLanguageChanged(); - } - - protected void LinkFrench_Click(object sender, EventArgs e) - { - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("fr-FR"); - FireLanguageChanged(); - } - - protected void LinkItalian_Click(object sender, EventArgs e) - { - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("it-IT"); - FireLanguageChanged(); - } - - protected void LinkDutch_Click(object sender, EventArgs e) - { - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("nl-NL"); - FireLanguageChanged(); - } - - protected void LinkPolish_Click(object sender, EventArgs e) - { - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("pl-PL"); - FireLanguageChanged(); - } - - protected void LinkPortuguese_Click(object sender, EventArgs e) - { - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("pt-PT"); - FireLanguageChanged(); - } - - protected void LinkRussian_Click(object sender, EventArgs e) - { - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("ru-RU"); - FireLanguageChanged(); - } - - protected void LinkFinnish_Click(object sender, EventArgs e) - { - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("fi-FI"); - FireLanguageChanged(); - } - - protected void LinkSwedish_Click(object sender, EventArgs e) - { - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("sv-SE"); - FireLanguageChanged(); - } - - - private void FireLanguageChanged() - { - HttpCookie cookieCulture = new HttpCookie("PreferredCulture"); - cookieCulture.Value = System.Threading.Thread.CurrentThread.CurrentCulture.Name.ToString(); - cookieCulture.Expires = DateTime.Now.AddDays(365); - Response.Cookies.Add(cookieCulture); - - if (LanguageChanged != null) - { - LanguageChanged(this, new EventArgs()); - } - - // As we are way too late in the page processing when this language change happens, we need to retrigger another postback for it to take effect. - // There MUST MUST MUST be a better way to do this. Especially as controls on pages need yet a third postback. - - Page.ClientScript.RegisterStartupScript(this.GetType(), "changedLanguagePostback", Page.ClientScript.GetPostBackEventReference(this, string.Empty), true); - } - - public event EventHandler LanguageChanged; - } - -} - diff --git a/Site5/Controls/v5/Base/MainMenu.ascx.cs b/Site5/Controls/v5/Base/MainMenu.ascx.cs index 279f32e8..26a0bb57 100644 --- a/Site5/Controls/v5/Base/MainMenu.ascx.cs +++ b/Site5/Controls/v5/Base/MainMenu.ascx.cs @@ -1,11 +1,6 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Security.Cryptography; -using System.Web; using System.Web.UI; -using System.Web.UI.WebControls; using System.Xml.Serialization; using Swarmops.Interface.Objects; diff --git a/Site5/Controls/v5/Financial/ComboBudgets.ascx.cs b/Site5/Controls/v5/Financial/ComboBudgets.ascx.cs index 06ce8480..2804e8f8 100644 --- a/Site5/Controls/v5/Financial/ComboBudgets.ascx.cs +++ b/Site5/Controls/v5/Financial/ComboBudgets.ascx.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; namespace Swarmops.Controls.Financial { diff --git a/Site5/Controls/v5/Financial/ComboIncomeCostType.ascx.cs b/Site5/Controls/v5/Financial/ComboIncomeCostType.ascx.cs index d818c1e8..e0964838 100644 --- a/Site5/Controls/v5/Financial/ComboIncomeCostType.ascx.cs +++ b/Site5/Controls/v5/Financial/ComboIncomeCostType.ascx.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; public partial class Controls_v5_Financial_ComboIncomeCostType : System.Web.UI.UserControl { diff --git a/Site5/Controls/v5/Swarm/ComboPeople.ascx.cs b/Site5/Controls/v5/Swarm/ComboPeople.ascx.cs index 528ff5c5..c7ef0604 100644 --- a/Site5/Controls/v5/Swarm/ComboPeople.ascx.cs +++ b/Site5/Controls/v5/Swarm/ComboPeople.ascx.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Swarm; namespace Swarmops.Controls.Financial diff --git a/Site5/Controls/v5/Swarm/PersonDetailPopup.ascx.cs b/Site5/Controls/v5/Swarm/PersonDetailPopup.ascx.cs index 2c2ac9c0..4462429c 100644 --- a/Site5/Controls/v5/Swarm/PersonDetailPopup.ascx.cs +++ b/Site5/Controls/v5/Swarm/PersonDetailPopup.ascx.cs @@ -1,19 +1,6 @@ using System; -using System.Collections; -using System.Configuration; -using System.Data; -using System.Web; -using System.Web.Security; using System.Web.UI; -using System.Web.UI.HtmlControls; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using Swarmops.Controls.Swarm; -using Swarmops.Logic.Financial; using Swarmops.Logic.Swarm; -using Swarmops.Logic.Security; - - namespace Swarmops.Controls.Swarm { diff --git a/Site5/Controls/v5/UI/ExternalScripts.ascx.cs b/Site5/Controls/v5/UI/ExternalScripts.ascx.cs index 557eb686..6ea7e74d 100644 --- a/Site5/Controls/v5/UI/ExternalScripts.ascx.cs +++ b/Site5/Controls/v5/UI/ExternalScripts.ascx.cs @@ -1,10 +1,5 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; namespace Swarmops.Frontend.Controls.v5.UI { diff --git a/Site5/Default.aspx.cs b/Site5/Default.aspx.cs index dfd36e60..67323ab9 100644 --- a/Site5/Default.aspx.cs +++ b/Site5/Default.aspx.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Swarmops.Logic.Financial; public partial class Default : PageV5Base { diff --git a/Site5/Global.asax b/Site5/Global.asax index d270af6b..314cbd03 100644 --- a/Site5/Global.asax +++ b/Site5/Global.asax @@ -1,10 +1,4 @@ <%@ Application Language="C#" %> -<%@ Import Namespace="System.Globalization" %> -<%@ Import Namespace="System.Collections.Generic" %> -<%@ Import Namespace="System.IO" %> -<%@ Import Namespace="System.Security.Principal" %> -<%@ Import Namespace="System.Threading" %> -<%@ Import Namespace="Swarmops.Logic" %> + + + +
    +
    +  
    +
    + +

    (0)

    + + +
    +
    + + + diff --git a/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs b/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs new file mode 100644 index 00000000..d22ce75a --- /dev/null +++ b/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs @@ -0,0 +1,107 @@ +using System; +using System.Web.Services; +using System.Web.UI; +using System.Web.UI.WebControls; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; + +namespace Swarmops.Frontend.Pages.Comms +{ + public partial class SendMassMessage : PageV5Base + { + protected void Page_Load(object sender, EventArgs e) + { + this.PageIcon = "iconshock-messages"; + this.PageTitle = Resources.Pages.Comms.SendMassMessage_Title; + this.InfoBoxLiteral = Resources.Pages.Comms.SendMassMessage_Info; + + if (!Page.IsPostBack) + { + Localize(); + } + + this.TextMessage.Style[HtmlTextWriterStyle.Width] = "674px"; + this.TextMessage.Style["resize"] = "none"; + } + + private void Localize() + { + this.LabelGeography.Text = Resources.Pages.Comms.SendMassMessage_Geography; + this.LabelRecipientType.Text = Resources.Pages.Comms.SendMassMessage_RecipientType; + this.LabelHeaderMessage.Text = Resources.Pages.Comms.SendMassMessage_HeaderMessage; + + this.DropRecipientClasses.Items.Clear(); + this.DropRecipientClasses.Items.Add(new ListItem(Resources.Global.Global_SelectOne, "0")); + this.DropRecipientClasses.Items.Add(new ListItem("[Regulars]", "1")); + this.DropRecipientClasses.Items.Add(new ListItem("[Agents]", "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.ButtonSend.Text = Resources.Pages.Comms.SendMassMessage_SendMessage; + this.ButtonTest.Text = Resources.Pages.Comms.SendMassMessage_TestMessage; + } + + public struct ConfirmPayoutResult + { + public int AssignedId; + public string DisplayMessage; + }; + + [WebMethod] + public static string GetRecipientCount(int recipientTypeId, int geographyId) + { + int personCount = 0; + + AuthenticationData authData = GetAuthenticationDataAndCulture(); + Geography geography = Geography.FromIdentity(geographyId); + Geographies geoTree = geography.GetTree(); + Organizations orgTree = authData.CurrentOrganization.GetTree(); + + switch (recipientTypeId) + { + case 0: // "Select one" + personCount = 0; + break; + case 1: // Regulars + personCount = orgTree.GetMemberCountForGeographies(geoTree); + break; + case 2: // Agents + personCount = Activists.GetCountForGeography(geography); + break; + + // TODO: Dynamic membership types + + case 101: // Officers + personCount = orgTree.GetRoleHolderCountForGeographies(geoTree); + break; + case 102: // Volunteers + personCount = 0; // TODO + break; + default: + throw new NotImplementedException(); + + } + + string result; + string[] resources = Resources.Pages.Comms.SendMassMessage_RecipientCount.Split('|'); + + switch (personCount) + { + case 0: + result = resources[0]; + break; + case 1: + result = resources[1]; + break; + default: + result = String.Format(resources[2], personCount); + break; + } + + return result; + + } + } + +} \ No newline at end of file diff --git a/Site5/Pages/v5/Financial/AttestCosts.aspx.cs b/Site5/Pages/v5/Financial/AttestCosts.aspx.cs index a4d1232a..0ebaa49b 100644 --- a/Site5/Pages/v5/Financial/AttestCosts.aspx.cs +++ b/Site5/Pages/v5/Financial/AttestCosts.aspx.cs @@ -1,14 +1,10 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; using System.ServiceModel.Security; using System.Web; using System.Web.Services; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Financial; -using Swarmops.Logic.Structure; using Swarmops.Logic.Support; using Swarmops.Logic.Swarm; diff --git a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs index da5496d7..3834df23 100644 --- a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs +++ b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Financial; using Swarmops.Logic.Support; diff --git a/Site5/Pages/v5/Financial/EconomyNotEnabled.aspx.cs b/Site5/Pages/v5/Financial/EconomyNotEnabled.aspx.cs index 0aa10150..8fe8ac4b 100644 --- a/Site5/Pages/v5/Financial/EconomyNotEnabled.aspx.cs +++ b/Site5/Pages/v5/Financial/EconomyNotEnabled.aspx.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; public partial class Pages_v5_Finance_EconomyNotEnabled : PageV5Base { diff --git a/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs b/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs index fce26d97..b1962e48 100644 --- a/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs +++ b/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Financial; using Swarmops.Logic.Support; diff --git a/Site5/Pages/v5/Financial/Json-AttestableCosts.aspx.cs b/Site5/Pages/v5/Financial/Json-AttestableCosts.aspx.cs index e24b09be..efb0c758 100644 --- a/Site5/Pages/v5/Financial/Json-AttestableCosts.aspx.cs +++ b/Site5/Pages/v5/Financial/Json-AttestableCosts.aspx.cs @@ -1,15 +1,9 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; using System.Text; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Basic.Interfaces; using Swarmops.Logic.Financial; -using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; using Swarmops.Logic.Support; using Swarmops.Logic.Swarm; diff --git a/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs b/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs index b99a0c1b..6d96810f 100644 --- a/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs +++ b/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs @@ -1,17 +1,7 @@ using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; using System.Text; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Swarmops.Basic.Interfaces; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; -using Swarmops.Logic.Support; -using Swarmops.Logic.Swarm; namespace Swarmops.Frontend.Pages.Financial { @@ -39,9 +29,6 @@ namespace Swarmops.Frontend.Pages.Financial { StringBuilder result = new StringBuilder(16384); - string hasDoxString = - ""; - result.Append("{\"rows\":["); DateTime today = DateTime.Today; diff --git a/Site5/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs b/Site5/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs index b028db0a..a0e33b47 100644 --- a/Site5/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs +++ b/Site5/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs @@ -1,17 +1,7 @@ using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; using System.Text; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Swarmops.Basic.Interfaces; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; -using Swarmops.Logic.Support; -using Swarmops.Logic.Swarm; public partial class Pages_v5_Finance_Json_ValidatableReceipts : DataV5Base { diff --git a/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs b/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs index 2d7b1d73..9add1418 100644 --- a/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs +++ b/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs @@ -1,13 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.ServiceModel.Security; using System.Web; using System.Web.Services; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Basic.Enums; -using Swarmops.Database; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; diff --git a/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs b/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs index d867e766..618e5be9 100644 --- a/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs +++ b/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Financial; namespace Swarmops.Frontend.Pages.v5.Financial diff --git a/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs b/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs index 0bfebd7d..431cc4da 100644 --- a/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs +++ b/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs @@ -1,18 +1,12 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.ServiceModel.Security; using System.Text; using System.Web; using System.Web.Services; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; using Swarmops.Logic.Support; -using Swarmops.Logic.Swarm; namespace Swarmops.Frontend.Pages.v5.Financial { @@ -48,31 +42,8 @@ namespace Swarmops.Frontend.Pages.v5.Financial } - private Dictionary _attestationRights; private List _documentList; - - - private Dictionary GetAttestationRights() - { - // Right now, this function is quite primitive. At some point in the future, it needs to take into - // account that a budget may have several attesters. Right now, it just loops over all accounts and - // checks the owner. - - Dictionary result = new Dictionary(); - FinancialAccounts accounts = FinancialAccounts.ForOrganization(this.CurrentOrganization); - - foreach (FinancialAccount account in accounts) - { - if (account.OwnerPersonId == this.CurrentUser.Identity) - { - result[account.Identity] = true; - } - } - - return result; - } - private void Localize() { this.PageTitle = Resources.Pages.Financial.ValidateReceipts_PageTitle; @@ -120,7 +91,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial }; [WebMethod] - public static string Validate (string identifier) + public static new string Validate (string identifier) { identifier = HttpUtility.UrlDecode(identifier); diff --git a/Site5/Pages/v5/Init/Default.aspx b/Site5/Pages/v5/Init/Default.aspx index 40baa88b..c9f9e31a 100644 --- a/Site5/Pages/v5/Init/Default.aspx +++ b/Site5/Pages/v5/Init/Default.aspx @@ -1,5 +1,4 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="Pages_v5_Init_Default" %> -<%@ Register Src="~/Controls/v5/Base/LanguageSelector.ascx" TagName="LanguageSelector" TagPrefix="act5" %> diff --git a/Site5/Pages/v5/Init/Default.aspx.cs b/Site5/Pages/v5/Init/Default.aspx.cs index aff4263f..eb1227cd 100644 --- a/Site5/Pages/v5/Init/Default.aspx.cs +++ b/Site5/Pages/v5/Init/Default.aspx.cs @@ -2,25 +2,19 @@ using System.Collections.Generic; using System.Globalization; using System.IO; -using System.Linq; using System.Text; using System.Threading; using System.Web; using System.Web.Security; using System.Web.Services; -using System.Web.Services.Protocols; using System.Web.SessionState; using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Basic.Enums; -using Swarmops.Basic.Types; +using Swarmops.Database; +using Swarmops.Logic.Financial; using Swarmops.Logic.Support; using Swarmops.Site.Automation; -using Swarmops.Database; -using Country = Swarmops.Logic.Structure.Country; -using Swarmops.Logic.Financial; - public partial class Pages_v5_Init_Default : System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) diff --git a/Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs b/Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs index 327c2180..9c98695b 100644 --- a/Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs +++ b/Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs @@ -1,15 +1,11 @@ using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; using System.Web; using System.Web.Services; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Basic.Enums; +using Swarmops.Database; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; -using Swarmops.Logic.Support; using Swarmops.Logic.Swarm; namespace Swarmops.Frontend.Pages.v5.Ledgers @@ -212,47 +208,61 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers [WebMethod] public static ChangeAccountDataResult SetAccountBudget(int accountId, string budget) { - AuthenticationData authData = GetAuthenticationDataAndCulture(); - FinancialAccount account = FinancialAccount.FromIdentity(accountId); - - if (!PrepareAccountChange(account, authData, false)) + try { - return new ChangeAccountDataResult + AuthenticationData authData = GetAuthenticationDataAndCulture(); + FinancialAccount account = FinancialAccount.FromIdentity(accountId); + + if (!PrepareAccountChange(account, authData, false)) { - Result = ChangeAccountDataOperationsResult.NoPermission - }; + return new ChangeAccountDataResult + { + Result = ChangeAccountDataOperationsResult.NoPermission + }; + } + + Int64 newTreeBudget; + budget = budget.Replace("%A0", "%20"); // some very weird browser space-to-otherspace translation weirds out number parsing + budget = HttpContext.Current.Server.UrlDecode(budget); + + if (budget.Trim().Length > 0 && Int64.TryParse(budget, NumberStyles.Currency, CultureInfo.CurrentCulture, out newTreeBudget)) + { + newTreeBudget *= 100; // convert to cents + + int year = DateTime.Today.Year; + FinancialAccounts accountTree = account.GetTree(); + Int64 currentTreeBudget = accountTree.GetBudgetSumCents(year); + Int64 currentSingleBudget = account.GetBudgetCents(year); + Int64 suballocatedBudget = currentTreeBudget - currentSingleBudget; + + Int64 newSingleBudget = newTreeBudget - suballocatedBudget; + + account.SetBudgetCents(DateTime.Today.Year, newSingleBudget); + return new ChangeAccountDataResult + { + Result = ChangeAccountDataOperationsResult.Changed, + NewData = (newTreeBudget/100).ToString("N0", CultureInfo.CurrentCulture) + }; + } + else + { + return new ChangeAccountDataResult + { + Result = ChangeAccountDataOperationsResult.Invalid + }; + } + + } + catch (Exception weirdException) + { + // Exceptions are happening here in deployment ONLY. We're logging it to find which one and why. + // TODO: This really needs to be in Logic. DO NOT DO NOT DO NOT call Database layer directly from Site layer. + + SwarmDb.GetDatabaseForWriting().CreateExceptionLogEntry(DateTime.UtcNow, "AccountPlan-SetBudget", weirdException); + + throw; } - Int64 newTreeBudget; - budget = budget.Replace("%A0", "%20"); // some very weird browser space-to-otherspace translation weirds out number parsing - budget = HttpContext.Current.Server.UrlDecode(budget); - - if (budget.Trim().Length > 0 && Int64.TryParse(budget, NumberStyles.Currency, CultureInfo.CurrentCulture, out newTreeBudget)) - { - newTreeBudget *= 100; // convert to cents - - int year = DateTime.Today.Year; - FinancialAccounts accountTree = account.GetTree(); - Int64 currentTreeBudget = accountTree.GetBudgetSumCents(year); - Int64 currentSingleBudget = account.GetBudgetCents(year); - Int64 suballocatedBudget = currentTreeBudget - currentSingleBudget; - - Int64 newSingleBudget = newTreeBudget - suballocatedBudget; - - account.SetBudgetCents(DateTime.Today.Year, newSingleBudget); - return new ChangeAccountDataResult - { - Result = ChangeAccountDataOperationsResult.Changed, - NewData = (newTreeBudget/100).ToString("N0", CultureInfo.CurrentCulture) - }; - } - else - { - return new ChangeAccountDataResult - { - Result = ChangeAccountDataOperationsResult.Invalid - }; - } } [WebMethod] diff --git a/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs b/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs index b1808763..f3b2c31d 100644 --- a/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs +++ b/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using System.Globalization; namespace Swarmops.Frontend.Pages.v5.Ledgers diff --git a/Site5/Pages/v5/Ledgers/CloseLedgers.aspx.cs b/Site5/Pages/v5/Ledgers/CloseLedgers.aspx.cs index 2440eece..98a44706 100644 --- a/Site5/Pages/v5/Ledgers/CloseLedgers.aspx.cs +++ b/Site5/Pages/v5/Ledgers/CloseLedgers.aspx.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Basic.Enums; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; @@ -55,43 +51,43 @@ public partial class Pages_v5_Ledgers_CloseLedgers : PageV5Base // First, roll over virtual balances. - if (false) // if this.CurrentOrganization.Parameters.VirtualBankingEnabled - { - FinancialAccount rootAccount = FinancialAccount.FromIdentity(29); // HACK: Hardcoded account; should be _organization.FinancialAccount.CostsVirtualBankingRoot - FinancialAccount tempAccount = FinancialAccount.FromIdentity(98); // HACK: Hardcoded account; should be _organization.FinancialAccount.AssetsVirtualRollover + //if (false) // if this.CurrentOrganization.Parameters.VirtualBankingEnabled + //{ + // FinancialAccount rootAccount = FinancialAccount.FromIdentity(29); // HACK: Hardcoded account; should be _organization.FinancialAccount.CostsVirtualBankingRoot + // FinancialAccount tempAccount = FinancialAccount.FromIdentity(98); // HACK: Hardcoded account; should be _organization.FinancialAccount.AssetsVirtualRollover - FinancialAccounts localAccounts = rootAccount.GetTree(); + // FinancialAccounts localAccounts = rootAccount.GetTree(); - foreach (FinancialAccount account in localAccounts) - { - Int64 currentBalanceCents = account.GetDeltaCents(new DateTime(closingYear, 1, 1), new DateTime(closingYear+1, 1, 1)); - Int64 budgetCents = -account.GetBudgetCents(closingYear); - Int64 carryOverCents = budgetCents - currentBalanceCents; + // foreach (FinancialAccount account in localAccounts) + // { + // Int64 currentBalanceCents = account.GetDeltaCents(new DateTime(closingYear, 1, 1), new DateTime(closingYear+1, 1, 1)); + // Int64 budgetCents = -account.GetBudgetCents(closingYear); + // Int64 carryOverCents = budgetCents - currentBalanceCents; - if (carryOverCents != 0) - { - FinancialTransaction transactionOldYear = FinancialTransaction.Create(1, - new DateTime(closingYear, 12, - 31, 23, 50, - 00), - "Budgetrest " + account.Name); - // HACK: Localize rollover label + // if (carryOverCents != 0) + // { + // FinancialTransaction transactionOldYear = FinancialTransaction.Create(1, + // new DateTime(closingYear, 12, + // 31, 23, 50, + // 00), + // "Budgetrest " + account.Name); + // // HACK: Localize rollover label - transactionOldYear.AddRow(account, carryOverCents, null); - transactionOldYear.AddRow(tempAccount, -carryOverCents, null); + // transactionOldYear.AddRow(account, carryOverCents, null); + // transactionOldYear.AddRow(tempAccount, -carryOverCents, null); - FinancialTransaction transactionNewYear = FinancialTransaction.Create(1, - new DateTime(closingYear + 1, - 1, 1, 0, 10, 0), - "Budgetrest " + - closingYear.ToString() + " " + - account.Name); + // FinancialTransaction transactionNewYear = FinancialTransaction.Create(1, + // new DateTime(closingYear + 1, + // 1, 1, 0, 10, 0), + // "Budgetrest " + + // closingYear.ToString() + " " + + // account.Name); - transactionNewYear.AddRow(account, -carryOverCents, null); - transactionNewYear.AddRow(tempAccount, carryOverCents, null); - } - } - } + // transactionNewYear.AddRow(account, -carryOverCents, null); + // transactionNewYear.AddRow(tempAccount, carryOverCents, null); + // } + // } + //} // Then, actually close the ledgers. diff --git a/Site5/Pages/v5/Ledgers/Csv-BalanceData.aspx.cs b/Site5/Pages/v5/Ledgers/Csv-BalanceData.aspx.cs index f8c9e621..5473b3f7 100644 --- a/Site5/Pages/v5/Ledgers/Csv-BalanceData.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Csv-BalanceData.aspx.cs @@ -1,16 +1,8 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Threading; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Basic.Enums; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; public partial class Pages_v5_Ledgers_Csv_BalanceData : DataV5Base { @@ -68,7 +60,6 @@ public partial class Pages_v5_Ledgers_Csv_BalanceData : DataV5Base private int _year = 2012; - private CultureInfo _renderCulture; private void RecurseCsvReport(List reportLines, string accountPrefix) { diff --git a/Site5/Pages/v5/Ledgers/Csv-ProfitLossData.aspx.cs b/Site5/Pages/v5/Ledgers/Csv-ProfitLossData.aspx.cs index 009ca749..0c98ea95 100644 --- a/Site5/Pages/v5/Ledgers/Csv-ProfitLossData.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Csv-ProfitLossData.aspx.cs @@ -1,17 +1,8 @@ - -using System; +using System; using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; +using System.Globalization; using Swarmops.Basic.Enums; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; -using System.Globalization; public partial class Pages_v5_Ledgers_Csv_ProfitLossData : DataV5Base { @@ -77,7 +68,6 @@ public partial class Pages_v5_Ledgers_Csv_ProfitLossData : DataV5Base private int _year = 2012; - private CultureInfo _renderCulture; private void RecurseCsvReport (List reportLines, string accountPrefix) { diff --git a/Site5/Pages/v5/Ledgers/DebugLedgers.aspx.cs b/Site5/Pages/v5/Ledgers/DebugLedgers.aspx.cs index 8c70f41f..98b1ea13 100644 --- a/Site5/Pages/v5/Ledgers/DebugLedgers.aspx.cs +++ b/Site5/Pages/v5/Ledgers/DebugLedgers.aspx.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; diff --git a/Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx.cs b/Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx.cs index de2c4479..de1e970d 100644 --- a/Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx.cs @@ -1,10 +1,6 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Basic.Enums; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; @@ -42,7 +38,6 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers } private int _year = 2012; - private CultureInfo _renderCulture; private AuthenticationData _authenticationData; private Dictionary _hashedAccounts; @@ -125,18 +120,6 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers return String.Join(",", childStrings.ToArray()); } - private class DisplayedAccount - { - public string Name; - public int Identity; - }; - - private class DisplayedAccounts : List - { - // typedef - }; - - private Dictionary> _treeMap; private Dictionary _singleBalanceLookup; private Dictionary _treeBalanceLookup; private Dictionary _singleBudgetLookup; @@ -216,11 +199,11 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { if (treeValue != 0 && singleValue == 0) { - return string.Format(_renderCulture, + return string.Format(CultureInfo.CurrentCulture, "Σ {1:N0} ", accountId, treeValue / 100.00); } - return string.Format(_renderCulture, + return string.Format(CultureInfo.CurrentCulture, "Σ {1:N0}{2:N0}", accountId, treeValue / 100.0, singleValue / 100.0); } diff --git a/Site5/Pages/v5/Ledgers/Json-BalanceSheetData.aspx.cs b/Site5/Pages/v5/Ledgers/Json-BalanceSheetData.aspx.cs index 3c4a0827..dd9b0611 100644 --- a/Site5/Pages/v5/Ledgers/Json-BalanceSheetData.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Json-BalanceSheetData.aspx.cs @@ -1,16 +1,8 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Threading; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Basic.Enums; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; namespace Swarmops.Frontend.Pages.v5.Ledgers { @@ -68,8 +60,6 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers private int _year = 2012; - private CultureInfo _renderCulture; - private string RecurseReport(List reportLines) @@ -104,16 +94,16 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers } else { - element += string.Format(_renderCulture, ",\"lastYear\":\"{0:N0}\"", + element += string.Format(CultureInfo.CurrentCulture, ",\"lastYear\":\"{0:N0}\"", (double) line.AccountValues.PreviousYear/100.0); for (int quarter = 1; quarter <= 4; quarter++) { - element += string.Format(_renderCulture, ",\"q{0}\":\"{1:N0}\"", quarter, + element += string.Format(CultureInfo.CurrentCulture, ",\"q{0}\":\"{1:N0}\"", quarter, line.AccountValues.Quarters[quarter - 1]/100.0); } - element += string.Format(_renderCulture, ",\"ytd\":\"{0:N0}\"", + element += string.Format(CultureInfo.CurrentCulture, ",\"ytd\":\"{0:N0}\"", (double) line.AccountValues.ThisYear/100.0); } @@ -128,11 +118,11 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { if (treeValue != 0 && singleValue == 0) { - return string.Format(_renderCulture, + return string.Format(CultureInfo.CurrentCulture, "\"Σ {1:N0} \"", accountId, treeValue/100.00); } - return string.Format(_renderCulture, + return string.Format(CultureInfo.CurrentCulture, "\"Σ {1:N0}{2:N0}\"", accountId, treeValue/100.0, singleValue/100.0); } diff --git a/Site5/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs b/Site5/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs index d4328d0a..2b690253 100644 --- a/Site5/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs @@ -1,11 +1,7 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; using System.Text; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; diff --git a/Site5/Pages/v5/Ledgers/Json-ProfitLossData.aspx.cs b/Site5/Pages/v5/Ledgers/Json-ProfitLossData.aspx.cs index f1749a48..925d1c6d 100644 --- a/Site5/Pages/v5/Ledgers/Json-ProfitLossData.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Json-ProfitLossData.aspx.cs @@ -1,15 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; +using System.Globalization; using Swarmops.Basic.Enums; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; -using System.Globalization; public partial class Pages_v5_Ledgers_Json_ProfitLossData : DataV5Base { @@ -66,21 +59,20 @@ public partial class Pages_v5_Ledgers_Json_ProfitLossData : DataV5Base { string result = string.Format("\"name\":\"{0}\"", Resources.Pages.Ledgers.ProfitLossStatement_Results); - result += string.Format(_renderCulture, ",\"lastYear\":\"{0:N0}\"", (double)totals.PreviousYear / -100.0); + result += string.Format(CultureInfo.CurrentCulture, ",\"lastYear\":\"{0:N0}\"", (double)totals.PreviousYear / -100.0); for (int quarter = 1; quarter <= 4; quarter++) { - result += string.Format(_renderCulture, ",\"q{0}\":\"{1:N0}\"", quarter, totals.Quarters[quarter-1] / -100.0); + result += string.Format(CultureInfo.CurrentCulture, ",\"q{0}\":\"{1:N0}\"", quarter, totals.Quarters[quarter-1] / -100.0); } - result += string.Format(_renderCulture, ",\"ytd\":\"{0:N0}\"", (double)totals.ThisYear / -100.0); + result += string.Format(CultureInfo.CurrentCulture, ",\"ytd\":\"{0:N0}\"", (double)totals.ThisYear / -100.0); return "{" + result + "}"; } private int _year = 2012; - private CultureInfo _renderCulture; private string RecurseReport (List reportLines) { @@ -111,14 +103,14 @@ public partial class Pages_v5_Ledgers_Json_ProfitLossData : DataV5Base } else { - element += string.Format(_renderCulture, ",\"lastYear\":\"{0:N0}\"", (double)line.AccountValues.PreviousYear / -100.0); + element += string.Format(CultureInfo.CurrentCulture, ",\"lastYear\":\"{0:N0}\"", (double)line.AccountValues.PreviousYear / -100.0); for (int quarter = 1; quarter <= 4; quarter++) { - element += string.Format(_renderCulture, ",\"q{0}\":\"{1:N0}\"", quarter, line.AccountValues.Quarters[quarter-1] / -100.0); + element += string.Format(CultureInfo.CurrentCulture, ",\"q{0}\":\"{1:N0}\"", quarter, line.AccountValues.Quarters[quarter-1] / -100.0); } - element += string.Format(_renderCulture, ",\"ytd\":\"{0:N0}\"", (double)line.AccountValues.ThisYear / -100.0); + element += string.Format(CultureInfo.CurrentCulture, ",\"ytd\":\"{0:N0}\"", (double)line.AccountValues.ThisYear / -100.0); } elements.Add("{" + element + "}"); @@ -132,9 +124,9 @@ public partial class Pages_v5_Ledgers_Json_ProfitLossData : DataV5Base { if (treeValue != 0 && singleValue == 0) { - return string.Format(_renderCulture, "\"Σ {1:N0} \"", accountId, treeValue / -100.00); + return string.Format(CultureInfo.CurrentCulture, "\"Σ {1:N0} \"", accountId, treeValue / -100.00); } - return string.Format(_renderCulture, "\"Σ {1:N0}{2:N0}\"", accountId, treeValue / -100.0, singleValue / -100.0); + return string.Format(CultureInfo.CurrentCulture, "\"Σ {1:N0}{2:N0}\"", accountId, treeValue / -100.0, singleValue / -100.0); } diff --git a/Site5/Pages/v5/Ledgers/Json-ResyncPreview.aspx.cs b/Site5/Pages/v5/Ledgers/Json-ResyncPreview.aspx.cs index d039b6c8..2a218711 100644 --- a/Site5/Pages/v5/Ledgers/Json-ResyncPreview.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Json-ResyncPreview.aspx.cs @@ -2,9 +2,6 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; using Swarmops.Logic.Financial; @@ -99,10 +96,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers } private int _year = 2012; - private CultureInfo _renderCulture; private AuthenticationData _authenticationData; - private Dictionary _hashedAccounts; - + // private Dictionary _hashedAccounts; private string PrintNullableCents (string currency, long cents) { @@ -135,7 +130,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers } } - + /* -- is this even used? private string GetAccountGroup (FinancialAccountType type, string localizedGroupName) { string childrenString = GetAccountsRecurse(type, 0); @@ -212,20 +207,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers } return String.Join(",", childStrings.ToArray()); - } + }*/ - private class DisplayedAccount - { - public string Name; - public int Identity; - }; - - private class DisplayedAccounts : List - { - // typedef - }; - - private Dictionary> _treeMap; private Dictionary _singleBalanceLookup; private Dictionary _treeBalanceLookup; private Dictionary _singleBudgetLookup; @@ -305,11 +288,11 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { if (treeValue != 0 && singleValue == 0) { - return string.Format(_renderCulture, + return string.Format(CultureInfo.CurrentCulture, "Σ {1:N0} ", accountId, treeValue / 100.00); } - return string.Format(_renderCulture, + return string.Format(CultureInfo.CurrentCulture, "Σ {1:N0}{2:N0}", accountId, treeValue / 100.0, singleValue / 100.0); } diff --git a/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs b/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs index 69941cd2..f32ec304 100644 --- a/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs +++ b/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs @@ -1,10 +1,5 @@ using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; public partial class Pages_v5_Ledgers_ProfitLossStatement : PageV5Base { diff --git a/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs b/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs index 85e593fa..03a794aa 100644 --- a/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs +++ b/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs @@ -1,15 +1,14 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Globalization; using System.IO; using System.Linq; using System.Text; using System.Threading; using System.Web; using System.Web.Services; -using System.Web.UI; using System.Web.UI.WebControls; -using System.Globalization; using Swarmops.Basic.Enums; using Swarmops.Basic.Interfaces; using Swarmops.Logic.Financial; diff --git a/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx.cs b/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx.cs index 349d69a2..c09de249 100644 --- a/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx.cs +++ b/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx.cs @@ -1,15 +1,13 @@ using System; -using System.Collections.Generic; using System.Threading; -using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using Swarmops.Basic.Enums; using Swarmops.Controls.Swarm; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Security; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; public partial class Pages_v5_Ledgers_SetRootBudgets : PageV5Base { diff --git a/Site5/Pages/v5/Ledgers/UploadBankFiles.aspx.cs b/Site5/Pages/v5/Ledgers/UploadBankFiles.aspx.cs index ea85e93e..7408fe8b 100644 --- a/Site5/Pages/v5/Ledgers/UploadBankFiles.aspx.cs +++ b/Site5/Pages/v5/Ledgers/UploadBankFiles.aspx.cs @@ -2,24 +2,18 @@ using System.Collections.Generic; using System.Globalization; using System.IO; -using System.Linq; using System.Text; -using System.Text.RegularExpressions; using System.Threading; -using System.Web; using System.Web.Services; -using System.Web.Services.Description; -using System.Web.UI; using System.Web.UI.WebControls; -using Swarmops.Logic.Cache; -using Swarmops.Logic.Swarm; using Swarmops.Basic.Enums; using Swarmops.Basic.Types; +using Swarmops.Logic.Cache; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; - +using Swarmops.Logic.Swarm; // TODO: There are significant remnants in this file from the old Telerik-based upload code. When Account Automation is complete and the user can select a bank profile // for an account, uploading payment files as well as bank statements, remove that dead code as its templates won't be needed after that. diff --git a/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs b/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs index ceb6ac1c..1a9c0c22 100644 --- a/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs +++ b/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Web; -using System.Web.UI; using System.Web.UI.WebControls; namespace Swarmops.Frontend.Pages.v5.Ledgers diff --git a/Site5/Pages/v5/Security/AccessDenied.aspx.cs b/Site5/Pages/v5/Security/AccessDenied.aspx.cs index 6ca6f026..1522b723 100644 --- a/Site5/Pages/v5/Security/AccessDenied.aspx.cs +++ b/Site5/Pages/v5/Security/AccessDenied.aspx.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; public partial class Security_AccessDenied : PageV5Base { diff --git a/Site5/Pages/v5/Security/ChangeOrganizations.aspx.cs b/Site5/Pages/v5/Security/ChangeOrganizations.aspx.cs index 724b64c5..7f6e0b03 100644 --- a/Site5/Pages/v5/Security/ChangeOrganizations.aspx.cs +++ b/Site5/Pages/v5/Security/ChangeOrganizations.aspx.cs @@ -1,12 +1,6 @@ using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Web; using System.Web.Security; -using System.Web.UI; -using System.Web.UI.WebControls; -using Swarmops.Logic.Security; namespace Swarmops.Frontend.Pages.Security { diff --git a/Site5/Pages/v5/Security/DatabaseUpgradeRequired.aspx.cs b/Site5/Pages/v5/Security/DatabaseUpgradeRequired.aspx.cs index 164e8ac2..1e9cf606 100644 --- a/Site5/Pages/v5/Security/DatabaseUpgradeRequired.aspx.cs +++ b/Site5/Pages/v5/Security/DatabaseUpgradeRequired.aspx.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; public partial class Security_DatabaseUpgradeRequired : PageV5Base { diff --git a/Site5/Pages/v5/Security/Json-AccessibleOrganizationsTree.aspx.cs b/Site5/Pages/v5/Security/Json-AccessibleOrganizationsTree.aspx.cs index c8a34f65..9a430632 100644 --- a/Site5/Pages/v5/Security/Json-AccessibleOrganizationsTree.aspx.cs +++ b/Site5/Pages/v5/Security/Json-AccessibleOrganizationsTree.aspx.cs @@ -1,11 +1,5 @@ using System; using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Swarmops.Logic.Financial; using Swarmops.Logic.Structure; namespace Swarmops.Frontend.Pages.Security diff --git a/Site5/Pages/v5/Support/StreamUpload.aspx.cs b/Site5/Pages/v5/Support/StreamUpload.aspx.cs index 5751eb56..2d8a7744 100644 --- a/Site5/Pages/v5/Support/StreamUpload.aspx.cs +++ b/Site5/Pages/v5/Support/StreamUpload.aspx.cs @@ -1,21 +1,11 @@ using System; -using System.Collections; -using System.Configuration; -using System.Data; using System.Diagnostics; using System.IO; using System.Net.Mime; -using System.Web; -using System.Web.Security; -using System.Web.UI; -using System.Web.UI.HtmlControls; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; using Swarmops.Basic.Enums; using Swarmops.Logic.Communications; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; using Swarmops.Logic.Support; namespace Swarmops.Pages.v5.Support diff --git a/Site5/Pages/v5/Swarm/Json-ListFindPeople.aspx.cs b/Site5/Pages/v5/Swarm/Json-ListFindPeople.aspx.cs index 7d1a5284..e564aae4 100644 --- a/Site5/Pages/v5/Swarm/Json-ListFindPeople.aspx.cs +++ b/Site5/Pages/v5/Swarm/Json-ListFindPeople.aspx.cs @@ -1,11 +1,6 @@ using System; using System.Collections.Generic; -using System.Globalization; -using System.Linq; using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Swarmops.Logic.Financial; using Swarmops.Logic.Security; using Swarmops.Logic.Structure; using Swarmops.Logic.Swarm; diff --git a/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs b/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs index 67c7844e..d7d89eef 100644 --- a/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs +++ b/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs @@ -1,13 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.ServiceModel.Security; using System.Web; using System.Web.Services; -using System.Web.UI; -using System.Web.UI.WebControls; using Swarmops.Basic.Enums; -using Swarmops.Database; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; diff --git a/Site5/Pages/v5/User/SelectLanguage.aspx b/Site5/Pages/v5/User/SelectLanguage.aspx new file mode 100644 index 00000000..9e855ad6 --- /dev/null +++ b/Site5/Pages/v5/User/SelectLanguage.aspx @@ -0,0 +1,67 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="SelectLanguage.aspx.cs" Inherits="Swarmops.Frontend.Pages.v5.User.SelectLanguage" %> +<%@ Register src="~/Controls/v5/UI/ExternalScripts.ascx" tagname="ExternalScripts" tagprefix="Swarmops5" %> + + + + + + + + + + + + + + + +
    ';"> +
    ')" >
    +
    <%# Eval("DisplayName") %>
    +
    +
    +
    +
    + + + diff --git a/Site5/Pages/v5/User/SelectLanguage.aspx.cs b/Site5/Pages/v5/User/SelectLanguage.aspx.cs new file mode 100644 index 00000000..f5456579 --- /dev/null +++ b/Site5/Pages/v5/User/SelectLanguage.aspx.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Globalization; +using System.ServiceModel.Security; +using System.Web; +using System.Web.Services; +using Swarmops.Logic.Financial; +using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; + +namespace Swarmops.Frontend.Pages.v5.User +{ + public partial class SelectLanguage : PageV5Base + { + protected void Page_Load(object sender, EventArgs e) + { + this.PageIcon = "iconshock-language"; + + if (!Page.IsPostBack) + { + Localize(); + } + + PopulateRepeater(); + } + + private void Localize() + { + this.PageTitle = "Select Language"; + this.InfoBoxLiteral = "Select language / Seleccione su idioma / Sélectionner votre langue / Wählen Sie Ihre Sprache / Välj språk / Selecione seu idioma / " + + "Velg ditt språk / Selecteer uw taal / Vælg dit sprog / Valitse kieli / επιλέξτε τη γλώσσα σας / выберите язык"; + } + + private void PopulateRepeater() + { + string[] availableCultures = {"en-US", "sv-SE", "nl-NL"}; + + List availableLanguages = new List(); + foreach (string cultureId in availableCultures) + { + LanguageParameters newLanguage = new LanguageParameters(); + newLanguage.IconUrl = "/Images/Flags/" + cultureId.Substring(3, 2).ToLowerInvariant() + "-64px.png"; + newLanguage.CultureId = cultureId; + CultureInfo culture = CultureInfo.CreateSpecificCulture(cultureId); + newLanguage.DisplayName = culture.NativeName; + newLanguage.DisplayName = Char.ToUpperInvariant(newLanguage.DisplayName[0]) + + newLanguage.DisplayName.Substring(1); // Capitalize + + if (cultureId.StartsWith("en")) + { + newLanguage.IconUrl = "/Images/Flags/uk-64px.png"; // use "uk" for en-GB and en-US rather than "gb" or "us" + } + availableLanguages.Add(newLanguage); + } + + this.RepeaterLanguages.DataSource = availableLanguages; + this.RepeaterLanguages.DataBind(); + } + + private class LanguageParameters + { + public string IconUrl { get; set; } + public string CultureId { get; set; } + public string DisplayName { get; set; } + } + } +} \ No newline at end of file diff --git a/Site5/Pages/v5/User/SetCulture.aspx b/Site5/Pages/v5/User/SetCulture.aspx new file mode 100644 index 00000000..ea3c2ede --- /dev/null +++ b/Site5/Pages/v5/User/SetCulture.aspx @@ -0,0 +1 @@ +<%@ Page Title="" Language="C#" AutoEventWireup="true" CodeFile="SetCulture.aspx.cs" Inherits="Swarmops.Frontend.Pages.v5.User.SetCulture" %> diff --git a/Site5/Pages/v5/User/SetCulture.aspx.cs b/Site5/Pages/v5/User/SetCulture.aspx.cs new file mode 100644 index 00000000..67a7d3c9 --- /dev/null +++ b/Site5/Pages/v5/User/SetCulture.aspx.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Globalization; +using System.ServiceModel.Security; +using System.Web; +using System.Web.Services; +using Swarmops.Logic.Financial; +using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; + +namespace Swarmops.Frontend.Pages.v5.User +{ + public partial class SetCulture : PageV5Base + { + // This minimal page takes the culture on the querystring, sets it for the user, and redirects to Dashboard + + protected void Page_Load(object sender, EventArgs e) + { + AuthenticationData authenticationData = GetAuthenticationDataAndCulture(); + + if (authenticationData.CurrentUser == null) + { + throw new UnauthorizedAccessException("No"); // may cause problems on login screen? + } + + string cultureId = Request.QueryString["CultureId"]; + Response.SetCookie(new HttpCookie("PreferredCulture", cultureId)); + authenticationData.CurrentUser.PreferredCulture = cultureId; + Response.Redirect("/"); // to dashboard + } + + } +} \ No newline at end of file diff --git a/Site5/Scripts/ScriptLicenses.txt b/Site5/Scripts/ScriptLicenses.txt index 8d7df7f6..683bbbaa 100644 --- a/Site5/Scripts/ScriptLicenses.txt +++ b/Site5/Scripts/ScriptLicenses.txt @@ -1,8 +1,15 @@ Some of these scripts are not in the public domain. -jQuery is licensed as MIT (free to use for any purpose). So is FancyBox, Alertify, Superfish, HoverIntent, and jQuery SwitchButton. +jQuery is licensed as MIT License (free to use for any purpose). So is FancyBox, Alertify, Superfish, HoverIntent, and jQuery SwitchButton. SmartWizard is licensed under Creative Commons Attribution-ShareAlike. The Crowdin JIPT script is part of the translation package and is proprietary to Crowdin. It is part of development, not part of production. +The MIT License text follows, as required by the MIT License: + +"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." \ No newline at end of file diff --git a/Site5/Security/Authenticate.aspx.cs b/Site5/Security/Authenticate.aspx.cs index 8db3bed1..9998a1fb 100644 --- a/Site5/Security/Authenticate.aspx.cs +++ b/Site5/Security/Authenticate.aspx.cs @@ -1,13 +1,4 @@ using System; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -using System.Data; -using System.Configuration; -using System.Web.Security; -using System.Web.UI.WebControls.WebParts; -using System.Web.UI.HtmlControls; public partial class Security_Authenticate : System.Web.UI.Page { diff --git a/Site5/Security/Login.aspx b/Site5/Security/Login.aspx index 603b8038..9134f479 100644 --- a/Site5/Security/Login.aspx +++ b/Site5/Security/Login.aspx @@ -1,5 +1,4 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeFile="Login.aspx.cs" EnableViewState="true" Inherits="Swarmops.Pages.Security.Login" %> -<%@ Import Namespace="Swarmops.Database" %> diff --git a/Site5/Security/Login.aspx.cs b/Site5/Security/Login.aspx.cs index 8bf68977..240e87f0 100644 --- a/Site5/Security/Login.aspx.cs +++ b/Site5/Security/Login.aspx.cs @@ -1,15 +1,11 @@ using System; -using System.Collections.Generic; -using System.IO; using System.Threading; using System.Web; using System.Web.Security; -using System.Web.UI; -using System.Web.UI.WebControls; -using Swarmops.Logic.Support; -using Swarmops.Logic.Swarm; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Pages.Security { diff --git a/Site5/Tests/TestBookkeepingIntegrity.aspx.cs b/Site5/Tests/TestBookkeepingIntegrity.aspx.cs index 0e2ece0c..5d9832c9 100644 --- a/Site5/Tests/TestBookkeepingIntegrity.aspx.cs +++ b/Site5/Tests/TestBookkeepingIntegrity.aspx.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; using System.Web.UI.WebControls; using Swarmops.Basic.Enums; using Swarmops.Logic.Financial; diff --git a/Swarmops.sln b/Swarmops.sln index 54ff4349..92f30bb0 100644 --- a/Swarmops.sln +++ b/Swarmops.sln @@ -1,5 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30723.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logic", "Logic\Logic.csproj", "{13E59551-34AC-43DC-9A03-EF5E4721DC61}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Interface", "Interface\Interface.csproj", "{BA24FAF7-D518-49E8-952A-45595682877E}" @@ -42,6 +44,8 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Site5", "Site5\", "{367F36E {BA24FAF7-D518-49E8-952A-45595682877E} = {BA24FAF7-D518-49E8-952A-45595682877E} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{011D2EFB-77AB-4A13-A753-85C2E56C961D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Autobuild|.NET = Autobuild|.NET @@ -172,6 +176,21 @@ Global {367F36EA-AE1C-4E15-BAF9-BA75B18B3807}.Release|Any CPU.Build.0 = Debug|Any CPU {367F36EA-AE1C-4E15-BAF9-BA75B18B3807}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU {367F36EA-AE1C-4E15-BAF9-BA75B18B3807}.Release|Mixed Platforms.Build.0 = Debug|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Autobuild|.NET.ActiveCfg = Release|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Autobuild|Any CPU.ActiveCfg = Release|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Autobuild|Any CPU.Build.0 = Release|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Autobuild|Mixed Platforms.ActiveCfg = Release|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Autobuild|Mixed Platforms.Build.0 = Release|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Debug|.NET.ActiveCfg = Debug|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Release|.NET.ActiveCfg = Release|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Release|Any CPU.Build.0 = Release|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D}.Release|Mixed Platforms.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Tests/DummyTest.cs b/Tests/DummyTest.cs new file mode 100644 index 00000000..957dccd6 --- /dev/null +++ b/Tests/DummyTest.cs @@ -0,0 +1,22 @@ +using NUnit.Framework; + +namespace Tests +{ + class DummyTest + { + + [TestCase] + public void ThisTestShouldSuccedd() + { + Assert.True(true); + } + + [TestCase] + public void ThisTestShouldFail() + { + Assert.Fail(); + } + + + } +} diff --git a/Tests/Properties/AssemblyInfo.cs b/Tests/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..3db2c44e --- /dev/null +++ b/Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Tests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Tieto")] +[assembly: AssemblyProduct("Tests")] +[assembly: AssemblyCopyright("Copyright © Tieto 2014")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("7c33f251-0319-4b3b-af1d-f35eacbcee77")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj new file mode 100644 index 00000000..1babc4d8 --- /dev/null +++ b/Tests/Tests.csproj @@ -0,0 +1,59 @@ + + + + + Debug + AnyCPU + {011D2EFB-77AB-4A13-A753-85C2E56C961D} + Library + Properties + Tests + Tests + v4.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\NUnit.2.6.3\lib\nunit.framework.dll + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Tests/packages.config b/Tests/packages.config new file mode 100644 index 00000000..ad37a528 --- /dev/null +++ b/Tests/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Utility/BotCode/ActivityMailer.cs b/Utility/BotCode/ActivityMailer.cs index 7647c97d..855241a5 100644 --- a/Utility/BotCode/ActivityMailer.cs +++ b/Utility/BotCode/ActivityMailer.cs @@ -2,11 +2,9 @@ using System; using System.Collections.Generic; using System.Configuration; using System.Net.Mail; -using System.Text; using System.Web; -using Swarmops.Basic.Enums; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Utility.BotCode { diff --git a/Utility/BotCode/BallotComposer.cs b/Utility/BotCode/BallotComposer.cs index eb020a85..31cf68d2 100644 --- a/Utility/BotCode/BallotComposer.cs +++ b/Utility/BotCode/BallotComposer.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; -using Swarmops.Logic.Structure; using Swarmops.Logic.Governance; +using Swarmops.Logic.Structure; namespace Swarmops.Utility.BotCode { diff --git a/Utility/BotCode/BlogTop50Scraper.cs b/Utility/BotCode/BlogTop50Scraper.cs index d2925bc1..367f5890 100644 --- a/Utility/BotCode/BlogTop50Scraper.cs +++ b/Utility/BotCode/BlogTop50Scraper.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using System.IO; +using System.Net; using System.Text; using System.Text.RegularExpressions; -using System.Net; -using Swarmops.Logic; using Swarmops.Database; namespace Swarmops.Utility.BotCode diff --git a/Utility/BotCode/BlogWatcher.cs b/Utility/BotCode/BlogWatcher.cs index a3010bf0..cafbb662 100644 --- a/Utility/BotCode/BlogWatcher.cs +++ b/Utility/BotCode/BlogWatcher.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Net; using NRss; - -using Swarmops.Logic.Support; using Swarmops.Logic.Media; namespace Swarmops.Utility.BotCode diff --git a/Utility/BotCode/BotLog.cs b/Utility/BotCode/BotLog.cs index 54a05b85..f8580672 100644 --- a/Utility/BotCode/BotLog.cs +++ b/Utility/BotCode/BotLog.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.IO; using System.Text; diff --git a/Utility/BotCode/EventProcessor.cs b/Utility/BotCode/EventProcessor.cs index b0cafdef..b6b10c93 100644 --- a/Utility/BotCode/EventProcessor.cs +++ b/Utility/BotCode/EventProcessor.cs @@ -3,19 +3,17 @@ using System.Collections.Generic; using System.Globalization; using System.Net.Mail; using System.Text; +using Swarmops.Basic; using Swarmops.Basic.Enums; -using Swarmops.Database; +using Swarmops.Basic.Types; using Swarmops.Logic.Communications; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; -using System.Threading; -using Swarmops.Basic; -using Swarmops.Basic.Types; using Swarmops.Logic.Governance; +using Swarmops.Logic.Security; using Swarmops.Logic.Special.Mail; +using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; using Swarmops.Utility.Financial; using Swarmops.Utility.Mail; diff --git a/Utility/BotCode/HeartBeater.cs b/Utility/BotCode/HeartBeater.cs index 38befa90..f8da88bd 100644 --- a/Utility/BotCode/HeartBeater.cs +++ b/Utility/BotCode/HeartBeater.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using System.IO; using Swarmops.Logic.Support; diff --git a/Utility/BotCode/InternalPollMaintenance.cs b/Utility/BotCode/InternalPollMaintenance.cs index 14b45818..d6598cdc 100644 --- a/Utility/BotCode/InternalPollMaintenance.cs +++ b/Utility/BotCode/InternalPollMaintenance.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; using Swarmops.Logic.Governance; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Utility.BotCode { diff --git a/Utility/BotCode/InternalPollRandomizer.cs b/Utility/BotCode/InternalPollRandomizer.cs index 066b72d0..3b891195 100644 --- a/Utility/BotCode/InternalPollRandomizer.cs +++ b/Utility/BotCode/InternalPollRandomizer.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Governance; namespace Swarmops.Utility.BotCode diff --git a/Utility/BotCode/MailProcessor.cs b/Utility/BotCode/MailProcessor.cs index 5a4517be..c3df3a6c 100644 --- a/Utility/BotCode/MailProcessor.cs +++ b/Utility/BotCode/MailProcessor.cs @@ -2,17 +2,16 @@ using System; using System.Collections.Generic; using System.Configuration; using System.IO; -using System.Text; using System.Net.Mail; using System.Net.Mime; -using Swarmops.Basic.Enums; -using Swarmops.Basic.Diagnostics; -using Swarmops.Logic.Communications; -using Swarmops.Logic.Swarm; +using System.Text; using System.Threading; using Swarmops.Basic; +using Swarmops.Basic.Enums; +using Swarmops.Logic.Communications; using Swarmops.Logic.Media; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; using Swarmops.Utility.Mail; namespace Swarmops.Utility.BotCode diff --git a/Utility/BotCode/MailResolver.cs b/Utility/BotCode/MailResolver.cs index 878902a3..496c851f 100644 --- a/Utility/BotCode/MailResolver.cs +++ b/Utility/BotCode/MailResolver.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Logic.Communications; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; using Swarmops.Utility.Mail; namespace Swarmops.Utility.BotCode diff --git a/Utility/BotCode/Mappery.cs b/Utility/BotCode/Mappery.cs index 49dc5ebe..6e5621be 100644 --- a/Utility/BotCode/Mappery.cs +++ b/Utility/BotCode/Mappery.cs @@ -1,14 +1,13 @@ using System; +using System.Collections.Generic; using System.Drawing; using System.IO; -using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; using Swarmops.Basic.Enums; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; - +using Swarmops.Logic.Swarm; namespace Swarmops.Utility.BotCode { diff --git a/Utility/BotCode/MediaWatcher.cs b/Utility/BotCode/MediaWatcher.cs index 92a7227a..9c0bd51d 100644 --- a/Utility/BotCode/MediaWatcher.cs +++ b/Utility/BotCode/MediaWatcher.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Net; using NRss; using Swarmops.Logic.Media; diff --git a/Utility/BotCode/NewsletterChecker.cs b/Utility/BotCode/NewsletterChecker.cs index 5a5a75d9..98d62179 100644 --- a/Utility/BotCode/NewsletterChecker.cs +++ b/Utility/BotCode/NewsletterChecker.cs @@ -1,16 +1,11 @@ using System; using System.Collections.Generic; -using System.Text; - -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; -using Swarmops.Utility.Mail; -using Swarmops.Utility.Special.Sweden; using NRss; using Swarmops.Logic.Communications; using Swarmops.Logic.Special.Sweden; +using Swarmops.Logic.Structure; using Swarmops.Logic.Support; - +using Swarmops.Logic.Swarm; namespace Swarmops.Utility.BotCode { diff --git a/Utility/BotCode/PressReleaseChecker.cs b/Utility/BotCode/PressReleaseChecker.cs index 036b8f02..69d698ce 100644 --- a/Utility/BotCode/PressReleaseChecker.cs +++ b/Utility/BotCode/PressReleaseChecker.cs @@ -1,17 +1,12 @@ using System; using System.Collections.Generic; -using System.Text; -using System.Net; -using Swarmops.Basic.Enums; -using Swarmops.Logic.Swarm; -using Swarmops.Utility.Mail; - using NRss; +using Swarmops.Basic.Enums; using Swarmops.Logic.Communications; -using Swarmops.Logic.Structure; using Swarmops.Logic.Media; +using Swarmops.Logic.Structure; using Swarmops.Logic.Support; - +using Swarmops.Logic.Swarm; namespace Swarmops.Utility.BotCode { diff --git a/Utility/BotCode/RosterHousekeeping.cs b/Utility/BotCode/RosterHousekeeping.cs index 35afeb95..6c8489fe 100644 --- a/Utility/BotCode/RosterHousekeeping.cs +++ b/Utility/BotCode/RosterHousekeeping.cs @@ -1,16 +1,16 @@ using System; using System.Collections.Generic; -using System.Text; -using Swarmops.Basic.Enums; -using Swarmops.Logic.Communications; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Security; -using Swarmops.Logic.Structure; using System.Diagnostics; +using System.Text; using Swarmops.Basic; +using Swarmops.Basic.Enums; using Swarmops.Basic.Types; using Swarmops.Database; +using Swarmops.Logic.Communications; +using Swarmops.Logic.Security; +using Swarmops.Logic.Structure; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; using Swarmops.Utility.Mail; namespace Swarmops.Utility.BotCode @@ -390,8 +390,6 @@ namespace Swarmops.Utility.BotCode // NEW December 2010: Organizations are separated as per common agreement, there are no common reminder mails. Every membership renews on its own. - int longestAncestry = 0; // "ancestry" as a length means distance to organization tree root - int shortestAncestry = 999; Organization lowOrg = membership.Organization; DateTime currentExpiry = membership.Expires; Person person = membership.Person; diff --git a/Utility/BotCode/SalaryProcessor.cs b/Utility/BotCode/SalaryProcessor.cs index 3354df3f..2d182a0b 100644 --- a/Utility/BotCode/SalaryProcessor.cs +++ b/Utility/BotCode/SalaryProcessor.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Text; using Swarmops.Basic.Enums; using Swarmops.Logic.Financial; using Swarmops.Logic.Support; diff --git a/Utility/BotCode/SchulzeProcessor.cs b/Utility/BotCode/SchulzeProcessor.cs index 29b1699a..2f05f02f 100644 --- a/Utility/BotCode/SchulzeProcessor.cs +++ b/Utility/BotCode/SchulzeProcessor.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Governance; namespace Swarmops.Utility.BotCode diff --git a/Utility/BotCode/TurnaroundTracker.cs b/Utility/BotCode/TurnaroundTracker.cs index 56f59685..a57bbfa7 100644 --- a/Utility/BotCode/TurnaroundTracker.cs +++ b/Utility/BotCode/TurnaroundTracker.cs @@ -1,11 +1,8 @@ using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Communications; -using Swarmops.Logic.Structure; -using Swarmops.Utility.Special.Sweden; using Swarmops.Database; +using Swarmops.Logic.Communications; using Swarmops.Logic.Special.Sweden; +using Swarmops.Logic.Structure; using Swarmops.Logic.Support; namespace Swarmops.Utility.BotCode diff --git a/Utility/BotCode/UpdateStatsCache.cs b/Utility/BotCode/UpdateStatsCache.cs index c6e2ac08..a3515133 100644 --- a/Utility/BotCode/UpdateStatsCache.cs +++ b/Utility/BotCode/UpdateStatsCache.cs @@ -1,13 +1,3 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Net; -using System.Text; -using Swarmops.Basic.Enums; -using Swarmops.Logic.Special.Sweden; -using Swarmops.Logic.Structure; -using Swarmops.Logic.Support; - namespace Swarmops.Utility.BotCode { public class UpdateStatsCache diff --git a/Utility/Communications/CommsTransmitterMail.cs b/Utility/Communications/CommsTransmitterMail.cs index 414b681b..94ddae2a 100644 --- a/Utility/Communications/CommsTransmitterMail.cs +++ b/Utility/Communications/CommsTransmitterMail.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Net.Mail; using System.Text; -using Swarmops.Database; using Swarmops.Logic.Communications; using Swarmops.Logic.Communications.Transmission; using Swarmops.Logic.Support; diff --git a/Utility/ExceptionMail.cs b/Utility/ExceptionMail.cs index 5de16523..7ba41fe2 100644 --- a/Utility/ExceptionMail.cs +++ b/Utility/ExceptionMail.cs @@ -1,9 +1,7 @@ using System; -using System.Collections.Generic; -using System.Text; -using Swarmops.Logic.Swarm; using Swarmops.Basic; using Swarmops.Database; +using Swarmops.Logic.Swarm; using Swarmops.Utility.Mail; namespace Swarmops.Utility diff --git a/Utility/Financial/PaymentGroupMapper.cs b/Utility/Financial/PaymentGroupMapper.cs index e5aeed2d..97327304 100644 --- a/Utility/Financial/PaymentGroupMapper.cs +++ b/Utility/Financial/PaymentGroupMapper.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; using Swarmops.Logic.Financial; using Swarmops.Logic.Structure; diff --git a/Utility/Financial/PaypalImporter.cs b/Utility/Financial/PaypalImporter.cs index 1b0d456e..f8749a49 100644 --- a/Utility/Financial/PaypalImporter.cs +++ b/Utility/Financial/PaypalImporter.cs @@ -1,12 +1,10 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Text; -using Swarmops.Basic.Enums; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Security; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Utility.Financial { diff --git a/Utility/Financial/PaysonImporter.cs b/Utility/Financial/PaysonImporter.cs index 48200299..0fe52f72 100644 --- a/Utility/Financial/PaysonImporter.cs +++ b/Utility/Financial/PaysonImporter.cs @@ -1,14 +1,12 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Text; using System.Text.RegularExpressions; using System.Web; -using Swarmops.Basic.Enums; using Swarmops.Logic.Financial; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Security; using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; namespace Swarmops.Utility.Financial { diff --git a/Utility/Mail/MailTransmitter.cs b/Utility/Mail/MailTransmitter.cs index c555c474..609c8bf6 100644 --- a/Utility/Mail/MailTransmitter.cs +++ b/Utility/Mail/MailTransmitter.cs @@ -1,12 +1,10 @@ using System; using System.Collections.Generic; -using System.Text; -using System.Net; using System.Net.Mail; -using Swarmops.Basic.Enums; -using Swarmops.Logic.Swarm; +using System.Text; using Swarmops.Basic; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Utility.Mail { diff --git a/Utility/Mail/Newsletter.cs b/Utility/Mail/Newsletter.cs index 51601047..f68091e8 100644 --- a/Utility/Mail/Newsletter.cs +++ b/Utility/Mail/Newsletter.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - using Swarmops.Logic.Swarm; namespace Swarmops.Utility.Mail diff --git a/Utility/Mail/NewsletterTransmitter.cs b/Utility/Mail/NewsletterTransmitter.cs index 7d7029dd..23ccf58d 100644 --- a/Utility/Mail/NewsletterTransmitter.cs +++ b/Utility/Mail/NewsletterTransmitter.cs @@ -1,15 +1,12 @@ using System; using System.IO; -using System.Net; using System.Net.Mail; using System.Net.Mime; using System.Text; using System.Text.RegularExpressions; using System.Web; - -using Swarmops.Basic.Types; -using Swarmops.Logic.Swarm; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Utility.Mail { diff --git a/Utility/Mail/NewsletterTransmitter3.cs b/Utility/Mail/NewsletterTransmitter3.cs index 674d6a5d..3ce2792e 100644 --- a/Utility/Mail/NewsletterTransmitter3.cs +++ b/Utility/Mail/NewsletterTransmitter3.cs @@ -1,15 +1,12 @@ using System; using System.IO; -using System.Net; using System.Net.Mail; using System.Net.Mime; using System.Text; -using System.Text.RegularExpressions; using System.Web; -using Swarmops.Basic.Types; -using Swarmops.Logic.Swarm; using Swarmops.Basic; using Swarmops.Logic.Support; +using Swarmops.Logic.Swarm; namespace Swarmops.Utility.Mail { diff --git a/Utility/Mail/PressReleaseTransmitter.cs b/Utility/Mail/PressReleaseTransmitter.cs index f1bc69c2..0a5b0298 100644 --- a/Utility/Mail/PressReleaseTransmitter.cs +++ b/Utility/Mail/PressReleaseTransmitter.cs @@ -1,16 +1,12 @@ using System; using System.IO; -using System.Net; using System.Net.Mail; using System.Net.Mime; using System.Text; -using System.Text.RegularExpressions; using System.Web; -using Swarmops.Basic.Types; using Swarmops.Basic; using Swarmops.Logic.Media; - namespace Swarmops.Utility.Mail { diff --git a/Utility/Migrations/PeopleOptionalData.cs b/Utility/Migrations/PeopleOptionalData.cs index cf89918c..27cbbb92 100644 --- a/Utility/Migrations/PeopleOptionalData.cs +++ b/Utility/Migrations/PeopleOptionalData.cs @@ -1,11 +1,8 @@ using System; -using System.Collections.Generic; using System.Data.Common; -using System.Data.SqlClient; -using System.Text; using Swarmops.Basic.Enums; -using Swarmops.Logic.Swarm; using Swarmops.Database; +using Swarmops.Logic.Swarm; namespace Swarmops.Utility.Migrations { diff --git a/Utility/Properties/AssemblyInfo.cs b/Utility/Properties/AssemblyInfo.cs index ae98fc89..4b8655af 100644 --- a/Utility/Properties/AssemblyInfo.cs +++ b/Utility/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/Utility/Server/ActiveDirectoryCode.cs b/Utility/Server/ActiveDirectoryCode.cs index 09ff7eb0..62dadeb8 100644 --- a/Utility/Server/ActiveDirectoryCode.cs +++ b/Utility/Server/ActiveDirectoryCode.cs @@ -1,9 +1,3 @@ -using System; -using System.DirectoryServices; -using System.Collections.Generic; -using System.Text; - - namespace Swarmops.Utility.Server { public class ActiveDirectoryCode diff --git a/Utility/Server/ExchangeCode.cs b/Utility/Server/ExchangeCode.cs index a8bfbda7..2686fbd9 100644 --- a/Utility/Server/ExchangeCode.cs +++ b/Utility/Server/ExchangeCode.cs @@ -1,6 +1,3 @@ -using System; -using System.DirectoryServices; - //using CDOEXM; namespace Swarmops.Utility.Server diff --git a/Utility/Special/Sweden/SupportMailReview.cs b/Utility/Special/Sweden/SupportMailReview.cs index 3ce258d5..fbb43669 100644 --- a/Utility/Special/Sweden/SupportMailReview.cs +++ b/Utility/Special/Sweden/SupportMailReview.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using System.IO; using System.Net.Mail; using System.Text; -using Swarmops.Utility.Mail; using Swarmops.Basic; using Swarmops.Logic.Special.Sweden; using Swarmops.Logic.Support; diff --git a/Utility/Special/Sweden/SwedishForumMemberCheck.cs b/Utility/Special/Sweden/SwedishForumMemberCheck.cs index 593ad599..02bb1ac9 100644 --- a/Utility/Special/Sweden/SwedishForumMemberCheck.cs +++ b/Utility/Special/Sweden/SwedishForumMemberCheck.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; -using System.Text; -using Swarmops.Basic.Enums; -using Swarmops.Logic.Swarm; -using Swarmops.Logic.Structure; using Swarmops.Logic.Special.Sweden; +using Swarmops.Logic.Structure; +using Swarmops.Logic.Swarm; using Swarmops.Utility.BotCode; namespace Swarmops.Utility.Special.Sweden diff --git a/Utility/Special/UrlTranslator.cs b/Utility/Special/UrlTranslator.cs index 1f9704ed..d5549efd 100644 --- a/Utility/Special/UrlTranslator.cs +++ b/Utility/Special/UrlTranslator.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.IO; -using System.Text; using System.Net; namespace Swarmops.Utility.Special diff --git a/Utility/Utility.csproj b/Utility/Utility.csproj index 7dba055d..cccb9eb5 100644 --- a/Utility/Utility.csproj +++ b/Utility/Utility.csproj @@ -115,21 +115,6 @@ - - - {6608C2E6-F841-4CD1-8AB2-28DC3B1DDDD1} - Basic - True - - - {3A5B5F19-51A5-48CE-A82E-97D5C189E5CB} - Database - - - {13E59551-34AC-43DC-9A03-EF5E4721DC61} - Logic - - ResXFileCodeGenerator @@ -150,5 +135,19 @@ + + + {6608c2e6-f841-4cd1-8ab2-28dc3b1dddd1} + Basic + + + {3a5b5f19-51a5-48ce-a82e-97d5c189e5cb} + Database + + + {13e59551-34ac-43dc-9a03-ef5e4721dc61} + Logic + + - + \ No newline at end of file