Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add eventDate to getActiveProjects and update method to get all project items when date is present #160

Merged
merged 6 commits into from
Dec 19, 2023
Merged

Add eventDate to getActiveProjects and update method to get all project items when date is present #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
096c428
added eventDate to getActiveProjects
jallentxbiomed Dec 14, 2023
1521e7e
added eventDate to method
jallentxbiomed Dec 18, 2023
4ab7d67
added eventDate to method
jallentxbiomed Dec 18, 2023
9a20975
Merge branch '23.11_fb_addGetAllProjects' of https://github.com/LabKe…
jallentxbiomed Dec 18, 2023
35e5805
Merge branch '23.11_fb_addGetAllProjects' of https://github.com/LabKe…
jallentxbiomed Dec 18, 2023
5a94d47
Merge branch '23.11_fb_addGetAllProjects' of https://github.com/LabKe…
jallentxbiomed Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api-src/org/labkey/api/snd/SNDService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
17 changes: 13 additions & 4 deletions src/org/labkey/snd/SNDManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
{
Expand Down
11 changes: 9 additions & 2 deletions src/org/labkey/snd/SNDServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}