server/AyaNova/biz/UserBiz.cs

@@ -358,6 +358,8 @@ namespace AyaNova.Biz
                     await ct.Database.ExecuteSqlInterpolatedAsync($"delete from anotifysubscription where userid = {dbObject.Id}");
                     //personal datalistview
                     await ct.Database.ExecuteSqlInterpolatedAsync($"delete from adatalistview where public = {false} and userid = {dbObject.Id}");                    
+                    //Dashboard view
+                    await ct.Database.ExecuteSqlInterpolatedAsync($"delete from adashboardview where userid = {dbObject.Id}");
 
                     await EventLogProcessor.DeleteObjectLogAsync(UserId, BizType, dbObject.Id, dbObject.Name, ct);
                     await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, BizType, ct);

server/AyaNova/models/AyContext.cs

@@ -70,6 +70,7 @@ namespace AyaNova.Models
 
         public virtual DbSet<Logo> Logo { get; set; }
         public virtual DbSet<Report> Report { get; set; }
+        public virtual DbSet<DashboardView> DashboardView { get; set; }
 
         //Note: had to add this constructor to work with the code in startup.cs that gets the connection string from the appsettings.json file
         //and commented out the above on configuring

server/AyaNova/models/DashboardView.cs

@@ -0,0 +1,23 @@
+
+using System.ComponentModel.DataAnnotations;
+
+namespace AyaNova.Models
+{
+
+    public class DashboardView
+    {
+        public DashboardView(){
+            View="[]";//empty view by default
+        }
+        public long Id { get; set; }
+        public uint Concurrency { get; set; }
+
+        [Required]
+        public long UserId { get; set; }
+
+        [Required]
+        public string View { get; set; }//JSON Dashboard registry view object
+
+
+    }
+}

server/AyaNova/models/Logo.cs

@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using AyaNova.Biz;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Newtonsoft.Json;
-
 namespace AyaNova.Models
 {
 

server/AyaNova/util/AySchema.cs

@@ -20,10 +20,10 @@ namespace AyaNova.Util
         /////////// CHANGE THIS ON NEW SCHEMA UPDATE ////////////////////
 
         //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
-        private const int DESIRED_SCHEMA_LEVEL = 14;
+        private const int DESIRED_SCHEMA_LEVEL = 15;
 
-        internal const long EXPECTED_COLUMN_COUNT = 414;
+        internal const long EXPECTED_COLUMN_COUNT = 417;
-        internal const long EXPECTED_INDEX_COUNT = 142;
+        internal const long EXPECTED_INDEX_COUNT = 144;
 
         //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
 
@@ -431,7 +431,7 @@ $BODY$;
             {
                 LogUpdateMessage(log);
 
-                await ExecQueryAsync("CREATE TABLE adatalistview (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, userId bigint not null, name varchar(255) not null unique,  public bool not null," +
+                await ExecQueryAsync("CREATE TABLE adatalistview (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, userid bigint not null, name varchar(255) not null unique,  public bool not null," +
                 "listkey varchar(255) not null, listview text)");
 
                 await SetSchemaLevelAsync(++currentSchema);
@@ -732,19 +732,14 @@ $BODY$;
                 await AyaNova.Biz.PrimeData.PrimeReportTemplates();
             }
 
-//  public string HeaderTemplate { get; set; }
+            //////////////////////////////////////////////////           
-//         public string FooterTemplate { get; set; }
+            //DATAFILTER / DATALISTTEMPLATE tables
-//         public bool DisplayHeaderFooter { get; set; }
+            if (currentSchema < 15)
-//         public ReportPaperFormat PaperFormat { get; set; }
+            {
-//         public bool Landscape { get; set; }
+                LogUpdateMessage(log);
-//         public string MarginOptionsBottom { get; set; }
+                await ExecQueryAsync("CREATE TABLE adashboardview (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, userid bigint not null unique, view text not null)");
-//         public string MarginOptionsLeft { get; set; }
+                await SetSchemaLevelAsync(++currentSchema);
-//         public string MarginOptionsRight { get; set; }
+            }
-//         public string MarginOptionsTop { get; set; }
-//         public string PageRanges { get; set; }
-//         public bool PreferCSSPageSize { get; set; }
-//         public bool PrintBackground { get; set; }
-//         public decimal Scale { get; set; }
 
             //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
 

server/AyaNova/util/DbUtil.cs

@@ -284,7 +284,7 @@ namespace AyaNova.Util
                     await cmd.ExecuteNonQueryAsync();
                 }
 
-                //Delete from users table
+                //Delete users 
                 using (var cmd = new Npgsql.NpgsqlCommand())
                 {
                     cmd.Connection = conn;
@@ -293,6 +293,9 @@ namespace AyaNova.Util
 
                     cmd.CommandText = "ALTER SEQUENCE auser_id_seq RESTART WITH 2;";
                     await cmd.ExecuteNonQueryAsync();
+
+                      cmd.CommandText = "delete from  \"adashboardview\" where userid <> 1;";
+                    await cmd.ExecuteNonQueryAsync();
                 }
 
                 //Delete non stock translations