diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests/SOP Delinquents.qview.xml b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests/SOP Delinquents.qview.xml
new file mode 100644
index 000000000..2f322f5ab
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests/SOP Delinquents.qview.xml	
@@ -0,0 +1,12 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <sorts>
+        <sort column="lastname" descending="false"/>
+        <sort column="firstName" descending="false"/>
+        <sort column="requirementname" descending="false"/>
+    </sorts>
+    <filters>
+        <filter column="months_until_renewal" operator="lte" value="2"/>
+        <filter column="employeeid/isActive" operator="eq" value="true"/>
+        <filter column="requirementname" operator="contains" value="sop review"/>
+    </filters>
+</customView>
\ No newline at end of file
diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests/Training.qview.xml b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests/Training.qview.xml
new file mode 100644
index 000000000..9cdc395a6
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests/Training.qview.xml
@@ -0,0 +1,22 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <columns>
+        <column name="employeeid"/>
+        <column name="email"/>
+        <column name="lastName"/>
+        <column name="firstName"/>
+        <column name="employeeId/isActive"/>
+        <column name="unit"/>
+        <column name="requirementname"/>
+        <column name="requirement_name_type"/>
+        <column name="trackingflag"/>
+        <column name="expired_period"/>
+        <column name="mostrecentcompleted_date"/>
+        <column name="months_until_renewal"/>
+    </columns>
+    <sorts>
+        <sort column="lastName" descending="false"/>
+        <sort column="firstName" descending="false"/>
+        <sort column="requirement_name_type" descending="false"/>
+        <sort column="requirementname" descending="false"/>
+    </sorts>
+</customView>
\ No newline at end of file
diff --git a/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-24.007-24.008.sql b/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-24.007-24.008.sql
new file mode 100644
index 000000000..ea9b67efb
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-24.007-24.008.sql
@@ -0,0 +1,317 @@
+
+
+EXEC core.fn_dropifexists 'p_ComplianceRecentOverDueSoon_Process', 'onprc_ehr_compliancedb', 'PROCEDURE';
+GO
+
+-- Author:	R. Blasa
+-- Created: 9-20-2024
+
+/*
+**
+** 	Created by
+**      Blasa  		9-20-2024     Created a storedprocedure to create a static set of data from
+**                                 the ComplianceRecentTest.sql query
+**
+**
+**
+*/
+
+CREATE Procedure onprc_ehr_compliancedb.p_ComplianceRecentOverDueSoon_Process
+
+
+AS
+
+
+
+              ----- Reset Reporting table
+              Delete onprc_ehr_compliancedb.ComplianceRecentReport
+
+	                      If @@Error <> 0
+	                                GoTo Err_Proc
+
+
+
+BEGIN
+
+          Insert into onprc_ehr_compliancedb.ComplianceRecentReport
+                        (
+                         requirementname,
+                         employeeid,
+                         unit,
+                         category,
+                         trackingflag,
+                         email,
+                         lastname,
+                         firstname,
+                         host,
+                         supervisor,
+                         trainee_type,
+                         requirement_name_type,
+                         times_completed,
+                          expired_period,
+                          new_expired_Period,
+                          mostrecentcompleted_date,
+                          comment,
+                          snooze_date,
+                          months_until_renewal
+
+                         )
+
+
+
+
+        select b.requirementname,
+               a.employeeid,
+               string_agg(a.unit,char(10)) as unit,
+               string_agg(a.category,char(10)) as category,
+               string_agg(b.trackingflag,char(10)) as trackingflag,
+              (select h.email from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as  email,
+              (select h.lastname from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as lastname,
+              (select h.firstname from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as firstname,
+              (select h.majorudds from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as host,
+              (select h.supervisor from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as supervisor,
+              (select h.type from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as trainee_type,      ----- type trainee, or trainer
+              (select h.type from ehr_compliancedb.Requirements h where h.requirementname = b.requirementname) as requirement_type,  ----- type trainee, or trainer
+
+
+               (select count(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= b.requirementname and zz.employeeid= a.employeeid  ) as times_Completed,
+
+               (select k.expireperiod from ehr_compliancedb.Requirements k where k.requirementname = b.requirementname) as ExpiredPeriod,
+
+               ( select  (datediff(month,max(pq.date), tt.reviewdate) ) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname =   b.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                 having (tt.expireperiod) > (datediff(month,max(pq.date), tt.reviewdate))   and (tt.reviewdate is not null)  ) as NewExpirePeriod,
+
+               (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= b.requirementname and zz.employeeid= a.employeeid  ) as mostrecentcompleted_date,
+
+               (Select distinct string_agg(yy.comment, char(10))  from ehr_compliancedb.completiondates yy where yy.date in (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= b.requirementname and zz.employeeid= a.employeeid )
+                                                                                             And  yy.requirementname= b.requirementname and yy.employeeid= a.employeeid   ) as comment,
+
+               (Select distinct string_agg(yy.snooze_date, char(10)) from ehr_compliancedb.completiondates yy where yy.date in (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= b.requirementname and zz.employeeid= a.employeeid )
+                                                                                             And  yy.requirementname= b.requirementname and yy.employeeid= a.employeeid   ) as snooze_date,
+
+               CAST(
+                       CASE
+
+                           WHEN (select max(st.date) from ehr_compliancedb.completiondates st where st.requirementname = b.requirementname and st.employeeid = a.employeeid ) IS NULL   then 0
+                           WHEN ( select  (tt.expireperiod)  from  ehr_compliancedb.requirements tt where tt.requirementname = b.requirementname  group by tt.expireperiod  ) = 0 then Null
+
+
+                           WHEN ( select  count(*) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname = b.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                                  having (tt.expireperiod) >  ( datediff(month,max(pq.date), tt.reviewdate)  ) ) > 0 THEN
+
+                               ( select  (datediff(month,max(pq.date), tt.reviewdate) - ( datediff(month,max(pq.date), getdate())) ) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname =   b.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                                 having (tt.expireperiod) > (datediff(month,max(pq.date), tt.reviewdate)  )   )
+
+
+
+
+                           ELSE ( select  (tt.expireperiod) - ( datediff(month,max(pq.date), getdate())) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where   tt.requirementname =   b.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod )
+
+                           END  AS FLOAT)  AS MonthsUntilRenewal
+
+
+
+        from ehr_Compliancedb.employeeperunit a ,ehr_compliancedb.requirementspercategory b
+        where ( a.unit = b.unit or a.category = b.category )
+          And b.requirementname not in (select distinct t.requirementname from ehr_compliancedb.employeerequirementexemptions t Where a.employeeid = t.employeeid
+                                                                                                                                  And b.requirementname = t.requirementname)
+          And a.employeeid in (select p.employeeid from ehr_compliancedb.employees p where a.employeeid = p.employeeid And p.enddate is null)
+           And b.requirementname in  (select q.requirementname from ehr_compliancedb.Requirements q where q.requirementname = b.requirementname And q.dateDisabled is null )
+
+
+             group by b.requirementname,a.employeeid
+
+
+        union
+
+        select a.requirementname,
+               a.employeeid,
+               null as unit,
+               null as category,
+               'None' as trackingflag,
+              (select h.email from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as  email,
+              (select h.lastname from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as lastname,
+              (select h.firstname from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as firstname,
+              (select h.majorudds from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as host,
+              (select h.supervisor from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as supervisor,
+              (select h.type from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as trainee_type,      ----- type trainee, or trainer
+              (select h.type from ehr_compliancedb.Requirements h where h.requirementname = a.requirementname) as requirement_type,      ----- type trainee, or trainer
+
+
+               (select count(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= a.requirementname and zz.employeeid= a.employeeid  ) as timesCompleted,
+
+               (select k.expireperiod from ehr_compliancedb.Requirements k where k.requirementname = a.requirementname) as ExpiredPeriod,
+
+               ( select  (datediff(month,max(pq.date), tt.reviewdate) )from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname =   a.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                 having (tt.expireperiod) > (datediff(month,max(pq.date), tt.reviewdate))  and (tt.reviewdate is not null)  ) as NewExpirePeriod,
+
+               (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= a.requirementname and zz.employeeid= a.employeeid  ) as MostRecentDate,
+
+               (Select distinct string_agg(yy.comment, char(10))  from ehr_compliancedb.completiondates yy where yy.date in (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= a.requirementname and zz.employeeid= a.employeeid )
+                                                                                             And  yy.requirementname= a.requirementname and yy.employeeid= a.employeeid   ) as comment,
+
+               (Select distinct string_agg(yy.snooze_date, char(10))  from ehr_compliancedb.completiondates yy where yy.date in (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= a.requirementname and zz.employeeid= a.employeeid )
+                                                                                             And  yy.requirementname= a.requirementname and yy.employeeid= a.employeeid   ) as snooze_date,
+
+               CAST(
+                       CASE
+                           WHEN (select max(st.date) from ehr_compliancedb.completiondates st where st.requirementname = a.requirementname and st.employeeid = a.employeeid ) IS NULL   then 0
+                           WHEN ( select  (tt.expireperiod)  from  ehr_compliancedb.requirements tt where tt.requirementname = a.requirementname   group by tt.expireperiod  ) = 0 then Null
+
+
+                           WHEN ( select  count(*) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname = a.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                                  having (tt.expireperiod) >  (datediff(month,max(pq.date), tt.reviewdate)  )) > 0 THEN
+
+                               ( select  (datediff(month,max(pq.date), tt.reviewdate) - ( datediff(month,max(pq.date), getdate())) ) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname =   a.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                                 having (tt.expireperiod) > (datediff(month,max(pq.date), tt.reviewdate) )   )
+
+
+                           ELSE ( select  (tt.expireperiod) - ( datediff(month,max(pq.date), getdate())) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where   tt.requirementname =   a.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod )
+
+                           END  AS FLOAT)  AS MonthsUntilRenewal
+
+
+        from  ehr_compliancedb.completiondates a
+        where a.requirementname not in (select distinct h.requirementname from ehr_compliancedb.employeeperunit k, ehr_compliancedb.requirementspercategory h Where (k.unit = h.unit
+            or k.category = h.category) And a.employeeid = k.employeeid )
+          And a.requirementname not in (select distinct t.requirementname from ehr_compliancedb.employeerequirementexemptions t Where a.employeeid = t.employeeid
+                                                                                                                                  And a.requirementname = t.requirementname)
+          And a.employeeid in (select p.employeeid from ehr_compliancedb.employees p where a.employeeid = p.employeeid And p.enddate is null)
+          And a.requirementname in  (select q.requirementname from ehr_compliancedb.Requirements q where q.requirementname = a.requirementname And q.dateDisabled is null )
+
+        group by a.requirementname,a.employeeid
+
+        UNION
+
+        --- Training that was completed by as an employee training exemptions, and at least completed one, or more times
+
+        select a.requirementname,
+               a.employeeid,
+               null as unit,
+               null as category,
+               'No' as trackingflag,
+                (select h.email from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as  email,
+                  (select h.lastname from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as lastname,
+                  (select h.firstname from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as firstname,
+                  (select h.majorudds from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as host,
+                  (select h.supervisor from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as supervisor,
+                   (select h.type from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as trainee_type,      ----- type trainee, or trainer
+                  (select h.type from ehr_compliancedb.Requirements h where h.requirementname = a.requirementname) as requirement_type,      ----- type trainee, or trainer
+
+
+                   (select count(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= a.requirementname and zz.employeeid= a.employeeid  ) as timesCompleted,
+
+                   (select k.expireperiod from ehr_compliancedb.Requirements k where k.requirementname = a.requirementname) as ExpiredPeriod,
+
+                   ( select  (datediff(month,max(pq.date), tt.reviewdate) )from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname =   a.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                     having (tt.expireperiod) > (datediff(month,max(pq.date), tt.reviewdate))  and (tt.reviewdate is not null)  ) as NewExpirePeriod,
+
+                   (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= a.requirementname and zz.employeeid= a.employeeid  ) as MostRecentDate,
+
+                   (Select distinct string_agg(yy.comment, char(10))  from ehr_compliancedb.completiondates yy where yy.date in (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= a.requirementname and zz.employeeid= a.employeeid )
+                                                                                                 And  yy.requirementname= a.requirementname and yy.employeeid= a.employeeid   ) as comment,
+
+                   (Select distinct string_agg(yy.snooze_date, char(10))  from ehr_compliancedb.completiondates yy where yy.date in (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= a.requirementname and zz.employeeid= a.employeeid )
+                                                                                                 And  yy.requirementname= a.requirementname and yy.employeeid= a.employeeid   ) as snooze_date,
+
+                   CAST(
+                           CASE
+                               WHEN (select max(st.date) from ehr_compliancedb.completiondates st where st.requirementname = a.requirementname and st.employeeid = a.employeeid ) IS NULL   then 0
+                               WHEN ( select  (tt.expireperiod)  from  ehr_compliancedb.requirements tt where tt.requirementname = a.requirementname   group by tt.expireperiod  ) = 0 then Null
+
+
+                               WHEN ( select  count(*) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname = a.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                                      having (tt.expireperiod) >  (datediff(month,max(pq.date), tt.reviewdate) )) > 0 THEN
+
+                                   ( select  ( datediff(month,max(pq.date), tt.reviewdate) - (datediff(month,max(pq.date), getdate())) )from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname =   a.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                                     having (tt.expireperiod) > (datediff(month,max(pq.date), tt.reviewdate))   )
+
+
+                               ELSE ( select  (tt.expireperiod) - ( datediff(month,max(pq.date), getdate())) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where   tt.requirementname =   a.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod )
+
+                               END  AS DECIMAL)  AS MonthsUntilRenewal
+
+
+        from  ehr_compliancedb.employeerequirementexemptions a
+              Where a.employeeid in (select p.employeeid from ehr_compliancedb.employees p where a.employeeid = p.employeeid And p.enddate is null)
+              And a.requirementname in  (select q.requirementname from ehr_compliancedb.Requirements q where q.requirementname = a.requirementname And q.dateDisabled is null )
+
+        group by a.requirementname,a.employeeid
+
+        UNION
+
+        --- Additional requirements for employees that have not completed training, but is required
+
+        select j.requirementname,
+               j.employeeid,
+               null as unit,
+               null as category,
+               'Yes' as trackingflag,
+              (select h.email from ehr_compliancedb.employees h where h.employeeid = j.employeeid) as  email,
+              (select h.lastname from ehr_compliancedb.employees h where h.employeeid = j.employeeid) as lastname,
+              (select h.firstname from ehr_compliancedb.employees h where h.employeeid = j.employeeid) as firstname,
+              (select h.majorudds from ehr_compliancedb.employees h where h.employeeid = j.employeeid) as host,
+              (select h.supervisor from ehr_compliancedb.employees h where h.employeeid = j.employeeid) as supervisor,
+              (select h.type from ehr_compliancedb.employees h where h.employeeid = j.employeeid) as trainee_type,      ----- type trainee, or trainer
+              (select h.type from ehr_compliancedb.Requirements h where h.requirementname = j.requirementname) as requirement_type,      ----- type trainee, or trainer
+
+              (select count(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= j.requirementname and zz.employeeid= j.employeeid  ) as timesCompleted,
+
+                                (select k.expireperiod from ehr_compliancedb.Requirements k where k.requirementname = j.requirementname) as ExpiredPeriod,
+
+                                ( select  (datediff(month,max(pq.date), tt.reviewdate) )from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname =   j.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = j.employeeid group by tt.expireperiod, tt.reviewdate
+                                  having (tt.expireperiod) > (datediff(month,max(pq.date), tt.reviewdate))  and (tt.reviewdate is not null)  ) as NewExpirePeriod,
+
+                                (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= j.requirementname and zz.employeeid= j.employeeid  ) as MostRecentDate,
+
+                                (Select distinct string_agg(yy.comment, char(10))  from ehr_compliancedb.completiondates yy where yy.date in (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= j.requirementname and zz.employeeid= j.employeeid )
+                                                                                                              And  yy.requirementname= j.requirementname and yy.employeeid= j.employeeid   ) as comment,
+
+                                (Select distinct string_agg(yy.snooze_date, char(10))  from ehr_compliancedb.completiondates yy where yy.date in (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= j.requirementname and zz.employeeid= j.employeeid )
+                                                                                                              And  yy.requirementname= j.requirementname and yy.employeeid= j.employeeid   ) as snooze_date,
+
+                                CAST(
+                                        CASE
+                                            WHEN (select max(st.date) from ehr_compliancedb.completiondates st where st.requirementname = j.requirementname and st.employeeid = j.employeeid ) IS NULL   then 0
+                                            WHEN ( select  (tt.expireperiod)  from  ehr_compliancedb.requirements tt where tt.requirementname = j.requirementname   group by tt.expireperiod  ) = 0 then Null
+
+
+                                            WHEN ( select  count(*) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname = j.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = j.employeeid group by tt.expireperiod, tt.reviewdate
+                                                   having (tt.expireperiod) >  (datediff(month,max(pq.date), tt.reviewdate) )) > 0 THEN
+
+                                                ( select  ( datediff(month,max(pq.date), tt.reviewdate) - (datediff(month,max(pq.date), getdate())) )from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname =   j.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = j.employeeid group by tt.expireperiod, tt.reviewdate
+                                                  having (tt.expireperiod) > (datediff(month,max(pq.date), tt.reviewdate))   )
+
+
+                                            ELSE ( select  (tt.expireperiod) - ( datediff(month,max(pq.date), getdate())) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where   tt.requirementname =   j.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = j.employeeid group by tt.expireperiod )
+
+                                            END  AS DECIMAL)  AS MonthsUntilRenewal
+
+
+
+        from  ehr_compliancedb.RequirementsPerEmployee j
+          Where j.employeeid in (select p.employeeid from ehr_compliancedb.employees p where j.employeeid = p.employeeid And p.enddate is null)
+          And j.requirementname in  (select q.requirementname from ehr_compliancedb.Requirements q where q.requirementname = j.requirementname And q.dateDisabled is null )
+
+        group by j.requirementname,j.employeeid
+
+        order by employeeid,requirementname, mostrecentcompleted_date desc
+
+
+	       If @@Error <> 0
+	                 GoTo Err_Proc
+
+
+
+
+ RETURN 0
+
+
+Err_Proc:
+
+	RETURN 1
+
+
+END
+
+GO
diff --git a/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-24.008-24.009.sql b/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-24.008-24.009.sql
new file mode 100644
index 000000000..54bfb6df4
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-24.008-24.009.sql
@@ -0,0 +1,232 @@
+
+
+EXEC core.fn_dropifexists 'p_ComplianceProcedureOverDueSoon_Process', 'onprc_ehr_compliancedb', 'PROCEDURE';
+GO
+
+-- Author:	R. Blasa
+-- Created: 9-20-2024
+
+/*
+**
+** 	Created by
+**      Blasa  		9-20-2024     Created a storedprocedure to create a static set of data from
+**                                 the ComplianceProcedureRecentTest.sql query
+**
+**
+**
+*/
+
+CREATE Procedure onprc_ehr_compliancedb.p_ComplianceProcedureOverDueSoon_Process
+
+
+AS
+
+
+              ----- Reset Reporting table
+              Delete onprc_ehr_compliancedb.ComplianceProcedureReport
+
+	                      If @@Error <> 0
+	                                GoTo Err_Proc
+
+
+
+BEGIN
+
+          Insert into onprc_ehr_compliancedb.ComplianceProcedureReport
+                        (
+                         requirementname,
+                         employeeid,
+                         unit,
+                         category,
+                         trackingflag,
+                         email,
+                         lastname,
+                         firstname,
+                         host,
+                         supervisor,
+                         trainee_type,
+                         requirement_name_type,
+                         times_completed,
+                          expired_period,
+                          new_expired_Period,
+                          mostrecentcompleted_date,
+                          comment,
+                          snooze_date,
+                          months_until_renewal
+
+                         )
+
+
+
+
+
+        select b.requirementname,
+               a.employeeid,
+               string_agg(a.unit,char(10)) as unit,
+               string_agg(a.category,char(10)) as category,
+               string_agg(b.trackingflag,char(10)) as trackingflag,
+              (select h.email from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as  email,
+              (select h.lastname from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as lastname,
+              (select h.firstname from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as firstname,
+              (select h.majorudds from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as host,
+              (select h.supervisor from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as supervisor,
+              (select h.type from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as trainee_type,      ----- type trainee, or trainer
+              (select h.type from ehr_compliancedb.Requirements h where h.requirementname = b.requirementname) as requirement_type,
+
+               (select count(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= b.requirementname and zz.employeeid= a.employeeid  ) as times_Completed,
+
+               (select k.expireperiod from ehr_compliancedb.Requirements k where k.requirementname = b.requirementname) as ExpiredPeriod,
+
+               ( select  (datediff(month,max(pq.date), tt.reviewdate) ) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname =   b.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                 having (tt.expireperiod) > (datediff(month,max(pq.date), tt.reviewdate))   and (tt.reviewdate is not null)  ) as NewExpirePeriod,
+
+               (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= b.requirementname and zz.employeeid= a.employeeid  ) as mostrecentcompleted_date,
+
+               (Select distinct string_agg(yy.comment, char(10))  from ehr_compliancedb.completiondates yy where yy.date in (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= b.requirementname and zz.employeeid= a.employeeid )
+                                                                                             And  yy.requirementname= b.requirementname and yy.employeeid= a.employeeid   ) as comment,
+
+               (Select distinct string_agg(yy.snooze_date, char(10)) from ehr_compliancedb.completiondates yy where yy.date in (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= b.requirementname and zz.employeeid= a.employeeid )
+                                                                                             And  yy.requirementname= b.requirementname and yy.employeeid= a.employeeid   ) as snooze_date,
+
+               CAST(
+                       CASE
+
+                           WHEN (select max(st.date) from ehr_compliancedb.completiondates st where st.requirementname = b.requirementname and st.employeeid = a.employeeid ) IS NULL   then 0
+                           WHEN ( select  (tt.expireperiod)  from  ehr_compliancedb.requirements tt where tt.requirementname = b.requirementname   group by tt.expireperiod  ) = 0 then Null
+
+
+                           WHEN ( select  count(*) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname = b.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                                  having (tt.expireperiod) >  ( datediff(month,max(pq.date), tt.reviewdate)        )) > 0 THEN
+
+                               ( select  (datediff(month,max(pq.date), tt.reviewdate) - ( datediff(month,max(pq.date), getdate())   ) )from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname =   b.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                                 having (tt.expireperiod) > ( datediff(month,max(pq.date), tt.reviewdate)    )      )
+
+
+
+
+                           ELSE ( select  (tt.expireperiod) - ( datediff(month,max(pq.date), getdate()) )  from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where   tt.requirementname =   b.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod )
+
+                           END  AS Float)  AS MonthsUntilRenewal
+
+
+
+        from ehr_Compliancedb.employeeperunit a ,ehr_compliancedb.requirementspercategory b
+        where ( a.unit = b.unit or a.category = b.category )
+          And b.requirementname not in (select distinct t.requirementname from ehr_compliancedb.employeerequirementexemptions t Where a.employeeid = t.employeeid
+                                                                                                                                  And b.requirementname = t.requirementname)
+          And a.employeeid in (select p.employeeid from ehr_compliancedb.employees p where a.employeeid = p.employeeid And p.enddate is null)
+          And b.requirementname in  (select q.requirementname from ehr_compliancedb.Requirements q where q.requirementname = b.requirementname And q.dateDisabled is null )
+
+
+          group by b.requirementname,a.employeeid
+
+          union
+
+          select a.requirementname,
+                 a.employeeid,
+                 null as unit,
+                 null as category,
+                 'None' as trackingflag,
+                 (select h.email from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as  email,
+                 (select h.lastname from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as lastname,
+                 (select h.firstname from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as firstname,
+                 (select h.majorudds from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as host,
+                 (select h.supervisor from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as supervisor,
+                 (select h.type from ehr_compliancedb.employees h where h.employeeid = a.employeeid) as trainee_type,      ----- type trainee, or trainer
+                 (select h.type from ehr_compliancedb.Requirements h where h.requirementname = a.requirementname) as requirement_type,      ----- type trainee, or trainer
+
+
+                 (select count(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= a.requirementname and zz.employeeid= a.employeeid  ) as timesCompleted,
+
+                 (select k.expireperiod from ehr_compliancedb.Requirements k where k.requirementname = a.requirementname) as ExpiredPeriod,
+
+                 ( select  (datediff(month,max(pq.date), tt.reviewdate) )from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname =   a.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                   having (tt.expireperiod) > (datediff(month,max(pq.date), tt.reviewdate))  and (tt.reviewdate is not null)  ) as NewExpirePeriod,
+
+                 (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= a.requirementname and zz.employeeid= a.employeeid  ) as MostRecentDate,
+
+                 (Select distinct string_agg(yy.comment, char(10))  from ehr_compliancedb.completiondates yy where yy.date in (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= a.requirementname and zz.employeeid= a.employeeid )
+                                                                                                               And  yy.requirementname= a.requirementname and yy.employeeid= a.employeeid   ) as comment,
+
+                 (Select distinct string_agg(yy.snooze_date, char(10))  from ehr_compliancedb.completiondates yy where yy.date in (select max(zz.date) from ehr_compliancedb.completiondates zz where zz.requirementname= a.requirementname and zz.employeeid= a.employeeid )
+                                                                                                                   And  yy.requirementname= a.requirementname and yy.employeeid= a.employeeid   ) as snooze_date,
+
+                 CAST(
+                         CASE
+                             WHEN (select max(st.date) from ehr_compliancedb.completiondates st where st.requirementname = a.requirementname and st.employeeid = a.employeeid ) IS NULL   then 0
+                             WHEN ( select  (tt.expireperiod)  from  ehr_compliancedb.requirements tt where tt.requirementname = a.requirementname   group by tt.expireperiod  ) = 0 then Null
+
+
+                             WHEN ( select  count(*) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname = a.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                                    having (tt.expireperiod) >  (datediff(month,max(pq.date), tt.reviewdate)  )) > 0 THEN
+
+                                 ( select  (datediff(month,max(pq.date), tt.reviewdate) - ( datediff(month,max(pq.date), getdate())) ) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where tt.requirementname =   a.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod, tt.reviewdate
+                                   having (tt.expireperiod) > (datediff(month,max(pq.date), tt.reviewdate) )   )
+
+
+                             ELSE ( select  (tt.expireperiod) - ( datediff(month,max(pq.date), getdate())) from  ehr_compliancedb.requirements tt, ehr_compliancedb.completiondates pq where   tt.requirementname =   a.requirementname and pq.requirementname = tt.requirementname and pq.employeeid = a.employeeid group by tt.expireperiod )
+
+                             END  AS FLOAT)  AS MonthsUntilRenewal
+
+
+          from  ehr_compliancedb.completiondates a
+          where a.requirementname not in (select distinct h.requirementname from ehr_compliancedb.employeeperunit k, ehr_compliancedb.requirementspercategory h Where (k.unit = h.unit
+              or k.category = h.category) And a.employeeid = k.employeeid )
+            And a.requirementname not in (select distinct t.requirementname from ehr_compliancedb.employeerequirementexemptions t Where a.employeeid = t.employeeid
+                                                                                                                                    And a.requirementname = t.requirementname)
+            And a.employeeid in (select p.employeeid from ehr_compliancedb.employees p where a.employeeid = p.employeeid And p.enddate is null)
+            And a.requirementname in  (select q.requirementname from ehr_compliancedb.Requirements q where q.requirementname = a.requirementname And q.dateDisabled is null )
+
+          group by a.requirementname,a.employeeid
+
+        union
+
+        -- Additional requirements for employees that have not completed training, but is required
+        select j.requirementname,
+               j.employeeid,
+               null as unit,
+               null as category,
+               'Yes' as trackingflag,
+              (select h.email from ehr_compliancedb.employees h where h.employeeid = j.employeeid) as  email,
+              (select h.lastname from ehr_compliancedb.employees h where h.employeeid = j.employeeid) as lastname,
+              (select h.firstname from ehr_compliancedb.employees h where h.employeeid = j.employeeid) as firstname,
+              (select h.majorudds from ehr_compliancedb.employees h where h.employeeid = j.employeeid) as host,
+              (select h.supervisor from ehr_compliancedb.employees h where h.employeeid = j.employeeid) as supervisor,
+              (select h.type from ehr_compliancedb.employees h where h.employeeid = j.employeeid) as trainee_type,      ----- type trainee, or trainer
+              (select h.type from ehr_compliancedb.Requirements h where h.requirementname = j.requirementname) as requirement_type,    ----- type trainee, or trainer
+               null as timesCompleted,
+               null as ExpiredPeriod,
+               null as NewExpirePeriod,
+               null as MostRecentDate,
+               '' as comment,
+               null as snooze_date,
+               null AS MonthsUntilRenewal
+
+
+
+        from  ehr_compliancedb.RequirementsPerEmployee j
+          Where j.employeeid in (select p.employeeid from ehr_compliancedb.employees p where j.employeeid = p.employeeid And p.enddate is null)
+         And j.requirementname in  (select q.requirementname from ehr_compliancedb.Requirements q where q.requirementname = j.requirementname And q.dateDisabled is null )
+
+        group by j.requirementname,j.employeeid
+
+        order by employeeid,requirementname, mostrecentcompleted_date desc
+
+
+	       If @@Error <> 0
+	                 GoTo Err_Proc
+
+
+
+
+ RETURN 0
+
+
+Err_Proc:
+
+	RETURN 1
+
+
+END
+
+GO
\ No newline at end of file
diff --git a/ONPRC_EHR_ComplianceDB/resources/views/requirementDetails.html b/ONPRC_EHR_ComplianceDB/resources/views/requirementDetails.html
new file mode 100644
index 000000000..6bc8fa143
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/views/requirementDetails.html
@@ -0,0 +1,94 @@
+<script type="text/javascript" nonce="<%=scriptNonce%>">
+
+    Ext4.onReady(function (){
+        if (!LABKEY.ActionURL.getParameter('requirementname')){
+            alert('Must Provide A Requirement Name');
+            return;
+        }
+
+        var webpart = <%=webpartContext%>;
+        var domSpec = [{
+            tag: 'div',
+            id: 'details_' + webpart.wrapperDivId,
+            style: 'margin-bottom: 20px;'
+        },{
+            tag: 'div',
+            id: 'summary_' + webpart.wrapperDivId,
+            style: 'margin-bottom: 20px;'
+        },{
+            tag: 'div',
+            id: 'percategory_' + webpart.wrapperDivId,
+            style: 'margin-bottom: 20px;'
+        },{
+            tag: 'div',
+            id: 'peremployee_' + webpart.wrapperDivId,
+            style: 'margin-bottom: 20px;'
+        },{
+            tag: 'div',
+            id: 'exemptions_' + webpart.wrapperDivId,
+            style: 'margin-bottom: 20px;'
+        },{
+            tag: 'div',
+            id: 'history_' + webpart.wrapperDivId,
+            style: 'margin-bottom: 20px;'
+        }];
+
+        var el = Ext4.get(webpart.wrapperDivId);
+        Ext4.DomHelper.append(el, domSpec);
+
+        var filterArray = [LABKEY.Filter.create('requirementname', LABKEY.ActionURL.getParameter('requirementname'), LABKEY.Filter.Types.EQUAL)];
+
+        Ext4.create('LDK.panel.DetailsPanel', {
+            store: {
+                schemaName: 'ehr_compliancedb',
+                queryName: 'requirements',
+                filterArray: filterArray
+            },
+            showBackBtn: false,
+            title: 'Requirement Details',
+            renderTo: 'details_' + webpart.wrapperDivId
+        });
+
+        Ext4.create('LDK.panel.QueryPanel', {
+            queryConfig: {
+                title: 'Categories/Units That Must Complete This Requirement',
+                schemaName: 'ehr_compliancedb',
+                queryName: 'requirementspercategory',
+                filterArray: filterArray,
+                failure: LDK.Utils.getErrorCallback()
+            }
+        }).render('percategory_' + webpart.wrapperDivId);
+
+        Ext4.create('LDK.panel.QueryPanel', {
+            queryConfig: {
+                title: 'Individual Employees That Must Complete This Requirement (beyond their category/unit)',
+                schemaName: 'ehr_compliancedb',
+                queryName: 'requirementsperemployee',
+                filterArray: filterArray,
+                failure: LDK.Utils.getErrorCallback()
+            }
+        }).render('peremployee_' + webpart.wrapperDivId);
+
+        Ext4.create('LDK.panel.QueryPanel', {
+            queryConfig: {
+                title: 'Individual Employees Exempt From This Requirement',
+                schemaName: 'ehr_compliancedb',
+                queryName: 'employeerequirementexemptions',
+                filterArray: filterArray,
+                failure: LDK.Utils.getErrorCallback()
+            }
+        }).render('exemptions_' + webpart.wrapperDivId);
+
+        // Modified: 1-23-2025 R. Blasa  exclude employee requirement exemptions
+        Ext4.create('LDK.panel.QueryPanel', {
+            queryConfig: {
+                title: 'All Employees Who Must Complete This Requirement',
+                schemaName: 'ehr_compliancedb',
+                queryName: 'ComplianceProcedureRecentTests',
+                filterArray: filterArray,
+                failure: LDK.Utils.getErrorCallback()
+            }
+        }).render('summary_' + webpart.wrapperDivId);
+    });
+
+</script>
\ No newline at end of file
diff --git a/ONPRC_EHR_ComplianceDB/resources/views/requirementDetails.view.xml b/ONPRC_EHR_ComplianceDB/resources/views/requirementDetails.view.xml
new file mode 100644
index 000000000..8fe8cdeeb
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/views/requirementDetails.view.xml
@@ -0,0 +1,6 @@
+<view xmlns="http://labkey.org/data/xml/view" title="Requirement Details" frame="none">
+    <dependencies>
+        <dependency path="Ext4"/>
+        <dependency path="LDK/LDKApi"/>
+    </dependencies>
+</view>
\ No newline at end of file
diff --git a/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java b/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
index a03021ffb..6177e2f77 100644
--- a/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
+++ b/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
@@ -55,7 +55,7 @@ public String getName()
     @Override
     public Double getSchemaVersion()
     {
-        return 24.007;
+        return 24.009;
     }
 
     @Override