diff --git a/server/AyaNova/biz/ImportAyaNova7Biz.cs b/server/AyaNova/biz/ImportAyaNova7Biz.cs index 71b52560..fd530800 100644 --- a/server/AyaNova/biz/ImportAyaNova7Biz.cs +++ b/server/AyaNova/biz/ImportAyaNova7Biz.cs @@ -86,15 +86,10 @@ namespace AyaNova.Biz //Pass off the JSON data from the import file into the import job item by item - // TAGS - // - Unit model category - // - Unit service type - // - Workorder Item Type - // - Client group - // - Workorder category - // - PartCategory - // - Dispatch zones - // - ScheduleableUserGroups + //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 + //for example scheduleable user groups are imported as tags, but then a second pass is required to tag the users of that group + + //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 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); - //IMPORT Part Category AS TAGS + //IMPORT Part Category AS TAGS 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); - //IMPORT XXXX AS TAGS - await DoImport("XXXX", AyaType.Tag, job.GId, importMap, importFileName, zipEntries); + //IMPORT Scheduleable User Groups AS TAGS + 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 @@ -132,6 +128,9 @@ namespace AyaNova.Biz //IMPORT LOCALES 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.UpdateJobStatus(job.GId, JobStatus.Completed, ct); diff --git a/server/AyaNova/biz/TagBiz.cs b/server/AyaNova/biz/TagBiz.cs index 4bc22337..e8f6ee1f 100644 --- a/server/AyaNova/biz/TagBiz.cs +++ b/server/AyaNova/biz/TagBiz.cs @@ -244,9 +244,7 @@ namespace AyaNova.Biz case "GZTW.AyaNova.BLL.WorkorderCategory": case "GZTW.AyaNova.BLL.PartCategory": case "GZTW.AyaNova.BLL.DispatchZone": - case "XXXXXXXXXXX": - case "XXXXXXXXXXX": - case "XXXXXXXXXXX": + case "GZTW.AyaNova.BLL.ScheduleableUserGroup": { var NewTagName = j["Name"].Value(); var OldV7Id = new Guid(j["ID"].Value());