Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit298b09b

Browse files
authored
Merge pull request#249 from Resgrid/develop
CU-868frm4jk Removing v3 api, minor fixes.
2 parents4e54b00 +34ff56b commit298b09b

File tree

49 files changed

+517
-12183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+517
-12183
lines changed

‎Core/Resgrid.Services/AuthorizationService.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,9 @@ public async Task<bool> CanUserViewUserAsync(string viewerUserId, string targetU
335335
vardepartment=await_departmentsService.GetDepartmentByUserIdAsync(viewerUserId);
336336
vardepartment1=await_departmentsService.GetDepartmentByUserIdAsync(targetUserId);
337337

338+
if(department==null||department1==null)
339+
returnfalse;
340+
338341
if(department.DepartmentId!=department1.DepartmentId)
339342
returnfalse;
340343

‎Core/Resgrid.Services/CallEmailTemplates/ResgridEmailTemplate.cs‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
usingSystem;
22
usingSystem.Collections.Generic;
33
usingSystem.Collections.ObjectModel;
4+
usingSystem.Diagnostics.Eventing.Reader;
45
usingSystem.Linq;
56
usingSystem.Text;
67
usingSystem.Threading.Tasks;
@@ -57,8 +58,25 @@ public async Task<Call> GenerateCall(CallEmail email, string managingUser, List<
5758
c.MapPage=data[4];
5859

5960
c.NatureOfCall=data[5];
60-
c.Address=data[3];
6161

62+
if(!string.IsNullOrEmpty(data[3]))
63+
{
64+
c.Address=data[3];
65+
66+
try
67+
{
68+
varaddress=awaitgeolocationProvider.GetLatLonFromAddress(c.Address);
69+
70+
71+
if(address!=null)
72+
c.GeoLocationData=address;
73+
}
74+
catch(Exceptionex)
75+
{
76+
Resgrid.Framework.Logging.LogException(ex,
77+
$"Failed to geocode address '{c.Address}' for email{email.MessageId}");
78+
}
79+
}
6280
StringBuildertitle=newStringBuilder();
6381

6482
title.Append("Email Call ");

‎Core/Resgrid.Services/ShiftsService.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,10 @@ public async Task<Dictionary<int, Dictionary<int, int>>> GetShiftDayNeedsObjAsyn
488488
}
489489
}
490490

491-
shiftGroups.Add(group.DepartmentGroupId,roleRequirements);
491+
if(shiftGroups.ContainsKey(group.DepartmentGroupId))
492+
shiftGroups[group.DepartmentGroupId]=roleRequirements;
493+
else
494+
shiftGroups.Add(group.DepartmentGroupId,roleRequirements);
492495
}
493496
}
494497

‎Web/Resgrid.Web.Services/Controllers/v3/AuthController.cs‎

Lines changed: 0 additions & 185 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp