diff --git a/Tests/Resgrid.Tests/Mocks/MockTrainingAttachmentRepository.cs b/Tests/Resgrid.Tests/Mocks/MockTrainingAttachmentRepository.cs
new file mode 100644
index 00000000..db6263e8
--- /dev/null
+++ b/Tests/Resgrid.Tests/Mocks/MockTrainingAttachmentRepository.cs
@@ -0,0 +1,103 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Resgrid.Model;
+using Resgrid.Model.Repositories;
+
+namespace Resgrid.Tests.Mocks
+{
+	/// <summary>
+	/// In-memory mock for <see cref="ITrainingAttachmentRepository"/>
+	/// </summary>
+	public sealed class MockTrainingAttachmentRepository : ITrainingAttachmentRepository
+	{
+		private readonly List<TrainingAttachment> _attachments = new List<TrainingAttachment>();
+		private int _nextId = 1;
+
+		public Task<IEnumerable<TrainingAttachment>> GetAllAsync()
+			=> Task.FromResult<IEnumerable<TrainingAttachment>>(_attachments.ToList());
+
+		public Task<TrainingAttachment> GetByIdAsync(object id)
+		{
+			var intId = (int)id;
+			var attachment = _attachments.FirstOrDefault(a => a.TrainingAttachmentId == intId);
+			return Task.FromResult(attachment);
+		}
+
+		public Task<IEnumerable<TrainingAttachment>> GetAllByDepartmentIdAsync(int departmentId)
+			=> Task.FromResult<IEnumerable<TrainingAttachment>>(new List<TrainingAttachment>());
+
+		public Task<IEnumerable<TrainingAttachment>> GetAllByUserIdAsync(string userId)
+			=> Task.FromResult<IEnumerable<TrainingAttachment>>(new List<TrainingAttachment>());
+
+		public Task<TrainingAttachment> InsertAsync(TrainingAttachment entity, CancellationToken cancellationToken, bool firstLevelOnly = false)
+		{
+			entity.TrainingAttachmentId = _nextId++;
+			_attachments.Add(entity);
+			return Task.FromResult(entity);
+		}
+
+		public Task<TrainingAttachment> UpdateAsync(TrainingAttachment entity, CancellationToken cancellationToken, bool firstLevelOnly = false)
+		{
+			var existing = _attachments.FirstOrDefault(a => a.TrainingAttachmentId == entity.TrainingAttachmentId);
+			if (existing != null)
+			{
+				_attachments.Remove(existing);
+			}
+			_attachments.Add(entity);
+			return Task.FromResult(entity);
+		}
+
+		public Task<bool> DeleteAsync(TrainingAttachment entity, CancellationToken cancellationToken)
+		{
+			var existing = _attachments.FirstOrDefault(a => a.TrainingAttachmentId == entity.TrainingAttachmentId);
+			if (existing != null)
+			{
+				_attachments.Remove(existing);
+			}
+			return Task.FromResult(true);
+		}
+
+		public Task<TrainingAttachment> SaveOrUpdateAsync(TrainingAttachment entity, CancellationToken cancellationToken, bool firstLevelOnly = false)
+		{
+			if (entity.TrainingAttachmentId == 0)
+			{
+				entity.TrainingAttachmentId = _nextId++;
+				_attachments.Add(entity);
+			}
+			else
+			{
+				var existing = _attachments.FirstOrDefault(a => a.TrainingAttachmentId == entity.TrainingAttachmentId);
+				if (existing != null)
+				{
+					_attachments.Remove(existing);
+				}
+				_attachments.Add(entity);
+			}
+			return Task.FromResult(entity);
+		}
+
+		public Task<bool> DeleteMultipleAsync(TrainingAttachment entity, string parentKeyName, object parentKeyId, List<object> ids, CancellationToken cancellationToken)
+			=> Task.FromResult(true);
+
+		public Task<IEnumerable<TrainingAttachment>> GetTrainingAttachmentsByTrainingIdAsync(int trainingId)
+		{
+			var result = _attachments.Where(a => a.TrainingId == trainingId).ToList();
+			return Task.FromResult<IEnumerable<TrainingAttachment>>(result);
+		}
+
+		public void SeedAttachment(TrainingAttachment attachment)
+		{
+			if (attachment.TrainingAttachmentId == 0)
+			{
+				attachment.TrainingAttachmentId = _nextId++;
+			}
+			else
+			{
+				_nextId = System.Math.Max(_nextId, attachment.TrainingAttachmentId + 1);
+			}
+			_attachments.Add(attachment);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Tests/Resgrid.Tests/Mocks/MockTrainingQuestionRepository.cs b/Tests/Resgrid.Tests/Mocks/MockTrainingQuestionRepository.cs
new file mode 100644
index 00000000..d47fe531
--- /dev/null
+++ b/Tests/Resgrid.Tests/Mocks/MockTrainingQuestionRepository.cs
@@ -0,0 +1,103 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Resgrid.Model;
+using Resgrid.Model.Repositories;
+
+namespace Resgrid.Tests.Mocks
+{
+	/// <summary>
+	/// In-memory mock for <see cref="ITrainingQuestionRepository"/>
+	/// </summary>
+	public sealed class MockTrainingQuestionRepository : ITrainingQuestionRepository
+	{
+		private readonly List<TrainingQuestion> _questions = new List<TrainingQuestion>();
+		private int _nextId = 1;
+
+		public Task<IEnumerable<TrainingQuestion>> GetAllAsync()
+			=> Task.FromResult<IEnumerable<TrainingQuestion>>(_questions.ToList());
+
+		public Task<TrainingQuestion> GetByIdAsync(object id)
+		{
+			var intId = (int)id;
+			var question = _questions.FirstOrDefault(q => q.TrainingQuestionId == intId);
+			return Task.FromResult(question);
+		}
+
+		public Task<IEnumerable<TrainingQuestion>> GetAllByDepartmentIdAsync(int departmentId)
+			=> Task.FromResult<IEnumerable<TrainingQuestion>>(new List<TrainingQuestion>());
+
+		public Task<IEnumerable<TrainingQuestion>> GetAllByUserIdAsync(string userId)
+			=> Task.FromResult<IEnumerable<TrainingQuestion>>(new List<TrainingQuestion>());
+
+		public Task<TrainingQuestion> InsertAsync(TrainingQuestion entity, CancellationToken cancellationToken, bool firstLevelOnly = false)
+		{
+			entity.TrainingQuestionId = _nextId++;
+			_questions.Add(entity);
+			return Task.FromResult(entity);
+		}
+
+		public Task<TrainingQuestion> UpdateAsync(TrainingQuestion entity, CancellationToken cancellationToken, bool firstLevelOnly = false)
+		{
+			var existing = _questions.FirstOrDefault(q => q.TrainingQuestionId == entity.TrainingQuestionId);
+			if (existing != null)
+			{
+				_questions.Remove(existing);
+			}
+			_questions.Add(entity);
+			return Task.FromResult(entity);
+		}
+
+		public Task<bool> DeleteAsync(TrainingQuestion entity, CancellationToken cancellationToken)
+		{
+			var existing = _questions.FirstOrDefault(q => q.TrainingQuestionId == entity.TrainingQuestionId);
+			if (existing != null)
+			{
+				_questions.Remove(existing);
+			}
+			return Task.FromResult(true);
+		}
+
+		public Task<TrainingQuestion> SaveOrUpdateAsync(TrainingQuestion entity, CancellationToken cancellationToken, bool firstLevelOnly = false)
+		{
+			if (entity.TrainingQuestionId == 0)
+			{
+				entity.TrainingQuestionId = _nextId++;
+				_questions.Add(entity);
+			}
+			else
+			{
+				var existing = _questions.FirstOrDefault(q => q.TrainingQuestionId == entity.TrainingQuestionId);
+				if (existing != null)
+				{
+					_questions.Remove(existing);
+				}
+				_questions.Add(entity);
+			}
+			return Task.FromResult(entity);
+		}
+
+		public Task<bool> DeleteMultipleAsync(TrainingQuestion entity, string parentKeyName, object parentKeyId, List<object> ids, CancellationToken cancellationToken)
+			=> Task.FromResult(true);
+
+		public Task<IEnumerable<TrainingQuestion>> GetTrainingQuestionsByTrainingIdAsync(int trainingId)
+		{
+			var result = _questions.Where(q => q.TrainingId == trainingId).ToList();
+			return Task.FromResult<IEnumerable<TrainingQuestion>>(result);
+		}
+
+		public void SeedQuestion(TrainingQuestion question)
+		{
+			if (question.TrainingQuestionId == 0)
+			{
+				question.TrainingQuestionId = _nextId++;
+			}
+			else
+			{
+				_nextId = System.Math.Max(_nextId, question.TrainingQuestionId + 1);
+			}
+			_questions.Add(question);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Tests/Resgrid.Tests/Mocks/MockTrainingRepository.cs b/Tests/Resgrid.Tests/Mocks/MockTrainingRepository.cs
new file mode 100644
index 00000000..f728b6e1
--- /dev/null
+++ b/Tests/Resgrid.Tests/Mocks/MockTrainingRepository.cs
@@ -0,0 +1,121 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Resgrid.Model;
+using Resgrid.Model.Repositories;
+
+namespace Resgrid.Tests.Mocks
+{
+	/// <summary>
+	/// In-memory mock for <see cref="ITrainingRepository"/> that stores trainings
+	/// without requiring a database connection.
+	/// </summary>
+	public sealed class MockTrainingRepository : ITrainingRepository
+	{
+		private readonly List<Training> _trainings = new List<Training>();
+		private int _nextId = 1;
+
+		public List<Training> Trainings => _trainings;
+
+		public Task<IEnumerable<Training>> GetAllAsync()
+			=> Task.FromResult<IEnumerable<Training>>(_trainings.ToList());
+
+		public Task<Training> GetByIdAsync(object id)
+		{
+			var intId = (int)id;
+			var training = _trainings.FirstOrDefault(t => t.TrainingId == intId);
+			return Task.FromResult(training);
+		}
+
+		public Task<IEnumerable<Training>> GetAllByDepartmentIdAsync(int departmentId)
+		{
+			var result = _trainings.Where(t => t.DepartmentId == departmentId).ToList();
+			return Task.FromResult<IEnumerable<Training>>(result);
+		}
+
+		public Task<IEnumerable<Training>> GetAllByUserIdAsync(string userId)
+			=> Task.FromResult<IEnumerable<Training>>(new List<Training>());
+
+		public Task<Training> InsertAsync(Training entity, CancellationToken cancellationToken, bool firstLevelOnly = false)
+		{
+			entity.TrainingId = _nextId++;
+			_trainings.Add(entity);
+			return Task.FromResult(entity);
+		}
+
+		public Task<Training> UpdateAsync(Training entity, CancellationToken cancellationToken, bool firstLevelOnly = false)
+		{
+			var existing = _trainings.FirstOrDefault(t => t.TrainingId == entity.TrainingId);
+			if (existing != null)
+			{
+				_trainings.Remove(existing);
+			}
+			_trainings.Add(entity);
+			return Task.FromResult(entity);
+		}
+
+		public Task<bool> DeleteAsync(Training entity, CancellationToken cancellationToken)
+		{
+			var existing = _trainings.FirstOrDefault(t => t.TrainingId == entity.TrainingId);
+			if (existing != null)
+			{
+				_trainings.Remove(existing);
+			}
+			return Task.FromResult(true);
+		}
+
+		public Task<Training> SaveOrUpdateAsync(Training entity, CancellationToken cancellationToken, bool firstLevelOnly = false)
+		{
+			if (entity.TrainingId == 0)
+			{
+				entity.TrainingId = _nextId++;
+				_trainings.Add(entity);
+			}
+			else
+			{
+				var existing = _trainings.FirstOrDefault(t => t.TrainingId == entity.TrainingId);
+				if (existing != null)
+				{
+					_trainings.Remove(existing);
+				}
+				_trainings.Add(entity);
+			}
+			return Task.FromResult(entity);
+		}
+
+		public Task<bool> DeleteMultipleAsync(Training entity, string parentKeyName, object parentKeyId, List<object> ids, CancellationToken cancellationToken)
+			=> Task.FromResult(true);
+
+		public List<Training> GetAllTrainings()
+			=> _trainings.ToList();
+
+		public Task<IEnumerable<Training>> GetTrainingsByDepartmentIdAsync(int departmentId)
+		{
+			var result = _trainings.Where(t => t.DepartmentId == departmentId).ToList();
+			return Task.FromResult<IEnumerable<Training>>(result);
+		}
+
+		public Task<Training> GetTrainingByTrainingIdAsync(int trainingId)
+		{
+			var training = _trainings.FirstOrDefault(t => t.TrainingId == trainingId);
+			return Task.FromResult(training);
+		}
+
+		/// <summary>
+		/// Helper method to seed test data
+		/// </summary>
+		public void SeedTraining(Training training)
+		{
+			if (training.TrainingId == 0)
+			{
+				training.TrainingId = _nextId++;
+			}
+			else
+			{
+				_nextId = System.Math.Max(_nextId, training.TrainingId + 1);
+			}
+			_trainings.Add(training);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Tests/Resgrid.Tests/Mocks/MockTrainingUserRepository.cs b/Tests/Resgrid.Tests/Mocks/MockTrainingUserRepository.cs
new file mode 100644
index 00000000..00c024dd
--- /dev/null
+++ b/Tests/Resgrid.Tests/Mocks/MockTrainingUserRepository.cs
@@ -0,0 +1,106 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Resgrid.Model;
+using Resgrid.Model.Repositories;
+
+namespace Resgrid.Tests.Mocks
+{
+	/// <summary>
+	/// In-memory mock for <see cref="ITrainingUserRepository"/>
+	/// </summary>
+	public sealed class MockTrainingUserRepository : ITrainingUserRepository
+	{
+		private readonly List<TrainingUser> _users = new List<TrainingUser>();
+		private int _nextId = 1;
+
+		public Task<IEnumerable<TrainingUser>> GetAllAsync()
+			=> Task.FromResult<IEnumerable<TrainingUser>>(_users.ToList());
+
+		public Task<TrainingUser> GetByIdAsync(object id)
+		{
+			var intId = (int)id;
+			var user = _users.FirstOrDefault(u => u.TrainingUserId == intId);
+			return Task.FromResult(user);
+		}
+
+		public Task<IEnumerable<TrainingUser>> GetAllByDepartmentIdAsync(int departmentId)
+			=> Task.FromResult<IEnumerable<TrainingUser>>(new List<TrainingUser>());
+
+		public Task<IEnumerable<TrainingUser>> GetAllByUserIdAsync(string userId)
+		{
+			var result = _users.Where(u => u.UserId == userId).ToList();
+			return Task.FromResult<IEnumerable<TrainingUser>>(result);
+		}
+
+		public Task<TrainingUser> InsertAsync(TrainingUser entity, CancellationToken cancellationToken, bool firstLevelOnly = false)
+		{
+			entity.TrainingUserId = _nextId++;
+			_users.Add(entity);
+			return Task.FromResult(entity);
+		}
+
+		public Task<TrainingUser> UpdateAsync(TrainingUser entity, CancellationToken cancellationToken, bool firstLevelOnly = false)
+		{
+			var existing = _users.FirstOrDefault(u => u.TrainingUserId == entity.TrainingUserId);
+			if (existing != null)
+			{
+				_users.Remove(existing);
+			}
+			_users.Add(entity);
+			return Task.FromResult(entity);
+		}
+
+		public Task<bool> DeleteAsync(TrainingUser entity, CancellationToken cancellationToken)
+		{
+			var existing = _users.FirstOrDefault(u => u.TrainingUserId == entity.TrainingUserId);
+			if (existing != null)
+			{
+				_users.Remove(existing);
+			}
+			return Task.FromResult(true);
+		}
+
+		public Task<TrainingUser> SaveOrUpdateAsync(TrainingUser entity, CancellationToken cancellationToken, bool firstLevelOnly = false)
+		{
+			if (entity.TrainingUserId == 0)
+			{
+				entity.TrainingUserId = _nextId++;
+				_users.Add(entity);
+			}
+			else
+			{
+				var existing = _users.FirstOrDefault(u => u.TrainingUserId == entity.TrainingUserId);
+				if (existing != null)
+				{
+					_users.Remove(existing);
+				}
+				_users.Add(entity);
+			}
+			return Task.FromResult(entity);
+		}
+
+		public Task<bool> DeleteMultipleAsync(TrainingUser entity, string parentKeyName, object parentKeyId, List<object> ids, CancellationToken cancellationToken)
+			=> Task.FromResult(true);
+
+		public Task<TrainingUser> GetTrainingUserByTrainingIdAndUserIdAsync(int trainingId, string userId)
+		{
+			var user = _users.FirstOrDefault(u => u.TrainingId == trainingId && u.UserId == userId);
+			return Task.FromResult(user);
+		}
+
+		public void SeedUser(TrainingUser user)
+		{
+			if (user.TrainingUserId == 0)
+			{
+				user.TrainingUserId = _nextId++;
+			}
+			else
+			{
+				_nextId = System.Math.Max(_nextId, user.TrainingUserId + 1);
+			}
+			_users.Add(user);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Tests/Resgrid.Tests/Services/TrainingServiceTests.cs b/Tests/Resgrid.Tests/Services/TrainingServiceTests.cs
new file mode 100644
index 00000000..1efd683d
--- /dev/null
+++ b/Tests/Resgrid.Tests/Services/TrainingServiceTests.cs
@@ -0,0 +1,507 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using Resgrid.Framework.Testing;
+using Resgrid.Model;
+using Resgrid.Model.Repositories;
+using Resgrid.Model.Services;
+using Resgrid.Services;
+using Resgrid.Tests.Mocks;
+
+namespace Resgrid.Tests.Services
+{
+	[TestFixture]
+	public class TrainingServiceTests
+	{
+		private MockTrainingRepository _trainingRepository;
+		private MockTrainingAttachmentRepository _attachmentRepository;
+		private MockTrainingQuestionRepository _questionRepository;
+		private MockTrainingUserRepository _userRepository;
+		private Mock<ICommunicationService> _communicationServiceMock;
+		private Mock<IDepartmentsService> _departmentServiceMock;
+		private TrainingService _trainingService;
+
+		[SetUp]
+		public void SetUp()
+		{
+			_trainingRepository = new MockTrainingRepository();
+			_attachmentRepository = new MockTrainingAttachmentRepository();
+			_questionRepository = new MockTrainingQuestionRepository();
+			_userRepository = new MockTrainingUserRepository();
+			_communicationServiceMock = new Mock<ICommunicationService>();
+			_departmentServiceMock = new Mock<IDepartmentsService>();
+
+			_trainingService = new TrainingService(
+				_trainingRepository,
+				_attachmentRepository,
+				_userRepository,
+				_questionRepository,
+				_communicationServiceMock.Object,
+				_departmentServiceMock.Object
+			);
+		}
+
+		#region GetTrainingByIdAsync Tests
+
+		[Test]
+		public async Task GetTrainingByIdAsync_Should_Return_Training_With_Questions_And_Attachments()
+		{
+			// Arrange
+			var training = new Training
+			{
+				TrainingId = 1,
+				DepartmentId = 1,
+				Name = "Fire Safety Training",
+				Description = "Basic fire safety",
+				TrainingText = "Learn fire safety basics",
+				CreatedByUserId = TestData.Users.TestUser1Id,
+				CreatedOn = DateTime.UtcNow
+			};
+			_trainingRepository.SeedTraining(training);
+
+			var question = new TrainingQuestion
+			{
+				TrainingQuestionId = 1,
+				TrainingId = 1,
+				Question = "What is the correct response to a fire?"
+			};
+			_questionRepository.SeedQuestion(question);
+
+			var attachment = new TrainingAttachment
+			{
+				TrainingAttachmentId = 1,
+				TrainingId = 1,
+				FileName = "fire_safety.pdf"
+			};
+			_attachmentRepository.SeedAttachment(attachment);
+
+			// Act
+			var result = await _trainingService.GetTrainingByIdAsync(1);
+
+			// Assert
+			result.Should().NotBeNull();
+			result.TrainingId.Should().Be(1);
+			result.Name.Should().Be("Fire Safety Training");
+			result.Questions.Should().NotBeNull();
+			result.Questions.Should().HaveCount(1);
+			result.Attachments.Should().NotBeNull();
+			result.Attachments.Should().HaveCount(1);
+		}
+
+		[Test]
+		public async Task GetTrainingByIdAsync_Should_Return_Null_For_NonExistent_Training()
+		{
+			// Act
+			var result = await _trainingService.GetTrainingByIdAsync(999);
+
+			// Assert
+			result.Should().BeNull();
+		}
+
+		#endregion
+
+		#region GetAllTrainingsForDepartmentAsync Tests
+
+		[Test]
+		public async Task GetAllTrainingsForDepartmentAsync_Should_Return_Trainings_For_Department()
+		{
+			// Arrange
+			_trainingRepository.SeedTraining(new Training
+			{
+				TrainingId = 1,
+				DepartmentId = 1,
+				Name = "Training 1",
+				Description = "Description 1",
+				TrainingText = "Text 1",
+				CreatedByUserId = TestData.Users.TestUser1Id,
+				CreatedOn = DateTime.UtcNow
+			});
+			_trainingRepository.SeedTraining(new Training
+			{
+				TrainingId = 2,
+				DepartmentId = 1,
+				Name = "Training 2",
+				Description = "Description 2",
+				TrainingText = "Text 2",
+				CreatedByUserId = TestData.Users.TestUser1Id,
+				CreatedOn = DateTime.UtcNow
+			});
+			_trainingRepository.SeedTraining(new Training
+			{
+				TrainingId = 3,
+				DepartmentId = 2,
+				Name = "Training 3 (Other Dept)",
+				Description = "Description 3",
+				TrainingText = "Text 3",
+				CreatedByUserId = TestData.Users.TestUser5Id,
+				CreatedOn = DateTime.UtcNow
+			});
+
+			// Act
+			var result = await _trainingService.GetAllTrainingsForDepartmentAsync(1);
+
+			// Assert
+			result.Should().NotBeNull();
+			result.Should().HaveCount(2);
+			result.All(t => t.DepartmentId == 1).Should().BeTrue();
+		}
+
+		[Test]
+		public async Task GetAllTrainingsForDepartmentAsync_Should_Return_Empty_List_For_NonExistent_Department()
+		{
+			// Act
+			var result = await _trainingService.GetAllTrainingsForDepartmentAsync(999);
+
+			// Assert
+			result.Should().NotBeNull();
+			result.Should().BeEmpty();
+		}
+
+		#endregion
+
+		#region SaveAsync Tests
+
+		[Test]
+		public async Task SaveAsync_Should_Create_New_Training()
+		{
+			// Arrange
+			var training = new Training
+			{
+				Name = "New Training",
+				Description = "New Description",
+				TrainingText = "New Text",
+				DepartmentId = 1,
+				CreatedByUserId = TestData.Users.TestUser1Id,
+				CreatedOn = DateTime.UtcNow
+			};
+
+			// Act
+			var result = await _trainingService.SaveAsync(training);
+
+			// Assert
+			result.Should().NotBeNull();
+			result.TrainingId.Should().BeGreaterThan(0);
+			result.Name.Should().Be("New Training");
+		}
+
+		[Test]
+		public async Task SaveAsync_Should_Update_Existing_Training()
+		{
+			// Arrange
+			var existing = new Training
+			{
+				TrainingId = 1,
+				DepartmentId = 1,
+				Name = "Original Name",
+				Description = "Original Description",
+				TrainingText = "Original Text",
+				CreatedByUserId = TestData.Users.TestUser1Id,
+				CreatedOn = DateTime.UtcNow
+			};
+			_trainingRepository.SeedTraining(existing);
+
+			// Act
+			existing.Name = "Updated Name";
+			existing.Description = "Updated Description";
+			var result = await _trainingService.SaveAsync(existing);
+
+			// Assert
+			result.Should().NotBeNull();
+			result.TrainingId.Should().Be(1);
+			result.Name.Should().Be("Updated Name");
+			result.Description.Should().Be("Updated Description");
+		}
+
+		[Test]
+		public async Task SaveAsync_Should_Save_Training_With_Questions()
+		{
+			// Arrange
+			var training = new Training
+			{
+				Name = "Quiz Training",
+				Description = "Training with questions",
+				TrainingText = "Text",
+				DepartmentId = 1,
+				CreatedByUserId = TestData.Users.TestUser1Id,
+				CreatedOn = DateTime.UtcNow,
+				Questions = new List<TrainingQuestion>
+				{
+					new TrainingQuestion
+					{
+						Question = "Question 1?",
+						Answers = new List<TrainingQuestionAnswer>
+						{
+							new TrainingQuestionAnswer { Answer = "Answer A", Correct = true },
+							new TrainingQuestionAnswer { Answer = "Answer B", Correct = false }
+						}
+					}
+				}
+			};
+
+			// Act
+			var result = await _trainingService.SaveAsync(training);
+
+			// Assert
+			result.Should().NotBeNull();
+			result.Questions.Should().NotBeNull();
+			result.Questions.Should().HaveCount(1);
+		}
+
+		[Test]
+		public async Task SaveAsync_Should_Sanitize_Html_In_Description_And_Text()
+		{
+			// Arrange
+			var training = new Training
+			{
+				Name = "Training",
+				Description = "<script>alert('xss')</script><p>Safe content</p>",
+				TrainingText = "<script>alert('xss')</script><p>Safe training text</p>",
+				DepartmentId = 1,
+				CreatedByUserId = TestData.Users.TestUser1Id,
+				CreatedOn = DateTime.UtcNow
+			};
+
+			// Act
+			var result = await _trainingService.SaveAsync(training);
+
+			// Assert
+			result.Description.Should().NotContain("<script>");
+			result.TrainingText.Should().NotContain("<script>");
+		}
+
+		#endregion
+
+		#region DeleteTrainingAsync Tests
+
+		[Test]
+		public async Task DeleteTrainingAsync_Should_Delete_Training()
+		{
+			// Arrange
+			var training = new Training
+			{
+				TrainingId = 1,
+				DepartmentId = 1,
+				Name = "Training to Delete",
+				Description = "Description",
+				TrainingText = "Text",
+				CreatedByUserId = TestData.Users.TestUser1Id,
+				CreatedOn = DateTime.UtcNow
+			};
+			_trainingRepository.SeedTraining(training);
+
+			// Act
+			var result = await _trainingService.DeleteTrainingAsync(1);
+
+			// Assert
+			result.Should().BeTrue();
+			var deleted = await _trainingRepository.GetByIdAsync(1);
+			deleted.Should().BeNull();
+		}
+
+		#endregion
+
+		#region SetTrainingAsViewedAsync Tests
+
+		[Test]
+		public async Task SetTrainingAsViewedAsync_Should_Mark_Training_As_Viewed()
+		{
+			// Arrange
+			_trainingRepository.SeedTraining(new Training
+			{
+				TrainingId = 1,
+				DepartmentId = 1,
+				Name = "Training",
+				Description = "Description",
+				TrainingText = "Text",
+				CreatedByUserId = TestData.Users.TestUser1Id,
+				CreatedOn = DateTime.UtcNow
+			});
+
+			_userRepository.SeedUser(new TrainingUser
+			{
+				TrainingUserId = 1,
+				TrainingId = 1,
+				UserId = TestData.Users.TestUser1Id,
+				Viewed = false,
+				Complete = false
+			});
+
+			// Act
+			var result = await _trainingService.SetTrainingAsViewedAsync(1, TestData.Users.TestUser1Id);
+
+			// Assert
+			result.Should().NotBeNull();
+			result.Viewed.Should().BeTrue();
+			result.ViewedOn.Should().NotBeNull();
+		}
+
+		[Test]
+		public async Task SetTrainingAsViewedAsync_Should_Auto_Complete_When_No_Questions()
+		{
+			// Arrange
+			_trainingRepository.SeedTraining(new Training
+			{
+				TrainingId = 1,
+				DepartmentId = 1,
+				Name = "Training",
+				Description = "Description",
+				TrainingText = "Text",
+				CreatedByUserId = TestData.Users.TestUser1Id,
+				CreatedOn = DateTime.UtcNow
+			});
+
+			_userRepository.SeedUser(new TrainingUser
+			{
+				TrainingUserId = 1,
+				TrainingId = 1,
+				UserId = TestData.Users.TestUser1Id,
+				Viewed = false,
+				Complete = false
+			});
+
+			// Act
+			var result = await _trainingService.SetTrainingAsViewedAsync(1, TestData.Users.TestUser1Id);
+
+			// Assert
+			result.Should().NotBeNull();
+			result.Complete.Should().BeTrue();
+			result.CompletedOn.Should().NotBeNull();
+		}
+
+		[Test]
+		public async Task SetTrainingAsViewedAsync_Should_Return_Null_For_NonExistent_User()
+		{
+			// Act
+			var result = await _trainingService.SetTrainingAsViewedAsync(999, TestData.Users.TestUser1Id);
+
+			// Assert
+			result.Should().BeNull();
+		}
+
+		#endregion
+
+		#region RecordTrainingQuizResultAsync Tests
+
+		[Test]
+		public async Task RecordTrainingQuizResultAsync_Should_Record_Score_And_Mark_Complete()
+		{
+			// Arrange
+			_trainingRepository.SeedTraining(new Training
+			{
+				TrainingId = 1,
+				DepartmentId = 1,
+				Name = "Quiz Training",
+				Description = "Description",
+				TrainingText = "Text",
+				CreatedByUserId = TestData.Users.TestUser1Id,
+				CreatedOn = DateTime.UtcNow,
+				Questions = new List<TrainingQuestion>
+				{
+					new TrainingQuestion { TrainingQuestionId = 1, TrainingId = 1, Question = "Q1" },
+					new TrainingQuestion { TrainingQuestionId = 2, TrainingId = 1, Question = "Q2" },
+					new TrainingQuestion { TrainingQuestionId = 3, TrainingId = 1, Question = "Q3" }
+				}
+			});
+
+			foreach (var q in _trainingRepository.Trainings.First().Questions)
+			{
+				_questionRepository.SeedQuestion(q);
+			}
+
+			_userRepository.SeedUser(new TrainingUser
+			{
+				TrainingUserId = 1,
+				TrainingId = 1,
+				UserId = TestData.Users.TestUser1Id,
+				Viewed = true,
+				Complete = false
+			});
+
+			// Act - User gets 2 out of 3 correct (66.67%)
+			var result = await _trainingService.RecordTrainingQuizResultAsync(1, TestData.Users.TestUser1Id, 2);
+
+			// Assert
+			result.Should().NotBeNull();
+			result.Complete.Should().BeTrue();
+			result.CompletedOn.Should().NotBeNull();
+			result.Score.Should().BeApproximately(66.67, 0.1);
+		}
+
+		#endregion
+
+		#region ResetUserAsync Tests
+
+		[Test]
+		public async Task ResetUserAsync_Should_Reset_User_Progress()
+		{
+			// Arrange
+			_userRepository.SeedUser(new TrainingUser
+			{
+				TrainingUserId = 1,
+				TrainingId = 1,
+				UserId = TestData.Users.TestUser1Id,
+				Viewed = true,
+				ViewedOn = DateTime.UtcNow.AddDays(-1),
+				Complete = true,
+				CompletedOn = DateTime.UtcNow.AddDays(-1),
+				Score = 85.5
+			});
+
+			// Act
+			var result = await _trainingService.ResetUserAsync(1, TestData.Users.TestUser1Id);
+
+			// Assert
+			result.Should().NotBeNull();
+			result.Viewed.Should().BeFalse();
+			result.ViewedOn.Should().BeNull();
+			result.Complete.Should().BeFalse();
+			result.CompletedOn.Should().BeNull();
+			result.Score.Should().Be(0);
+		}
+
+		#endregion
+
+		#region GetTrainingUsersForUserAsync Tests
+
+		[Test]
+		public async Task GetTrainingUsersForUserAsync_Should_Return_User_Trainings()
+		{
+			// Arrange
+			_userRepository.SeedUser(new TrainingUser
+			{
+				TrainingUserId = 1,
+				TrainingId = 1,
+				UserId = TestData.Users.TestUser1Id,
+				Viewed = true
+			});
+			_userRepository.SeedUser(new TrainingUser
+			{
+				TrainingUserId = 2,
+				TrainingId = 2,
+				UserId = TestData.Users.TestUser1Id,
+				Viewed = false
+			});
+			_userRepository.SeedUser(new TrainingUser
+			{
+				TrainingUserId = 3,
+				TrainingId = 1,
+				UserId = TestData.Users.TestUser2Id,
+				Viewed = true
+			});
+
+			// Act
+			var result = await _trainingService.GetTrainingUsersForUserAsync(TestData.Users.TestUser1Id);
+
+			// Assert
+			result.Should().NotBeNull();
+			result.Should().HaveCount(2);
+			result.All(u => u.UserId == TestData.Users.TestUser1Id).Should().BeTrue();
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Web/Resgrid.Web/Areas/User/Controllers/TrainingsController.cs b/Web/Resgrid.Web/Areas/User/Controllers/TrainingsController.cs
index 5e90ab6c..8081234b 100644
--- a/Web/Resgrid.Web/Areas/User/Controllers/TrainingsController.cs
+++ b/Web/Resgrid.Web/Areas/User/Controllers/TrainingsController.cs
@@ -234,6 +234,239 @@ public async Task<IActionResult> View(int trainingId)
 			return View(model);
 		}
 
+		[HttpGet]
+		public async Task<IActionResult> Edit(int trainingId)
+		{
+			var training = await _trainingService.GetTrainingByIdAsync(trainingId);
+
+			if (training == null)
+				return NotFound();
+
+			if (training.DepartmentId != DepartmentId)
+				return Unauthorized();
+
+			var model = new EditTrainingModel();
+			model.Training = training;
+			model.ExistingUserIds = new List<string>();
+
+			if (training.Users != null)
+			{
+				foreach (var user in training.Users)
+				{
+					model.ExistingUserIds.Add(user.UserId);
+				}
+			}
+
+			return View(model);
+		}
+
+		[HttpPost]
+		public async Task<IActionResult> Edit(int trainingId, EditTrainingModel model, IFormCollection form, ICollection<IFormFile> attachments)
+		{
+			var existingTraining = await _trainingService.GetTrainingByIdAsync(trainingId);
+
+			if (existingTraining == null)
+				return NotFound();
+
+			if (existingTraining.DepartmentId != DepartmentId)
+				return Unauthorized();
+
+			if (attachments != null && attachments.Count > 0)
+			{
+				if (existingTraining.Attachments == null)
+					existingTraining.Attachments = new Collection<TrainingAttachment>();
+
+				foreach (var file in attachments)
+				{
+					if (file != null && file.Length > 0)
+					{
+var extension = System.IO.Path.GetExtension(file.FileName)?.TrimStart('.') ?? string.Empty;
+
+						if (!String.IsNullOrWhiteSpace(extension))
+							extension = extension.ToLower();
+
+						if (extension != "jpg" && extension != "jpeg" && extension != "png" && extension != "gif" &&
+							extension != "pdf" && extension != "doc"
+							&& extension != "docx" && extension != "ppt" && extension != "pptx" && extension != "pps" && extension != "ppsx" &&
+							extension != "odt"
+							&& extension != "xls" && extension != "xlsx" && extension != "txt" && extension != "mpg" && extension != "avi" &&
+							extension != "mpeg")
+							ModelState.AddModelError("fileToUpload", string.Format("File type ({0}) is not importable.", extension));
+
+						if (file.Length > 30000000)
+							ModelState.AddModelError("fileToUpload", "Attachment is too large, must be smaller then 30MB.");
+
+						var attachment = new TrainingAttachment();
+						attachment.FileType = file.ContentType;
+						attachment.FileName = file.FileName;
+						attachment.TrainingId = trainingId;
+
+using var stream = file.OpenReadStream();
+var uploadedFile = new byte[stream.Length];
+stream.Read(uploadedFile, 0, uploadedFile.Length);
+
+						attachment.Data = uploadedFile;
+						existingTraining.Attachments.Add(attachment);
+					}
+				}
+			}
+
+			// Handle adding new users (in addition to existing ones)
+			var roles = new List<string>();
+			var groups = new List<string>();
+			var users = new List<string>();
+
+			if (form.ContainsKey("rolesToAdd"))
+				roles.AddRange(form["rolesToAdd"].ToString().Split(char.Parse(",")));
+
+			if (form.ContainsKey("groupsToAdd"))
+				groups.AddRange(form["groupsToAdd"].ToString().Split(char.Parse(",")));
+
+			if (form.ContainsKey("usersToAdd"))
+				users.AddRange(form["usersToAdd"].ToString().Split(char.Parse(",")));
+
+			if (model.SendToAll)
+			{
+				var allUsers = await _departmentsService.GetAllUsersForDepartmentAsync(DepartmentId);
+				foreach (var user in allUsers)
+				{
+					if (existingTraining.Users == null)
+						existingTraining.Users = new List<TrainingUser>();
+
+					if (existingTraining.Users.All(x => x.UserId != user.UserId))
+					{
+						var trainingUser = new TrainingUser();
+						trainingUser.UserId = user.UserId;
+						existingTraining.Users.Add(trainingUser);
+					}
+				}
+			}
+			else
+			{
+				foreach (var user in users)
+				{
+					if (!string.IsNullOrWhiteSpace(user))
+					{
+						if (existingTraining.Users == null)
+							existingTraining.Users = new List<TrainingUser>();
+
+						if (existingTraining.Users.All(x => x.UserId != user))
+						{
+							var trainingUser = new TrainingUser();
+							trainingUser.UserId = user;
+							existingTraining.Users.Add(trainingUser);
+						}
+					}
+				}
+
+				foreach (var group in groups)
+				{
+					if (!string.IsNullOrWhiteSpace(group))
+					{
+						var members = await _departmentGroupsService.GetAllMembersForGroupAsync(int.Parse(group));
+
+						foreach (var member in members)
+						{
+							if (existingTraining.Users == null)
+								existingTraining.Users = new List<TrainingUser>();
+
+							if (existingTraining.Users.All(x => x.UserId != member.UserId))
+							{
+								var trainingUser = new TrainingUser();
+								trainingUser.UserId = member.UserId;
+								existingTraining.Users.Add(trainingUser);
+							}
+						}
+					}
+				}
+
+				foreach (var role in roles)
+				{
+					if (!string.IsNullOrWhiteSpace(role))
+					{
+						var roleMembers = await _personnelRolesService.GetAllMembersOfRoleAsync(int.Parse(role));
+
+						foreach (var member in roleMembers)
+						{
+							if (existingTraining.Users == null)
+								existingTraining.Users = new List<TrainingUser>();
+
+							if (existingTraining.Users.All(x => x.UserId != member.UserId))
+							{
+								var trainingUser = new TrainingUser();
+								trainingUser.UserId = member.UserId;
+								existingTraining.Users.Add(trainingUser);
+							}
+						}
+					}
+				}
+			}
+
+			if (ModelState.IsValid)
+			{
+				// Update basic properties
+				existingTraining.Name = model.Training.Name;
+				existingTraining.Description = System.Net.WebUtility.HtmlDecode(model.Training.Description);
+				existingTraining.TrainingText = System.Net.WebUtility.HtmlDecode(model.Training.TrainingText);
+				existingTraining.MinimumScore = model.Training.MinimumScore;
+				existingTraining.ToBeCompletedBy = model.Training.ToBeCompletedBy;
+				existingTraining.GroupsToAdd = form["groupsToAdd"];
+				existingTraining.RolesToAdd = form["rolesToAdd"];
+				existingTraining.UsersToAdd = form["usersToAdd"];
+
+				// Handle questions - remove existing and add new ones
+				existingTraining.Questions = null;
+
+				List<int> questions = (from object key in form.Keys where key.ToString().StartsWith("question_") select int.Parse(key.ToString().Replace("question_", ""))).ToList();
+
+				if (questions.Count > 0)
+					existingTraining.Questions = new Collection<TrainingQuestion>();
+
+				foreach (var i in questions)
+				{
+					if (form.ContainsKey("question_" + i))
+					{
+						var questionText = form["question_" + i];
+						var question = new TrainingQuestion();
+						question.Question = questionText;
+						question.TrainingId = trainingId;
+
+						List<int> answers = (from object key in form.Keys where key.ToString().StartsWith("answerForQuestion_" + i + "_") select int.Parse(key.ToString().Replace("answerForQuestion_" + i + "_", ""))).ToList();
+
+						if (answers.Count > 0)
+							question.Answers = new Collection<TrainingQuestionAnswer>();
+
+						foreach (var answer in answers)
+						{
+							var trainingQuestionAnswer = new TrainingQuestionAnswer();
+							var answerForQuestion = form["answerForQuestion_" + i + "_" + answer];
+
+							var possibleAnswer = form["answer_" + i];
+							trainingQuestionAnswer.Answer = answerForQuestion;
+							trainingQuestionAnswer.TrainingQuestionId = question.TrainingQuestionId;
+
+							if (!string.IsNullOrWhiteSpace(possibleAnswer))
+							{
+								if ("answerForQuestion_" + i + "_" + answer == possibleAnswer)
+									trainingQuestionAnswer.Correct = true;
+							}
+
+							question.Answers.Add(trainingQuestionAnswer);
+						}
+
+						existingTraining.Questions.Add(question);
+					}
+				}
+
+				await _trainingService.SaveAsync(existingTraining);
+
+				return RedirectToAction("Index");
+			}
+
+			model.Training = existingTraining;
+			return View(model);
+		}
+
 		[HttpGet]
 		public async Task<FileResult> GetTrainingAttachment(int trainingAttachmentId)
 		{
diff --git a/Web/Resgrid.Web/Areas/User/Models/Training/EditTrainingModel.cs b/Web/Resgrid.Web/Areas/User/Models/Training/EditTrainingModel.cs
new file mode 100644
index 00000000..9ac09c85
--- /dev/null
+++ b/Web/Resgrid.Web/Areas/User/Models/Training/EditTrainingModel.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using Resgrid.Model;
+
+using System.Collections.Generic;
+
+namespace Resgrid.Web.Areas.User.Models.Training
+{
+	public class EditTrainingModel
+	{
+		public Resgrid.Model.Training Training { get; set; }
+		public string Message { get; set; }
+		public bool SendToAll { get; set; }
+		public List<string> ExistingUserIds { get; set; }
+	}
+}
+}
\ No newline at end of file
diff --git a/Web/Resgrid.Web/Areas/User/Views/Home/Dashboard.cshtml b/Web/Resgrid.Web/Areas/User/Views/Home/Dashboard.cshtml
index e9312958..d88a1c73 100644
--- a/Web/Resgrid.Web/Areas/User/Views/Home/Dashboard.cshtml
+++ b/Web/Resgrid.Web/Areas/User/Views/Home/Dashboard.cshtml
@@ -222,8 +222,30 @@
   </div>
 </div>
 
-<div class="respondToACallWindow" id="respondToACallWindow"></div>
-<div class="respondToAStationWindow" id="respondToAStationWindow"></div>
+<div class="modal fade respondToACallWindow" tabindex="-1" role="dialog" id="respondToACallWindow">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">@localizer["RespondToCall"]</h4>
+      </div>
+      <div class="modal-body">
+      </div>
+    </div>
+  </div>
+</div>
+<div class="modal fade respondToAStationWindow" tabindex="-1" role="dialog" id="respondToAStationWindow">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">@localizer["RespondToStation"]</h4>
+      </div>
+      <div class="modal-body">
+      </div>
+    </div>
+  </div>
+</div>
 
 @section Scripts
 {
diff --git a/Web/Resgrid.Web/Areas/User/Views/Trainings/Edit.cshtml b/Web/Resgrid.Web/Areas/User/Views/Trainings/Edit.cshtml
new file mode 100644
index 00000000..4eefa1fa
--- /dev/null
+++ b/Web/Resgrid.Web/Areas/User/Views/Trainings/Edit.cshtml
@@ -0,0 +1,272 @@
+@using Resgrid.Model
+@model Resgrid.Web.Areas.User.Models.Training.EditTrainingModel
+@{
+	ViewBag.Title = "Resgrid | Edit Training";
+}
+
+<div class="row wrapper border-bottom white-bg page-heading">
+	<div class="col-sm-4">
+		<h2>Edit Training</h2>
+		<ol class="breadcrumb">
+			<li>
+				<a asp-controller="Home" asp-action="Dashboard" asp-route-area="User">Home</a>
+			</li>
+			<li>
+				<a asp-controller="Trainings" asp-action="Index" asp-route-area="User">Trainings</a>
+			</li>
+			<li class="active">
+				<strong>Edit Training</strong>
+			</li>
+		</ol>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-xs-12">
+		<div class="wrapper wrapper-content">
+			<div class="ibox float-e-margins">
+				<div class="ibox-content">
+					<form id="editTrainingForm" class="form-horizontal" role="form" asp-controller="Trainings" asp-action="Edit" asp-route-area="User" asp-route-trainingId="@Model.Training.TrainingId" method="post">
+
+						<div class="row">
+							<div class="col-md-8 col-md-offset-1">
+								@if (!String.IsNullOrEmpty(Model.Message))
+								{
+									<div class="alert alert-success">
+										@Model.Message
+									</div>
+								}
+								@Html.AntiForgeryToken()
+								<input type="hidden" asp-for="Training.TrainingId" />
+								<input type="hidden" asp-for="Training.CreatedByUserId" />
+								<input type="hidden" asp-for="Training.CreatedOn" />
+								<input type="hidden" asp-for="Training.DepartmentId" />
+								<div asp-validation-summary="All" class="text-danger"></div>
+							</div>
+						</div>
+
+						<div class="form-group">
+							<label class="col-sm-2 control-label required">
+								Training name
+							</label>
+							<div class="col-sm-10">
+								<div class="col-md-5">
+									@Html.TextBoxFor(m => m.Training.Name, new { @class = "form-control", autofocus = "autofocus" })
+								</div>
+							</div>
+						</div>
+						<div class="form-group">
+							<label class="col-sm-2 control-label required">
+								Description
+							</label>
+							<div class="col-sm-10">
+								<div class="col-md-6">
+									<input type="hidden" asp-for="Training.Description">
+						
+									<div id="editor-container" style="width:100%; height: 300px;">
+										@Html.Raw(Model.Training.Description)
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="form-group">
+							<label class="col-sm-2 control-label required">
+								Training Text
+							</label>
+							<div class="col-sm-10">
+								<div class="col-md-10">
+									<input type="hidden" asp-for="Training.TrainingText">
+						
+									<div id="editor-container2" style="width:100%; height: 300px;">
+										@Html.Raw(Model.Training.TrainingText)
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="form-group">
+							<label class="col-sm-2 control-label">
+								Minimum Score
+							</label>
+							<div class="col-sm-10">
+								<div class="col-md-2">
+									<div class="input-group input-group-sm">
+										@Html.TextBoxFor(m => m.Training.MinimumScore, new { @class = "form-control", type = "number", min = "0", max = "100" })
+										<span class="input-group-addon">%</span>
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="form-group">
+							<label class="col-sm-2 control-label">
+								Due Date
+							</label>
+							<div class="col-sm-10">
+								<div class="col-md-5">
+									@Html.TextBoxFor(m => m.Training.ToBeCompletedBy, new { @class = "form-control", onkeydown = "javascript:return false;" })
+								</div>
+							</div>
+						</div>
+
+						@if (Model.Training.Attachments != null && Model.Training.Attachments.Count > 0)
+						{
+							<div class="form-group">
+								<label class="col-sm-2 control-label">
+									Existing Attachments
+								</label>
+								<div class="col-sm-10">
+									<div class="col-md-8">
+										<ul class="list-unstyled">
+											@foreach (var attachment in Model.Training.Attachments)
+											{
+												<li>
+													<a asp-controller="Trainings" asp-action="GetTrainingAttachment" asp-route-area="User" asp-route-trainingAttachmentId="@attachment.TrainingAttachmentId" target="_blank">
+														<i class="fa fa-file"></i> @attachment.FileName
+													</a>
+												</li>
+											}
+										</ul>
+									</div>
+								</div>
+							</div>
+						}
+
+						<div class="form-group">
+							<label class="col-sm-2 control-label">
+								Add Attachments
+							</label>
+							<div class="col-sm-10">
+								<div class="col-md-5">
+									<input name="attachments" id="attachments" type="file" multiple />
+								</div>
+							</div>
+						</div>
+
+						<div class="form-group">
+							<label class="col-sm-2 control-label">
+								Currently Assigned
+							</label>
+							<div class="col-sm-10">
+								<div class="col-md-8">
+									<span class="help-block">@(Model.Training.Users?.Count ?? 0) user(s) currently assigned to this training.</span>
+								</div>
+							</div>
+						</div>
+
+						<div class="form-group">
+							<label class="col-sm-2 control-label">
+								Add all Personnel
+							</label>
+							<div class="col-sm-10">
+								<div class="row">
+									<div class="col-xs-4">
+										@Html.CheckBoxFor(m => m.SendToAll)
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="form-group">
+							<label class="col-sm-2 control-label">
+								Add Groups
+							</label>
+							<div class="col-sm-10">
+								<div class="row">
+									<div class="col-xs-4"><select id="groupsToAdd" name="groupsToAdd"></select></div>
+								</div>
+							</div>
+						</div>
+						<div class="form-group">
+							<label class="col-sm-2 control-label">
+								Add Roles
+							</label>
+							<div class="col-sm-10">
+								<div class="row">
+									<div class="col-xs-6"><select id="rolesToAdd" name="rolesToAdd"></select></div>
+								</div>
+							</div>
+						</div>
+						<div class="form-group">
+							<label class="col-sm-2 control-label">
+								Add Users
+							</label>
+							<div class="col-sm-10">
+								<div class="row">
+									<div class="col-xs-6"><select id="usersToAdd" name="usersToAdd"></select></div>
+								</div>
+							</div>
+						</div>
+
+						<div class="form-group">
+							<label class="col-sm-2 control-label">
+								Questions
+							</label>
+							<div class="col-sm-10">
+								<div class="row">
+									<div class="col-xs-10">Questions are optional, if you just want your personnel to view the training that will be tracked without questions. <br /></div>
+								</div>
+								<div class="row">
+									<div class="col-xs-12">
+										<table id="questions" class="table table-striped table-bordered">
+											<thead>
+												<tr>
+													<th style="max-width: 200px;font-size: 14px;">Question</th>
+													<th style="max-width: 350px;font-size: 14px;">Answers</th>
+													<th style="max-width: 90px;font-size: 16px;"><a id="addQuestionButton" class="btn btn-success btn-xs" onclick="resgrid.training.edittraining.addQuestion();" data-original-title="Add Question"><i class="icon-plus"></i> Add Question</a></th>
+												</tr>
+											</thead>
+											<tbody>
+												@{ var qIndex = 0; }
+												@if (Model.Training.Questions != null)
+												{
+													foreach (var question in Model.Training.Questions)
+													{
+														<tr id="questionRow_@qIndex">
+															<td>
+																<input type="hidden" name="questionId_@qIndex" value="@question.TrainingQuestionId" />
+																<input type="text" name="question_@qIndex" value="@question.Question" class="form-control" />
+															</td>
+															<td>
+																@{ var aIndex = 0; }
+																@if (question.Answers != null)
+																{
+																	foreach (var answer in question.Answers)
+																	{
+																		<div style="margin-bottom: 5px;">
+																			<input type="radio" name="answer_@(qIndex)" value="answerForQuestion_@(qIndex)_@(aIndex)" @(answer.Correct ? "checked" : "") /> Correct
+																			<input type="text" name="answerForQuestion_@(qIndex)_@(aIndex)" value="@answer.Answer" class="form-control" style="display:inline-block; width:auto;" />
+																		</div>
+																		aIndex++;
+																	}
+																}
+															</td>
+															<td>
+																<a class="btn btn-xs btn-danger" onclick="resgrid.training.edittraining.removeQuestion(@qIndex);"><i class="icon-trash"></i> Remove</a>
+															</td>
+														</tr>
+														qIndex++;
+													}
+												}
+											</tbody>
+										</table>
+									</div>
+								</div>
+							</div>
+						</div>
+
+						<div class="form-group">
+							<div class="col-sm-4 col-sm-offset-2">
+								<a class="btn btn-white" asp-controller="Trainings" asp-action="Index" asp-route-area="User">Cancel</a>
+								<button class="btn btn-primary" type="submit">Save Training</button>
+							</div>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+
+@section Scripts
+{
+	<script src="~/js/app/internal/training/resgrid.training.edittraining.js"></script>
+}
\ No newline at end of file
diff --git a/Web/Resgrid.Web/Areas/User/Views/Trainings/Index.cshtml b/Web/Resgrid.Web/Areas/User/Views/Trainings/Index.cshtml
index 4a800b19..7a168ef8 100644
--- a/Web/Resgrid.Web/Areas/User/Views/Trainings/Index.cshtml
+++ b/Web/Resgrid.Web/Areas/User/Views/Trainings/Index.cshtml
@@ -104,6 +104,9 @@
                     <td>
                       @if (ClaimsAuthorizationHelper.IsUserDepartmentAdmin())
 					  {
+                        <a href="@Url.Action("Edit", "Trainings", new { area = "User", trainingId = t.TrainingId })" class='btn btn-xs btn-info'>
+                          <i class='icon-pencil'></i> Edit
+                        </a>
                         <a href="@Url.Action("Report", "Trainings", new { area = "User", trainingId = t.TrainingId })" class='btn btn-xs btn-primary'>
                           <i class='icon-eye-open'></i> Report
                         </a>
diff --git a/Web/Resgrid.Web/wwwroot/js/app/internal/training/resgrid.training.edittraining.js b/Web/Resgrid.Web/wwwroot/js/app/internal/training/resgrid.training.edittraining.js
new file mode 100644
index 00000000..d58e7bd2
--- /dev/null
+++ b/Web/Resgrid.Web/wwwroot/js/app/internal/training/resgrid.training.edittraining.js
@@ -0,0 +1,105 @@
+var resgrid;
+(function (resgrid) {
+    var training;
+    (function (training) {
+        var edittraining;
+        (function (edittraining) {
+            $(document).ready(function () {
+                resgrid.common.analytics.track('Training - Edit');
+
+                var quillDescription = new Quill('#editor-container', {
+                    placeholder: '',
+                    theme: 'snow'
+                });
+
+                var quillTraining = new Quill('#editor-container2', {
+                    placeholder: '',
+                    theme: 'snow'
+                });
+
+                $(document).on('submit', '#editTrainingForm', function () {
+                    $('#Training_Description').val(quillDescription.root.innerHTML);
+                    $('#Training_TrainingText').val(quillTraining.root.innerHTML);
+
+                    return true;
+                });
+
+                // Date picker - no time needed
+                $('#Training_ToBeCompletedBy').datetimepicker({
+                    timepicker: false,
+                    format: 'm/d/Y',
+                    scrollMonth: false,
+                    scrollInput: false
+                });
+
+                // File upload: use native HTML file input (no Kendo Upload needed)
+
+                $('#SendToAll').change(function () {
+                    if (this.checked) {
+                        $('#groupsToAdd').prop('disabled', true).trigger('change.select2');
+                        $('#rolesToAdd').prop('disabled', true).trigger('change.select2');
+                        $('#usersToAdd').prop('disabled', true).trigger('change.select2');
+                    } else {
+                        $('#groupsToAdd').prop('disabled', false).trigger('change.select2');
+                        $('#rolesToAdd').prop('disabled', false).trigger('change.select2');
+                        $('#usersToAdd').prop('disabled', false).trigger('change.select2');
+                    }
+                });
+
+                function initSelect2(selector, placeholder, url) {
+                    $(selector).select2({
+                        placeholder: placeholder,
+                        allowClear: true,
+                        ajax: {
+                            url: url,
+                            dataType: 'json',
+                            processResults: function (data) {
+                                return {
+                                    results: $.map(data, function (item) {
+                                        return { id: item.Id, text: item.Name };
+                                    })
+                                };
+                            }
+                        }
+                    });
+                }
+
+                initSelect2('#groupsToAdd', 'Select groups...', resgrid.absoluteBaseUrl + '/User/Department/GetRecipientsForGrid?filter=1');
+                initSelect2('#rolesToAdd', 'Select roles...', resgrid.absoluteBaseUrl + '/User/Department/GetRecipientsForGrid?filter=2');
+                initSelect2('#usersToAdd', 'Select users...', resgrid.absoluteBaseUrl + '/User/Department/GetRecipientsForGrid?filter=3&filterSelf=true');
+                resgrid.training.edittraining.questionsCount = 0;
+            });
+            function addQuestion() {
+                resgrid.training.edittraining.questionsCount++;
+                $('#questions tbody').first().append("<tr><td style='max-width: 215px;'><textarea id='question_" + edittraining.questionsCount + "' name='question_" + edittraining.questionsCount + "' rows='4' cols='40'></textarea></td><td>" + resgrid.training.edittraining.generateAnswersTable(edittraining.questionsCount) + "</td><td style='text-align:center;'><a onclick='$(this).parent().parent().remove();' class='tip-top' data-original-title='Remove this question'><i class='fa fa-minus' style='color: red;'></i></a></td></tr>");
+            }
+            edittraining.addQuestion = addQuestion;
+            function generateAnswersTable(count) {
+                var answersTable = '<table id="answersTable_' + count + '" class="table table-striped table-bordered"><thead><tr><th style="max-width:35px;font-size: 14px;" >Ans</th><th style = "font-size: 14px;" >Answer Text</th><th style = "font-size: 16px;" ><a id="addAnswerButton" class="btn btn-success btn-xs" onclick="resgrid.training.edittraining.addAnswer(' + count + ');" data-original-title="Add Answers to Question" ><i class="icon-plus" ></i> Add Answer</a></th></tr></thead><tbody></tbody></table>';
+                return answersTable;
+            }
+            edittraining.generateAnswersTable = generateAnswersTable;
+            function addAnswer(count) {
+                var id = generate(4);
+                $('#answersTable_' + count + ' tbody').append("<tr><td><input type='radio' name='answer_" + count + "' value='answerForQuestion_" + count + "_" + id + "'></td><td><textarea rows='3' cols='30' data-bv-notempty data-bv-notempty-message='Answer is required' id='answerForQuestion_" + count + "_" + id + "' name='answerForQuestion_" + count + "_" + id + "'></textarea></td><td style='text-align:center;'><a onclick='$(this).parent().parent().remove();' class='tip-top' data-original-title='Remove this answer from the question'><i class='fa fa-minus' style='color: red;'></i></a></td></tr>");
+            }
+            edittraining.addAnswer = addAnswer;
+            function removeQuestion(index) {
+                $('#questionRow_' + index).remove();
+            }
+            edittraining.removeQuestion = removeQuestion;
+            function generate(length) {
+                var arr = [];
+                var n;
+                for (var i = 0; i < length; i++) {
+                    do
+                        n = Math.floor(Math.random() * 20 + 1);
+                    while (arr.indexOf(n) !== -1);
+                    arr[i] = n;
+                }
+                return arr.join('');
+            }
+            edittraining.generate = generate;
+        })(edittraining = training.edittraining || (training.edittraining = {}));
+    })(training = resgrid.training || (resgrid.training = {}));
+})(resgrid || (resgrid = {}));
\ No newline at end of file