Skip to content

Commit 654564d

Browse files
Merge pull request #187 from Avanade/185-code-improvements
185 code improvements
2 parents 3d7c2a0 + dc08dd7 commit 654564d

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

src/goapp/controller/item/item-page-controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ func (c *itemPageController) RespondToItem(w http.ResponseWriter, r *http.Reques
238238
Data: *item,
239239
RequireRemarks: itemIsAuthorized.RequireRemarks,
240240
IsApprover: isApprover, // show remarks and approve/reject buttons
241-
AlreadyProcessed: itemIsAuthorized.IsApproved.Value,
241+
AlreadyProcessed: item.DateResponded != "",
242242
ApproverResponse: approverResponse,
243243
ConsultLegalButton: consultLegalButton,
244244
Action: action,

src/goapp/repository/ipdrequest/ipdrequest-repository.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ func (r *ipdRequestRepository) UpdateResponse(data *model.ResponseCallback) erro
106106
sql.Named("ApprovalRequestId", data.ItemId),
107107
sql.Named("IsApproved", data.IsApproved),
108108
sql.Named("ApproverRemarks", data.Remarks),
109-
sql.Named("ResponseDate", data.ResponseDate),
110109
sql.Named("RespondedBy", data.RespondedBy),
111110
)
112111

src/goapp/service/email/email-service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (s *sdkEmailService) SendActivityEmail(req *model.ItemActivity, recipients
7272
<tr>
7373
<td style="padding: 15px 0 10px 0;">
7474
<span><b>|User|</b></span>
75-
<span>commented on your request:</span>
75+
<span>commented on a request:</span>
7676
</td>
7777
</tr>
7878
<tr>

src/sqldb/Stored Procedures/PR_IPDisclosureRequest_Update_Response.sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ CREATE PROCEDURE [dbo].[PR_IPDisclosureRequest_Update_Response]
22
@ApprovalRequestId [UNIQUEIDENTIFIER],
33
@IsApproved [BIT],
44
@ApproverRemarks [VARCHAR](100),
5-
@ResponseDate [DATETIME],
65
@RespondedBy [VARCHAR](100)
76
AS
87
BEGIN
98
UPDATE [dbo].[IPDisclosureRequest]
109
SET
1110
[IsApproved] = @IsApproved,
1211
[ApproverRemarks] = @ApproverRemarks,
13-
[ResponseDate] = @ResponseDate,
12+
[ResponseDate] = GETDATE(),
1413
[RespondedBy] = @RespondedBy
1514
WHERE [ApprovalRequestId] = @ApprovalRequestId
1615
END

0 commit comments

Comments
 (0)