From 436e80a9ebd557ff12a6038cef884fef11c21eb4 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 30 Aug 2018 19:25:09 +0000 Subject: [PATCH] --- server/AyaNova/biz/ImportAyaNova7Biz.cs | 19 +++++++++++++++++-- server/AyaNova/biz/UserBiz.cs | 12 ++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/server/AyaNova/biz/ImportAyaNova7Biz.cs b/server/AyaNova/biz/ImportAyaNova7Biz.cs index 62f6cc1e..480d9b51 100644 --- a/server/AyaNova/biz/ImportAyaNova7Biz.cs +++ b/server/AyaNova/biz/ImportAyaNova7Biz.cs @@ -95,7 +95,7 @@ namespace AyaNova.Biz //Now can do event log entries await DoImport("GZTW.AyaNova.BLL.User-eventlog", AyaType.User, job.GId, importMap, importFileName, zipEntries); - + //IMPORT UNIT MODEL CATEGORIES AS TAGS await DoImport("GZTW.AyaNova.BLL.UnitModelCategory", AyaType.Tag, job.GId, importMap, importFileName, zipEntries); @@ -121,7 +121,7 @@ namespace AyaNova.Biz 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); - + //IMPORT REGIONS AS TAGS @@ -132,8 +132,23 @@ namespace AyaNova.Biz //Now can do user locale settings properly await DoImport("GZTW.AyaNova.BLL.User-locale", AyaType.User, job.GId, importMap, importFileName, zipEntries); + //CLIENT + //do import for client here + //Now can do user client settings properly + //await DoImport("GZTW.AyaNova.BLL.User-client", AyaType.User, job.GId, importMap, importFileName, zipEntries); + + //HEADOFFICE + //do import for ho here + //Now can do user ho settings properly + //await DoImport("GZTW.AyaNova.BLL.User-headoffice", AyaType.User, 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/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index c328ff48..24de20dd 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -465,6 +465,18 @@ namespace AyaNova.Biz //handle tag entries for users now that we have the SUG tags created throw new System.NotImplementedException(); } + //break; + case "GZTW.AyaNova.BLL.User-client": + { + //handle setting client id for user client login + throw new System.NotImplementedException(); + } + //break; + case "GZTW.AyaNova.BLL.User-headoffice": + { + //handle setting ho id for user headoffice login + throw new System.NotImplementedException(); + } //break; }