Labels Milestones

Resolve "Генерация таймлайна для проекта" #212

Merged

a.vasin merged 1 commits from 101-projecgt-timeline into dev 5 years ago

Conversation 35 Commits 1 Files Changed 2

a.vasin commented 5 years ago (Migrated from gitlab.com)

Closes #101

Closes #101

a.vasin commented 5 years ago (Migrated from gitlab.com)

changed milestone to %3

changed milestone to %3

a.vasin commented 5 years ago (Migrated from gitlab.com)

restored source branch 101-projecgt-timeline

restored source branch `101-projecgt-timeline`

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• b1e101c9 - #101 db event edited

Compare with previous version

added 1 commit <ul><li>b1e101c9 - #101 db event edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=41305462&start_sha=2dff183662769376db3efc91cc60a2ac93235a20)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 279cc0e1 - #101 project model edited

Compare with previous version

added 1 commit <ul><li>279cc0e1 - #101 project model edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=41308595&start_sha=b1e101c94036eb56b7d6c9d67667179433ae0c53)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 181 commits

• 279cc0e1...330ffc4d - 180 commits from branch dev
• eceb8ec5 - #101 project model edited

Compare with previous version

added 181 commits <ul><li>279cc0e1...330ffc4d - 180 commits from branch <code>dev</code></li><li>eceb8ec5 - #101 project model edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43519323&start_sha=279cc0e18a876ee6bf70fc06087680162cbd45ad)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• eb30d07d - #101 project deadlines on timeline

Compare with previous version

added 1 commit <ul><li>eb30d07d - #101 project deadlines on timeline</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43524027&start_sha=eceb8ec528e8ee0fdb8c3e9974a89693e595d9cf)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 192adbfa - #101 no projects message

Compare with previous version

added 1 commit <ul><li>192adbfa - #101 no projects message</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43525725&start_sha=eb30d07d10f9d8072832e1077fcac22e481e3cbd)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 9013d792 - #101 grant attach

Compare with previous version

added 1 commit <ul><li>9013d792 - #101 grant attach</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43561535&start_sha=192adbfa0b73a539c1b2b241cf3f21f57643d2bc)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 632c6299 - #101 files attach modified

Compare with previous version

added 1 commit <ul><li>632c6299 - #101 files attach modified</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43567930&start_sha=9013d79228d5688bc308a821440d39a62de8d21c)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 4498b712 - #101 project tests

Compare with previous version

added 1 commit <ul><li>4498b712 - #101 project tests</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43597933&start_sha=632c6299b776664dd0ca15def3496739c5ecf5a8)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 9388302a - #101 project tests

Compare with previous version

added 1 commit <ul><li>9388302a - #101 project tests</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43694577&start_sha=4498b712595a72b8ff82799f5f4dc0c737b72abd)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• a7b48e15 - #101 project tests

Compare with previous version

added 1 commit <ul><li>a7b48e15 - #101 project tests</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43698339&start_sha=9388302a47c9548eb6fa4055c11f7ce6fc9cade4)

a.vasin commented 5 years ago (Migrated from gitlab.com)

unmarked as a Work In Progress

unmarked as a **Work In Progress**

a.vasin commented 5 years ago (Migrated from gitlab.com)

assigned to @romanov73

assigned to @romanov73

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

в этом классе уже много однотипных методов для разных активностей, сделайте один, порефакторите, передавайте только нужные параметры события

в этом классе уже много однотипных методов для разных активностей, сделайте один, порефакторите, передавайте только нужные параметры события

a.vasin commented 5 years ago (Migrated from gitlab.com)

changed this line in version 11 of the diff

