1.1.0 accounts mode

Author: TradeControl

changelog.md

@@ -0,0 +1,4 @@
+# Change Log
+
+Changes to 1.1.0, released 1 July 2021.
+

docs/dev_plan.md

@@ -0,0 +1,86 @@
+# Trade Control - Web Interface
+
+## Implementation Plan
+
+### Phase 1 - Data Models
+
+- [x] Entity Framework Core scaffold
+- [x] Test model - Calendars
+
+### Phase 2 - Business Logic
+
+- [x] Asynchronous connection to the [sqlnode](https://github.com/tradecontrol/sqlnode)  
+- [x] Test logic - Payment Entry
+
+The implmented EF Core scaffold and business logic support the functionality of sql node version 3.34.2 for Phases 3-6. 
+
+### Phase 3 - Web Environment
+
+Requires sql node version 3.34.3 to support the AspNetCore.Identity datastore and registration process.
+
+- [x] Authentication
+- [x] Register new users 
+- [x] Authorisation
+- [x] [Device Detection](https://github.com/wangkanai/Detection)
+- [x] Layouts and Navigation
+- [x] Session service
+
+### Phase 4 - Accounts Mode
+
+Requires [sql node 3.34.6](https://github.com/tradecontrol/sqlnode) or higher.
+
+- [x] Accounts Mode menu
+- [x] Basic home page
+- [x] Error trapping
+- [x] Error Log
+- [x] Payment Entry - bank accounts and adjustments 
+- [x] Create and lookup organisations, category, tax and cash codes
+- [x] Asset Entry - capital accounts for long-term assets and liabilities 
+- [x] Cash Account Statements - reporting and maintenance 
+- [x] Interbank Transfers - accruals and payments
+- [x] Cash Account Maintenance - cash, asset and dummy accounts
+- [x] Organisation Maintenance - create, edit and delete organisations, contacts and addresses
+- [x] Organisation Enquiries - details, invoices, payments and SvD statements
+- [x] Debtors and Creditors - current and historical balance sheet audit
+- [x] Raise invoices and credit notes
+- [x] Cancel invoices
+- [x] Modify and reshedule invoices
+- [x] Invoice Register - sales and purchases by period
+- [x] Cash Code invoice summary
+- [x] Unpaid income and expense
+- [x] Host settings
+- [x] [Website email service](https://github.com/jstedfast/MailKit)
+- [x] Html document templates
+- [x] Template manager
+- [x] Configure email document templates (images and attachments)
+- [x] File transfer (upload/download templates)
+- [x] Email invoices to contacts
+- [x] Email preview
+- [x] Vat Statement and quarterly totals
+- [x] Company Tax Statement and period totals
+- [x] Tax rates
+- [x] Balance Sheet by period
+- [x] Profit and Loss by period
+- [x] Category and Cash Code maintenance
+- [x] Cash Totals
+- [x] Tax Settings
+- [x] System settings 
+- [x] Period End maintenance and closedown
+- [x] Error reporting template and support submission
+- [x] Company initialisation
+- [x] [sql node](https://github.com/tradecontrol/sqlnode) release
+
+### Phase 5 - MIS Mode
+
+- [ ] Definitions
+- [ ] Interface
+- [ ] Documents
+
+### Phase 6 - Extensions
+
+- [ ] [Supply-Chain Network](https://github.com/tradecontrol/network)
+- [ ] [Bitcoin Wallet](https://github.com/tradecontrol/bitcoin)
+
+## Licence
+
+The Trade Control Code licence is issued by Trade Control Ltd under a [GNU General Public Licence v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html) 

readme.md

@@ -2,86 +2,22 @@
 
 Using ASP.NET Core to web enable the [Accounts](https://tradecontrol.github.io/accounts) and [MIS](https://tradecontrol.github.io/mis) interface on desktops and mobiles.
 
-## Implementation Plan
+## Publications
 
-### Phase 1 - Data Models
+| Release | Published |
+| - | - |
+| Accounts Mode | 1 July 2021 |
 
-- [x] Entity Framework Core scaffold
-- [x] Test model - Calendars
+## Development
 
-### Phase 2 - Business Logic
+- [implementation plan](docs/dev_plan.md)
+- [change log](changelog.md)
 
-- [x] Asynchronous connection to the [sqlnode](https://github.com/tradecontrol/sqlnode)  
-- [x] Test logic - Payment Entry
+## Documentation
 
-The implmented EF Core scaffold and business logic support the functionality of sql node version 3.34.2 for Phases 3-6. 
-
-### Phase 3 - Web Environment
-
-Requires sql node version 3.34.3 to support the AspNetCore.Identity datastore and registration process.
-
-- [x] Authentication
-- [x] Register new users 
-- [x] Authorisation
-- [x] [Device Detection](https://github.com/wangkanai/Detection)
-- [x] Layouts and Navigation
-- [x] Session service
-
-### Phase 4 - Accounts Mode
-
-Requires [sql node 3.34.6](https://github.com/tradecontrol/sqlnode) or higher.
-
-- [x] Accounts Mode menu
-- [x] Basic home page
-- [x] Error trapping
-- [x] Error Log
-- [x] Payment Entry - bank accounts and adjustments 
-- [x] Create and lookup organisations, category, tax and cash codes
-- [x] Asset Entry - capital accounts for long-term assets and liabilities 
-- [x] Cash Account Statements - reporting and maintenance 
-- [x] Interbank Transfers - accruals and payments
-- [x] Cash Account Maintenance - cash, asset and dummy accounts
-- [x] Organisation Maintenance - create, edit and delete organisations, contacts and addresses
-- [x] Organisation Enquiries - details, invoices, payments and SvD statements
-- [x] Debtors and Creditors - current and historical balance sheet audit
-- [x] Raise invoices and credit notes
-- [x] Cancel invoices
-- [x] Modify and reshedule invoices
-- [x] Invoice Register - sales and purchases by period
-- [x] Cash Code invoice summary
-- [x] Unpaid income and expense
-- [x] Host settings
-- [x] [Website email service](https://github.com/jstedfast/MailKit)
-- [x] Html document templates
-- [x] Template manager
-- [x] Configure email document templates (images and attachments)
-- [x] File transfer (upload/download templates)
-- [x] Email invoices to contacts
-- [x] Email preview
-- [x] Vat Statement and quarterly totals
-- [x] Company Tax Statement and period totals
-- [x] Tax rates
-- [x] Balance Sheet by period
-- [x] Profit and Loss by period
-- [x] Category and Cash Code maintenance
-- [x] Cash Totals
-- [x] Tax Settings
-- [x] System settings 
-- [x] Period End maintenance and closedown
-- [x] Error reporting template and support submission
-- [x] Company initialisation
-- [x] [sql node](https://github.com/tradecontrol/sqlnode) release
-
-### Phase 5 - MIS Mode
-
-- [ ] Definitions
-- [ ] Interface
-- [ ] Documents
-
-### Phase 6 - Extensions
-
-- [ ] [Supply-Chain Network](https://github.com/tradecontrol/network)
-- [ ] [Bitcoin Wallet](https://github.com/tradecontrol/bitcoin)
+- [overview](https://tradecontrol.github.io)
+- [installation](https://tradecontrol.github.io/tutorials/installing-web)
+- [tutorial](https://tradecontrol.github.io/tutorials/cash-book-web)
 
 ## Versioning
 

src/TCWeb/Areas/Identity/IdentityHostingStartup.cs

@@ -78,7 +78,6 @@ public void Configure(IWebHostBuilder builder)
                 CultureInfo.DefaultThreadCurrentCulture = cultureInfo;
                 CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
 
-                /*
                 double sessionTimeSpan = double.Parse(context.Configuration.GetSection("Settings")["SessionTimeSpan"]);
 
                 services.AddSession(options =>
@@ -87,7 +86,6 @@ public void Configure(IWebHostBuilder builder)
                     options.Cookie.HttpOnly = true;
                     options.Cookie.IsEssential = true;
                 });
-                */
 
             });
         }

src/TCWeb/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml

@@ -6,5 +6,5 @@
 
 <h1>@ViewData["Title"]</h1>
 <div>
-    Your registration is being processed. Please await confirmation by email from your systems administrator.
+    Your registration is being processed. System administrators can log in automatically.
 </div>

src/TCWeb/Data/NodeContext.cs

@@ -143,7 +143,7 @@ public NodeContext(DbContextOptions<NodeContext> options) : base(options) { }
         public virtual DbSet<Cash_vwAccountStatement> Cash_AccountStatements { get; set; }
         public virtual DbSet<Cash_vwAccountStatementListing> Cash_AccountStatementListings { get; set; }
         public virtual DbSet<Cash_vwBalanceSheet> Cash_BalanceSheet { get; set; }
-        public virtual DbSet<Cash_vwProfitAndLossByMonth> Cash_ProfitAndLossByMonth { get; set; }
+        public virtual DbSet<Cash_vwProfitAndLossByPeriod> Cash_ProfitAndLossByMonth { get; set; }
         public virtual DbSet<Cash_vwProfitAndLossByYear> Cash_ProfitAndLossByYear { get; set; }
         public virtual DbSet<Invoice_vwAccountsMode> Invoice_AccountsMode { get; set; }
         public virtual DbSet<App_vwHost> App_Host { get; set; }
@@ -172,7 +172,10 @@ public NodeContext(DbContextOptions<NodeContext> options) : base(options) { }
         public virtual DbSet<Invoice_vwCandidateSale> Invoice_CandidateSales { get; set; }
         public virtual DbSet<Org_vwCashAccountAsset> Org_CashAccountAssets { get; set; }
         public virtual DbSet<Org_vwCashAccount> Org_CashAccounts { get; set; }
-        public virtual DbSet<Cash_vwCashFlowType> Cash_CashFlowTypes { get; set; }
+        public virtual DbSet<Cash_vwCashFlowType> Cash_FlowTypes { get; set; }
+        public virtual DbSet<Cash_vwFlowCategory> Cash_FlowCategories { get; set; }
+        public virtual DbSet<Cash_vwFlowCategoryByPeriod> Cash_FlowCategoryByPeriods { get; set; }
+        public virtual DbSet<Cash_vwFlowCategoryByYear> Cash_FlowCategoryByYears { get; set; }
         public virtual DbSet<Cash_vwCategoryBudget> Cash_CategoryBudget { get; set; }
         public virtual DbSet<Cash_vwCategoryTotal> Cash_CategoryTotals { get; set; }
         public virtual DbSet<Cash_vwCategoryTotalCandidate> Cash_CategoryTotalCandidates { get; set; }
@@ -1878,24 +1881,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                     .IsUnique()
                     .HasFillFactor((byte)90);
 
-                entity.Property(e => e.InsertedBy).HasDefaultValueSql("(suser_sname())");
-
-                entity.Property(e => e.InsertedOn).HasDefaultValueSql("(getdate())");
-
-                entity.Property(e => e.OrganisationStatusCode).HasDefaultValueSql("((1))");
-
-                entity.Property(e => e.OrganisationTypeCode).HasDefaultValueSql("((1))");
-
-                //entity.Property(e => e.PayBalance).HasDefaultValueSql("((1))");
-
-                //entity.Property(e => e.RowVer)
-                //    .IsRowVersion()
-                //    .IsConcurrencyToken();
-
-                entity.Property(e => e.UpdatedBy).HasDefaultValueSql("(suser_sname())");
-
-                entity.Property(e => e.UpdatedOn).HasDefaultValueSql("(getdate())");
-
                 entity.HasOne(d => d.AddressCodeNavigation)
                     .WithMany(p => p.TbOrgs)
                     .HasForeignKey(d => d.AddressCode)
@@ -2729,9 +2714,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 entity.ToView("vwAttributesForQuote", "Task");
             });
 
-            modelBuilder.Entity<Cash_vwProfitAndLossByMonth>(entity =>
+            modelBuilder.Entity<Cash_vwProfitAndLossByPeriod>(entity =>
             {
-                entity.ToView("vwProfitAndLossByMonth", "Cash");
+                entity.ToView("vwProfitAndLossByPeriod", "Cash");
             });
 
             modelBuilder.Entity<Cash_vwProfitAndLossByYear>(entity =>
@@ -2818,6 +2803,21 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 entity.ToView("vwCashFlowTypes", "Cash");
             });
 
+            modelBuilder.Entity<Cash_vwFlowCategory>(entity =>
+            {
+                entity.ToView("vwFlowCategories", "Cash");
+            });
+
+            modelBuilder.Entity<Cash_vwFlowCategoryByPeriod>(entity =>
+            {
+                entity.ToView("vwFlowCategoryByPeriod", "Cash");
+            });
+
+            modelBuilder.Entity<Cash_vwFlowCategoryByYear>(entity =>
+            {
+                entity.ToView("vwFlowCategoryByYear", "Cash");
+            });
+
             modelBuilder.Entity<Cash_vwCategoryBudget>(entity =>
             {
                 entity.ToView("vwCategoryBudget", "Cash");