diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 12af2b50..e2345d03 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -3262,7 +3262,7 @@ namespace AyaNova.Biz { //SEARCH INDEXING var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, obj.AyaType); - SearchParams.AddText(obj.Notes).AddText(obj.TravelDetails); + SearchParams.AddText(obj.TravelDetails); if (isNew) await Search.ProcessNewObjectKeywordsAsync(SearchParams); @@ -3275,7 +3275,7 @@ namespace AyaNova.Biz var obj = await TravelGetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); if (obj != null) - SearchParams.AddText(obj.Notes).AddText(obj.TravelDetails); + SearchParams.AddText(obj.TravelDetails); return SearchParams; } diff --git a/server/AyaNova/models/WorkOrderItemTravel.cs b/server/AyaNova/models/WorkOrderItemTravel.cs index 96a3789a..09f4a7a6 100644 --- a/server/AyaNova/models/WorkOrderItemTravel.cs +++ b/server/AyaNova/models/WorkOrderItemTravel.cs @@ -11,9 +11,7 @@ namespace AyaNova.Models public long Id { get; set; } public uint Concurrency { get; set; } - public string Notes { get; set; } - - + public long? UserId { get; set; } public DateTime? TravelStartDate { get; set; } public DateTime? TravelStopDate { get; set; } diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 7d3f1875..eb32ff19 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 = 1; - internal const long EXPECTED_COLUMN_COUNT = 929; + internal const long EXPECTED_COLUMN_COUNT = 931; internal const long EXPECTED_INDEX_COUNT = 141; internal const long EXPECTED_CHECK_CONSTRAINTS = 429; internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 115; @@ -31,8 +31,7 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! - ///////////////////////////////////////////////////////////////// (C929:I141:CC429:FC115:V6:R2) - + ///////////////////////////////////////////////////////////////// /* @@ -829,12 +828,12 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); //WORKORDERITEM UNIT await ExecQueryAsync("CREATE TABLE aworkorderitemunit (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderitemid BIGINT NOT NULL REFERENCES aworkorderitem (id), " - + "notes TEXT, customfields TEXT, tags VARCHAR(255) ARRAY, unitid BIGINT NOT NULL REFERENCES aunit" + + "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY, unitid BIGINT NOT NULL REFERENCES aunit" + ")"); //WORKORDERITEM OUTSIDE SERVICE await ExecQueryAsync("CREATE TABLE aworkorderitemoutsideservice (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderitemid BIGINT NOT NULL REFERENCES aworkorderitem (id), " - + "unitid BIGINT REFERENCES aunit, vendorsenttoid BIGINT REFERENCES avendor, vendorsentviaid BIGINT REFERENCES avendor, rmanumber text, trackingnumber text, " + + "notes TEXT, unitid BIGINT REFERENCES aunit, vendorsenttoid BIGINT REFERENCES avendor, vendorsentviaid BIGINT REFERENCES avendor, rmanumber text, trackingnumber text, " + "repaircost DECIMAL(38,18) NOT NULL default 0, shippingcost DECIMAL(38,18) NOT NULL default 0, shippingprice DECIMAL(38,18) NOT NULL default 0, " + "SentDate TIMESTAMP, etadate TIMESTAMP, returndate TIMESTAMP" + ")"); diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index e4964707..fa24bd1c 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -2220,10 +2220,18 @@ namespace AyaNova.Util RequestDate=woDate.ToUniversalTime() }; + //add two users for testing var woItemScheduledUser=new WorkOrderItemScheduledUser(){ UserId = Fake.Random.Long(1, TotalSeededUsers), EstimatedQuantity=1 }; + woItem.ScheduledUsers.Add(woItemScheduledUser); + + woItemScheduledUser=new WorkOrderItemScheduledUser(){ + UserId = Fake.Random.Long(1, TotalSeededUsers), + EstimatedQuantity=2 + }; + woItem.ScheduledUsers.Add(woItemScheduledUser); o.Items.Add(woItem); }