changed this line in [version 11 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43816078&start_sha=a7b48e1534eb191a26f6543436209a0fd8bd8835#1867927eb0e09f497a51071b0efe7414990e6437_210_269)

a.vasin commented 5 years ago (Migrated from gitlab.com)

resolved all discussions

resolved all discussions

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 6 commits

• a7b48e15...a878f8c2 - 3 commits from branch dev
• 291f4e1e - #101 db edited
• a5ac2bcb - Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline
• 267bd5b0 - #101 event service edited

Compare with previous version

added 6 commits <ul><li>a7b48e15...a878f8c2 - 3 commits from branch <code>dev</code></li><li>291f4e1e - #101 db edited</li><li>a5ac2bcb - Merge branch &#39;dev&#39; of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline</li><li>267bd5b0 - #101 event service edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43816078&start_sha=a7b48e1534eb191a26f6543436209a0fd8bd8835)

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

Это ужас! Такого точно не должно быть! Зачем вам конкретные сущности? Для таймлайна нужны: список дедлайнов, название для событий таймлайна, суффикс описания. Все. Других параметров передавать не надо. Все эти атрибуты есть в исходных сущностях

Это ужас! Такого точно не должно быть! Зачем вам конкретные сущности? Для таймлайна нужны: список дедлайнов, название для событий таймлайна, суффикс описания. Все. Других параметров передавать не надо. Все эти атрибуты есть в исходных сущностях

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 961a6a31 - #101 event service edited

Compare with previous version

added 1 commit <ul><li>961a6a31 - #101 event service edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43816187&start_sha=267bd5b0f37f0f257d08c6e4cc7766ced1264d8e)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 7edb9d2a - #101 event service edited

Compare with previous version

added 1 commit <ul><li>7edb9d2a - #101 event service edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43816291&start_sha=961a6a318e29917922bfa539d792ecdda3e9cc9b)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 38478835 - #101 event service edited

Compare with previous version

added 1 commit <ul><li>38478835 - #101 event service edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43816377&start_sha=7edb9d2aa38d27778a16d6c3c2389333de3a3e09)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• ae8dc58a - #101 event service edited

Compare with previous version

added 1 commit <ul><li>ae8dc58a - #101 event service edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43816580&start_sha=38478835fbca880a8dabf764d6a9d28c0435fc78)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• e6dc2abd - #101 event service edited

Compare with previous version

added 1 commit <ul><li>e6dc2abd - #101 event service edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43816680&start_sha=ae8dc58a9dab04bafa5a2722d383cda2d428bbe9)

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

public void createFromObject(EventSource eventSource,  List<Event> events) {
timeline.getEvents().removeAll(events);
                for (Deadline deadline : eventSource.getDeadlines()) {
                    Event newEvent = new Event();
                    newEvent.setTitle(eventSource.getTitle());
                    newEvent.setStatus(Event.EventStatus.NEW);
                    newEvent.setExecuteDate(deadline.getDate());
                    newEvent.setCreateDate(new Date());
                    newEvent.setUpdateDate(new Date());
                    newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' "+suffix+" '" + eventSource.getTitle() + "'");
                    newEvent.setRecipients(authors);
                    newEvent.setSource(eventSource);
                    timeline.getEvents().add(eventRepository.save(newEvent));
                }
                timelineService.save(timeline);

}
``

``` public void createFromObject(EventSource eventSource, List<Event> events) { timeline.getEvents().removeAll(events); for (Deadline deadline : eventSource.getDeadlines()) { Event newEvent = new Event(); newEvent.setTitle(eventSource.getTitle()); newEvent.setStatus(Event.EventStatus.NEW); newEvent.setExecuteDate(deadline.getDate()); newEvent.setCreateDate(new Date()); newEvent.setUpdateDate(new Date()); newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' "+suffix+" '" + eventSource.getTitle() + "'"); newEvent.setRecipients(authors); newEvent.setSource(eventSource); timeline.getEvents().add(eventRepository.save(newEvent)); } timelineService.save(timeline); } ``

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• db3252d8 - #101 event service edited

Compare with previous version

added 1 commit <ul><li>db3252d8 - #101 event service edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43817131&start_sha=e6dc2abdd9ca7292a3bf4115a6c20eb27fbdbe68)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• bde4ac5f - #101 event service edited

Compare with previous version

added 1 commit <ul><li>bde4ac5f - #101 event service edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43817679&start_sha=db3252d8228da4662275e92fe262c1da9703039f)

a.vasin commented 5 years ago (Migrated from gitlab.com)

changed this line in version 19 of the diff

changed this line in [version 19 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43964369&start_sha=bde4ac5f1c3a98235f2062e713e78fa21b91eacd#1867927eb0e09f497a51071b0efe7414990e6437_126_115)

a.vasin commented 5 years ago (Migrated from gitlab.com)

resolved all discussions

resolved all discussions

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 3 commits

• 1224cc7a - Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline
• dc52968d - Merge branch '101-projecgt-timeline' of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline
• 482964fe - #101 EventService edited

Compare with previous version

added 3 commits <ul><li>1224cc7a - Merge branch &#39;dev&#39; of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline</li><li>dc52968d - Merge branch &#39;101-projecgt-timeline&#39; of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline</li><li>482964fe - #101 EventService edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43964369&start_sha=bde4ac5f1c3a98235f2062e713e78fa21b91eacd)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• bdff81d2 - #101 tests edited

Compare with previous version

added 1 commit <ul><li>bdff81d2 - #101 tests edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/85/diffs?diff_id=43966306&start_sha=482964fe5315475574bbf839229476f6aae6d663)

a.vasin commented 5 years ago (Migrated from gitlab.com)

marked as a Work In Progress

marked as a **Work In Progress**

a.vasin commented 5 years ago (Migrated from gitlab.com)

unmarked as a Work In Progress

unmarked as a **Work In Progress**

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

merged

merged

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

mentioned in commit bacd3827e3

mentioned in commit bacd3827e3c88f12968ae654eadb1f3cd8d6bf17

The pull request has been merged as bacd3827e3.

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 101-projecgt-timeline dev

git pull origin 101-projecgt-timeline

Step 2:

Merge the changes and update on Gitea.

git checkout dev

git merge --no-ff 101-projecgt-timeline

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

Subscribe

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#212

Write Preview

Loading…

Cancel

Save

There is no content yet.