From c3fbab130cb54cb60231a20ac26cd9b8a4aec4a8 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sun, 19 Apr 2020 23:10:09 +0000 Subject: [PATCH] --- server/AyaNova/biz/AyaFormFieldDefinitions.cs | 2 ++ server/AyaNova/biz/UserBiz.cs | 4 ++-- server/AyaNova/biz/WidgetBiz.cs | 6 +++--- server/AyaNova/models/User.cs | 2 +- server/AyaNova/models/Widget.cs | 2 +- server/AyaNova/util/AySchema.cs | 4 ++-- server/AyaNova/util/Seeder.cs | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/server/AyaNova/biz/AyaFormFieldDefinitions.cs b/server/AyaNova/biz/AyaFormFieldDefinitions.cs index b050b807..51f48e43 100644 --- a/server/AyaNova/biz/AyaFormFieldDefinitions.cs +++ b/server/AyaNova/biz/AyaFormFieldDefinitions.cs @@ -61,6 +61,8 @@ namespace AyaNova.Biz l.Add(new AyaFormFieldDefinition { TKey = "User", FieldKey = "UserId" }); l.Add(new AyaFormFieldDefinition { TKey = "Active", FieldKey = "Active", Hideable = false }); l.Add(new AyaFormFieldDefinition { TKey = "Tags", FieldKey = "Tags" }); + l.Add(new AyaFormFieldDefinition { TKey = "Wiki", FieldKey = "Wiki" }); + //TODO: attachments form field? l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom1", FieldKey = "WidgetCustom1", IsCustomField = true }); l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom2", FieldKey = "WidgetCustom2", IsCustomField = true }); diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index 53da4801..c14ee0df 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -221,7 +221,7 @@ namespace AyaNova.Biz { //SEARCH INDEXING var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, BizType); - SearchParams.AddText(obj.Notes).AddText(obj.Name).AddText(obj.EmployeeNumber).AddText(obj.Tags).AddText(obj.WikiContent).AddCustomFields(obj.CustomFields); + SearchParams.AddText(obj.Notes).AddText(obj.Name).AddText(obj.EmployeeNumber).AddText(obj.Tags).AddText(obj.Wiki).AddCustomFields(obj.CustomFields); if (isNew) await Search.ProcessNewObjectKeywordsAsync(SearchParams); @@ -234,7 +234,7 @@ namespace AyaNova.Biz var obj = await ct.User.SingleOrDefaultAsync(m => m.Id == id); var SearchParams = new Search.SearchIndexProcessObjectParameters(); if (obj != null) - SearchParams.AddText(obj.Notes).AddText(obj.Name).AddText(obj.EmployeeNumber).AddText(obj.Tags).AddText(obj.WikiContent).AddCustomFields(obj.CustomFields); + SearchParams.AddText(obj.Notes).AddText(obj.Name).AddText(obj.EmployeeNumber).AddText(obj.Tags).AddText(obj.Wiki).AddCustomFields(obj.CustomFields); return SearchParams; } diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index 0fe815df..5a996816 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -99,7 +99,7 @@ namespace AyaNova.Biz { Widget outObj = new Widget(); - CopyObject.Copy(dbObj, outObj, "WikiContent"); + CopyObject.Copy(dbObj, outObj, "Wiki"); // outObj.Name = Util.StringUtil.NameUniquify(outObj.Name, 255); //generate unique name string newUniqueName = string.Empty; @@ -202,7 +202,7 @@ namespace AyaNova.Biz { //SEARCH INDEXING var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, BizType); - SearchParams.AddText(obj.Notes).AddText(obj.Name).AddText(obj.Serial).AddText(obj.WikiContent).AddText(obj.Tags).AddCustomFields(obj.CustomFields); + SearchParams.AddText(obj.Notes).AddText(obj.Name).AddText(obj.Serial).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields); if (isNew) @@ -216,7 +216,7 @@ namespace AyaNova.Biz var obj = await ct.Widget.SingleOrDefaultAsync(m => m.Id == id); var SearchParams = new Search.SearchIndexProcessObjectParameters(); if (obj != null) - SearchParams.AddText(obj.Notes).AddText(obj.Name).AddText(obj.Serial).AddText(obj.WikiContent).AddText(obj.Tags).AddCustomFields(obj.CustomFields); + SearchParams.AddText(obj.Notes).AddText(obj.Name).AddText(obj.Serial).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields); return SearchParams; } diff --git a/server/AyaNova/models/User.cs b/server/AyaNova/models/User.cs index 245eb062..c8ee0bb9 100644 --- a/server/AyaNova/models/User.cs +++ b/server/AyaNova/models/User.cs @@ -35,7 +35,7 @@ namespace AyaNova.Models public long? CustomerId { get; set; } public long? HeadOfficeId { get; set; } public long? SubVendorId { get; set; } - public string WikiContent { get; set; } + public string Wiki { get; set; } public string CustomFields { get; set; } public List Tags { get; set; } diff --git a/server/AyaNova/models/Widget.cs b/server/AyaNova/models/Widget.cs index daa40bc9..52344d98 100644 --- a/server/AyaNova/models/Widget.cs +++ b/server/AyaNova/models/Widget.cs @@ -24,7 +24,7 @@ namespace AyaNova.Models public DateTime? EndDate { get; set; } public string Notes { get; set; } public int? Count { get; set; } - public string WikiContent {get;set;} + public string Wiki {get;set;} public string CustomFields { get; set; } public List Tags { get; set; } //relations diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index ea1e98ea..6e36432b 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -172,7 +172,7 @@ namespace AyaNova.Util await ExecQueryAsync("CREATE TABLE auser (id BIGSERIAL PRIMARY KEY, active bool not null, name varchar(255) not null unique, " + "login text not null, password text not null, salt text not null, roles integer not null, " + "dlkey text, dlkeyexpire timestamp, usertype integer not null, employeenumber varchar(255), notes text, customerid bigint, " + - "headofficeid bigint, subvendorid bigint, wikicontent text null, customfields text, tags varchar(255) ARRAY)"); + "headofficeid bigint, subvendorid bigint, wiki text null, customfields text, tags varchar(255) ARRAY)"); //Index for name fetching await ExecQueryAsync("CREATE UNIQUE INDEX auser_name_id_idx ON auser (id, name);"); @@ -212,7 +212,7 @@ namespace AyaNova.Util //id, text, longtext, boolean, currency, await ExecQueryAsync("CREATE TABLE awidget (id BIGSERIAL PRIMARY KEY, name varchar(255) not null unique, serial bigint not null," + "startdate timestamp, enddate timestamp, dollaramount decimal(19,5), active bool, usertype int4, count integer," + - "notes text, userid bigint null, wikicontent text null, customfields text, tags varchar(255) ARRAY)"); + "notes text, userid bigint null, wiki text null, customfields text, tags varchar(255) ARRAY)"); //TEST TEST TEST ONLY FOR DEVELOPMENT TESTING TO ENSURE UNIQUENESS //exec("CREATE UNIQUE INDEX awidget_serial_idx ON awidget (serial);"); diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index 889878cc..32725ccf 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -673,7 +673,7 @@ namespace AyaNova.Util o.UserType = randomUserType; o.Notes = f.Lorem.Sentence(); - o.WikiContent=@" + o.Wiki=@" ## Example Markdown for Wiki pages Headings