From 0dd959c992f917b1c168ad227e908587996d33a9 Mon Sep 17 00:00:00 2001 From: Ismael Ibuan <102030576+iibuan@users.noreply.github.com> Date: Fri, 28 Feb 2025 18:29:11 +0800 Subject: [PATCH 1/3] update message on email Signed-off-by: Ismael Ibuan <102030576+iibuan@users.noreply.github.com> --- src/goapp/service/email/email-service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/goapp/service/email/email-service.go b/src/goapp/service/email/email-service.go index e2d82ac..830e378 100644 --- a/src/goapp/service/email/email-service.go +++ b/src/goapp/service/email/email-service.go @@ -72,7 +72,7 @@ func (s *sdkEmailService) SendActivityEmail(req *model.ItemActivity, recipients |User| - commented on your request: + commented on a request: From 3f4311471c971adb13cf58aa846498e7cf3cf061 Mon Sep 17 00:00:00 2001 From: Ismael Ibuan <102030576+iibuan@users.noreply.github.com> Date: Mon, 3 Mar 2025 21:29:16 +0800 Subject: [PATCH 2/3] Fix comment and response actions showing on items already processed Signed-off-by: Ismael Ibuan <102030576+iibuan@users.noreply.github.com> --- src/goapp/controller/item/item-page-controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/goapp/controller/item/item-page-controller.go b/src/goapp/controller/item/item-page-controller.go index 8909e5b..ecdaad1 100644 --- a/src/goapp/controller/item/item-page-controller.go +++ b/src/goapp/controller/item/item-page-controller.go @@ -238,7 +238,7 @@ func (c *itemPageController) RespondToItem(w http.ResponseWriter, r *http.Reques Data: *item, RequireRemarks: itemIsAuthorized.RequireRemarks, IsApprover: isApprover, // show remarks and approve/reject buttons - AlreadyProcessed: itemIsAuthorized.IsApproved.Value, + AlreadyProcessed: item.DateResponded != "", ApproverResponse: approverResponse, ConsultLegalButton: consultLegalButton, Action: action, From dc08dd7eb93826878756d70896f7fdf24624539c Mon Sep 17 00:00:00 2001 From: Ismael Ibuan <102030576+iibuan@users.noreply.github.com> Date: Mon, 3 Mar 2025 22:51:08 +0800 Subject: [PATCH 3/3] remove response date from params Signed-off-by: Ismael Ibuan <102030576+iibuan@users.noreply.github.com> --- src/goapp/repository/ipdrequest/ipdrequest-repository.go | 1 - .../PR_IPDisclosureRequest_Update_Response.sql | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/goapp/repository/ipdrequest/ipdrequest-repository.go b/src/goapp/repository/ipdrequest/ipdrequest-repository.go index d28e07c..90d0b87 100644 --- a/src/goapp/repository/ipdrequest/ipdrequest-repository.go +++ b/src/goapp/repository/ipdrequest/ipdrequest-repository.go @@ -106,7 +106,6 @@ func (r *ipdRequestRepository) UpdateResponse(data *model.ResponseCallback) erro sql.Named("ApprovalRequestId", data.ItemId), sql.Named("IsApproved", data.IsApproved), sql.Named("ApproverRemarks", data.Remarks), - sql.Named("ResponseDate", data.ResponseDate), sql.Named("RespondedBy", data.RespondedBy), ) diff --git a/src/sqldb/Stored Procedures/PR_IPDisclosureRequest_Update_Response.sql b/src/sqldb/Stored Procedures/PR_IPDisclosureRequest_Update_Response.sql index 4bf6bd4..a730568 100644 --- a/src/sqldb/Stored Procedures/PR_IPDisclosureRequest_Update_Response.sql +++ b/src/sqldb/Stored Procedures/PR_IPDisclosureRequest_Update_Response.sql @@ -2,7 +2,6 @@ CREATE PROCEDURE [dbo].[PR_IPDisclosureRequest_Update_Response] @ApprovalRequestId [UNIQUEIDENTIFIER], @IsApproved [BIT], @ApproverRemarks [VARCHAR](100), - @ResponseDate [DATETIME], @RespondedBy [VARCHAR](100) AS BEGIN @@ -10,7 +9,7 @@ BEGIN SET [IsApproved] = @IsApproved, [ApproverRemarks] = @ApproverRemarks, - [ResponseDate] = @ResponseDate, + [ResponseDate] = GETDATE(), [RespondedBy] = @RespondedBy WHERE [ApprovalRequestId] = @ApprovalRequestId END