diff --git a/docs/8.0/ayanova/docs/ay-biz-admin-import-v7.md b/docs/8.0/ayanova/docs/ay-biz-admin-import-v7.md index 18a6f1ca..933bf81a 100644 --- a/docs/8.0/ayanova/docs/ay-biz-admin-import-v7.md +++ b/docs/8.0/ayanova/docs/ay-biz-admin-import-v7.md @@ -114,6 +114,7 @@ Users are migrated directly with the following exceptions: * Login credentials and password are not migrated and will need to be set * Active status is set to false on all migrated users except the Adminstrator account * Administrator account password is not migrated, instead the new v8 SuperUser account replaces it and defaults to login "superuser" and password "l3tm3in" +* User UI Color is not migrated as it is not used in AyaNova 8 ### Service bank The service bank feature has not been ported to AyaNova 8 as it does not appear to be widely used and would need extensive re-working. We could be wrong about this and if the Service Bank feature is important to you please let us know and how you would like to see it implemented as a feature. If there is demand for it we can work it back into AyaNova 8 as a feature based on your feedback. No data is migrated from the v7 Service Bank to v8. diff --git a/server/AyaNova/biz/UserOptionsBiz.cs b/server/AyaNova/biz/UserOptionsBiz.cs index 5cfab9da..0500ec5c 100644 --- a/server/AyaNova/biz/UserOptionsBiz.cs +++ b/server/AyaNova/biz/UserOptionsBiz.cs @@ -135,11 +135,11 @@ namespace AyaNova.Biz AddError(ApiErrorCode.VALIDATION_REQUIRED, "UserId"); - //Hexadecimal notation: #RGB[A] R (red), G (green), B (blue), and A (alpha) are hexadecimal characters (0–9, A–F). A is optional. The three-digit notation (#RGB) is a shorter version of the six-digit form (#RRGGBB). For example, #f09 is the same color as #ff0099. Likewise, the four-digit RGB notation (#RGBA) is a shorter version of the eight-digit form (#RRGGBBAA). For example, #0f38 is the same color as #00ff3388. - if (inObj.UiColor.Length > 12 || inObj.UiColor.Length < 4 || inObj.UiColor[0] != '#') - { - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "UiColor", "UiColor must be valid HEX color value"); - } + // //Hexadecimal notation: #RGB[A] R (red), G (green), B (blue), and A (alpha) are hexadecimal characters (0–9, A–F). A is optional. The three-digit notation (#RGB) is a shorter version of the six-digit form (#RRGGBB). For example, #f09 is the same color as #ff0099. Likewise, the four-digit RGB notation (#RGBA) is a shorter version of the eight-digit form (#RRGGBBAA). For example, #0f38 is the same color as #00ff3388. + // if (inObj.UiColor.Length > 12 || inObj.UiColor.Length < 4 || inObj.UiColor[0] != '#') + // { + // AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "UiColor", "UiColor must be valid HEX color value"); + // } return; } diff --git a/server/AyaNova/models/UserOptions.cs b/server/AyaNova/models/UserOptions.cs index e3ac21f6..9c9281b9 100644 --- a/server/AyaNova/models/UserOptions.cs +++ b/server/AyaNova/models/UserOptions.cs @@ -25,8 +25,11 @@ namespace AyaNova.Models Hexadecimal notation: #RGB[A] R (red), G (green), B (blue), and A (alpha) are hexadecimal characters (0–9, A–F). A is optional. The three-digit notation (#RGB) is a shorter version of the six-digit form (#RRGGBB). For example, #f09 is the same color as #ff0099. Likewise, the four-digit RGB notation (#RGBA) is a shorter version of the eight-digit form (#RRGGBBAA). For example, #0f38 is the same color as #00ff3388. */ - [MaxLength(12)] - public string UiColor { get; set; } + //removed for v8 alpha due to schedule not really supporting colors and + //it's kind of tacky in my opinion and outdated and it would detract from the use of colors already in teh schedule + //plus no where else does ayanova use this value so it's a lot of nothing + // [MaxLength(12)] + // public string UiColor { get; set; } //browser forced overrides public string LanguageOverride { get; set; } @@ -49,7 +52,7 @@ namespace AyaNova.Models { CurrencyName = "USD"; Hour12 = true; - UiColor = "#000000";//black is the default + // UiColor = "#000000";//black is the default } } diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 20b48ea0..8361ab78 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -22,16 +22,16 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!! private const int DESIRED_SCHEMA_LEVEL = 1; - internal const long EXPECTED_COLUMN_COUNT = 1302; + internal const long EXPECTED_COLUMN_COUNT = 1301; internal const long EXPECTED_INDEX_COUNT = 145; - internal const long EXPECTED_CHECK_CONSTRAINTS = 518; + internal const long EXPECTED_CHECK_CONSTRAINTS = 517; internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 193; internal const long EXPECTED_VIEWS = 11; internal const long EXPECTED_ROUTINES = 2; //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!! - ///////////////////////////////////////////////////////////////// C1302:I145:CC518:FC193:V11:R2 + ///////////////////////////////////////////////////////////////// C1301:I145:CC517:FC193:V11:R2 /* @@ -484,7 +484,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); //Add user options table await ExecQueryAsync("CREATE TABLE auseroptions (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, " + "userid BIGINT NOT NULL UNIQUE REFERENCES auser (id), translationid BIGINT NOT NULL REFERENCES atranslation (id), languageoverride TEXT, timezoneoverride TEXT, " - + "currencyname TEXT, hour12 BOOL NOT NULL, emailaddress TEXT, phone1 TEXT, phone2 TEXT, phone3 TEXT, uicolor VARCHAR(12) NOT NULL default '#000000', mapurltemplate TEXT)"); + + "currencyname TEXT, hour12 BOOL NOT NULL, emailaddress TEXT, phone1 TEXT, phone2 TEXT, phone3 TEXT, mapurltemplate TEXT)"); //Prime the db with the default SuperUser account diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index 71f27ee7..e5cf0d5d 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -1756,7 +1756,7 @@ namespace AyaNova.Util u.UserOptions.EmailAddress = bogusEmail; u.UserOptions.Hour12 = true; u.UserOptions.CurrencyName = "USD"; - u.UserOptions.UiColor = Fake.Internet.Color().ToUpperInvariant(); + //u.UserOptions.UiColor = Fake.Internet.Color().ToUpperInvariant(); //this seems wrong to get a new context inside a loop but in testing is actually faster!?