diff --git a/BuildFiles/Building/precompile-deploy.cmd b/BuildFiles/Building/precompile-deploy.cmd index 9b032e97..e18d8218 100644 --- a/BuildFiles/Building/precompile-deploy.cmd +++ b/BuildFiles/Building/precompile-deploy.cmd @@ -1,8 +1,37 @@ if not exist C:\Lab\Swarmops\build\Deploy-Staging\BuildDropped.txt goto testSprint + cd \Lab\Swarmops\build\Deploy-Staging -C:\Windows\Microsoft.NET\Framework\v4.0.30319\aspnet_compiler.exe -u -v / -p frontend-raw -f -fixednames -errorstack frontend -C:\Windows\Microsoft.NET\Framework\v4.0.30319\aspnet_merge.exe -o Swarmops.Site.dll frontend + +C:\Windows\Microsoft.NET\Framework64\v4.0.30319\aspnet_compiler.exe -u -v / -p frontend-raw -f -fixednames -errorstack frontend + +if errorlevel 1 goto testSprint +C:\"Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools"\aspnet_merge.exe -o Swarmops.Site.dll frontend +rd /s /q frontend-raw +del \Lab\Swarmops\build\Deploy-Staging\BuildDropped.txt +robocopy \Lab\Swarmops\build\Deploy-Staging \\swarmops-dev\builddrop\swarmops\internal /MIR +echo foo > \\swarmops-dev\builddrop\swarmops\internal\BuildDropped.txt +cd .. +rd /s /q \Lab\Swarmops\build\Deploy-Staging + + :testSprint -echo ending +if not exist C:\Lab\Swarmops\sprint\Deploy-Staging\BuildDropped.txt goto endScript + +cd \Lab\Swarmops\sprint\Deploy-Staging + +C:\Windows\Microsoft.NET\Framework64\v4.0.30319\aspnet_compiler.exe -u -v / -p frontend-raw -f -fixednames -errorstack frontend + +if errorlevel 1 goto endScript +C:\"Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools"\aspnet_merge.exe -o Swarmops.Site.dll frontend +rd /s /q frontend-raw +del \Lab\Swarmops\sprint\Deploy-Staging\BuildDropped.txt +robocopy \Lab\Swarmops\sprint\Deploy-Staging \\swarmops-dev\builddrop\swarmops\sprint /MIR +echo foo > \\swarmops-dev\builddrop\swarmops\sprint\BuildDropped.txt +cd .. +rd /s /q \Lab\Swarmops\sprint\Deploy-Staging + + +:endScript +echo foo diff --git a/BuildFiles/Packaging/templates/mail-sprint-ready.txt b/BuildFiles/Packaging/templates/mail-sprint-ready.txt new file mode 100644 index 00000000..5643327b --- /dev/null +++ b/BuildFiles/Packaging/templates/mail-sprint-ready.txt @@ -0,0 +1,3 @@ +A sprint build has been deployed to staging area. It is ready for packaging and deployment. + +Shell to swarmops-dev and run the 'do-sprint' script to deploy the sprint. diff --git a/BuildFiles/Packaging/test-build-drop b/BuildFiles/Packaging/test-build-drop index d7fa1167..075282e4 100755 --- a/BuildFiles/Packaging/test-build-drop +++ b/BuildFiles/Packaging/test-build-drop @@ -4,6 +4,22 @@ # /home/packager/lastbuild/swarmops/internal/BuildDropped.txt # and if that file exists, it launches an internal build. +# It also watches for the completion of a sprint/release build and informs +# when it is ready for deployment, but does not actually package those. + +if [ -e /home/packager/lastbuild/swarmops/sprint/BuildDropped.txt ]; then + rm /home/packager/lastbuild/swarmops/sprint/BuildDropped.txt + SPRINTNAME=$(cat ../lastbuild/swarmops/sprint/frontend/SprintName.txt | tr -d '\n') + BUILDID=$(cat ../lastbuild/swarmops/sprint/BuildIdentity.txt | tr -d ' \r') + COMMITID=$(cat ../lastbuild/swarmops/sprint/CommitIdentity.txt | tr -d ' \r') + BUILDID=$(echo $BUILDID | cut -c 1-6)$(echo $COMMITID | cut -c 1-7) + + mail -a "From: Swarmops Builder " -s "Swarmops SPRINT $SPRINTNAME ($BUILDID) ready." "rick.falkvinge@pirateacademy.eu" < /home/packager/swarmops/templates/mail-sprint-ready.txt + +fi + + + if [ ! -e /home/packager/lastbuild/swarmops/internal/BuildDropped.txt ]; then exit 0; fi diff --git a/LINESOFCODE b/LINESOFCODE index 9ebbdca8..e3e66a31 100644 --- a/LINESOFCODE +++ b/LINESOFCODE @@ -132,7 +132,7 @@ 78 ./Database/Database-PaymentCodes.cs 246 ./Database/Database-ConnectionsCommands.cs 200 ./Database/Database-Events.cs - 191 ./Database/Database-Constructors.cs + 192 ./Database/Database-Constructors.cs 171 ./Database/Database-ExternalIdentities.cs 207 ./Database/Database-Salaries.cs 83 ./Database/Database-AutoMails.cs @@ -317,62 +317,64 @@ 24 ./Utility/Mail/Newsletter.cs 10 ./Site5/Pages/v5/Financial/EconomyNotEnabled.aspx.cs 1 ./Site5/Pages/v5/Financial/Json-ValidatableReceipts.aspx - 296 ./Site5/Pages/v5/Financial/AttestCosts.aspx.cs + 298 ./Site5/Pages/v5/Financial/AttestCosts.aspx.cs 211 ./Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs - 85 ./Site5/Pages/v5/Financial/RequestCashAdvance.aspx + 82 ./Site5/Pages/v5/Financial/RequestCashAdvance.aspx 114 ./Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs 13 ./Site5/Pages/v5/Financial/EconomyNotEnabled.aspx 76 ./Site5/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs 1 ./Site5/Pages/v5/Financial/Json-PayableCosts.aspx - 158 ./Site5/Pages/v5/Financial/CreateInboundInvoice.aspx - 151 ./Site5/Pages/v5/Financial/FileExpenseClaim.aspx - 208 ./Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs - 145 ./Site5/Pages/v5/Financial/PayOutMoney.aspx + 155 ./Site5/Pages/v5/Financial/CreateInboundInvoice.aspx + 144 ./Site5/Pages/v5/Financial/FileExpenseClaim.aspx + 210 ./Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs + 143 ./Site5/Pages/v5/Financial/PayOutMoney.aspx 197 ./Site5/Pages/v5/Financial/Json-AttestableCosts.aspx.cs - 184 ./Site5/Pages/v5/Financial/AttestCosts.aspx + 183 ./Site5/Pages/v5/Financial/AttestCosts.aspx 69 ./Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs - 185 ./Site5/Pages/v5/Financial/ValidateReceipts.aspx + 183 ./Site5/Pages/v5/Financial/ValidateReceipts.aspx 1 ./Site5/Pages/v5/Financial/Json-AttestableCosts.aspx - 114 ./Site5/Pages/v5/Financial/PayOutMoney.aspx.cs - 225 ./Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs - 142 ./Site5/Pages/v5/Admin/CreateOrganization.aspx.cs - 69 ./Site5/Pages/v5/Admin/CreateOrganization.aspx + 115 ./Site5/Pages/v5/Financial/PayOutMoney.aspx.cs + 227 ./Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs + 141 ./Site5/Pages/v5/Admin/CreateOrganization.aspx.cs + 42 ./Site5/Pages/v5/Admin/CreateOrganization.aspx 16 ./Site5/Pages/v5/Admin/Hacks/TemporaryHack.aspx - 108 ./Site5/Pages/v5/Admin/Hacks/PopulateData.aspx + 106 ./Site5/Pages/v5/Admin/Hacks/PopulateData.aspx 59 ./Site5/Pages/v5/Admin/Hacks/Temp-SetOrganizationAdminAccess.aspx.cs 28 ./Site5/Pages/v5/Admin/Hacks/Temp-SetOrganizationAdminAccess.aspx 101 ./Site5/Pages/v5/Admin/Hacks/PopulateData.aspx.cs 79 ./Site5/Pages/v5/Admin/Hacks/TemporaryHack.aspx.cs + 198 ./Site5/Pages/v5/Admin/EditOrganization.aspx + 387 ./Site5/Pages/v5/Admin/EditOrganization.aspx.cs 106 ./Site5/Pages/v5/Comms/SendMassMessage.aspx.cs - 65 ./Site5/Pages/v5/Comms/SendMassMessage.aspx + 63 ./Site5/Pages/v5/Comms/SendMassMessage.aspx 13 ./Site5/Pages/v5/Security/DatabaseUpgradeRequired.aspx 13 ./Site5/Pages/v5/Security/AccessDenied.aspx.cs 17 ./Site5/Pages/v5/Security/AccessDenied.aspx - 36 ./Site5/Pages/v5/Security/ChangeOrganizationsAdvanced.aspx + 31 ./Site5/Pages/v5/Security/ChangeOrganizationsAdvanced.aspx 61 ./Site5/Pages/v5/Security/ChangeOrganizations.aspx.cs 1 ./Site5/Pages/v5/Security/SetCurrentOrganization.aspx - 84 ./Site5/Pages/v5/Security/ChangeOrganizations.aspx + 82 ./Site5/Pages/v5/Security/ChangeOrganizations.aspx 1 ./Site5/Pages/v5/Security/Json-AccessibleOrganizationsTree.aspx 13 ./Site5/Pages/v5/Security/DatabaseUpgradeRequired.aspx.cs 91 ./Site5/Pages/v5/Security/Json-AccessibleOrganizationsTree.aspx.cs 38 ./Site5/Pages/v5/Security/ChangeOrganizationsAdvanced.aspx.cs - 56 ./Site5/Pages/v5/Security/SetCurrentOrganization.aspx.cs + 66 ./Site5/Pages/v5/Security/SetCurrentOrganization.aspx.cs 841 ./Site5/Pages/v5/Init/Default.aspx.cs 697 ./Site5/Pages/v5/Init/Default.aspx - 704 ./Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs + 706 ./Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs 129 ./Site5/Pages/v5/Ledgers/CloseLedgers.aspx.cs - 59 ./Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs + 61 ./Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs 22 ./Site5/Pages/v5/Ledgers/CloseLedgers.aspx 328 ./Site5/Pages/v5/Ledgers/SetRootBudgets.aspx.cs 0 ./Site5/Pages/v5/Ledgers/Json-InspectLedgerData.aspx - 48 ./Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs - 345 ./Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs - 211 ./Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx.cs + 50 ./Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs + 362 ./Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs + 213 ./Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx.cs 29 ./Site5/Pages/v5/Ledgers/DebugLedgers.aspx.cs 1 ./Site5/Pages/v5/Ledgers/Json-BalanceSheetData.aspx 189 ./Site5/Pages/v5/Ledgers/Json-InspectLedgerData.aspx.cs 11 ./Site5/Pages/v5/Ledgers/DebugLedgers.aspx - 73 ./Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs + 75 ./Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs 423 ./Site5/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs 1 ./Site5/Pages/v5/Ledgers/Json-ResyncPreview.aspx 1 ./Site5/Pages/v5/Ledgers/Json-ProfitLossData.aspx @@ -383,30 +385,32 @@ 133 ./Site5/Pages/v5/Ledgers/Json-ProfitLossData.aspx.cs 1 ./Site5/Pages/v5/Ledgers/Csv-ProfitLossData.aspx 300 ./Site5/Pages/v5/Ledgers/Json-ResyncPreview.aspx.cs - 208 ./Site5/Pages/v5/Ledgers/UploadBankFiles.aspx - 137 ./Site5/Pages/v5/Ledgers/InspectLedgers.aspx - 94 ./Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx - 44 ./Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs + 205 ./Site5/Pages/v5/Ledgers/UploadBankFiles.aspx + 133 ./Site5/Pages/v5/Ledgers/InspectLedgers.aspx + 92 ./Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx + 46 ./Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs 1250 ./Site5/Pages/v5/Ledgers/UploadBankFiles.aspx.cs 92 ./Site5/Pages/v5/Ledgers/Csv-ProfitLossData.aspx.cs - 119 ./Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx - 270 ./Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx - 494 ./Site5/Pages/v5/Ledgers/AccountPlan.aspx - 117 ./Site5/Pages/v5/Ledgers/BalanceSheet.aspx + 117 ./Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx + 267 ./Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx + 529 ./Site5/Pages/v5/Ledgers/AccountPlan.aspx + 114 ./Site5/Pages/v5/Ledgers/BalanceSheet.aspx 1 ./Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx 131 ./Site5/Pages/v5/Ledgers/Json-BalanceSheetData.aspx.cs 1 ./Site5/Pages/v5/Swarm/Json-ListFindPeople.aspx - 208 ./Site5/Pages/v5/Swarm/ListFindPeople.aspx + 16 ./Site5/Pages/v5/Swarm/AddPerson.aspx.cs + 35 ./Site5/Pages/v5/Swarm/AddPerson.aspx + 204 ./Site5/Pages/v5/Swarm/ListFindPeople.aspx 63 ./Site5/Pages/v5/Swarm/Json-ListFindPeople.aspx.cs 111 ./Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs 1 ./Site5/Pages/v5/User/SetCulture.aspx 70 ./Site5/Pages/v5/User/SelectLanguage.aspx.cs 33 ./Site5/Pages/v5/User/SetCulture.aspx.cs - 97 ./Site5/Pages/v5/User/SelectLanguage.aspx + 96 ./Site5/Pages/v5/User/SelectLanguage.aspx 191 ./Site5/Pages/v5/Support/StreamUpload.aspx.cs 2 ./Site5/Pages/v5/Support/StreamUpload.aspx 20 ./Site5/Default.aspx.cs - 17 ./Site5/Default.aspx + 18 ./Site5/Default.aspx 377 ./Site5/Security/Login.aspx.cs 99 ./Site5/Security/Login-Old.aspx.cs 220 ./Site5/Security/Login.aspx @@ -436,15 +440,17 @@ 128 ./Site5/Automation/Json-BudgetsTree.aspx.cs 33 ./Site5/Tests/TestBookkeepingIntegrity.aspx 80 ./Site5/Tests/TestBookkeepingIntegrity.aspx.cs - 378 ./Site5/Master-v5.master.cs + 393 ./Site5/Master-v5.master.cs 106 ./Site5/Controls/v5/Base/MainMenu.ascx.cs 31 ./Site5/Controls/v5/Base/ComboGeographies.ascx.cs 40 ./Site5/Controls/v5/Base/ComboGeographies.ascx - 73 ./Site5/Controls/v5/Base/FileUpload.ascx.cs + 75 ./Site5/Controls/v5/Base/FileUpload.ascx.cs + 27 ./Site5/Controls/v5/Base/DropDown.ascx.cs 68 ./Site5/Controls/v5/Base/FileUpload.ascx 1 ./Site5/Controls/v5/Base/MainMenu.ascx + 34 ./Site5/Controls/v5/Base/DropDown.ascx 20 ./Site5/Controls/v5/Financial/CurrencyTextBox.ascx.cs - 36 ./Site5/Controls/v5/Financial/ComboBudgets.ascx + 101 ./Site5/Controls/v5/Financial/ComboBudgets.ascx 1 ./Site5/Controls/v5/Financial/ComboIncomeCostType.ascx 1 ./Site5/Controls/v5/Financial/CurrencyTextBox.ascx 8 ./Site5/Controls/v5/Financial/ComboIncomeCostType.ascx.cs @@ -453,15 +459,17 @@ 18 ./Site5/Controls/v5/Swarm/ComboPeople.ascx.cs 98 ./Site5/Controls/v5/Swarm/ComboPeople.ascx 26 ./Site5/Controls/v5/Swarm/PersonDetailPopup.ascx - 35 ./Site5/Controls/v5/UI/ExternalScripts.ascx.cs - 9 ./Site5/Controls/v5/UI/ExternalScripts.ascx + 46 ./Site5/Controls/v5/UI/ExternalScripts.ascx.cs + 5 ./Site5/Controls/v5/UI/ExternalScripts.ascx + 5 ./Site5/Controls/v5/UI/IncludedScripts.ascx + 44 ./Site5/Controls/v5/UI/IncludedScripts.ascx.cs 81 ./Site5/Global.asax + 376 ./Site5/App_Code/CommonV5.cs 880 ./Site5/App_Code/GetGeographyData.cs - 60 ./Site5/App_Code/MasterV5Base.cs - 144 ./Site5/App_Code/PageV5Base.cs - 151 ./Site5/App_Code/DataV5Base.cs - 71 ./Site5/App_Code/ControlV5Base.cs - 110 ./Site5/App_Code/CommonV5Base.cs + 65 ./Site5/App_Code/MasterV5Base.cs + 157 ./Site5/App_Code/PageV5Base.cs + 163 ./Site5/App_Code/DataV5Base.cs + 83 ./Site5/App_Code/ControlV5Base.cs 96 ./Site5/App_Code/FieldValidation.cs 376 ./Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.Designer.cs 91 ./Logic/App_GlobalResources/Logic.Financial.FinancialTransactionTagSetTypesStock.Designer.cs @@ -485,9 +493,9 @@ 50 ./Logic/Financial/FinancialValidations.cs 678 ./Logic/Financial/Payout.cs 13 ./Logic/Financial/IBankDataPaymentsReader.cs - 41 ./Logic/Financial/Currency.cs + 55 ./Logic/Financial/Currency.cs 212 ./Logic/Financial/FinancialAccounts.cs - 406 ./Logic/Financial/FinancialAccount.cs + 412 ./Logic/Financial/FinancialAccount.cs 10 ./Logic/Financial/StockBankDataReaders.cs 451 ./Logic/Financial/Payouts.cs 189 ./Logic/Financial/Payment.cs @@ -506,7 +514,7 @@ 10 ./Logic/Financial/ISummable.cs 126 ./Logic/Financial/ExpenseClaims.cs 59 ./Logic/Financial/ExternalBankDataRecord.cs - 282 ./Logic/Financial/OrganizationFinancialAccounts.cs + 309 ./Logic/Financial/OrganizationFinancialAccounts.cs 9 ./Logic/Financial/IBankDataAccountStatementReader.cs 23 ./Logic/Financial/ImportedBankData.cs 71 ./Logic/Financial/FinancialTransactions.cs @@ -539,7 +547,7 @@ 58 ./Logic/AssemblyInfo.cs 809 ./Logic/Security/BCrypt.cs 29 ./Logic/Security/MD5.cs - 49 ./Logic/Security/Accesses.cs + 62 ./Logic/Security/Accesses.cs 309 ./Logic/Security/Authority.cs 22 ./Logic/Security/ActivityEnum.cs 29 ./Logic/Security/SHA1.cs @@ -1177,4 +1185,4 @@ 33 ./Site4/App_Code/MasterV4Base.cs 285 ./Site4/App_Code/GeoSok.cs 700 ./Site4/App_Code/CellAddressableTable.cs - 156454 total + 157661 total diff --git a/Logic/App_GlobalResources/it-IT/Logic.Communications.Transmission.NotificationPayload.it-IT.resx b/Logic/App_GlobalResources/it-IT/Logic.Communications.Transmission.NotificationPayload.it-IT.resx index 79a76f7a..f435b86a 100644 --- a/Logic/App_GlobalResources/it-IT/Logic.Communications.Transmission.NotificationPayload.it-IT.resx +++ b/Logic/App_GlobalResources/it-IT/Logic.Communications.Transmission.NotificationPayload.it-IT.resx @@ -117,9 +117,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - + + L'anticipo richiesto con [OrganizationName] per [CurrencyCode] [BudgetAmountFloat], riguardante [RequestPurpose], è stato confermato dal responsabile del Bilancio. Ora si potrà procedere al pagamento. + + + [OrganizationName] Anticipo confermato: [CurrencyCode] [BudgetAmountFloat] + + + L'anticipo richiesto con [OrganizationName] per [CurrencyCode] [BudgetAmountFloat], riguardante [RequestPurpose], non è stato confermato dal responsabile del Bilancio. Questo di solito indica che vi sono problemi con la vostra richiesta. + +Rimanete in attesa di ulteriori indicazioni dal responsabile del bilancio. + diff --git a/Site5/Default.aspx b/Site5/Default.aspx index 89e49366..d4867ab7 100644 --- a/Site5/Default.aspx +++ b/Site5/Default.aspx @@ -9,7 +9,7 @@

What you see here is the new interface being rewritten on top of the already-running engine. It runs on Debian/Ubuntu servers for frontend and backend.

This notice will be replaced with a proper Dashboard when all the basic functions are in place. You can see functions appear as they are implemented in the menu.

A rough roadmap says that basic financials are implemented first, then member registry functions, then communications, then responsibilities, then governance. For more on the specific roadmap, go to the SCRUM planning for Swarmops.

-

Look at the Swarmops code on Github (and feel free to contribute)! Current line count: 156,454.

+

Look at the Swarmops code on Github (and feel free to contribute)! Current line count: 157,661.

diff --git a/Site5/Images/Logo-Stock.png b/Site5/Images/Logo-Stock.png index 33f542ef..b8120899 100644 Binary files a/Site5/Images/Logo-Stock.png and b/Site5/Images/Logo-Stock.png differ diff --git a/Site5/SprintName.txt b/Site5/SprintName.txt index 9fedd4b2..47522214 100644 --- a/Site5/SprintName.txt +++ b/Site5/SprintName.txt @@ -1 +1 @@ -Black-5/GFE +Black-6