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

Develop#259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
ucswift merged 4 commits intomasterfromdevelop
Oct 23, 2025
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
NextNext commit
CU-868fwmkkw Fixing issue with disabled/deletes user showing on map.
  • Loading branch information
@ucswift
ucswift committedOct 7, 2025
commit0c3b08d98a58bc80e5ea2539d5432f9c32d96c6f
4 changes: 2 additions & 2 deletionsCore/Resgrid.Services/SubscriptionsService.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,10 +99,10 @@ public async Task<DepartmentPlanCount> GetPlanCountsForDepartmentAsync(int depar
var response = await client.ExecuteAsync<GetPlanCountsForDepartmentResult>(request);

if (response.StatusCode == HttpStatusCode.NotFound)
returnnull;
returnnew DepartmentPlanCount();

if (response.Data == null)
returnnull;
returnnew DepartmentPlanCount();

return response.Data.Data;
}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,8 @@ public async Task<ActionResult<GetMapDataResult>> GetMapDataAndMarkers()
var callTypes = await _callsService.GetCallTypesForDepartmentAsync(DepartmentId);

var personnelStates = await _actionLogsService.GetLastActionLogsForDepartmentAsync(DepartmentId);
var personnelNames = await _departmentsService.GetAllPersonnelNamesForDepartmentAsync(DepartmentId);
//var personnelNames = await _departmentsService.GetAllPersonnelNamesForDepartmentAsync(DepartmentId);
var people = await _usersService.GetUserGroupAndRolesByDepartmentIdAsync(DepartmentId, false, false, false);
Comment on lines +105 to +106
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

🛠️ Refactor suggestion |🟠 Major

Remove commented-out code.

The commented-out line should be deleted rather than left in the codebase. Version control preserves the history if needed.

Apply this diff:

-//var personnelNames = await _departmentsService.GetAllPersonnelNamesForDepartmentAsync(DepartmentId); var people = await _usersService.GetUserGroupAndRolesByDepartmentIdAsync(DepartmentId, false, false, false); var personnelLocations = await _usersService.GetLatestLocationsForDepartmentPersonnelAsync(DepartmentId);

As per coding guidelines (avoid commented-out code).

📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
//var personnelNames = await _departmentsService.GetAllPersonnelNamesForDepartmentAsync(DepartmentId);
varpeople=await_usersService.GetUserGroupAndRolesByDepartmentIdAsync(DepartmentId,false,false,false);
varpeople=await_usersService.GetUserGroupAndRolesByDepartmentIdAsync(DepartmentId,false,false,false);
🤖 Prompt for AI Agents
In Web/Resgrid.Web.Services/Controllers/v4/MappingController.cs around lines 105to 106, remove the commented-out line "//var personnelNames = await_departmentsService.GetAllPersonnelNamesForDepartmentAsync(DepartmentId);" soonly the active call to _usersService remains; commit the deletion (no codechanges beyond removing the commented line) to keep the codebase clean and relyon version control for history.

var personnelLocations = await _usersService.GetLatestLocationsForDepartmentPersonnelAsync(DepartmentId);

var personnelLocationTTL = await _departmentSettingsService.GetMappingPersonnelLocationTTLAsync(DepartmentId);
Expand DownExpand Up@@ -373,9 +374,9 @@ public async Task<ActionResult<GetMapDataResult>> GetMapDataAndMarkers()
}
}

if (personnelNames != null &&personnelNames.Any())
if (people != null &&people.Any())
{
foreach (var person inpersonnelNames)
foreach (var person inpeople)
{
if (!await _authorizationService.CanUserViewPersonLocationViaMatrixAsync(person.UserId, UserId, DepartmentId))
continue;
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp