diff --git a/.vscode/launch.json b/.vscode/launch.json index 0e2049e9..8fd97968 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "false", + "AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/Controllers/DataListSavedFilterController.cs b/server/AyaNova/Controllers/DataListSavedFilterController.cs index c7056b45..38923396 100644 --- a/server/AyaNova/Controllers/DataListSavedFilterController.cs +++ b/server/AyaNova/Controllers/DataListSavedFilterController.cs @@ -161,7 +161,7 @@ namespace AyaNova.Api.Controllers //Default filters can never be created from outside //they are only ever created from inside so a post with a default=true is always invalid - if (inObj.Default == true) + if (inObj.DefaultFilter == true) { return BadRequest(new ApiErrorResponse(ApiErrorCode.INVALID_OPERATION, "default", "Default filters can only be created internally")); } diff --git a/server/AyaNova/models/DataListSavedFilter.cs b/server/AyaNova/models/DataListSavedFilter.cs index 2148780e..b32ad355 100644 --- a/server/AyaNova/models/DataListSavedFilter.cs +++ b/server/AyaNova/models/DataListSavedFilter.cs @@ -17,7 +17,7 @@ namespace AyaNova.Models [Required] public bool Public { get; set; } [Required] - public bool Default { get; set; } //is the users default filter for this listkey + public bool DefaultFilter { get; set; } //is the users default filter for this listkey [Required, MaxLength(255)] public string ListKey { get; set; }//max 255 characters ascii set public string Filter { get; set; }//JSON serialized List object of DataListBase diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index dd223e9f..6e88c658 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -22,7 +22,7 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! private const int DESIRED_SCHEMA_LEVEL = 15; - internal const long EXPECTED_COLUMN_COUNT = 704; + internal const long EXPECTED_COLUMN_COUNT = 710; internal const long EXPECTED_INDEX_COUNT = 124; //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! @@ -396,6 +396,7 @@ BEGIN when 65 then aytable = 'apartassembly'; when 66 then aytable = 'apartwarehouse'; when 67 then aytable = 'apartinventory'; aynamecolumn='description'; + when 68 then return format('DataListSavedColumnView %L', ayobjectid); else RETURN returnstr; end case; @@ -510,7 +511,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); LogUpdateMessage(log); await ExecQueryAsync("CREATE TABLE adatalistsavedfilter (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, userid BIGINT NOT NULL, name TEXT NOT NULL, public BOOL NOT NULL, " - + "default BOOL NOT NULL, listkey VARCHAR(255) NOT NULL, filter TEXT)"); + + "defaultfilter BOOL NOT NULL, listkey VARCHAR(255) NOT NULL, filter TEXT)"); await ExecQueryAsync("CREATE TABLE adatalistsavedcolumnview (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, userid BIGINT NOT NULL, " + "listkey VARCHAR(255) NOT NULL, columns TEXT, sort TEXT)");