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

4.0.x sprint17 vir 144 further filter by merging #284

Merged
30 commits merged into from
Oct 14, 2016
Merged

4.0.x sprint17 vir 144 further filter by merging #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6e91f3c
Now adding filter criterion to active filter
jeremythuff Oct 4, 2016
ed67725
Now filtering by Status
jeremythuff Oct 5, 2016
121239e
Finished styling for status filters
jeremythuff Oct 5, 2016
e738e56
Added filters for UMI Publications
jeremythuff Oct 5, 2016
554d55c
WIP Custom action filters
jeremythuff Oct 7, 2016
ca87019
Refactored NamedSearchFilter to NamedSearchFilterGroup
jeremythuff Oct 7, 2016
8970f34
Added a filterCriterion model for value and gloss
jeremythuff Oct 7, 2016
d4378e6
Fixed bug with user update
jeremythuff Oct 7, 2016
13a3e0b
Merge pull request #279 from TexasDigitalLibrary/4.0.x-sprint17-vir-1…
jeremythuff Oct 7, 2016
d6674ed
Filtering by custom actions
jeremythuff Oct 7, 2016
fdc25e6
(WIP) pagination and sorting on predicate field values
jcreel Oct 10, 2016
0dd0665
Now filtering by Assigned to
jeremythuff Oct 10, 2016
ccab35b
predicate -> fieldPredicate
jcreel Oct 10, 2016
af5fded
Filtering by field values
jcreel Oct 10, 2016
3110a97
Updated weaver snapshot.
Oct 11, 2016
8e1ec7e
Do not overwrite defaults changed from UI.
Oct 11, 2016
4b8faca
Autowire DataSource.
Oct 11, 2016
646f81c
Setup to complete out sql query for submission list.
Oct 11, 2016
c79f7e8
Removed unused imports and class members.
Oct 11, 2016
2ea3745
Merge branch '4.0.x-sprint17-sql-query' into 4.0.x-sprint17-vir-144-f…
jeremythuff Oct 11, 2016
8d07ce7
Now sorting and filtering by status
jeremythuff Oct 11, 2016
2d7aafc
Now sorting and filtering organization category
jeremythuff Oct 12, 2016
1bb51e1
Now filtering and sorting on assigned to
jeremythuff Oct 12, 2016
22bfb71
UI for filter further by organization category and name
jeremythuff Oct 12, 2016
ebc2b5f
Now filtering by dates and date ranges
jeremythuff Oct 13, 2016
dbb76a3
Now filtering by document type
jeremythuff Oct 13, 2016
06d7236
Now sorting organization filters by category
jeremythuff Oct 13, 2016
55bd1df
No filtering by embargo type
jeremythuff Oct 14, 2016
de5d28c
Merge pull request #282 from TexasDigitalLibrary/4.0.x-sprint17-vir-1…
Oct 14, 2016
299fefd
Merge branch '4.0.x-sprint17-staging' into 4.0.x-sprint17-vir-144-fur…
jeremythuff Oct 14, 2016
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
7 changes: 4 additions & 3 deletions src/main/java/org/tdl/vireo/controller/SubmissionController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ public ApiResponse updateSubmission(@ApiVariable("submissionId") Long submission
@ApiMapping("/query/{page}/{size}")
@Auth(role = "MANAGER")
public ApiResponse querySubmission(@ApiCredentials Credentials credentials, @ApiVariable Integer page, @ApiVariable Integer size, @ApiModel List<SubmissionListColumn> submissionListColumns) {
return new ApiResponse(SUCCESS, submissionRepo.pageableDynamicSubmissionQuery(credentials, submissionListColumns, new PageRequest(page, size)));
User user = userRepo.findByEmail(credentials.getEmail());
return new ApiResponse(SUCCESS, submissionRepo.pageableDynamicSubmissionQuery(user.getActiveFilter(), submissionListColumns, new PageRequest(page, size)));
}

@ApiMapping("/all-submission-state")
Expand All @@ -124,7 +125,7 @@ public ApiResponse batchUpdateSubmissionStates(@ApiCredentials Credentials crede

User user = userRepo.findByEmail(credentials.getEmail());

submissionRepo.dynamicSubmissionQuery(credentials, user.getSubmissionViewColumns()).forEach(sub -> {
submissionRepo.batchDynamicSubmissionQuery(user.getActiveFilter(), user.getSubmissionViewColumns()).forEach(sub -> {
sub.setState(submissionState);
submissionRepo.save(sub);
});
Expand All @@ -140,7 +141,7 @@ public ApiResponse batchAssignTo(@ApiCredentials Credentials credentials, @ApiMo

User user = userRepo.findByEmail(credentials.getEmail());

submissionRepo.dynamicSubmissionQuery(credentials, user.getSubmissionViewColumns()).forEach(sub -> {
submissionRepo.batchDynamicSubmissionQuery(user.getActiveFilter(), user.getSubmissionViewColumns()).forEach(sub -> {
sub.setAssignee(assignee);
submissionRepo.save(sub);
});
Expand Down
Loading