Develop #234
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -174,4 +174,22 @@ | |
| <data name="UnitDispatchAlsoDispatchToGroupLabel" xml:space="preserve"> | ||
| <value /> | ||
| </data> | ||
| <data name="ShiftSettingsHeader" xml:space="preserve"> | ||
| <value /> | ||
| </data> | ||
| <data name="SaveShiftSettingsText" xml:space="preserve"> | ||
| <value /> | ||
| </data> | ||
| <data name="ShiftSignupSettingsHeader" xml:space="preserve"> | ||
| <value /> | ||
| </data> | ||
| <data name="ShiftSignupsMultipleGroupsHeader" xml:space="preserve"> | ||
| <value /> | ||
| </data> | ||
| <data name="PersonnelOnUnitSetUnitStatusLabel" xml:space="preserve"> | ||
| <value /> | ||
| </data> | ||
| <data name="PersonnelOnUnitSetUnitStatusHelp" xml:space="preserve"> | ||
| <value /> | ||
| </data> | ||
| </root> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -51,6 +51,12 @@ public class ActionLog : IEntity | |
| [ProtoMember(9)] | ||
| public string Note { get; set; } | ||
|
|
||
| [ProtoMember(12)] | ||
| public int? UnitStateId { get; set; } | ||
|
|
||
| [ProtoMember(13)] | ||
| public string UnitName { get; set; } | ||
|
|
||
| [NotMapped] | ||
| [ProtoMember(10)] | ||
| public double Eta { get; set; } | ||
|
|
@@ -103,6 +109,11 @@ public string GetActionText() | |
| return "Responding to Station"; | ||
| case ActionTypes.RespondingToScene: | ||
| return "Responding to Scene"; | ||
| case ActionTypes.OnUnit: | ||
| if (!String.IsNullOrWhiteSpace(UnitName)) | ||
| return $"On Unit ({UnitName})"; | ||
| else | ||
| return "On Unit"; | ||
| default: | ||
| throw new ArgumentOutOfRangeException(); | ||
| } | ||
|
|
@@ -126,6 +137,8 @@ public string GetActionCss() | |
| return "label-success"; | ||
| case ActionTypes.RespondingToScene: | ||
| return "label-success"; | ||
| case ActionTypes.OnUnit: | ||
| return "label-success"; | ||
| default: | ||
| throw new ArgumentOutOfRangeException(); | ||
| } | ||
|
|
@@ -177,6 +190,8 @@ public static int GetWeightForAction(this ActionLog actionLog) | |
| return 1; | ||
| else if (actionLog.ActionTypeId == (int)ActionTypes.RespondingToScene) | ||
| return 1; | ||
| else if (actionLog.ActionTypeId == (int)ActionTypes.OnUnit) | ||
| return 2; | ||
| else if (actionLog.ActionTypeId == (int)ActionTypes.OnScene) | ||
| return 2; | ||
| else if (actionLog.ActionTypeId == (int)ActionTypes.NotResponding) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,6 +47,12 @@ public enum ActionTypes | |
| /// User is Responding directly to a scene (For a Specific Call) | ||
| /// </summary> | ||
| [Display(Name = "Responding To Scene")] | ||
| RespondingToScene = 6, | ||
|
|
||
| /// <summary> | ||
| /// User is on a Unit and has a state submitted recently | ||
| /// </summary> | ||
| [Display(Name = "On Unit")] | ||
| OnUnit = 7 | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,5 +36,6 @@ public enum DepartmentSettingTypes | |
| ModuleSettings = 32, | ||
| UnitDispatchAlsoDispatchToAssignedPersonnel = 33, | ||
| UnitDispatchAlsoDispatchToGroup = 34, | ||
| PersonnelOnUnitSetUnitStatus = 35, | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -225,5 +225,7 @@ Task<ActionLog> SetUserActionAsync(string userId, int departmentId, int actionTy | |
| Task<List<ActionLog>> GetActionLogsForCallAsync(int departmentId, int callId); | ||
|
|
||
| Task<List<ActionLog>> GetAllActionLogsInDateRangeAsync(int departmentId, DateTime startDate, DateTime endDate); | ||
|
|
||
| Task<ActionLog> CreateUnitLinkedStatus(string userId, int departmentId, int unitStateId, string unitName, CancellationToken cancellationToken = default(CancellationToken)); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -272,6 +272,8 @@ public interface IDepartmentSettingsService | |
|
|
||
| Task<bool> GetUnitDispatchAlsoDispatchToGroupAsync(int departmentId); | ||
|
|
||
| Task<bool> GetPersonnelOnUnitSetUnitStatusAsync(int departmentId); | ||
|
|
||
| Task<DepartmentSetting> SetDepartmentModuleSettingsAsync(int departmentId, DepartmentModuleSettings settings, CancellationToken cancellationToken = default(CancellationToken)); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,15 @@ | ||
| using Amazon.SimpleEmail.Model; | ||
| using Resgrid.Model; | ||
| using Resgrid.Model.Events; | ||
| using Resgrid.Model.Providers; | ||
| using Resgrid.Model.Repositories; | ||
| using Resgrid.Model.Services; | ||
| using Resgrid.Providers.Bus; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Resgrid.Services | ||
| { | ||
|
|
@@ -406,5 +407,18 @@ public async Task<List<ActionLog>> GetActionLogsForCallAsync(int departmentId, i | |
| var items = await _actionLogsRepository.GetActionLogsForCallAndTypesAsync(callId, callEnabledStates); | ||
| return items.ToList(); | ||
| } | ||
|
|
||
| public async Task<ActionLog> CreateUnitLinkedStatus(string userId, int departmentId, int unitStateId, string unitName, CancellationToken cancellationToken = default(CancellationToken)) | ||
| { | ||
| var al = new ActionLog(); | ||
| al.ActionTypeId = (int)ActionTypes.OnUnit; | ||
| al.DepartmentId = departmentId; | ||
| al.UserId = userId; | ||
| al.Timestamp = DateTime.UtcNow; | ||
| al.UnitStateId = unitStateId; | ||
| al.UnitName = unitName; | ||
|
|
||
| return await SaveActionLogAsync(al, cancellationToken); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -348,6 +348,7 @@ public List<CustomStateDetail> GetDefaultPersonStatuses() | |
| details.Add(new CustomStateDetail() { CustomStateDetailId = (int)ActionTypes.AvailableStation, ButtonText = "Available Station", ButtonColor = "#d1dade", TextColor = "5E5E5E", NoteType = (int)CustomStateNoteTypes.Optional, DetailType = (int)CustomStateDetailTypes.Stations }); | ||
| details.Add(new CustomStateDetail() { CustomStateDetailId = (int)ActionTypes.RespondingToStation, ButtonText = "Responding to Station", ButtonColor = "#449d44", TextColor = "#ffffff", NoteType = (int)CustomStateNoteTypes.Optional, DetailType = (int)CustomStateDetailTypes.Stations }); | ||
| details.Add(new CustomStateDetail() { CustomStateDetailId = (int)ActionTypes.RespondingToScene, ButtonText = "Responding to Scene", ButtonColor = "#449d44", TextColor = "#ffffff", NoteType = (int)CustomStateNoteTypes.Optional, DetailType = (int)CustomStateDetailTypes.Calls }); | ||
| details.Add(new CustomStateDetail() { CustomStateDetailId = (int)ActionTypes.OnUnit, ButtonText = "On Unit", ButtonColor = "#449d44", TextColor = "#ffffff", NoteType = (int)CustomStateNoteTypes.Optional, DetailType = (int)CustomStateDetailTypes.CallsAndStations }); | ||
|
|
||
| return details; | ||
| } | ||
|
|
@@ -360,7 +361,7 @@ public List<CustomStateDetail> GetDefaultPersonStaffings() | |
| details.Add(new CustomStateDetail() { CustomStateDetailId = (int)UserStateTypes.Unavailable, ButtonText = "Unavailable", ButtonColor = "#ed5565", TextColor = "#ffffff", NoteType = (int)CustomStateNoteTypes.Optional }); | ||
| details.Add(new CustomStateDetail() { CustomStateDetailId = (int)UserStateTypes.Committed, ButtonText = "Committed", ButtonColor = "#23c6c8", TextColor = "#ffffff", NoteType = (int)CustomStateNoteTypes.Optional }); | ||
| details.Add(new CustomStateDetail() { CustomStateDetailId = (int)UserStateTypes.OnShift, ButtonText = "On Shift", ButtonColor = "#228bcb", TextColor = "#ffffff", NoteType = (int)CustomStateNoteTypes.Optional }); | ||
|
|
||
|
|
||
| return details; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -715,6 +715,16 @@ public async Task<bool> GetUnitDispatchAlsoDispatchToGroupAsync(int departmentId | |
| return false; | ||
| } | ||
|
|
||
| public async Task<bool> GetPersonnelOnUnitSetUnitStatusAsync(int departmentId) | ||
| { | ||
| var settingValue = await GetSettingByDepartmentIdType(departmentId, DepartmentSettingTypes.PersonnelOnUnitSetUnitStatus); | ||
|
|
||
| if (settingValue != null) | ||
| return bool.Parse(settingValue.Setting); | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| public async Task<DepartmentSetting> SetDepartmentModuleSettingsAsync(int departmentId, DepartmentModuleSettings settings, CancellationToken cancellationToken = default(CancellationToken)) | ||
| { | ||
| return await SaveOrUpdateSettingAsync(departmentId, ObjectSerialization.Serialize(settings), | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -583,25 +583,18 @@ private async Task<bool> RetryQueueItem(BasicDeliverEventArgs ea, Exception mex) | |
| if (currentDeliveryCount >= 3) | ||
| return true; | ||
|
|
||
| var connection = await RabbitConnection.CreateConnection(_clientName); | ||
| if (connection != null) | ||
| { | ||
| using (var channel = await connection.CreateChannelAsync()) | ||
| { | ||
| var props = new BasicProperties(); | ||
| props.DeliveryMode = DeliveryModes.Persistent; | ||
| props.Expiration = "36000000"; | ||
|
|
||
| props.Headers = new Dictionary<string, object>(); | ||
| props.Headers.Add("x-redelivered-count", currentDeliveryCount + 1); | ||
| props.Headers.Add("x-previous-error", mex.Message); | ||
|
|
||
| await channel.BasicPublishAsync(exchange: ea.Exchange, | ||
| routingKey: ea.RoutingKey, | ||
|
|
@@ -612,15 +605,14 @@ await channel.BasicPublishAsync(exchange: ea.Exchange, | |
|
|
||
| return true; | ||
| } | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Logging.LogException(ex); | ||
| return true; // Somethings really wrong, just don't retry. | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| using FluentMigrator; | ||
| using System; | ||
|
|
||
| namespace Resgrid.Providers.Migrations.Migrations | ||
| { | ||
| [Migration(36)] | ||
| public class M0036_AddingUnitStateToActionLogs : Migration | ||
| { | ||
| public override void Up() | ||
| { | ||
| Alter.Table("ActionLogs").AddColumn("UnitStateId").AsInt32().Nullable(); | ||
| Alter.Table("ActionLogs").AddColumn("UnitName").AsString().Nullable(); | ||
| } | ||
|
|
||
| public override void Down() | ||
| { | ||
|
Comment on lines
+11
to
+16
Contributor
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chainImplement Down() and consider explicit length for UnitName for SQL Server parity
Apply this diff: - Alter.Table("ActionLogs").AddColumn("UnitStateId").AsInt32().Nullable();
- Alter.Table("ActionLogs").AddColumn("UnitName").AsString().Nullable();
+ Alter.Table("ActionLogs").AddColumn("UnitStateId").AsInt32().Nullable();
+ Alter.Table("ActionLogs").AddColumn("UnitName").AsString(256).Nullable();And implement Down(): public override void Down()
{
-
+ Delete.Column("UnitName").FromTable("ActionLogs");
+ Delete.Column("UnitStateId").FromTable("ActionLogs");
}🏁 Script executed: #!/bin/bash
set -e
# Locate the migration file for M0036
echo "=== Migration file path ==="
rg -l "M0036_AddingUnitStateToActionLogs" -t cs
# Show the Up() method
echo -e "\n=== Up() method content ==="
rg -n "public override void Up" -A5 -B2 Providers/Resgrid.Providers.Migrations/Migrations/M0036_AddingUnitStateToActionLogs.cs
# Show the Down() method
echo -e "\n=== Down() method content ==="
rg -n "public override void Down" -A3 -B2 Providers/Resgrid.Providers.Migrations/Migrations/M0036_AddingUnitStateToActionLogs.cs
# List other migrations using AsString() without an explicit length
echo -e "\n=== Other AsString() usages without length ==="
rg -n "AsString\\(\\)" -A1 -t cs Providers/Resgrid.Providers.Migrations/MigrationsLength of output: 19647 🏁 Script executed: #!/bin/bash
set -e
# Show the full content of the PG version of the migration
echo "=== PG Migration file content ==="
sed -n '1,200p' Providers/Resgrid.Providers.MigrationsPg/Migrations/M0036_AddingUnitStateToActionLogs.csLength of output: 641 Add reversible Down() methods and specify SQL Server string length
SQL Server migration diff: public override void Up()
{
- Alter.Table("ActionLogs").AddColumn("UnitStateId").AsInt32().Nullable();
- Alter.Table("ActionLogs").AddColumn("UnitName").AsString().Nullable();
+ Alter.Table("ActionLogs").AddColumn("UnitStateId").AsInt32().Nullable();
+ Alter.Table("ActionLogs").AddColumn("UnitName").AsString(256).Nullable();
}
public override void Down()
-{
-}
+{
+ Delete.Column("UnitName").FromTable("ActionLogs");
+ Delete.Column("UnitStateId").FromTable("ActionLogs");
+}PG migration diff: public override void Down()
-{
-}
+{
+ Delete.Column("unitname").FromTable("actionlogs");
+ Delete.Column("unitstateid").FromTable("actionlogs");
+}🤖 Prompt for AI Agents |
||
|
|
||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| using FluentMigrator; | ||
| using System; | ||
|
|
||
| namespace Resgrid.Providers.Migrations.MigrationsPg | ||
| { | ||
| [Migration(35)] | ||
| public class M0035_UpdatingContactsTableAgain : Migration | ||
| { | ||
| public override void Up() | ||
| { | ||
|
|
||
| } | ||
|
|
||
| public override void Down() | ||
| { | ||
|
|
||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Verification agent
🧩 Analysis chain
Empty Spanish values will render blank UI; remove to enable fallback or populate with text
Including keys with
<value />in a localized .resx overrides fallback to the neutral/English resource. These four entries will show as empty strings in the Spanish UI. Either remove them (so ResourceManager falls back to English) or populate with text (Spanish or English placeholders).Also, the PR summary claims these entries were later removed in this file, but they are still present here. Please reconcile to avoid drift.
Option A — remove to enable fallback:
Option B — populate with English placeholders to avoid blanks (until Spanish translations are ready):
🏁 Script executed:
Length of output: 527
Empty Spanish entries in Department.es.resx will render blank UI—please remove or populate
The following keys in
Core/Resgrid.Localization/Areas/User/Department/Department.es.resxstill have empty<value/>, which overrides fallback to English and leads to blank labels in the Spanish UI. Additionally, the PR summary states these were removed, but they remain in this file. Please reconcile and then either:• Remove them so ResourceManager falls back to English
• Populate them with placeholder text (Spanish or English) until translations are available
Affected locations:
Option A — remove entries to enable fallback:
Option B — add English placeholders until Spanish copy is ready:
📝 Committable suggestion
🤖 Prompt for AI Agents