This commit is contained in:
2018-08-30 18:09:12 +00:00
parent cc6beb7f5d
commit ff167e6e4a
2 changed files with 14 additions and 17 deletions

View File

@@ -86,15 +86,10 @@ namespace AyaNova.Biz
//Pass off the JSON data from the import file into the import job item by item //Pass off the JSON data from the import file into the import job item by item
// TAGS //NOTE: Many of these require a second pass - one to get the object imported and then another to set another imported object to that object
// - Unit model category //for example scheduleable user groups are imported as tags, but then a second pass is required to tag the users of that group
// - Unit service type
// - Workorder Item Type
// - Client group
// - Workorder category
// - PartCategory
// - Dispatch zones
// - ScheduleableUserGroups
//USERS - Import first so all other objects can be properly attributed in event log //USERS - Import first so all other objects can be properly attributed in event log
@@ -111,19 +106,20 @@ namespace AyaNova.Biz
//IMPORT Client group AS TAGS //IMPORT Client group AS TAGS
await DoImport("GZTW.AyaNova.BLL.ClientGroup", AyaType.Tag, job.GId, importMap, importFileName, zipEntries); await DoImport("GZTW.AyaNova.BLL.ClientGroup", AyaType.Tag, job.GId, importMap, importFileName, zipEntries);
//IMPORT Workorder category AS TAGS //IMPORT Workorder category AS TAGS
await DoImport("GZTW.AyaNova.BLL.WorkorderCategory", AyaType.Tag, job.GId, importMap, importFileName, zipEntries); await DoImport("GZTW.AyaNova.BLL.WorkorderCategory", AyaType.Tag, job.GId, importMap, importFileName, zipEntries);
//IMPORT Part Category AS TAGS //IMPORT Part Category AS TAGS
await DoImport("GZTW.AyaNova.BLL.PartCategory", AyaType.Tag, job.GId, importMap, importFileName, zipEntries); await DoImport("GZTW.AyaNova.BLL.PartCategory", AyaType.Tag, job.GId, importMap, importFileName, zipEntries);
//IMPORT Dispatch zones AS TAGS //IMPORT Dispatch zones AS TAGS
await DoImport("GZTW.AyaNova.BLL.DispatchZone", AyaType.Tag, job.GId, importMap, importFileName, zipEntries); await DoImport("GZTW.AyaNova.BLL.DispatchZone", AyaType.Tag, job.GId, importMap, importFileName, zipEntries);
//IMPORT XXXX AS TAGS //IMPORT Scheduleable User Groups AS TAGS
await DoImport("XXXX", AyaType.Tag, job.GId, importMap, importFileName, zipEntries); await DoImport("GZTW.AyaNova.BLL.ScheduleableUserGroup", AyaType.Tag, job.GId, importMap, importFileName, zipEntries);
//TODO: TAG Users with tags from scheduleable users groups
//IMPORT REGIONS AS TAGS //IMPORT REGIONS AS TAGS
@@ -132,6 +128,9 @@ namespace AyaNova.Biz
//IMPORT LOCALES //IMPORT LOCALES
await DoImport("GZTW.AyaNova.BLL.Locale", AyaType.Locale, job.GId, importMap, importFileName, zipEntries); await DoImport("GZTW.AyaNova.BLL.Locale", AyaType.Locale, job.GId, importMap, importFileName, zipEntries);
//TODO: second pass now that all objects are in the db, need to go through again and set properties based on all imported data, e.g. scheduleableUserGroups are tags that must now be set on users
JobsBiz.LogJob(job.GId, "ImportAyaNova7 finished", ct); JobsBiz.LogJob(job.GId, "ImportAyaNova7 finished", ct);
JobsBiz.UpdateJobStatus(job.GId, JobStatus.Completed, ct); JobsBiz.UpdateJobStatus(job.GId, JobStatus.Completed, ct);

View File

@@ -244,9 +244,7 @@ namespace AyaNova.Biz
case "GZTW.AyaNova.BLL.WorkorderCategory": case "GZTW.AyaNova.BLL.WorkorderCategory":
case "GZTW.AyaNova.BLL.PartCategory": case "GZTW.AyaNova.BLL.PartCategory":
case "GZTW.AyaNova.BLL.DispatchZone": case "GZTW.AyaNova.BLL.DispatchZone":
case "XXXXXXXXXXX": case "GZTW.AyaNova.BLL.ScheduleableUserGroup":
case "XXXXXXXXXXX":
case "XXXXXXXXXXX":
{ {
var NewTagName = j["Name"].Value<string>(); var NewTagName = j["Name"].Value<string>();
var OldV7Id = new Guid(j["ID"].Value<string>()); var OldV7Id = new Guid(j["ID"].Value<string>());