From fc8d83c0be174a26a33d50a9c9563db75ca6107e Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 30 Dec 2019 19:16:18 +0000 Subject: [PATCH] --- docs/8.0/ayanova/docs/form-home-search.md | 3 +++ docs/8.0/ayanova/mkdocs.yml | 1 + server/AyaNova/biz/LocaleBiz.cs | 20 ++++++++++++-------- server/AyaNova/resource/de.json | 2 +- server/AyaNova/resource/en.json | 2 +- server/AyaNova/resource/es.json | 2 +- server/AyaNova/resource/fr.json | 2 +- 7 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 docs/8.0/ayanova/docs/form-home-search.md diff --git a/docs/8.0/ayanova/docs/form-home-search.md b/docs/8.0/ayanova/docs/form-home-search.md new file mode 100644 index 00000000..852d7432 --- /dev/null +++ b/docs/8.0/ayanova/docs/form-home-search.md @@ -0,0 +1,3 @@ +# HOME-SEARCH Placeholder + +This is a placeholder page for sections that are not written yet diff --git a/docs/8.0/ayanova/mkdocs.yml b/docs/8.0/ayanova/mkdocs.yml index f4832fe5..c9c6a64c 100644 --- a/docs/8.0/ayanova/mkdocs.yml +++ b/docs/8.0/ayanova/mkdocs.yml @@ -21,6 +21,7 @@ nav: - Forms: - Home: - 'Dashboard': 'form-home-dashboard.md' + - 'Search': 'form-home-search.md' - 'Schedule': 'form-home-schedule.md' - 'Memos': 'form-home-memos.md' - 'Reminders': 'form-home-reminders.md' diff --git a/server/AyaNova/biz/LocaleBiz.cs b/server/AyaNova/biz/LocaleBiz.cs index d28f5f47..d7a5e6ab 100644 --- a/server/AyaNova/biz/LocaleBiz.cs +++ b/server/AyaNova/biz/LocaleBiz.cs @@ -65,7 +65,7 @@ namespace AyaNova.Biz //replicate the source to a new dest and save Locale NewLocale = new Locale(); NewLocale.Name = inObj.Name; - + NewLocale.Stock = false; NewLocale.CjkIndex = false; foreach (LocaleItem i in SourceLocale.LocaleItems) @@ -420,6 +420,7 @@ namespace AyaNova.Biz s = s.Replace("PurchaseOrderPurchaseOrder", "PurchaseOrder", StringComparison.InvariantCultureIgnoreCase); s = s.Replace("WorkorderItemMiscExpenseExpense", "WorkorderItemMiscExpense", StringComparison.InvariantCultureIgnoreCase); s = s.Replace("WorkorderItemTravelTravel", "WorkorderItemTravel", StringComparison.InvariantCultureIgnoreCase); + s = s.Replace("DashboardDashboard", "Dashboard", StringComparison.InvariantCultureIgnoreCase); //ScheduleMarkers -> Reminder s = s.Replace("ScheduleMarker", "Reminder", StringComparison.InvariantCultureIgnoreCase); @@ -439,11 +440,14 @@ namespace AyaNova.Biz s = s.Replace("ScheduleMarkerStopDate", "ReminderStopDate", StringComparison.InvariantCultureIgnoreCase); s = s.Replace("ScheduleEditScheduleMarker", "ScheduleEditReminder", StringComparison.InvariantCultureIgnoreCase); s = s.Replace("ScheduleNewScheduleMarker", "ScheduleNewReminder", StringComparison.InvariantCultureIgnoreCase); - s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); - s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); - s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); - s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); - s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + + + //FUTURE + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); //Custom fields were 0 to 9, now 1 to 16 @@ -552,7 +556,7 @@ namespace AyaNova.Biz Dictionary NewLocaleDict = new Dictionary(); foreach (var Pair in j.Children()) { - var V7Value = Pair.First.Value().Replace(" && "," ").Replace(" & "," ").Replace("&","");//clean out LT values that had double ampersands for old Windows menu shortcut scheme + var V7Value = Pair.First.Value().Replace(" && ", " ").Replace(" & ", " ").Replace("&", "");//clean out LT values that had double ampersands for old Windows menu shortcut scheme var V7KeyName = ((JProperty)Pair).Name; if (!SkipKeys.Contains(V7KeyName)) @@ -595,7 +599,7 @@ namespace AyaNova.Biz //have file name, have all localized text Locale l = new Locale(); - l.Name = SourceLocaleName; + l.Name = SourceLocaleName; l.Stock = false; foreach (KeyValuePair K in NewLocaleDict) diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 0269241c..f1316f7b 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -182,7 +182,7 @@ "CoordinateTypesDegreesDecimalMinutes": "Grad Minuten (DDD° MM,mmm)", "CoordinateTypesDegreesMinutesSeconds": "Grad Minuten Sekunden (DDD° MM' SS,sss')", "CustomFieldKey": "Schlüssel für angepasstes Feld", - "DashboardDashboard": "Dashboard", + "Dashboard": "Dashboard", "DashboardNext": "Next", "DashboardNotAssigned": "Not assigned", "DashboardOverdue": "Overdue", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 13669220..573224d6 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -182,7 +182,7 @@ "CoordinateTypesDegreesDecimalMinutes": "Degrees minutes (DDD° MM.mmm)", "CoordinateTypesDegreesMinutesSeconds": "Degrees Minutes Seconds (DDD° MM' SS.sss')", "CustomFieldKey": "Custom field key", - "DashboardDashboard": "Dashboard", + "Dashboard": "Dashboard", "DashboardNext": "Next", "DashboardNotAssigned": "Not assigned", "DashboardOverdue": "Overdue", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index fa2c35cc..b2ea2c4f 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -182,7 +182,7 @@ "CoordinateTypesDegreesDecimalMinutes": "Grados minutos (GGG° MM,mmm)", "CoordinateTypesDegreesMinutesSeconds": "Grados Minutos Segundos (GGG° MM' SS,sss')", "CustomFieldKey": "Clave campo personalizado", - "DashboardDashboard": "Panel", + "Dashboard": "Panel", "DashboardNext": "Next", "DashboardNotAssigned": "Not assigned", "DashboardOverdue": "Overdue", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index bd09b965..16a5df7d 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -182,7 +182,7 @@ "CoordinateTypesDegreesDecimalMinutes": "Degrés minutes (DDD° MM,mmm)", "CoordinateTypesDegreesMinutesSeconds": "Degrés Minutes Secondes (DDD° MM' SS,sss')", "CustomFieldKey": "Clé de champ personnalisé", - "DashboardDashboard": "Tableau de bord", + "Dashboard": "Tableau de bord", "DashboardNext": "Next", "DashboardNotAssigned": "Not assigned", "DashboardOverdue": "Overdue",