From 9c1953714be3bb6cda6a96f16d24c7f41e88f66f Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 30 Aug 2018 19:18:30 +0000 Subject: [PATCH] --- server/AyaNova/biz/ImportAyaNova7Biz.cs | 5 +++-- server/AyaNova/biz/UserBiz.cs | 14 ++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/server/AyaNova/biz/ImportAyaNova7Biz.cs b/server/AyaNova/biz/ImportAyaNova7Biz.cs index 04e97990..01cf9000 100644 --- a/server/AyaNova/biz/ImportAyaNova7Biz.cs +++ b/server/AyaNova/biz/ImportAyaNova7Biz.cs @@ -124,9 +124,10 @@ namespace AyaNova.Biz //IMPORT Scheduleable User Groups AS TAGS await DoImport("GZTW.AyaNova.BLL.ScheduleableUserGroup", AyaType.Tag, job.GId, importMap, importFileName, zipEntries); + //Now can set users to correct tag for scheduleable user group + await DoImport("GZTW.AyaNova.BLL.User-scheduleableusergrouptags", AyaType.User, job.GId, importMap, importFileName, zipEntries); - - //TODO: TAG Users with tags from scheduleable users groups + //IMPORT REGIONS AS TAGS diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index a614558f..b3b386a0 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -329,13 +329,13 @@ namespace AyaNova.Biz #region V7 record format /* { - TODO: "DefaultLanguage": "Custom English", + "DefaultLanguage": "Custom English", TODO: "DefaultServiceTemplateID": "ca83a7b8-4e5f-4a7b-a02b-9cf78d5f983f", "UserType": 2, "Active": true, - TODO: "ClientID": "00000000-0000-0000-0000-000000000000", - TODO: "HeadOfficeID": "00000000-0000-0000-0000-000000000000", - TODO: "MemberOfGroup": "0f8a80ff-4b03-4114-ae51-2d13b812dd65", + "ClientID": "00000000-0000-0000-0000-000000000000", + "HeadOfficeID": "00000000-0000-0000-0000-000000000000", + "MemberOfGroup": "0f8a80ff-4b03-4114-ae51-2d13b812dd65", "Created": "03/21/2005 07:19 AM", "Modified": "09/15/2015 12:22 PM", "Creator": "2ecc77fc-69e2-4a7e-b88d-bd0ecaf36aed", @@ -458,6 +458,12 @@ namespace AyaNova.Biz { //handle locale entries for users now that we have the locales created + } + break; + case "GZTW.AyaNova.BLL.User-scheduleableusergrouptags": + { + //handle tag entries for users now that we have the SUG tags created + } break; }