admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-04-01 21:24:22 +00:00
parent 5b54497ddf
commit 84f394f2ed
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -3262,7 +3262,7 @@ namespace AyaNova.Biz
{ {
//SEARCH INDEXING //SEARCH INDEXING
var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, obj.AyaType); var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, obj.AyaType);
SearchParams.AddText(obj.Notes).AddText(obj.TravelDetails); SearchParams.AddText(obj.TravelDetails);
if (isNew) if (isNew)
await Search.ProcessNewObjectKeywordsAsync(SearchParams); await Search.ProcessNewObjectKeywordsAsync(SearchParams);
@@ -3275,7 +3275,7 @@ namespace AyaNova.Biz
var obj = await TravelGetAsync(id, false); var obj = await TravelGetAsync(id, false);
var SearchParams = new Search.SearchIndexProcessObjectParameters(); var SearchParams = new Search.SearchIndexProcessObjectParameters();
if (obj != null) if (obj != null)
SearchParams.AddText(obj.Notes).AddText(obj.TravelDetails); SearchParams.AddText(obj.TravelDetails);
return SearchParams; return SearchParams;
} }

4
server/AyaNova/models/WorkOrderItemTravel.cs
View File

@@ -11,9 +11,7 @@ namespace AyaNova.Models
public long Id { get; set; } public long Id { get; set; }
public uint Concurrency { get; set; } public uint Concurrency { get; set; }
public string Notes { get; set; }
public long? UserId { get; set; } public long? UserId { get; set; }
public DateTime? TravelStartDate { get; set; } public DateTime? TravelStartDate { get; set; }
public DateTime? TravelStopDate { get; set; } public DateTime? TravelStopDate { get; set; }

9
server/AyaNova/util/AySchema.cs
View File

@@ -22,7 +22,7 @@ namespace AyaNova.Util
//!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
private const int DESIRED_SCHEMA_LEVEL = 1; 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_INDEX_COUNT = 141;
internal const long EXPECTED_CHECK_CONSTRAINTS = 429; internal const long EXPECTED_CHECK_CONSTRAINTS = 429;
internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 115; 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!!!! //!!!!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 //WORKORDERITEM UNIT
await ExecQueryAsync("CREATE TABLE aworkorderitemunit (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderitemid BIGINT NOT NULL REFERENCES aworkorderitem (id), " 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 //WORKORDERITEM OUTSIDE SERVICE
await ExecQueryAsync("CREATE TABLE aworkorderitemoutsideservice (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderitemid BIGINT NOT NULL REFERENCES aworkorderitem (id), " 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, " + "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" + "SentDate TIMESTAMP, etadate TIMESTAMP, returndate TIMESTAMP"
+ ")"); + ")");

8
server/AyaNova/util/Seeder.cs
View File

@@ -2220,10 +2220,18 @@ namespace AyaNova.Util
RequestDate=woDate.ToUniversalTime() RequestDate=woDate.ToUniversalTime()
}; };
//add two users for testing
var woItemScheduledUser=new WorkOrderItemScheduledUser(){ var woItemScheduledUser=new WorkOrderItemScheduledUser(){
UserId = Fake.Random.Long(1, TotalSeededUsers), UserId = Fake.Random.Long(1, TotalSeededUsers),
EstimatedQuantity=1 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); o.Items.Add(woItem);
} }