-
Notifications
You must be signed in to change notification settings - Fork 43
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.
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
Powiadomienie do obserwujących sprawę #934
Merged
Merged
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
128c37e
add SendNotificationsMixin
NameeLesS e259fc1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 83325b9
add notify method in User model
NameeLesS 9e4feff
Merge branch 'dev' of https://github.com/NameeLesS/small_eod into dev
NameeLesS 63826d3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] b825181
add tests, notifications content
NameeLesS c405e21
add more notification tests and mails content change
NameeLesS 6db55e8
Merge branch 'dev' of https://github.com/watchdogpolska/small_eod int…
NameeLesS bd6b1ea
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] ab614e7
Adjust changes according to code review
NameeLesS b4a7abe
Resolved merge conflicts
NameeLesS File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
backend-project/small_eod/cases/templates/cases/email/case_created.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "notifications/email/mail_base.html" %} | ||
{% block subject %} | ||
<p>Utworzono nową sprawę - {{instance.name}}</p> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<p>W systemie small_eod pojawiła się nowa sprawa.</p> | ||
{% endblock %} |
8 changes: 8 additions & 0 deletions
8
backend-project/small_eod/cases/templates/cases/email/case_created.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "notifications/email/mail_base.txt" %} | ||
{% block subject %} | ||
Utworzono nową sprawę - {{instance.name}} | ||
{% endblock %} | ||
|
||
{% block content %} | ||
W systemie small_eod pojawiła się nowa sprawa. | ||
{% endblock %} |
8 changes: 8 additions & 0 deletions
8
backend-project/small_eod/cases/templates/cases/email/case_removed.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "notifications/email/mail_base.html" %} | ||
{% block subject %} | ||
<p>Zamknięto sprawę - {{instance.name}}</p> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<p>Zamknięto obserwowaną przez ciebie sprawę - {{instance.name}}</p> | ||
{% endblock %} |
8 changes: 8 additions & 0 deletions
8
backend-project/small_eod/cases/templates/cases/email/case_removed.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "notifications/email/mail_base.txt" %} | ||
{% block subject %} | ||
Zamknięto sprawę - {{instance.name}} | ||
{% endblock %} | ||
|
||
{% block content %} | ||
Zamknięto obserwowaną przez ciebie sprawę - {{instance.name}} | ||
{% endblock %} |
13 changes: 13 additions & 0 deletions
13
backend-project/small_eod/cases/templates/cases/email/case_updated.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{% extends "notifications/email/mail_base.html" %} | ||
{% block subject %} | ||
<p>Zaktualizowano sprawę - {{instance.name}}</p> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<<<<<<< Updated upstream | ||
<p>{{modified_by}} dokonał zmian w obserwowanej przez ciebie sprawie - {{instance.name}}.</p> | ||
{% endblock %} | ||
======= | ||
<p>{{modified_by}} dokonał(a) zmian w obserwowanej przez ciebie sprawie - {{instance.name}}.</p> | ||
{% endblock %} | ||
>>>>>>> Stashed changes |
12 changes: 12 additions & 0 deletions
12
backend-project/small_eod/cases/templates/cases/email/case_updated.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{% extends "notifications/email/mail_base.txt" %} | ||
{% block subject %} | ||
Zaktualizowano sprawę - {{instance.name}} | ||
{% endblock %} | ||
{% block content %} | ||
<<<<<<< Updated upstream | ||
{{instance.modified_by}} dokonał zmian w obserwowanej przez ciebie sprawie - {{instance.name}}. | ||
{% endblock %} | ||
======= | ||
{{instance.modified_by}} dokonał(a) zmian w obserwowanej przez ciebie sprawie - {{instance.name}}. | ||
{% endblock %} | ||
>>>>>>> Stashed changes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
backend-project/small_eod/events/templates/events/email/event_created.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{% extends "notifications/email/mail_base.html" %} | ||
{% block subject %} | ||
<p>Nowe wydarzenie w sprawie - {{instance.case.name}}</p> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<<<<<<< Updated upstream | ||
<p>{{instance.created_by}} utworzył nowe wydarzenie - {{instance.name}}.</p> | ||
{% endblock %} | ||
======= | ||
<p>{{instance.created_by}} utworzył(a) nowe wydarzenie - {{instance.name}}.</p> | ||
{% endblock %} | ||
>>>>>>> Stashed changes |
13 changes: 13 additions & 0 deletions
13
backend-project/small_eod/events/templates/events/email/event_created.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{% extends "notifications/email/mail_base.txt" %} | ||
{% block subject %} | ||
Utworzono nowe wydarzenie w sprawie - {{instance.case.name}} | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<<<<<<< Updated upstream | ||
{{instance.created_by}} utworzył nowe wydarzenie - {{instance.name}}. | ||
{% endblock %} | ||
======= | ||
{{instance.created_by}} utworzył(a) nowe wydarzenie - {{instance.name}}. | ||
{% endblock %} | ||
>>>>>>> Stashed changes |
8 changes: 8 additions & 0 deletions
8
backend-project/small_eod/events/templates/events/email/event_removed.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "notifications/email/mail_base.html" %} | ||
{% block subject %} | ||
<p>Usunięto wydarzenie - {{instance.name}}</p> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<p>Usunięto zaplanowane wydarzenie - {{instance.name}}</p> | ||
{% endblock %} |
8 changes: 8 additions & 0 deletions
8
backend-project/small_eod/events/templates/events/email/event_removed.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "notifications/email/mail_base.txt" %} | ||
{% block subject %} | ||
Usunięto wydarzenie - {{instance.name}} | ||
{% endblock %} | ||
|
||
{% block content %} | ||
Usunięto zaplanowane wydarzenie - {{instance.name}} | ||
{% endblock %} |
13 changes: 13 additions & 0 deletions
13
backend-project/small_eod/events/templates/events/email/event_updated.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{% extends "notifications/email/mail_base.html" %} | ||
{% block subject %} | ||
<p>Zaktualizowano wydarzenie - {{instance.name}}</p> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<<<<<<< Updated upstream | ||
<p>{{instance.modified_by}} dokonał zmian w zaplanowanym wydarzeniu - {{instance.name}}</p> | ||
{% endblock %} | ||
======= | ||
<p>{{instance.modified_by}} dokonał(a) zmian w zaplanowanym wydarzeniu - {{instance.name}}</p> | ||
{% endblock %} | ||
>>>>>>> Stashed changes |
13 changes: 13 additions & 0 deletions
13
backend-project/small_eod/events/templates/events/email/event_updated.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{% extends "notifications/email/mail_base.txt" %} | ||
{% block subject %} | ||
Zaktualizowano wydarzenie - {{instance.name}} | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<<<<<<< Updated upstream | ||
{{instance.modified_by}} dokonał zmian w zaplanowanym wydarzeniu - {{instance.name}} | ||
{% endblock %} | ||
======= | ||
{{instance.modified_by}} dokonał(a) zmian w zaplanowanym wydarzeniu - {{instance.name}} | ||
{% endblock %} | ||
>>>>>>> Stashed changes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
backend-project/small_eod/letters/templates/letters/email/letter_created.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{% extends "notifications/email/mail_base.html" %} | ||
{% block subject %} | ||
<p>Nowa wiadomość w sprawie - {{instance.case.name}}</p> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
{% if instance.direction == "received" %} | ||
<p>Otrzymano nową wiadomość - {{instance.reference_number}} - dotyczącą obserwowanej przez ciebie sprawy - {{instance.case.name}}</p> | ||
{% else %} | ||
<p>Wysłano wiadomość - {{instance.reference_number}} - w sprawie - {{instance.case.name}}</p> | ||
{% endif %} | ||
{% endblock %} |
12 changes: 12 additions & 0 deletions
12
backend-project/small_eod/letters/templates/letters/email/letter_created.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{% extends "notifications/email/mail_base.txt" %} | ||
{% block subject %} | ||
Nowa wiadomość w sprawie - {{instance.case.name}} | ||
{% endblock %} | ||
|
||
{% block content %} | ||
{% if instance.direction == "received" %} | ||
Otrzymano nową wiadomość - {{instance.reference_number}} - dotyczącą obserwowanej przez ciebie sprawy - {{instance.case.name}} | ||
{% else %} | ||
Wysłano wiadomość - {{instance.reference_number}} - w sprawie - {{instance.case.name}} | ||
{% endif %} | ||
{% endblock %} |
8 changes: 8 additions & 0 deletions
8
backend-project/small_eod/letters/templates/letters/email/letter_removed.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "notifications/email/mail_base.html" %} | ||
{% block subject %} | ||
<p>Usunięto wiadomość - {{instance.reference_number}}</p> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<p>Usunięto wiadomość - {{instance.reference_number}} - dotyczącą obserwowanej przez ciebie sprawy - {{instance.case.name}}.</p> | ||
{% endblock %} |
8 changes: 8 additions & 0 deletions
8
backend-project/small_eod/letters/templates/letters/email/letter_removed.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "notifications/email/mail_base.txt" %} | ||
{% block subject %} | ||
Usunięto wiadomość - {{instance.reference_number}} | ||
{% endblock %} | ||
|
||
{% block content %} | ||
Usunięto wiadomość - {{instance.reference_number}} - dotyczącą obserwowanej przez ciebie sprawy - {{instance.case.name}}. | ||
{% endblock %} |
13 changes: 13 additions & 0 deletions
13
backend-project/small_eod/letters/templates/letters/email/letter_updated.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{% extends "notifications/email/mail_base.html" %} | ||
{% block subject %} | ||
<p>Zmodyfikowano wiadomość - {{instance.reference_number}}</p> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<<<<<<< Updated upstream | ||
<p>{{instance.modified_by}} dokonał zmian w wiadomości - {{instance.reference_number}}.</p> | ||
{% endblock %} | ||
======= | ||
<p>{{instance.modified_by}} dokonał(a) zmian w wiadomości - {{instance.reference_number}}.</p> | ||
{% endblock %} | ||
>>>>>>> Stashed changes |
13 changes: 13 additions & 0 deletions
13
backend-project/small_eod/letters/templates/letters/email/letter_updated.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{% extends "notifications/email/mail_base.txt" %} | ||
{% block subject %} | ||
Zmodyfikowano wiadomość - {{instance.reference_number}} | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<<<<<<< Updated upstream | ||
{{instance.modified_by}} dokonał zmian w wiadomości - {{instance.reference_number}}. | ||
{% endblock %} | ||
======= | ||
{{instance.modified_by}} dokonał(a) zmian w wiadomości - {{instance.reference_number}}. | ||
{% endblock %} | ||
>>>>>>> Stashed changes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
backend-project/small_eod/notes/templates/notes/email/note_created.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{% extends "notifications/email/mail_base.html" %} | ||
{% block subject %} | ||
<p>Dodano notatkę do sprawy - {{case}}</p> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<<<<<<< Updated upstream | ||
<p>{{instance.created_by}} dodał nową notatkę do sprawy - {{instance.case.name}}</p> | ||
ad-m marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{% endblock %} | ||
======= | ||
<p>{{instance.created_by}} dodał(a) nową notatkę do sprawy - {{instance.case.name}}</p> | ||
{% endblock %} | ||
>>>>>>> Stashed changes |
13 changes: 13 additions & 0 deletions
13
backend-project/small_eod/notes/templates/notes/email/note_created.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{% extends "notifications/email/mail_base.txt" %} | ||
{% block subject %} | ||
Dodano notatkę do sprawy - {{case}} | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<<<<<<< Updated upstream | ||
{{instance.created_by}} dodał nową notatkę do sprawy - {{instance.case.name}} | ||
{% endblock %} | ||
======= | ||
{{instance.created_by}} dodał(a) nową notatkę do sprawy - {{instance.case.name}} | ||
{% endblock %} | ||
>>>>>>> Stashed changes |
8 changes: 8 additions & 0 deletions
8
backend-project/small_eod/notes/templates/notes/email/note_removed.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "notifications/email/mail_base.html" %} | ||
{% block subject %} | ||
<p>Usunięto notatkę dotyczącą sprawy - {{instance.case.name}}</p> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<p>Usunięto notatkę dotyczącą obserwowanej przez ciebie sprawy - {{instance.case.name}}</p> | ||
{% endblock %} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
O cholera xD Pycharm pokazywał mi że nie mam żadnych konfliktów.