Merge from wnprc18.3 svn r.64261 to r.65647

EHR_ComplianceDB/api-src/org/labkey/ehr_compliancedb/api/EHR_ComplianceService.java

@@ -0,0 +1,22 @@
+package org.labkey.ehr_compliancedb.api;
+
+import org.labkey.api.data.Container;
+
+/**
+ * Created by jon on 3/22/16.
+ */
+public abstract class EHR_ComplianceService {
+    static private EHR_ComplianceService _service = null;
+
+    static public EHR_ComplianceService get() {
+        return _service;
+    }
+
+    public static void setInstance(EHR_ComplianceService instance) {
+        _service = instance;
+    }
+
+    public abstract String getComplianceModuleName();
+
+    public abstract Container getEmployeeContainer(Container c);
+}

EHR_ComplianceDB/resources/module.xml

@@ -14,6 +14,13 @@
             </editPermissions>
             <description>This is the default view to show on the employees table</description>
         </propertyDescriptor>
+        <propertyDescriptor name="PDFContainer">
+            <canSetPerContainer>true</canSetPerContainer>
+            <editPermissions>
+                <permission>ADMIN</permission>
+            </editPermissions>
+            <description>This is the containerPath to the folder holding the list of PDFs shared between public and private folder. The PDF list has a Linked schema between both folders, the actual files have to reside in the public folder  Use of slashes is very important - it should be in the format '/myProject/compliance'</description>
+        </propertyDescriptor>
     </properties>
     <clientDependencies>
         <dependency path="clientapi/ext4.lib.xml"/>

EHR_ComplianceDB/resources/queries/ehr_compliancedb/MostRecentCompletionDates.sql

@@ -0,0 +1,14 @@
+PARAMETERS (RequirementName VARCHAR DEFAULT 'SOP REVIEW-ANNUAL')
+
+SELECT t1.employeeid, t3.lastname, t3.firstname, t1.requirementname, t1.date
+FROM ehr_compliancedb.completiondates t1
+  JOIN ehr_compliancedb.employees t3
+    ON t1.employeeid = t3.employeeid
+WHERE EXISTS (SELECT 1
+              FROM ehr_compliancedb.completiondates t2
+              WHERE t1.employeeid = t2.employeeid
+                    AND t1.requirementname = t2.requirementname
+                    AND UPPER(t2.requirementname) = UPPER(RequirementName)
+              GROUP BY t2.employeeid, t2.requirementname
+              HAVING t1.date = MAX(t2.date))
+ORDER BY LOWER(t1.employeeid) ASC

EHR_ComplianceDB/resources/queries/ehr_compliancedb/SOPDateLastRead/.qview.xml

@@ -6,7 +6,7 @@
                 <property name="columnTitle" value="Name"/>
             </properties>
         </column>
-        <column name="SOP_ID/PDF">
+        <column name="PDF">
             <properties>
                 <property name="columnTitle" value="PDF"/>
             </properties>

EHR_ComplianceDB/resources/queries/ehr_compliancedb/employees/Active Employees.qview.xml

@@ -1,4 +1,34 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <columns>
+        <column name="employeeid"/>
+        <column name="lastName"/>
+        <column name="firstName"/>
+        <column name="middleName"/>
+        <column name="email"/>
+        <column name="email2"/>
+        <column name="personid"/>
+        <column name="type"/>
+        <column name="majorudds"/>
+        <column name="title"/>
+        <column name="unit"/>
+        <column name="supervisor"/>
+        <column name="emergencycontact" />
+        <column name="emergencycontactdaytimephone" />
+        <column name="emergencycontactnighttimephone" />
+        <column name="category"/>
+        <column name="location"/>
+        <column name="startdate"/>
+        <column name="enddate"/>
+        <column name="notes"/>
+        <column name="homephone"/>
+        <column name="officephone"/>
+        <column name="cellphone"/>
+        <column name="contactsSla"/>
+        <column name="animals"/>
+        <column name="tissue"/>
+        <column name="barrier"/>
+        <column name="isemployee"/>
+    </columns>
     <sorts>
         <sort column="lastName" descending="false"/>
         <sort column="firstName" descending="false"/>