@@ -77,6 +77,8 @@ public async Task<OperationDataResult<WorkflowSettingsModel>> GetAllSettingsAsyn
7777 {
7878 try
7979 {
80+ var core = await _coreHelper . GetCore ( ) ;
81+ var microuserDbContext = core . DbContextHelper . GetDbContext ( ) ;
8082 var assignedSitesIds = await _dbContext . AssignedSites . Where ( y => y . WorkflowState != Constants . WorkflowStates . Removed ) . Select ( x => x . SiteMicrotingUid ) . ToListAsync ( ) ;
8183 var workOrdersSettings = new WorkflowSettingsModel
8284 {
@@ -85,14 +87,14 @@ public async Task<OperationDataResult<WorkflowSettingsModel>> GetAllSettingsAsyn
8587
8688 if ( assignedSitesIds . Count > 0 )
8789 {
88- var allSites = await _coreHelper . GetCore ( ) . Result . SiteReadAll ( true ) ;
90+ var allSites = await microuserDbContext . Sites . Where ( x => x . WorkflowState != Constants . WorkflowStates . Removed ) . ToListAsync ( ) ;
8991
9092 foreach ( var id in assignedSitesIds )
9193 {
92- var siteNameModel = allSites . Where ( x => x . SiteId == id ) . Select ( x => new SiteNameModel
94+ var siteNameModel = allSites . Where ( x => x . MicrotingUid == id ) . Select ( x => new SiteNameModel
9395 {
94- SiteName = x . SiteName ,
95- SiteUId = x . SiteId
96+ SiteName = x . Name ,
97+ SiteUId = x . MicrotingUid ! . Value
9698 } ) . FirstOrDefault ( ) ;
9799 if ( siteNameModel != null )
98100 {
@@ -154,19 +156,19 @@ public async Task<OperationResult> AddSiteToSettingsAsync(int siteId)
154156 }
155157 var language = await sdkDbContext . Languages . SingleAsync ( x => x . Id == site . LanguageId ) ;
156158 var mainElement = await theCore . ReadeForm ( newTaskId , language ) ;
157- switch ( language . Name )
159+ switch ( language . LanguageCode )
158160 {
159- case LanguageNames . Danish :
161+ case "da" :
160162 {
161163 mainElement . Label = "Ny hændelse" ;
162164 break ;
163165 }
164- case LanguageNames . English :
166+ case "en-US" :
165167 {
166- mainElement . Label = "Near incidet " ;
168+ mainElement . Label = "New incident " ;
167169 break ;
168170 }
169- case LanguageNames . German :
171+ case "de-DE" :
170172 {
171173 mainElement . Label = "Neuer Vorfall" ;
172174 break ;
0 commit comments