From 70282c8fd5854a47999639cd6b50cbc0a742d39d Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 12 Nov 2020 22:14:09 +0000 Subject: [PATCH] --- server/AyaNova/models/UserOptions.cs | 4 +++- server/AyaNova/resource/de.json | 3 ++- server/AyaNova/resource/en.json | 3 ++- server/AyaNova/resource/es.json | 3 ++- server/AyaNova/resource/fr.json | 3 ++- server/AyaNova/util/AySchema.cs | 4 ++-- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/server/AyaNova/models/UserOptions.cs b/server/AyaNova/models/UserOptions.cs index b57b06c5..33ae547b 100644 --- a/server/AyaNova/models/UserOptions.cs +++ b/server/AyaNova/models/UserOptions.cs @@ -10,7 +10,7 @@ namespace AyaNova.Models [Required] public long TranslationId { get; set; } - + //------------- [EmailAddress] public string EmailAddress { get; set; } @@ -28,6 +28,8 @@ namespace AyaNova.Models public string CurrencyName { get; set; } public bool Hour12 { get; set; } + public string MapUrlTemplate { get; set; } + //relations //https://docs.microsoft.com/en-us/ef/core/modeling/relationships#other-relationship-patterns diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 32d98fae..cc45d766 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1949,5 +1949,6 @@ "Forward": "Vorwärts gehen", "Last": "Letzte", "GeoCapture": "Auf aktuellen Standort einstellen", - "GeoView": "Ansicht auf Karte" + "GeoView": "Ansicht auf Karte", + "MapUrlTemplate":"Karten-URL-Vorlage" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 71a9ff3f..62d4120d 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1949,5 +1949,6 @@ "Forward": "Forward", "Last": "Last", "GeoCapture": "Set to current location", - "GeoView": "View on map" + "GeoView": "View on map", + "MapUrlTemplate":"Map URL template" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 7a08c4a1..3e109593 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1949,5 +1949,6 @@ "Forward": "Avanzar", "Last": "Último", "GeoCapture": "Establecer en la ubicación actual", - "GeoView": "Ver en el mapa" + "GeoView": "Ver en el mapa", + "MapUrlTemplate":"Plantilla de URL de mapa" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 197bfc4c..efe78ed9 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1949,5 +1949,6 @@ "Forward": "Avance", "Last": "Dernier", "GeoCapture": "Défini sur l'emplacement actuel", - "GeoView": "Voir sur la carte" + "GeoView": "Voir sur la carte", + "MapUrlTemplate":"Modèle d'URL de carte" } \ No newline at end of file diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 34e41171..7e5f2d84 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 = 444; + internal const long EXPECTED_COLUMN_COUNT = 445; internal const long EXPECTED_INDEX_COUNT = 144; //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! @@ -338,7 +338,7 @@ $BODY$; //Add user options table await ExecQueryAsync("CREATE TABLE auseroptions (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, " + "userid bigint not null REFERENCES auser (id), translationid bigint not null REFERENCES atranslation (id), languageoverride text, timezoneoverride text, " + - "currencyname text, hour12 bool not null, emailaddress text, uicolor varchar(12) not null default '#000000')"); + "currencyname text, hour12 bool not null, emailaddress text, uicolor varchar(12) not null default '#000000', mapurltemplate text)"); //Prime the db with the default SuperUser account