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

Resolve "Принять участие в конференции пользователю" #183

Merged
VladimirZarayskiy merged 1 commits from 69-take-part-conf into dev 2019-04-19 17:05:08 +04:00
Conversation 22 Commits 1 Files Changed 2 +17 -18
VladimirZarayskiy commented 2019-04-16 15:49:14 +04:00 (Migrated from gitlab.com)
Copy Link

Closes #69

Closes #69
VladimirZarayskiy commented 2019-04-16 15:49:14 +04:00 (Migrated from gitlab.com)
Copy Link

changed milestone to %5

changed milestone to %5
VladimirZarayskiy commented 2019-04-17 11:19:31 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>14c28050 - #65 changed interface</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/56/diffs?diff_id=39617551&start_sha=7491d7e9e42f07f1004c3f500c371cf28d5765b9)
VladimirZarayskiy commented 2019-04-17 13:00:57 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 8564f2cf - #69 managed to create a connection through a new entity

Compare with previous version

added 1 commit <ul><li>8564f2cf - #69 managed to create a connection through a new entity</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/56/diffs?diff_id=39627318&start_sha=14c28050c7bb6d357b3e2cd2b4c0ef58e6ac8832)
VladimirZarayskiy commented 2019-04-17 14:51:26 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>7e4d8d49 - #69 added method take part in conference</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/56/diffs?diff_id=39639141&start_sha=8564f2cf3462ee4d1c45450cc0fc9fdc402994af)
VladimirZarayskiy commented 2019-04-18 11:23:25 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 918079ac - #69 fixed not working code, now user can take part in conference and choose...

Compare with previous version

added 1 commit <ul><li>918079ac - #69 fixed not working code, now user can take part in conference and choose...</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/56/diffs?diff_id=39723185&start_sha=7e4d8d491845e70885e184e02ea6acf514bb2670)
VladimirZarayskiy commented 2019-04-18 14:33:54 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>8fd352aa - #69 added styles</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/56/diffs?diff_id=39745959&start_sha=918079ac890188e3a0f60217bf9053f5bee5b0ae)
VladimirZarayskiy commented 2019-04-18 15:38:55 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • 96431701 - #69 added button disabling take part, if cur user already taken part

Compare with previous version

added 1 commit <ul><li>96431701 - #69 added button disabling take part, if cur user already taken part</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/56/diffs?diff_id=39752192&start_sha=8fd352aaa4263f7d4c02ec41badb30b8891632a4)
VladimirZarayskiy commented 2019-04-18 15:46:02 +04:00 (Migrated from gitlab.com)
Copy Link

assigned to @romanov73

assigned to @romanov73
VladimirZarayskiy commented 2019-04-18 15:50:51 +04:00 (Migrated from gitlab.com)
Copy Link

unmarked as a Work In Progress

unmarked as a **Work In Progress**
romanov73 commented 2019-04-18 23:12:19 +04:00 (Migrated from gitlab.com)
Copy Link

метод в контроллере стал большим, нужно переносить в сервис

метод в контроллере стал большим, нужно переносить в сервис
romanov73 commented 2019-04-18 23:13:57 +04:00 (Migrated from gitlab.com)
Copy Link

parcipant.getUser().equals(userService.getCurrentUser())

parcipant.getUser().equals(userService.getCurrentUser())
romanov73 commented 2019-04-18 23:19:06 +04:00 (Migrated from gitlab.com)
Copy Link

а еще можно через стримы одной командой:
return conferenceUsers .stream() .anyMatch(participant -> participant.getUser().equals(userService.getCurrentUser()));

а еще можно через стримы одной командой: ` return conferenceUsers .stream() .anyMatch(participant -> participant.getUser().equals(userService.getCurrentUser()));`
VladimirZarayskiy commented 2019-04-19 14:24:55 +04:00 (Migrated from gitlab.com)
Copy Link

added 50 commits

  • 96431701...5a55e3cf - 49 commits from branch dev
  • 713e5004 - Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf

Compare with previous version

added 50 commits <ul><li>96431701...5a55e3cf - 49 commits from branch <code>dev</code></li><li>713e5004 - Merge remote-tracking branch &#39;remotes/origin/dev&#39; into 69-take-part-conf</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/56/diffs?diff_id=39855194&start_sha=96431701dfce3ebfe92500510ddfcbf700943a67)
VladimirZarayskiy commented 2019-04-19 14:29:18 +04:00 (Migrated from gitlab.com)
Copy Link

changed this line in version 8 of the diff

changed this line in [version 8 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/56/diffs?diff_id=39855462&start_sha=713e50043ec59e0d27fd2f58af5082f76a40a691#4507aa768a06337c46539c4bab2e3f780d6dc7b5_138_137)
VladimirZarayskiy commented 2019-04-19 14:29:19 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>9edcebb2 - #69 changed isCurrentUserParticipant</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/56/diffs?diff_id=39855462&start_sha=713e50043ec59e0d27fd2f58af5082f76a40a691)
VladimirZarayskiy commented 2019-04-19 14:39:13 +04:00 (Migrated from gitlab.com)
Copy Link

changed this line in version 9 of the diff

changed this line in [version 9 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/56/diffs?diff_id=39856034&start_sha=9edcebb2f571e607db810d55ffe3b00518a0afa3#ffd2d92a659641c319b215743e9f95cb233117c3_52_50)
VladimirZarayskiy commented 2019-04-19 14:39:14 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

  • b623402a - #69 changed method getConference in controller

Compare with previous version

added 1 commit <ul><li>b623402a - #69 changed method getConference in controller</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/56/diffs?diff_id=39856034&start_sha=9edcebb2f571e607db810d55ffe3b00518a0afa3)
VladimirZarayskiy commented 2019-04-19 14:39:59 +04:00 (Migrated from gitlab.com)
Copy Link

исправлено

исправлено
VladimirZarayskiy commented 2019-04-19 14:40:12 +04:00 (Migrated from gitlab.com)
Copy Link

исправлено

исправлено
romanov73 commented 2019-04-19 17:04:45 +04:00 (Migrated from gitlab.com)
Copy Link

resolved all discussions

resolved all discussions
romanov73 commented 2019-04-19 17:05:08 +04:00 (Migrated from gitlab.com)
Copy Link

mentioned in commit 2d0f2aeecd

mentioned in commit 2d0f2aeecdf0ab17503458b074aa995efa453cdd
romanov73 commented 2019-04-19 17:05:08 +04:00 (Migrated from gitlab.com)
Copy Link

merged

merged
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
backend

   
bug

   
frontend

   
выполнить первой

   
выполняется

   
конференции

   
события

   
статьи
No Label
backend
bug
frontend
выполнить первой
выполняется
конференции
события
статьи
Milestone
Clear milestone
No items
No Milestone
Конференции
Projects
Clear projects
No project
Assignees
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#183
No description provided.
Delete Branch "69-take-part-conf"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?