From 81cfb043f06ab71da7c021a063f80f6df58305cc Mon Sep 17 00:00:00 2001 From: Parker Berberian Date: Wed, 24 Oct 2018 15:12:32 -0400 Subject: Rewrite Notification subsystem In this commit: - delete a lot of really bad and / or unused code - redesign a much simpler Notification model - create and send notifications to the user's inbox on booking start & end - migrations - emails user when booking is ready and when it ends Not in this commit: - Creating notifications from lab messages - warning messages when a booking is about to end - creating "summary" notifications when e.g. a booking has been fulfilled by a lab Change-Id: I69b4dc36c3f2bce76d810106baadeef5a562cc7d Signed-off-by: Parker Berberian --- dashboard/src/templates/notifier/email_ended.txt | 21 +++++++++++++ .../src/templates/notifier/email_fulfilled.txt | 17 ++++++++++ dashboard/src/templates/notifier/end_booking.html | 36 ++++++++++++++++++++++ dashboard/src/templates/notifier/inbox.html | 2 +- dashboard/src/templates/notifier/new_booking.html | 34 ++++++++++++++++++++ 5 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 dashboard/src/templates/notifier/email_ended.txt create mode 100644 dashboard/src/templates/notifier/email_fulfilled.txt create mode 100644 dashboard/src/templates/notifier/end_booking.html create mode 100644 dashboard/src/templates/notifier/new_booking.html (limited to 'dashboard/src/templates/notifier') diff --git a/dashboard/src/templates/notifier/email_ended.txt b/dashboard/src/templates/notifier/email_ended.txt new file mode 100644 index 0000000..7467a0e --- /dev/null +++ b/dashboard/src/templates/notifier/email_ended.txt @@ -0,0 +1,21 @@ +{{user_name|default:"Developer"}}, + +The booking you requested of the OPNFV Lab as a Service has ended. + +booking information: + start: {{booking.start}} + end: {{booking.end}} + machines: + {% for host in hosts %} + - {{host}} + {% endfor %} + purpose: {{booking.purpose}} + +You may visit the following link for more information: +{{booking_url}} + +Feel free to create another booking with us! + +Thank you for contributing to the OPNFV platform! + + - The Lab-as-a-Service team diff --git a/dashboard/src/templates/notifier/email_fulfilled.txt b/dashboard/src/templates/notifier/email_fulfilled.txt new file mode 100644 index 0000000..d473961 --- /dev/null +++ b/dashboard/src/templates/notifier/email_fulfilled.txt @@ -0,0 +1,17 @@ +{{user_name|default:"Developer"}}, + +The booking you requested of the OPNFV Lab as a Service has finished deploying and is ready for you to use. + +The lab that fulfilled your booking request has sent you the following messages: + {% for message in messages %} + {% message.title %} + {% message.content %} + -------------------- + {% endfor %} + +You may visit the following link for more information: +{{booking_url}} + +Thank you for contributing to the OPNFV platform! + + - The Lab-as-a-Service team diff --git a/dashboard/src/templates/notifier/end_booking.html b/dashboard/src/templates/notifier/end_booking.html new file mode 100644 index 0000000..22014fb --- /dev/null +++ b/dashboard/src/templates/notifier/end_booking.html @@ -0,0 +1,36 @@ + + +
+ {% if owner %} +

Your booking has expired

+

Your booking has ended and the machines have been cleaned up.

+

Thank you for working on OPNFV, and feel free to book more machines if you need them.

+ {% else %} +

A booking that you collaborated on has expired

+

The booking owned by {{booking.owner.username}} that you worked on has ended

+

Thank you for contributing to OPNFV!

+ {% endif %} +

Booking information:

+
    +
  • owner: {{booking.owner.username}}
    • +
  • id: {{booking.id}}
    • +
  • lab: {{booking.resource.template.lab.lab_user.username}}
    • +
  • resource: {{booking.resource.template.name}}
    • +
  • start: {{booking.start}}
    • +
  • end: {{booking.end}}
    • +
  • purpose: {{booking.purpose}}
    • +
  • collaborators: +
      + {% for user in booking.collaborators.all %} +
    • user.username
      • + {% empty %} +
    • No collaborators
      • + {% endfor %} +
    +
    • +
+ +

You can find more detailed information Here

+
+ + diff --git a/dashboard/src/templates/notifier/inbox.html b/dashboard/src/templates/notifier/inbox.html index ee0f27a..c0ee1ba 100644 --- a/dashboard/src/templates/notifier/inbox.html +++ b/dashboard/src/templates/notifier/inbox.html @@ -65,7 +65,7 @@
- +
diff --git a/dashboard/src/templates/notifier/new_booking.html b/dashboard/src/templates/notifier/new_booking.html new file mode 100644 index 0000000..4b53875 --- /dev/null +++ b/dashboard/src/templates/notifier/new_booking.html @@ -0,0 +1,34 @@ + + +
+ {% if owner %} +

You have created a new booking

+

We have recieved your booking request and will start working on it right away.

+ {% else %} +

You have been added as a collaborator to a booking

+

{{booking.owner.username}} has given you access to thier booking.

+ {% endif %} +

Booking information:

+
    +
  • owner: {{booking.owner.username}}
    • +
  • id: {{booking.id}}
    • +
  • lab: {{booking.resource.template.lab.lab_user.username}}
    • +
  • resource: {{booking.resource.template.name}}
    • +
  • start: {{booking.start}}
    • +
  • end: {{booking.end}}
    • +
  • purpose: {{booking.purpose}}
    • +
  • collaborators: +
      + {% for user in booking.collaborators.all %} +
    • user.username
      • + {% empty %} +
    • No collaborators
      • + {% endfor %} +
    +
    • +
+ +

You can find more detailed information Here

+
+ + -- cgit 1.2.3-korg