Add eventDate to getActiveProjects and update method to get all proje…

…ct items when date is present (#160) * added eventDate to getActiveProjects * added eventDate to method * added eventDate to method
LabKey · Dec 19, 2023 · bd26b70 · bd26b70
1 parent 8787999
commit bd26b70
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/api-src/org/labkey/api/snd/SNDService.java b/api-src/org/labkey/api/snd/SNDService.java
@@ -29,6 +29,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -70,6 +71,7 @@ static SNDService get()
     Map<Integer, Category> getAllCategories(Container c, User u);
     Integer getQCStateId(Container c, User u, QCStateEnum qcState);
     QCStateEnum getQCState(Container c, User u, int qcStateId);
+    List<Map<String, Object>> getActiveProjects(Container c, User u, ArrayList<SimpleFilter> filters, Boolean activeProjectItemsOnly, Date eventDate);
     List<Map<String, Object>> getActiveProjects(Container c, User u, ArrayList<SimpleFilter> filters, Boolean activeProjectItemsOnly);
     List<Map<String, Object>> getActiveProjects(Container c, User u, ArrayList<SimpleFilter> filters);
 }
diff --git a/src/org/labkey/snd/SNDManager.java b/src/org/labkey/snd/SNDManager.java
@@ -3322,16 +3322,20 @@ public Map<Integer, Category> getAllCategories(Container c, User u)
      * Returns a list of active projects with a list of project items
      */
 
-    public List<Map<String, Object>> getActiveProjects(Container c, User u, ArrayList<SimpleFilter> filters, Boolean activeProjectItemsOnly)
+    public List<Map<String, Object>> getActiveProjects(Container c, User u, ArrayList<SimpleFilter> filters, Boolean activeProjectItemsOnly, Date eventDate)
     {
         List<Map<String, Object>> projectList = new ArrayList<>();
 
         UserSchema schema = getSndUserSchema(c, u);
         TableInfo projectsTable = getTableInfo(schema, SNDSchema.PROJECTS_TABLE_NAME);
 
         // Get from projects table
-        SimpleFilter filter = new SimpleFilter(FieldKey.fromParts("Active"), true, CompareType.EQUAL);
-        filter.addCondition(FieldKey.fromParts("enddate"), new Date(), CompareType.DATE_GTE);
+        SimpleFilter filter = new SimpleFilter();
+        if (eventDate == null)
+        {
+            filter.addCondition(FieldKey.fromParts("Active"), true, CompareType.EQUAL);
+            filter.addCondition(FieldKey.fromParts("enddate"), new Date(), CompareType.DATE_GTE);
+        }
 
         // apply filters that are passed as an argument
         if (filters != null) {
@@ -3398,8 +3402,13 @@ public List<Map<String, Object>> getActiveProjects(Container c, User u, ArrayLis
                 }
             }
 
+            boolean isActive = activeProjectItemsOnly;
+            if (eventDate != null && !eventDate.before(project.getStartDate()) && !eventDate.after(project.getEndDate())) {
+                isActive = false;
+            }
+
             // add projectItems
-            List<Map<String, Object>> pItems = getProjectItemsList(c, u, project.getProjectId(), project.getRevisionNum(), activeProjectItemsOnly);
+            List<Map<String, Object>> pItems = getProjectItemsList(c, u, project.getProjectId(), project.getRevisionNum(), isActive);
 
             if (pItems.size() > 0)
             {

diff --git a/src/org/labkey/snd/SNDServiceImpl.java b/src/org/labkey/snd/SNDServiceImpl.java
@@ -63,6 +63,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -559,12 +560,18 @@ public Map<Integer, Category> getAllCategories(Container c, User u)
         return SNDManager.get().getAllCategories(c, u);
     }
 
+    @Override
+    public List<Map<String, Object>> getActiveProjects(Container c, User u, ArrayList<SimpleFilter> filters, Boolean activeProjectItemsOnly, Date eventDate) {
+        return SNDManager.get().getActiveProjects(c, u, filters, activeProjectItemsOnly, eventDate);
+    }
+
     @Override
     public List<Map<String, Object>> getActiveProjects(Container c, User u, ArrayList<SimpleFilter> filters, Boolean activeProjectItemsOnly) {
-        return SNDManager.get().getActiveProjects(c, u, filters, activeProjectItemsOnly);
+        return SNDManager.get().getActiveProjects(c, u, filters, activeProjectItemsOnly, null);
     }
+
     @Override
     public List<Map<String, Object>> getActiveProjects(Container c, User u, ArrayList<SimpleFilter> filters) {
-        return SNDManager.get().getActiveProjects(c, u, filters, true);
+        return SNDManager.get().getActiveProjects(c, u, filters, true, null);
     }
 }