From e5d93fd7d6d86bc47ff56664bd812b4d9d0749a5 Mon Sep 17 00:00:00 2001
From: allan <allan@4gl.io>
Date: Tue, 2 Jul 2024 16:02:58 +0100
Subject: [PATCH 1/3] fix: ensuring review_reason_txt in output.  Closes #117

---
 sas/sasjs/services/approvers/gethistory.sas | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/sas/sasjs/services/approvers/gethistory.sas b/sas/sasjs/services/approvers/gethistory.sas
index e694ef1..65c79e7 100644
--- a/sas/sasjs/services/approvers/gethistory.sas
+++ b/sas/sasjs/services/approvers/gethistory.sas
@@ -105,8 +105,6 @@ create view work.submits as
     ,a.submitted_by_nm  as submitter
     ,put(a.REVIEWED_ON_DTTM,yymmddhhmmss.) as REVIEWED
     ,a.submit_status_cd as status
-    ,a.reviewed_on_dttm
-    ,a.reviewed_by_nm as approver
   from &mpelib..mpe_submit(where=(submit_status_cd ne 'SUBMITTED')) a
 
 %macro gethistory();
@@ -120,8 +118,18 @@ create view work.submits as
 %end;
 %mend gethistory;
 %gethistory()
+;
 
-  order by a.submitted_on_dttm desc;
+/* get latest reason text */
+create table work.reviews as 
+  select a.* 
+    ,b.reviewed_on_dttm
+    ,b.reviewed_by_nm as approver
+    ,b.review_reason_txt 
+  from work.submits a 
+  left join &mpelib..mpe_review b 
+  on a.table_id=b.table_id 
+  order by a.table_id desc, b.reviewed_on_dttm desc;
 
 %mp_abort(iftrue= (&syscc > 0)
   ,mac=&_program
@@ -129,7 +137,9 @@ create view work.submits as
 )
 
 data work.fromsas;
-  set work.submits;
+  set work.reviews;
+  by descending table_id descending reviewed_on_dttm;
+  if first.table_id;
   if _n_ ge &startrow;
   n+1;
   if n>&hist then stop;

From a156c0111b3de5e3744e38d377d6e9aa09915803 Mon Sep 17 00:00:00 2001
From: allan <allan@4gl.io>
Date: Tue, 2 Jul 2024 16:03:26 +0100
Subject: [PATCH 2/3] fix: adding SYSSITE, part of #116

---
 sas/sasjs/targets/sas9/services_meta/admin/configurator.sas     | 1 +
 sas/sasjs/targets/server/services_server/admin/configurator.sas | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sas/sasjs/targets/sas9/services_meta/admin/configurator.sas b/sas/sasjs/targets/sas9/services_meta/admin/configurator.sas
index 5f126d6..99619bb 100644
--- a/sas/sasjs/targets/sas9/services_meta/admin/configurator.sas
+++ b/sas/sasjs/targets/sas9/services_meta/admin/configurator.sas
@@ -188,6 +188,7 @@ data _null_;
     put "<li> METAPERSON: " metaperson "</li>";
     put "<li> METAUSER: " metauser "</li>";
     put "<li> SYSUSERID: " sysuserid "</li>";
+    put "<li> SYSSITE: &syssite</li>";
     url='/SASStoredProcess/do';
   end;
   else do;
diff --git a/sas/sasjs/targets/server/services_server/admin/configurator.sas b/sas/sasjs/targets/server/services_server/admin/configurator.sas
index 9e6df81..ab42987 100644
--- a/sas/sasjs/targets/server/services_server/admin/configurator.sas
+++ b/sas/sasjs/targets/server/services_server/admin/configurator.sas
@@ -222,6 +222,7 @@ data _null_;
   put "<li> SYSUSERID: " sysuserid "</li>";
   put "<li> SYSHOSTNAME: &syshostname</li>";
   put "<li> SYSVLONG: &sysvlong</li>";
+  put "<li> SYSSITE: &syssite</li>";
 run;
 
 data _null_;

From 75dac54591c667fb82d635671f8a3e4d0ee804d6 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Tue, 2 Jul 2024 15:19:21 +0000
Subject: [PATCH 3/3] chore(release): 6.11.1 [skip ci]

## [6.11.1](https://git.datacontroller.io/dc/dc/compare/v6.11.0...v6.11.1) (2024-07-02)

### Bug Fixes

* adding SYSSITE, part of [#116](https://git.datacontroller.io/dc/dc/issues/116) ([a156c01](https://git.datacontroller.io/dc/dc/commit/a156c0111b3de5e3744e38d377d6e9aa09915803))
* ensuring review_reason_txt in output.  Closes [#117](https://git.datacontroller.io/dc/dc/issues/117) ([e5d93fd](https://git.datacontroller.io/dc/dc/commit/e5d93fd7d6d86bc47ff56664bd812b4d9d0749a5))
---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb9b712..d34f82e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [6.11.1](https://git.datacontroller.io/dc/dc/compare/v6.11.0...v6.11.1) (2024-07-02)
+
+
+### Bug Fixes
+
+* adding SYSSITE, part of [#116](https://git.datacontroller.io/dc/dc/issues/116) ([a156c01](https://git.datacontroller.io/dc/dc/commit/a156c0111b3de5e3744e38d377d6e9aa09915803))
+* ensuring review_reason_txt in output.  Closes [#117](https://git.datacontroller.io/dc/dc/issues/117) ([e5d93fd](https://git.datacontroller.io/dc/dc/commit/e5d93fd7d6d86bc47ff56664bd812b4d9d0749a5))
+
 # [6.11.0](https://git.datacontroller.io/dc/dc/compare/v6.10.1...v6.11.0) (2024-06-27)
 
 
diff --git a/package.json b/package.json
index 20d4cf8..f309c9e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dcfrontend",
-  "version": "6.11.0",
+  "version": "6.11.1",
   "description": "Data Controller",
   "devDependencies": {
     "@saithodev/semantic-release-gitea": "^2.1.0",