romanov73
/
ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

Labels Milestones

Resolve "Фильтрация участников гранта по двум новым параметрам" #204

Merged
tatyana_belousova merged 1 commits from 117-filter-users into dev 5 years ago
Conversation 21 Commits 1 Files Changed 1
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

Closes #117

Closes #117
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

changed milestone to %4

changed milestone to %4
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 1 commit

Compare with previous version

added 1 commit <ul><li>51e121ae - #117 add BAK papers filter</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/77/diffs?diff_id=40420811&start_sha=88ec35faa0a241d9fde3278ce2fe835f8eb7b38f)
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 1 commit

Compare with previous version

added 1 commit <ul><li>39f3c694 - #117 add scopus papers filter</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/77/diffs?diff_id=40485980&start_sha=51e121ae249325615a3f378fe61595f9c25edcb6)
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 6 commits

  • 39f3c694...a352f561 - 5 commits from branch dev
  • 9cf002ad - Merge remote-tracking branch 'remotes/origin/dev' into 117-filter-users

Compare with previous version

added 6 commits <ul><li>39f3c694...a352f561 - 5 commits from branch <code>dev</code></li><li>9cf002ad - Merge remote-tracking branch &#39;remotes/origin/dev&#39; into 117-filter-users</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/77/diffs?diff_id=40486377&start_sha=39f3c6947925f9999e2d58ec16ff1e698b971f6c)
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

unmarked as a Work In Progress

unmarked as a **Work In Progress**
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

assigned to @romanov73

assigned to @romanov73
romanov73 commented 5 years ago (Migrated from gitlab.com)

в коде много повторений, посмотрите как сократить

в коде много повторений, посмотрите как сократить
romanov73 commented 5 years ago (Migrated from gitlab.com) 
return papers.stream()
                .filter(paper -> paper.getAuthors() != null)
.flatMap(paper.getAuthors().stream())
                .collect(toList());

не поможет?

```java return papers.stream() .filter(paper -> paper.getAuthors() != null) .flatMap(paper.getAuthors().stream()) .collect(toList()); ``` не поможет?
romanov73 commented 5 years ago (Migrated from gitlab.com)

почему тут старые (предыдущие) авторы?

почему тут старые (предыдущие) авторы?
romanov73 commented 5 years ago (Migrated from gitlab.com)

если уже делаем специфический запрос к БД то лучше в нем и отфильтровать все, зачем лишние данные тащить в приложение?

если уже делаем специфический запрос к БД то лучше в нем и отфильтровать все, зачем лишние данные тащить в приложение?
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/77/diffs?diff_id=40978544&start_sha=9cf002ad95f57bdcebbefd7be2dd52a0f2c5db79#ce7c00d2f25de8bf7e279fb48743517d4b49f41b_212_214)
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/77/diffs?diff_id=40978544&start_sha=9cf002ad95f57bdcebbefd7be2dd52a0f2c5db79#ce7c00d2f25de8bf7e279fb48743517d4b49f41b_232_228)
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/77/diffs?diff_id=40978544&start_sha=9cf002ad95f57bdcebbefd7be2dd52a0f2c5db79#a09d2139a65a90c7adda2cba3e4bfdedeb983984_308_308)
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 8 commits

  • 9cf002ad...a6f21771 - 2 commits from branch dev
  • 2ebd6101 - #38 add variable "files"
  • 6442a67f - #38 update view
  • a69a257f - #38 add styles
  • 1f6d15b7 - #38 create changelogs
  • c8cfde67 - Merge remote-tracking branch 'remotes/origin/dev' into 38-attach-file-grants
  • 8b333ab3 - Merge branch '38-attach-file-grants' into 117-filter-users

Compare with previous version

added 8 commits <ul><li>9cf002ad...a6f21771 - 2 commits from branch <code>dev</code></li><li>2ebd6101 - #38 add variable &quot;files&quot;</li><li>6442a67f - #38 update view</li><li>a69a257f - #38 add styles</li><li>1f6d15b7 - #38 create changelogs</li><li>c8cfde67 - Merge remote-tracking branch &#39;remotes/origin/dev&#39; into 38-attach-file-grants</li><li>8b333ab3 - Merge branch &#39;38-attach-file-grants&#39; into 117-filter-users</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/77/diffs?diff_id=40978544&start_sha=9cf002ad95f57bdcebbefd7be2dd52a0f2c5db79)
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 1 commit

Compare with previous version

added 1 commit <ul><li>b334b5d7 - #117 resolve discussions</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/77/diffs?diff_id=40979804&start_sha=8b333ab3a67085226f72abe58bbbc849dd17710c)
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 1 commit

Compare with previous version

added 1 commit <ul><li>de625923 - #117 resolve discussions v.2</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/77/diffs?diff_id=40981092&start_sha=b334b5d70ecda284777035e1065476f652855a18)
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 1 commit

Compare with previous version

added 1 commit <ul><li>0955388f - #117 fix port</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/77/diffs?diff_id=40981365&start_sha=de625923e96ba4172ac4ae047560c85fc13e12c2)
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 1 commit

Compare with previous version

added 1 commit <ul><li>74d43dcd - #117 resolve last discussion</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/77/diffs?diff_id=40984630&start_sha=0955388f277095bc08017cbc1466f58b572f7f8f)
tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

resolved all discussions

resolved all discussions
romanov73 commented 5 years ago (Migrated from gitlab.com)

merged

merged
romanov73 commented 5 years ago (Migrated from gitlab.com)

mentioned in commit 68737b976f

mentioned in commit 68737b976f986f8fa4492de40e03e311f3ec5135
The pull request has been merged as 68737b976f.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b 117-filter-users dev
git pull origin 117-filter-users

Step 2:

Merge the changes and update on Gitea.
git checkout dev
git merge --no-ff 117-filter-users
git push origin dev
Sign in to join this conversation.
Reviewers
Request review
No reviewers
Labels
Apply labels
Clear labels   
backend
   
bug
   
frontend
   
выполнить первой
   
выполняется
   
конференции
   
события
   
статьи
No Label
backend
bug
frontend
выполнить первой
выполняется
конференции
события
статьи
Milestone
Set milestone
Clear milestone
No items
No Milestone
Гранты
Projects
Set Project
Clear projects
No project
Assignees
Assign users
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: romanov73/ng-tracker#204
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch '117-filter-users'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes