diff --git a/StudentHouseDashboard/Data/AnnouncementRepository.cs b/StudentHouseDashboard/Data/AnnouncementRepository.cs index f97bb8c..8708a47 100644 --- a/StudentHouseDashboard/Data/AnnouncementRepository.cs +++ b/StudentHouseDashboard/Data/AnnouncementRepository.cs @@ -156,7 +156,7 @@ namespace Data UserRepository userRepository = new UserRepository(); StringBuilder sql = new StringBuilder(); sql.Append("SELECT * FROM Announcements "); - string[] searchStrings = query.Trim().Split(' '); + string[] searchStrings = query.Split(' '); for (int i = 0; i < searchStrings.Length; i++) { if (i == 0) diff --git a/StudentHouseDashboard/Data/CommentRepository.cs b/StudentHouseDashboard/Data/CommentRepository.cs index 53eb699..495dd9a 100644 --- a/StudentHouseDashboard/Data/CommentRepository.cs +++ b/StudentHouseDashboard/Data/CommentRepository.cs @@ -207,4 +207,37 @@ public class CommentRepository : ICommentRepository } DeleteComment(commentId); } + + public void CreateCommentOnComplaint(User author, string description, string title, DateTime publishDate, int complaintId) + { + + } + + public List GetAllCommentsOnComplaint(int complaintId) + { + List comments = new List(); + using (SqlConnection connection = SqlConnectionHelper.CreateConnection()) + { + string sql = "SELECT c.ID, c.Author, c.Description, c.Title, c.PublishDate, " + + "u.ID UserID, u.Name UserName, u.Password, u.Role FROM ComplaintsComments cc " + + "INNER JOIN Comments c ON c.ID = cc.CommentID " + + "INNER JOIN Users u ON u.ID = c.Author " + + "WHERE cc.ComplaintID = @complaintID"; + SqlCommand sqlCommand = new SqlCommand(sql, connection); + sqlCommand.Parameters.AddWithValue("@complaintID", complaintId); + var reader = sqlCommand.ExecuteReader(); + while (reader.Read()) + { + Comment newComment = new Comment((int)reader["ID"], + new User((int)reader["UserID"], reader["UserName"].ToString(), + reader["Password"].ToString(), (UserRole)reader["Role"]), + reader["Description"].ToString(), reader["Title"].ToString(), + (DateTime)reader["PublishDate"]); + newComment.Responses = GetAllCommentResponses(newComment.ID); + comments.Add(newComment); + } + } + + return comments; + } } \ No newline at end of file diff --git a/StudentHouseDashboard/Data/ComplaintRepository.cs b/StudentHouseDashboard/Data/ComplaintRepository.cs new file mode 100644 index 0000000..3e4c8d2 --- /dev/null +++ b/StudentHouseDashboard/Data/ComplaintRepository.cs @@ -0,0 +1,192 @@ +using Logic; +using Logic.Exceptions; +using Models; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Data +{ + public class ComplaintRepository : IComplaintRepository + { + public ComplaintRepository() + { + + } + public List GetAllComplaints() + { + List complaints = new List(); + UserRepository userRepository = new UserRepository(); + using (SqlConnection conn = SqlConnectionHelper.CreateConnection()) + { + string sql = "SELECT * FROM Complaints;"; + SqlCommand cmd = new SqlCommand(sql, conn); + var reader = cmd.ExecuteReader(); + + while (reader.Read()) + { + Complaint complaint = new Complaint(Convert.ToInt32(reader["ID"]), + userRepository.GetUserById(Convert.ToInt32(reader["Author"])), + reader["Description"].ToString(), reader["Title"].ToString(), + (DateTime)reader["PublishDate"], (ComplaintStatus)reader["Status"], + (ComplaintSeverity)reader["Severity"]); + CommentRepository commentRepository = new CommentRepository(); + complaint.Responses = commentRepository.GetAllCommentsOnComplaint(complaint.ID); + // ID, Name, Password, Role + complaints.Add(complaint); + } + conn.Close(); + } + return complaints; + } + public Complaint GetComplaintById(int id) + { + UserRepository userRepository = new UserRepository(); + using (SqlConnection conn = SqlConnectionHelper.CreateConnection()) + { + string sql = "SELECT * FROM Complaints WHERE ID = @id;"; + SqlCommand cmd = new SqlCommand(sql, conn); + cmd.Parameters.AddWithValue("id", id); + var reader = cmd.ExecuteReader(); + reader.Read(); + Complaint complaint = new Complaint(Convert.ToInt32(reader["ID"]), + userRepository.GetUserById(Convert.ToInt32(reader["Author"])), + reader["Description"].ToString(), reader["Title"].ToString(), + (DateTime)reader["PublishDate"], (ComplaintStatus)reader["Status"], + (ComplaintSeverity)reader["Severity"]); + CommentRepository commentRepository = new CommentRepository(); + complaint.Responses = commentRepository.GetAllCommentsOnComplaint(complaint.ID); + conn.Close(); + return complaint; + } + } + public List GetComplaintsByPage(int userId, int p, int c) + { + List complaints = new List(); + UserRepository userRepository = new UserRepository(); + User user = userRepository.GetUserById(userId); + string sql = "SELECT * FROM Complaints ORDER BY ID DESC OFFSET @start ROWS FETCH NEXT @count ROWS ONLY;"; + if (user.Role == UserRole.TENANT) + { + sql = $"SELECT * FROM Complaints WHERE Author = {userId} ORDER BY ID DESC OFFSET @start ROWS FETCH NEXT @count ROWS ONLY;"; + } + if (c == null) + { + throw new DatabaseOperationException("Get complaints: Invalid item count"); + } + if (p == null) + { + throw new DatabaseOperationException("Get complaints: Invalid page number"); + } + using (SqlConnection conn = SqlConnectionHelper.CreateConnection()) + { + + SqlCommand sqlCommand = new SqlCommand(sql, conn); + sqlCommand.Parameters.AddWithValue("@start", p * c); + sqlCommand.Parameters.AddWithValue("@count", c); + var reader = sqlCommand.ExecuteReader(); + while (reader.Read()) + { + complaints.Add(new Complaint(Convert.ToInt32(reader["ID"]), + userRepository.GetUserById(Convert.ToInt32(reader["Author"])), + reader["Description"].ToString(), reader["Title"].ToString(), + (DateTime)reader["PublishDate"], (ComplaintStatus)reader["Status"], + (ComplaintSeverity)reader["Severity"])); + } + + } + return complaints; + } + public Complaint CreateComplaint(string title, string description, User author, DateTime publishDate, ComplaintStatus status, ComplaintSeverity severity) + { + using (SqlConnection conn = SqlConnectionHelper.CreateConnection()) + { + string sql = "INSERT INTO Complaints (Author, Description, Title, PublishDate, Status, Severity) VALUES (@author, @desc, @title, @date, @status, @severity) " + + "SELECT SCOPE_IDENTITY();"; + SqlCommand cmd = new SqlCommand(sql, conn); + cmd.Parameters.AddWithValue("@author", author.ID); + cmd.Parameters.AddWithValue("@desc", description); + cmd.Parameters.AddWithValue("@title", title); + cmd.Parameters.AddWithValue("@date", publishDate); + cmd.Parameters.AddWithValue("@status", (int)status); + cmd.Parameters.AddWithValue("@severity", (int)severity); + int newId = Convert.ToInt32(cmd.ExecuteScalar()); + if (newId == 0) + { + throw new DatabaseOperationException("Database error: Complaint not created"); + } + else + { + return GetComplaintById(newId); + } + } + } + public void UpdateComplaint(int id, string title, string description, ComplaintStatus status, ComplaintSeverity severity) + { + using (SqlConnection conn = SqlConnectionHelper.CreateConnection()) + { + string sql = "UPDATE Complaints " + + "SET Description = @desc, Title = @title, Status = @status, Severity = @severity " + + "WHERE ID = @id " + + "SELECT SCOPE_IDENTITY();"; + SqlCommand cmd = new SqlCommand(sql, conn); + cmd.Parameters.AddWithValue("@id", id); + cmd.Parameters.AddWithValue("@desc", description); + cmd.Parameters.AddWithValue("@title", title); + cmd.Parameters.AddWithValue("@status", (int)status); + cmd.Parameters.AddWithValue("@severity", (int)severity); + var writer = cmd.ExecuteNonQuery(); + if (writer == -1) + { + throw new DatabaseOperationException("Database error: Complaint not created"); + } + } + } + + public List SearchComplaint(string query) + { + if (string.IsNullOrEmpty(query)) + { + throw new DatabaseOperationException("Search complaints error: Search query is empty"); + } + List complaints = new List(); + UserRepository userRepository = new UserRepository(); + StringBuilder sql = new StringBuilder(); + sql.Append("SELECT * FROM Complaints "); + string[] searchStrings = query.Split(' '); + for (int i = 0; i < searchStrings.Length; i++) + { + if (i == 0) + { + sql.Append($"WHERE Title LIKE @query{i} OR Description LIKE @query{i} "); + } + else + { + sql.Append($"OR Title LIKE @query{i} OR Description LIKE @query{i} "); + } + } + sql.Append(';'); + using (SqlConnection conn = SqlConnectionHelper.CreateConnection()) + { + SqlCommand sqlCommand = new SqlCommand(sql.ToString(), conn); + for (int i = 0; i < searchStrings.Length; i++) + { + sqlCommand.Parameters.AddWithValue($"@query{i}", $"%{searchStrings[i]}%"); + } + var reader = sqlCommand.ExecuteReader(); + while (reader.Read()) + { + complaints.Add(new Complaint(Convert.ToInt32(reader["ID"]), + userRepository.GetUserById(Convert.ToInt32(reader["Author"])), + reader["Description"].ToString(), reader["Title"].ToString(), + (DateTime)reader["PublishDate"], (ComplaintStatus)reader["Status"], + (ComplaintSeverity)reader["Severity"])); + } + } + return complaints; + } + } +} diff --git a/StudentHouseDashboard/Logic/AnnouncementManager.cs b/StudentHouseDashboard/Logic/AnnouncementManager.cs index 78c178b..2874e95 100644 --- a/StudentHouseDashboard/Logic/AnnouncementManager.cs +++ b/StudentHouseDashboard/Logic/AnnouncementManager.cs @@ -53,13 +53,16 @@ namespace Logic DateTime date; if (DateTime.TryParse(match.Groups[0].Value, out date)) { - query = Regex.Replace(query, "date:[0-9]{4}-[0-9]{2}-[0-9]{2}", ""); + query = Regex.Replace(query, "date:[0-9]{4}-[0-9]{2}-[0-9]{2}", "").Trim(); if (string.IsNullOrEmpty(query)) { + // search only by date return announcementRepository.GetAllAnnouncements().Where(x => x.PublishDate.Date == date.Date).ToList(); } + // search by date and keywords else return announcementRepository.SearchAnnouncement(query).Where(x => x.PublishDate.Date == date.Date).ToList(); } + // search by keywords else return announcementRepository.SearchAnnouncement(query); } } diff --git a/StudentHouseDashboard/Logic/ComplaintManager.cs b/StudentHouseDashboard/Logic/ComplaintManager.cs new file mode 100644 index 0000000..a595710 --- /dev/null +++ b/StudentHouseDashboard/Logic/ComplaintManager.cs @@ -0,0 +1,42 @@ +using Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Logic +{ + public class ComplaintManager + { + private IComplaintRepository complaintRepository; + public ComplaintManager(IComplaintRepository complaintRepository) + { + this.complaintRepository = complaintRepository; + } + public List GetAllComplaints() + { + return complaintRepository.GetAllComplaints(); + } + public Complaint GetComplaintById(int id) + { + return complaintRepository.GetComplaintById(id); + } + public List GetComplaintsByPage(int userId, int p, int c) + { + return complaintRepository.GetComplaintsByPage(userId, p, c); + } + public Complaint CreateComplaint(string title, string description, User author, DateTime publishDate, ComplaintStatus status, ComplaintSeverity severity) + { + return complaintRepository.CreateComplaint(title, description, author, publishDate, status, severity); + } + public void UpdateComplaint(int id, string title, string description, ComplaintStatus status, ComplaintSeverity severity) + { + complaintRepository.UpdateComplaint(id, title, description, status, severity); + } + public List SearchComplaint(string query) + { + return complaintRepository.SearchComplaint(query); + } + } +} diff --git a/StudentHouseDashboard/Logic/ICommentRepository.cs b/StudentHouseDashboard/Logic/ICommentRepository.cs index 436d3d4..9217df7 100644 --- a/StudentHouseDashboard/Logic/ICommentRepository.cs +++ b/StudentHouseDashboard/Logic/ICommentRepository.cs @@ -7,11 +7,13 @@ namespace Logic; public interface ICommentRepository { public List GetAllCommentsOnAnnouncement(int announcementId); + public List GetAllCommentsOnComplaint(int complaintId); public List GetAllCommentResponses(int commentId); public Comment GetCommentById(int id); public void UpdateComment(int id, string description); public Comment CreateComment(User author, string description, string title, DateTime publishDate); public void CreateCommentOnAnnouncement(User author, string description, string title, DateTime publishDate, int announcementId); + public void CreateCommentOnComplaint(User author, string description, string title, DateTime publishDate, int complaintId); public void CreateResponseOnComment(User author, string description, string title, DateTime publishDate, int commentId); public void DeleteComment(int id); public void DeleteCommentOnAnnouncement(int commentId, int announcementId); diff --git a/StudentHouseDashboard/Logic/IComplaintRepository.cs b/StudentHouseDashboard/Logic/IComplaintRepository.cs new file mode 100644 index 0000000..1f7260a --- /dev/null +++ b/StudentHouseDashboard/Logic/IComplaintRepository.cs @@ -0,0 +1,20 @@ +using Logic.Exceptions; +using Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Logic +{ + public interface IComplaintRepository + { + public List GetAllComplaints(); + public Complaint GetComplaintById(int id); + public List GetComplaintsByPage(int userId, int p, int c); + public Complaint CreateComplaint(string title, string description, User author, DateTime publishDate, ComplaintStatus status, ComplaintSeverity severity); + public void UpdateComplaint(int id, string title, string description, ComplaintStatus status, ComplaintSeverity severity); + public List SearchComplaint(string query); + } +} diff --git a/StudentHouseDashboard/Logic/UserManager.cs b/StudentHouseDashboard/Logic/UserManager.cs index 7479b01..6277289 100644 --- a/StudentHouseDashboard/Logic/UserManager.cs +++ b/StudentHouseDashboard/Logic/UserManager.cs @@ -33,12 +33,12 @@ namespace Logic } public User? AuthenticatedUser(string name, string password) { + if (string.IsNullOrEmpty(name) || string.IsNullOrEmpty(password)) + { + throw new ArgumentException("Name or password should not be empty!"); + } List users = userRepository.GetAllUsers(); User? user = users.Find(x => x.Name == name); - if (name == null || password == null) - { - throw new ArgumentNullException(); - } if (user != null && BCrypt.Net.BCrypt.Verify(password, user.Password)) { return user; @@ -57,12 +57,16 @@ namespace Logic } if (string.IsNullOrEmpty(name) || string.IsNullOrEmpty(password)) { - throw new ArgumentException("Name or password should not be empty"); + throw new ArgumentException("Name or password should not be empty!"); } return userRepository.CreateUser(name, password, role); } public void UpdateUser(int id, string name, string password, UserRole role) { + if (string.IsNullOrEmpty(name) || string.IsNullOrEmpty(password)) + { + throw new ArgumentException("Name or password should not be empty!"); + } userRepository.UpdateUser(id, name, password, role); } public void DisableUser(int id) diff --git a/StudentHouseDashboard/Models/Complaint.cs b/StudentHouseDashboard/Models/Complaint.cs index 83a728e..f47a582 100644 --- a/StudentHouseDashboard/Models/Complaint.cs +++ b/StudentHouseDashboard/Models/Complaint.cs @@ -7,6 +7,10 @@ namespace Models { public class Complaint : GenericMessage { + public Complaint() + { + + } public Complaint(int id, User author, string description, string title, DateTime publishDate, ComplaintStatus status, ComplaintSeverity severity) : base(id, author, description, title, publishDate) { Status = status; @@ -27,5 +31,9 @@ namespace Models { get;set; } + public override string ToString() + { + return $"({PublishDate.ToString("d")} - {Author.Name}) {Title}"; + } } } \ No newline at end of file diff --git a/StudentHouseDashboard/Models/ComplaintSeverity.cs b/StudentHouseDashboard/Models/ComplaintSeverity.cs index d2ebd96..0323eb6 100644 --- a/StudentHouseDashboard/Models/ComplaintSeverity.cs +++ b/StudentHouseDashboard/Models/ComplaintSeverity.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; @@ -7,9 +8,13 @@ namespace Models { public enum ComplaintSeverity { + [Description("Low")] LOW, + [Description("Normal")] NORMAL, + [Description("High")] HIGH, + [Description("Urgent")] URGENT } } \ No newline at end of file diff --git a/StudentHouseDashboard/Models/ComplaintStatus.cs b/StudentHouseDashboard/Models/ComplaintStatus.cs index d6b790b..712f9cd 100644 --- a/StudentHouseDashboard/Models/ComplaintStatus.cs +++ b/StudentHouseDashboard/Models/ComplaintStatus.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; @@ -7,9 +8,13 @@ namespace Models { public enum ComplaintStatus { + [Description("Filed")] FILED, + [Description("Under review")] UNDER_REVIEW, + [Description("Solved")] SOLVED, + [Description("Archived")] ARCHIVED } } \ No newline at end of file diff --git a/StudentHouseDashboard/Models/GenericMessage.cs b/StudentHouseDashboard/Models/GenericMessage.cs index f6d087d..30e86ab 100644 --- a/StudentHouseDashboard/Models/GenericMessage.cs +++ b/StudentHouseDashboard/Models/GenericMessage.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; @@ -32,6 +33,7 @@ namespace Models { get;set; } + [StringLength(255)] public string Title { get;set; diff --git a/StudentHouseDashboard/Models/User.cs b/StudentHouseDashboard/Models/User.cs index 9febc1b..08f65b3 100644 --- a/StudentHouseDashboard/Models/User.cs +++ b/StudentHouseDashboard/Models/User.cs @@ -25,7 +25,7 @@ namespace Models { get; set; } - + [StringLength(255)] public string Name { get; set; diff --git a/StudentHouseDashboard/Models/UserRole.cs b/StudentHouseDashboard/Models/UserRole.cs index 542e350..44d2522 100644 --- a/StudentHouseDashboard/Models/UserRole.cs +++ b/StudentHouseDashboard/Models/UserRole.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; @@ -8,11 +9,11 @@ namespace Models { public enum UserRole { - [Display(Name = "Tenant")] + [Description("Tenant")] TENANT, - [Display(Name = "Manager")] + [Description("Manager")] MANAGER, - [Display(Name = "Administrator")] + [Description("Administrator")] ADMIN } } \ No newline at end of file diff --git a/StudentHouseDashboard/Tests/UserManagerTest.cs b/StudentHouseDashboard/Tests/UserManagerTest.cs index 525eef2..b7496b7 100644 --- a/StudentHouseDashboard/Tests/UserManagerTest.cs +++ b/StudentHouseDashboard/Tests/UserManagerTest.cs @@ -28,7 +28,7 @@ namespace Tests } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] + [ExpectedException(typeof(ArgumentException))] public void AuthenticatedUserNullPasswordTest() { // Arrange diff --git a/StudentHouseDashboard/WebApp/Pages/Complaints.cshtml b/StudentHouseDashboard/WebApp/Pages/Complaints.cshtml new file mode 100644 index 0000000..962a851 --- /dev/null +++ b/StudentHouseDashboard/WebApp/Pages/Complaints.cshtml @@ -0,0 +1,76 @@ +@page +@using Models; +@using System.Security.Claims; +@model WebApp.Pages.ComplaintsModel +@{ + ViewData["Title"] = "Complaints"; + List complaints = ((List)ViewData["complaints"]).ToList(); + int currentPage = 0; + if (ViewData["page"] != null) + { + currentPage = Convert.ToInt32(ViewData["page"]); + } +} + +Create new complaint + +
+ @foreach (Complaint complaint in complaints) + { +
+
+
@complaint.Title
+
@complaint.Status
+
@complaint.Author.Name
+

@complaint.Description.PadRight(100).Substring(0,100).Trim()

+ More details +
+
+ } +
+ +@if (ViewData["page"] != null) +{ + +} \ No newline at end of file diff --git a/StudentHouseDashboard/WebApp/Pages/Complaints.cshtml.cs b/StudentHouseDashboard/WebApp/Pages/Complaints.cshtml.cs new file mode 100644 index 0000000..6f1cb2c --- /dev/null +++ b/StudentHouseDashboard/WebApp/Pages/Complaints.cshtml.cs @@ -0,0 +1,38 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Logic; +using Models; +using System.Security.Claims; + +namespace WebApp.Pages +{ + [Authorize] + public class ComplaintsModel : PageModel + { + public ComplaintManager ComplaintManager { get; set; } + private readonly IComplaintRepository _complaintRepository; + + public ComplaintsModel(IComplaintRepository complaintRepository) + { + _complaintRepository = complaintRepository; + } + + public void OnGet(int? p, int? c) // page, count + { + ComplaintManager = new ComplaintManager(_complaintRepository); + if (!(p < 0)) + { + p = 1; + } + if (!(c < 1)) + { + c = 10; + } + ViewData.Add("complaints", ComplaintManager.GetComplaintsByPage(int.Parse(User.FindFirstValue("id")), p.Value - 1, c.Value)); + ViewData.Add("page", p); + ViewData.Add("count", c); + ViewData.Add("allCount", ComplaintManager.GetAllComplaints().Count); + } + } +} diff --git a/StudentHouseDashboard/WebApp/Pages/CreateComplaint.cshtml b/StudentHouseDashboard/WebApp/Pages/CreateComplaint.cshtml new file mode 100644 index 0000000..99dc4f6 --- /dev/null +++ b/StudentHouseDashboard/WebApp/Pages/CreateComplaint.cshtml @@ -0,0 +1,24 @@ +@page +@using Models; +@model WebApp.Pages.CreateComplaintModel +@{ + ViewData["Title"] = "Create complaint"; +} + +

@ViewData["Title"]

+ +
+
+ + +
+
+ + +
+ +
\ No newline at end of file diff --git a/StudentHouseDashboard/WebApp/Pages/CreateComplaint.cshtml.cs b/StudentHouseDashboard/WebApp/Pages/CreateComplaint.cshtml.cs new file mode 100644 index 0000000..98e11b9 --- /dev/null +++ b/StudentHouseDashboard/WebApp/Pages/CreateComplaint.cshtml.cs @@ -0,0 +1,28 @@ +using Data; +using Logic; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Models; +using System.Security.Claims; + +namespace WebApp.Pages +{ + [Authorize] + public class CreateComplaintModel : PageModel + { + [BindProperty] + public Complaint Complaint { get; set; } + public void OnGet() + { + } + public IActionResult OnPost() + { + ComplaintManager complaintManager = new ComplaintManager(new ComplaintRepository()); + UserManager userManager = new UserManager(new UserRepository()); + User user = userManager.GetUserById(int.Parse(User.FindFirstValue("id"))); + complaintManager.CreateComplaint(Complaint.Title, Complaint.Description, user, DateTime.Now, ComplaintStatus.FILED, Complaint.Severity); + return RedirectToPage("Complaints"); + } + } +} diff --git a/StudentHouseDashboard/WebApp/Pages/Shared/_Layout.cshtml b/StudentHouseDashboard/WebApp/Pages/Shared/_Layout.cshtml index 6113aee..ae71aba 100644 --- a/StudentHouseDashboard/WebApp/Pages/Shared/_Layout.cshtml +++ b/StudentHouseDashboard/WebApp/Pages/Shared/_Layout.cshtml @@ -27,6 +27,9 @@
  • Announcements
    • +
  • + Complaints +
    • }
      diff --git a/StudentHouseDashboard/WebApp/Program.cs b/StudentHouseDashboard/WebApp/Program.cs index 70b2416..06e2107 100644 --- a/StudentHouseDashboard/WebApp/Program.cs +++ b/StudentHouseDashboard/WebApp/Program.cs @@ -21,6 +21,7 @@ namespace WebApp builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); + builder.Services.AddScoped(); var app = builder.Build(); diff --git a/StudentHouseDashboard/WinForms/ComplaintForm.Designer.cs b/StudentHouseDashboard/WinForms/ComplaintForm.Designer.cs new file mode 100644 index 0000000..31b87bc --- /dev/null +++ b/StudentHouseDashboard/WinForms/ComplaintForm.Designer.cs @@ -0,0 +1,237 @@ +namespace WinForms +{ + partial class ComplaintForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + lblTitle = new Label(); + tbTitle = new TextBox(); + lblDescription = new Label(); + tbDescription = new TextBox(); + lblPublishDate = new Label(); + btnSave = new Button(); + dtpPublishDate = new DateTimePicker(); + lblAuthor = new Label(); + lblComments = new Label(); + listBox1 = new ListBox(); + btnViewComment = new Button(); + btnEditComment = new Button(); + btnDeleteComment = new Button(); + btnCreateComment = new Button(); + cbStatus = new ComboBox(); + cbSeverity = new ComboBox(); + SuspendLayout(); + // + // lblTitle + // + lblTitle.AutoSize = true; + lblTitle.Location = new Point(12, 9); + lblTitle.Name = "lblTitle"; + lblTitle.Size = new Size(32, 15); + lblTitle.TabIndex = 0; + lblTitle.Text = "Title:"; + // + // tbTitle + // + tbTitle.Location = new Point(94, 6); + tbTitle.Name = "tbTitle"; + tbTitle.Size = new Size(405, 23); + tbTitle.TabIndex = 1; + // + // lblDescription + // + lblDescription.AutoSize = true; + lblDescription.Location = new Point(12, 38); + lblDescription.Name = "lblDescription"; + lblDescription.Size = new Size(70, 15); + lblDescription.TabIndex = 2; + lblDescription.Text = "Description:"; + // + // tbDescription + // + tbDescription.Location = new Point(94, 35); + tbDescription.Multiline = true; + tbDescription.Name = "tbDescription"; + tbDescription.Size = new Size(405, 112); + tbDescription.TabIndex = 3; + // + // lblPublishDate + // + lblPublishDate.AutoSize = true; + lblPublishDate.Location = new Point(12, 159); + lblPublishDate.Name = "lblPublishDate"; + lblPublishDate.Size = new Size(76, 15); + lblPublishDate.TabIndex = 4; + lblPublishDate.Text = "Publish Date:"; + // + // btnSave + // + btnSave.Location = new Point(424, 180); + btnSave.Name = "btnSave"; + btnSave.Size = new Size(75, 23); + btnSave.TabIndex = 6; + btnSave.Text = "Save changes"; + btnSave.UseVisualStyleBackColor = true; + btnSave.Click += btnSave_Click; + // + // dtpPublishDate + // + dtpPublishDate.Location = new Point(94, 153); + dtpPublishDate.Name = "dtpPublishDate"; + dtpPublishDate.Size = new Size(151, 23); + dtpPublishDate.TabIndex = 9; + // + // lblAuthor + // + lblAuthor.AutoSize = true; + lblAuthor.Location = new Point(12, 184); + lblAuthor.Name = "lblAuthor"; + lblAuthor.Size = new Size(70, 15); + lblAuthor.TabIndex = 10; + lblAuthor.Text = "Created by: "; + // + // lblComments + // + lblComments.AutoSize = true; + lblComments.Location = new Point(12, 209); + lblComments.Name = "lblComments"; + lblComments.Size = new Size(66, 15); + lblComments.TabIndex = 11; + lblComments.Text = "Comments"; + // + // listBox1 + // + listBox1.FormattingEnabled = true; + listBox1.ItemHeight = 15; + listBox1.Location = new Point(12, 227); + listBox1.Name = "listBox1"; + listBox1.Size = new Size(399, 154); + listBox1.TabIndex = 12; + // + // btnViewComment + // + btnViewComment.Location = new Point(424, 271); + btnViewComment.Name = "btnViewComment"; + btnViewComment.Size = new Size(75, 23); + btnViewComment.TabIndex = 13; + btnViewComment.Text = "View"; + btnViewComment.UseVisualStyleBackColor = true; + btnViewComment.Click += btnViewComment_Click; + // + // btnEditComment + // + btnEditComment.Location = new Point(424, 300); + btnEditComment.Name = "btnEditComment"; + btnEditComment.Size = new Size(75, 23); + btnEditComment.TabIndex = 14; + btnEditComment.Text = "Edit"; + btnEditComment.UseVisualStyleBackColor = true; + btnEditComment.Click += btnEditComment_Click; + // + // btnDeleteComment + // + btnDeleteComment.Location = new Point(424, 329); + btnDeleteComment.Name = "btnDeleteComment"; + btnDeleteComment.Size = new Size(75, 23); + btnDeleteComment.TabIndex = 15; + btnDeleteComment.Text = "Delete"; + btnDeleteComment.UseVisualStyleBackColor = true; + btnDeleteComment.Click += btnDeleteComment_Click; + // + // btnCreateComment + // + btnCreateComment.Location = new Point(424, 358); + btnCreateComment.Name = "btnCreateComment"; + btnCreateComment.Size = new Size(75, 23); + btnCreateComment.TabIndex = 16; + btnCreateComment.Text = "New"; + btnCreateComment.UseVisualStyleBackColor = true; + btnCreateComment.Click += btnCreateComment_Click; + // + // cbStatus + // + cbStatus.FormattingEnabled = true; + cbStatus.Location = new Point(251, 153); + cbStatus.Name = "cbStatus"; + cbStatus.Size = new Size(121, 23); + cbStatus.TabIndex = 17; + // + // cbSeverity + // + cbSeverity.FormattingEnabled = true; + cbSeverity.Location = new Point(378, 153); + cbSeverity.Name = "cbSeverity"; + cbSeverity.Size = new Size(121, 23); + cbSeverity.TabIndex = 18; + // + // ComplaintForm + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(511, 400); + Controls.Add(cbSeverity); + Controls.Add(cbStatus); + Controls.Add(btnCreateComment); + Controls.Add(btnDeleteComment); + Controls.Add(btnEditComment); + Controls.Add(btnViewComment); + Controls.Add(listBox1); + Controls.Add(lblComments); + Controls.Add(lblAuthor); + Controls.Add(dtpPublishDate); + Controls.Add(btnSave); + Controls.Add(lblPublishDate); + Controls.Add(tbDescription); + Controls.Add(lblDescription); + Controls.Add(tbTitle); + Controls.Add(lblTitle); + Name = "ComplaintForm"; + Text = "Complaint"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label lblTitle; + private TextBox tbTitle; + private Label lblDescription; + private TextBox tbDescription; + private Label lblPublishDate; + private Button btnSave; + private DateTimePicker dtpPublishDate; + private Label lblAuthor; + private Label lblComments; + private ListBox listBox1; + private Button btnViewComment; + private Button btnEditComment; + private Button btnDeleteComment; + private Button btnCreateComment; + private ComboBox cbStatus; + private ComboBox cbSeverity; + } +} \ No newline at end of file diff --git a/StudentHouseDashboard/WinForms/ComplaintForm.cs b/StudentHouseDashboard/WinForms/ComplaintForm.cs new file mode 100644 index 0000000..1ac7c33 --- /dev/null +++ b/StudentHouseDashboard/WinForms/ComplaintForm.cs @@ -0,0 +1,149 @@ +using Data; +using Logic; +using Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace WinForms +{ + public partial class ComplaintForm : Form + { + Complaint complaint; + User currentUser; + public ComplaintForm(Complaint? complaint, bool readOnly, User currentUser) + { + InitializeComponent(); + this.complaint = complaint; + this.currentUser = currentUser; + + dtpPublishDate.Enabled = false; + foreach (var item in Enum.GetValues(typeof(ComplaintStatus))) + { + cbStatus.Items.Add(item); + } + foreach (var item in Enum.GetValues(typeof(ComplaintSeverity))) + { + cbSeverity.Items.Add(item); + } + if (readOnly) + { + btnSave.Enabled = false; + tbTitle.Enabled = false; + tbDescription.Enabled = false; + cbStatus.Enabled = false; + cbSeverity.Enabled = false; + } + if (complaint != null) + { + tbTitle.Text = complaint.Title; + lblAuthor.Text = $"Created by: {complaint.Author.Name}"; + tbDescription.Text = complaint.Description; + dtpPublishDate.Value = complaint.PublishDate; + cbStatus.SelectedIndex = (int)complaint.Status; + cbSeverity.SelectedIndex = (int)complaint.Severity; + RefreshComments(); + } + else + { + btnCreateComment.Enabled = false; + btnDeleteComment.Enabled = false; + btnEditComment.Enabled = false; + btnViewComment.Enabled = false; + } + if (currentUser != null) + { + lblAuthor.Text = $"Created by: {currentUser.Name}"; + } + } + + private void btnSave_Click(object sender, EventArgs e) + { + ComplaintManager complaintManager = new ComplaintManager(new ComplaintRepository()); + if (string.IsNullOrEmpty(tbTitle.Text)) + { + MessageBox.Show("Please enter a title"); + return; + } + + if (this.complaint == null) + { + complaintManager.CreateComplaint(tbTitle.Text, tbDescription.Text, currentUser, dtpPublishDate.Value, (ComplaintStatus)cbStatus.SelectedIndex, (ComplaintSeverity)cbSeverity.SelectedIndex); + } + else + { + complaintManager.UpdateComplaint(complaint.ID, tbTitle.Text, tbDescription.Text, (ComplaintStatus)cbStatus.SelectedIndex, (ComplaintSeverity)cbSeverity.SelectedIndex); + } + this.DialogResult = DialogResult.OK; + } + + private void btnViewComment_Click(object sender, EventArgs e) + { + if (listBox1.SelectedIndex == -1) + { + MessageBox.Show("Please select an item from the list"); + } + else + { + CommentForm form = new CommentForm((Comment)listBox1.SelectedItem, true, currentUser); + form.ShowDialog(); + RefreshComments(); + } + } + + private void btnEditComment_Click(object sender, EventArgs e) + { + if (listBox1.SelectedIndex == -1) + { + MessageBox.Show("Please select an item from the list"); + } + else + { + CommentForm form = new CommentForm((Comment)listBox1.SelectedItem, false, currentUser); + form.ShowDialog(); + RefreshComments(); + } + } + + private void btnDeleteComment_Click(object sender, EventArgs e) + { + if (listBox1.SelectedIndex == -1) + { + MessageBox.Show("Please select an item from the list"); + } + else + { + Comment currentComment = (Comment)listBox1.SelectedItem; + if (MessageBox.Show($"Are you sure you want to delete\n{currentComment.Title}\nCreated at {currentComment.PublishDate.ToString("g")} by {currentComment.Author.Name}", + "Delete announcement", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + CommentManager commentManager = new CommentManager(new CommentRepository()); + commentManager.DeleteCommentOnAnnouncement(currentComment.ID, complaint.ID); + } + RefreshComments(); + } + } + + private void btnCreateComment_Click(object sender, EventArgs e) + { + CommentForm form = new CommentForm(null, false, currentUser, true, complaint.ID); + form.ShowDialog(); + RefreshComments(); + } + + private void RefreshComments() + { + listBox1.Items.Clear(); + foreach (var item in complaint.Responses) + { + listBox1.Items.Add(item); + } + } + } +} diff --git a/StudentHouseDashboard/WinForms/ComplaintForm.resx b/StudentHouseDashboard/WinForms/ComplaintForm.resx new file mode 100644 index 0000000..a395bff --- /dev/null +++ b/StudentHouseDashboard/WinForms/ComplaintForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/StudentHouseDashboard/WinForms/Dashboard.Designer.cs b/StudentHouseDashboard/WinForms/Dashboard.Designer.cs index b3d0b4e..f0e6882 100644 --- a/StudentHouseDashboard/WinForms/Dashboard.Designer.cs +++ b/StudentHouseDashboard/WinForms/Dashboard.Designer.cs @@ -38,17 +38,26 @@ tpUsers = new TabPage(); panelUserFunctions = new Panel(); tpAnnouncements = new TabPage(); - lbAnnouncements = new ListBox(); - panel1 = new Panel(); + panelAnnouncementsFunctions = new Panel(); btnNewAnnouncement = new Button(); btnDeleteAnnouncement = new Button(); btnViewAnnouncement = new Button(); btnEditAnnouncement = new Button(); + lbAnnouncements = new ListBox(); + tpComplaints = new TabPage(); + tpEvents = new TabPage(); + lbComplaints = new ListBox(); + panelComplaintFunctions = new Panel(); + btnArchiveComplaint = new Button(); + btnViewComplaint = new Button(); + btnEditComplaint = new Button(); tabControl1.SuspendLayout(); tpUsers.SuspendLayout(); panelUserFunctions.SuspendLayout(); tpAnnouncements.SuspendLayout(); - panel1.SuspendLayout(); + panelAnnouncementsFunctions.SuspendLayout(); + tpComplaints.SuspendLayout(); + panelComplaintFunctions.SuspendLayout(); SuspendLayout(); // // lblUserStatus @@ -116,6 +125,8 @@ // tabControl1.Controls.Add(tpUsers); tabControl1.Controls.Add(tpAnnouncements); + tabControl1.Controls.Add(tpComplaints); + tabControl1.Controls.Add(tpEvents); tabControl1.Dock = DockStyle.Fill; tabControl1.Location = new Point(0, 0); tabControl1.Name = "tabControl1"; @@ -149,7 +160,7 @@ // // tpAnnouncements // - tpAnnouncements.Controls.Add(panel1); + tpAnnouncements.Controls.Add(panelAnnouncementsFunctions); tpAnnouncements.Controls.Add(lbAnnouncements); tpAnnouncements.Location = new Point(4, 24); tpAnnouncements.Name = "tpAnnouncements"; @@ -159,27 +170,17 @@ tpAnnouncements.Text = "Announcements"; tpAnnouncements.UseVisualStyleBackColor = true; // - // lbAnnouncements + // panelAnnouncementsFunctions // - lbAnnouncements.Dock = DockStyle.Fill; - lbAnnouncements.FormattingEnabled = true; - lbAnnouncements.ItemHeight = 15; - lbAnnouncements.Location = new Point(3, 3); - lbAnnouncements.Name = "lbAnnouncements"; - lbAnnouncements.Size = new Size(717, 334); - lbAnnouncements.TabIndex = 0; - // - // panel1 - // - panel1.Controls.Add(btnNewAnnouncement); - panel1.Controls.Add(btnDeleteAnnouncement); - panel1.Controls.Add(btnViewAnnouncement); - panel1.Controls.Add(btnEditAnnouncement); - panel1.Dock = DockStyle.Bottom; - panel1.Location = new Point(3, 298); - panel1.Name = "panel1"; - panel1.Size = new Size(717, 39); - panel1.TabIndex = 7; + panelAnnouncementsFunctions.Controls.Add(btnNewAnnouncement); + panelAnnouncementsFunctions.Controls.Add(btnDeleteAnnouncement); + panelAnnouncementsFunctions.Controls.Add(btnViewAnnouncement); + panelAnnouncementsFunctions.Controls.Add(btnEditAnnouncement); + panelAnnouncementsFunctions.Dock = DockStyle.Bottom; + panelAnnouncementsFunctions.Location = new Point(3, 298); + panelAnnouncementsFunctions.Name = "panelAnnouncementsFunctions"; + panelAnnouncementsFunctions.Size = new Size(717, 39); + panelAnnouncementsFunctions.TabIndex = 7; // // btnNewAnnouncement // @@ -221,6 +222,87 @@ btnEditAnnouncement.UseVisualStyleBackColor = true; btnEditAnnouncement.Click += btnEditAnnouncement_Click; // + // lbAnnouncements + // + lbAnnouncements.Dock = DockStyle.Fill; + lbAnnouncements.FormattingEnabled = true; + lbAnnouncements.ItemHeight = 15; + lbAnnouncements.Location = new Point(3, 3); + lbAnnouncements.Name = "lbAnnouncements"; + lbAnnouncements.Size = new Size(717, 334); + lbAnnouncements.TabIndex = 0; + // + // tpComplaints + // + tpComplaints.Controls.Add(panelComplaintFunctions); + tpComplaints.Controls.Add(lbComplaints); + tpComplaints.Location = new Point(4, 24); + tpComplaints.Name = "tpComplaints"; + tpComplaints.Size = new Size(723, 340); + tpComplaints.TabIndex = 2; + tpComplaints.Text = "Complaints"; + tpComplaints.UseVisualStyleBackColor = true; + // + // tpEvents + // + tpEvents.Location = new Point(4, 24); + tpEvents.Name = "tpEvents"; + tpEvents.Size = new Size(723, 340); + tpEvents.TabIndex = 3; + tpEvents.Text = "Events"; + tpEvents.UseVisualStyleBackColor = true; + // + // lbComplaints + // + lbComplaints.Dock = DockStyle.Top; + lbComplaints.FormattingEnabled = true; + lbComplaints.ItemHeight = 15; + lbComplaints.Location = new Point(0, 0); + lbComplaints.Name = "lbComplaints"; + lbComplaints.Size = new Size(723, 289); + lbComplaints.TabIndex = 0; + // + // panelComplaintFunctions + // + panelComplaintFunctions.Controls.Add(btnArchiveComplaint); + panelComplaintFunctions.Controls.Add(btnViewComplaint); + panelComplaintFunctions.Controls.Add(btnEditComplaint); + panelComplaintFunctions.Dock = DockStyle.Bottom; + panelComplaintFunctions.Location = new Point(0, 285); + panelComplaintFunctions.Name = "panelComplaintFunctions"; + panelComplaintFunctions.Size = new Size(723, 55); + panelComplaintFunctions.TabIndex = 1; + // + // btnArchiveComplaint + // + btnArchiveComplaint.Location = new Point(8, 10); + btnArchiveComplaint.Name = "btnArchiveComplaint"; + btnArchiveComplaint.Size = new Size(75, 23); + btnArchiveComplaint.TabIndex = 7; + btnArchiveComplaint.Text = "Archive"; + btnArchiveComplaint.UseVisualStyleBackColor = true; + btnArchiveComplaint.Click += btnArchiveComplaint_Click; + // + // btnViewComplaint + // + btnViewComplaint.Location = new Point(170, 10); + btnViewComplaint.Name = "btnViewComplaint"; + btnViewComplaint.Size = new Size(75, 23); + btnViewComplaint.TabIndex = 9; + btnViewComplaint.Text = "View"; + btnViewComplaint.UseVisualStyleBackColor = true; + btnViewComplaint.Click += btnViewComplaint_Click; + // + // btnEditComplaint + // + btnEditComplaint.Location = new Point(89, 10); + btnEditComplaint.Name = "btnEditComplaint"; + btnEditComplaint.Size = new Size(75, 23); + btnEditComplaint.TabIndex = 8; + btnEditComplaint.Text = "Edit"; + btnEditComplaint.UseVisualStyleBackColor = true; + btnEditComplaint.Click += btnEditComplaint_Click; + // // Dashboard // AutoScaleDimensions = new SizeF(7F, 15F); @@ -235,7 +317,9 @@ tpUsers.ResumeLayout(false); panelUserFunctions.ResumeLayout(false); tpAnnouncements.ResumeLayout(false); - panel1.ResumeLayout(false); + panelAnnouncementsFunctions.ResumeLayout(false); + tpComplaints.ResumeLayout(false); + panelComplaintFunctions.ResumeLayout(false); ResumeLayout(false); PerformLayout(); } @@ -252,11 +336,18 @@ private TabPage tpUsers; private TabPage tpAnnouncements; private Panel panelUserFunctions; - private Panel panel1; + private Panel panelAnnouncementsFunctions; private Button btnNewAnnouncement; private Button btnDeleteAnnouncement; private Button btnViewAnnouncement; private Button btnEditAnnouncement; private ListBox lbAnnouncements; + private TabPage tpComplaints; + private Panel panelComplaintFunctions; + private ListBox lbComplaints; + private TabPage tpEvents; + private Button btnArchiveComplaint; + private Button btnViewComplaint; + private Button btnEditComplaint; } } \ No newline at end of file diff --git a/StudentHouseDashboard/WinForms/Dashboard.cs b/StudentHouseDashboard/WinForms/Dashboard.cs index 751e746..6e903bc 100644 --- a/StudentHouseDashboard/WinForms/Dashboard.cs +++ b/StudentHouseDashboard/WinForms/Dashboard.cs @@ -31,6 +31,7 @@ namespace WinForms btnNewAnnouncement.Enabled = false; btnDeleteAnnouncement.Enabled = false; btnEditAnnouncement.Enabled = true; + btnEditComplaint.Enabled = false; } else if (user.Role == UserRole.ADMIN) { @@ -40,6 +41,7 @@ namespace WinForms btnNewAnnouncement.Enabled = true; btnDeleteAnnouncement.Enabled = true; btnEditAnnouncement.Enabled = true; + btnEditComplaint.Enabled = true; } else { @@ -49,6 +51,7 @@ namespace WinForms btnNewAnnouncement.Enabled = false; btnDeleteAnnouncement.Enabled = false; btnEditAnnouncement.Enabled = false; + btnEditComplaint.Enabled = false; } RefreshLists(); } @@ -120,6 +123,12 @@ namespace WinForms { lbAnnouncements.Items.Add(announcement); } + ComplaintManager complaintManager = new ComplaintManager(new ComplaintRepository()); + lbComplaints.Items.Clear(); + foreach (Complaint complaint in complaintManager.GetAllComplaints()) + { + lbComplaints.Items.Add(complaint); + } } private void Dashboard_FormClosed(object sender, FormClosedEventArgs e) @@ -180,5 +189,52 @@ namespace WinForms RefreshLists(); } } + + private void btnArchiveComplaint_Click(object sender, EventArgs e) + { + if (lbComplaints.SelectedIndex == -1) + { + MessageBox.Show("Please select an item from the list"); + } + else + { + Complaint currentComplaint = (Complaint)lbComplaints.SelectedItem; + if (MessageBox.Show($"Are you sure you want to archive\n{currentComplaint.Title}\nCreated at {currentComplaint.PublishDate.ToString("g")} by {currentComplaint.Author.Name}", + "Archive complaint", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + AnnouncementManager announcementManager = new AnnouncementManager(new AnnouncementRepository()); + announcementManager.DeleteAnnouncement(currentComplaint.ID); + } + RefreshLists(); + } + } + + private void btnEditComplaint_Click(object sender, EventArgs e) + { + if (lbComplaints.SelectedIndex == -1) + { + MessageBox.Show("Please select an item from the list"); + } + else + { + ComplaintForm complaintForm = new ComplaintForm((Complaint)lbComplaints.SelectedItem, false, user); + complaintForm.ShowDialog(); + RefreshLists(); + } + } + + private void btnViewComplaint_Click(object sender, EventArgs e) + { + if (lbComplaints.SelectedIndex == -1) + { + MessageBox.Show("Please select an item from the list"); + } + else + { + ComplaintForm complaintForm = new ComplaintForm((Complaint)lbComplaints.SelectedItem, true, user); + complaintForm.ShowDialog(); + RefreshLists(); + } + } } } diff --git a/StudentHouseDashboard/WinForms/Dashboard.resx b/StudentHouseDashboard/WinForms/Dashboard.resx index f298a7b..a395bff 100644 --- a/StudentHouseDashboard/WinForms/Dashboard.resx +++ b/StudentHouseDashboard/WinForms/Dashboard.resx @@ -1,4 +1,64 @@ - + + + diff --git a/StudentHouseDashboard/WinForms/Login.cs b/StudentHouseDashboard/WinForms/Login.cs index 474978f..49dfe79 100644 --- a/StudentHouseDashboard/WinForms/Login.cs +++ b/StudentHouseDashboard/WinForms/Login.cs @@ -19,6 +19,10 @@ namespace WinForms { MessageBox.Show("Wrong username or password", "Login failed", MessageBoxButtons.OK, MessageBoxIcon.Error); } + /*else if (user.Role == UserRole.TENANT) + { + MessageBox.Show("This application is for the management. Please use the web portal", "Access denied", MessageBoxButtons.OK, MessageBoxIcon.Error); + }*/ else { Dashboard dashboard = new Dashboard(this, user); diff --git a/StudentHouseDashboard/WinForms/WinForms.csproj b/StudentHouseDashboard/WinForms/WinForms.csproj index 262e438..b78d006 100644 --- a/StudentHouseDashboard/WinForms/WinForms.csproj +++ b/StudentHouseDashboard/WinForms/WinForms.csproj @@ -16,6 +16,9 @@ + + Form + Form diff --git a/docs/testplan.docx b/docs/testplan.docx new file mode 100644 index 0000000..f471fd1 Binary files /dev/null and b/docs/testplan.docx differ diff --git a/queries.sql b/queries.sql index bce2c9b..59261c1 100644 --- a/queries.sql +++ b/queries.sql @@ -10,9 +10,25 @@ GO INSERT INTO Users ([Name], [Password], [Role]) VALUES - ('Admin', '1234', 2), - ('Manager', '1234', 1), - ('Room1', '1234', 0) + ('admin', 'admin', 2), + ('manager', 'manager', 1), + ('room1', 'room1', 0) +GO + +INSERT INTO ComplaintStatus ([Status]) +VALUES + ('FILED'), + ('UNDER_REVIEW'), + ('SOLVED'), + ('ARCHIVED') +GO + +INSERT INTO ComplaintSeverity ([Severity]) +VALUES + ('LOW'), + ('NORMAL'), + ('HIGH'), + ('URGENT') GO SELECT * FROM Users u JOIN UserRole r ON u.[Role] = r.ID \ No newline at end of file diff --git a/table.sql b/table.sql index 5a1709e..35da05c 100644 --- a/table.sql +++ b/table.sql @@ -52,4 +52,33 @@ CREATE TABLE CommentsResponses ( CommentID INT FOREIGN KEY REFERENCES Comments(ID) NOT NULL, ResponseID INT FOREIGN KEY REFERENCES Comments(ID) NOT NULL ) +GO + +CREATE TABLE ComplaintStatus ( + ID INT PRIMARY KEY IDENTITY(0,1) NOT NULL, + [Status] NVARCHAR(255) +) +GO + +CREATE TABLE ComplaintSeverity ( + ID INT PRIMARY KEY IDENTITY(0,1) NOT NULL, + [Severity] NVARCHAR(255) +) +GO + +CREATE TABLE Complaints ( + ID INT PRIMARY KEY IDENTITY NOT NULL, + [Author] INT FOREIGN KEY REFERENCES Users(ID) NOT NULL, + [Description] NVARCHAR(MAX), + [Title] NVARCHAR(255) NOT NULL, + [PublishDate] DATETIME NOT NULL, + [Status] INT FOREIGN KEY REFERENCES ComplaintStatus(ID) NOT NULL + [Severity] INT FOREIGN KEY REFERENCES ComplaintSeverity(ID) NOT NULL +) +GO + +CREATE TABLE ComplaintsComments ( + ComplaintID INT FOREIGN KEY REFERENCES Complaints(ID) NOT NULL, + CommentID INT FOREIGN KEY REFERENCES Comments(ID) NOT NULL +) GO \ No newline at end of file