Update schedule module

polyclinic_scheduling/apps/RUG_template/static/RUG_template/css/base.css

@@ -21,4 +21,48 @@
 
 .rug-breadcrumbs {
     display: none;
+}
+
+p {
+    max-width: none;
+}
+
+table {
+    width: 100%;
+}
+
+input {
+    width: 100%
+}
+
+.alert-warning {
+    color: #856404;
+    background-color: #fff3cd;
+    border-color: #ffeeba;
+}
+
+.alert-success {
+    color: #155724;
+    background-color: #d4edda;
+    border-color: #c3e6cb;
+}
+.alert-danger {
+    color: #721c24;
+    background-color: #f8d7da;
+    border-color: #f5c6cb;
+}
+.form-control {
+    display: block;
+    width: 100%;
+    height: calc(1.5em + .75rem + 2px);
+    padding: .375rem .75rem;
+    font-size: 1rem;
+    font-weight: 400;
+    line-height: 1.5;
+    color: #495057;
+    background-color: #fff;
+    background-clip: padding-box;
+    border: 1px solid #ced4da;
+    border-radius: .25rem;
+    transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
 }

polyclinic_scheduling/apps/RUG_template/templates/index.html

@@ -4,8 +4,6 @@
 {% block title %}{% trans "Welcome to the RUG Template page" %}{% endblock %}
 {% block pagetitle %}{% trans "Welcome to the RUG Template page" %}{% endblock %}
 {% block content %}
-<p>
-<strong>{% trans "Simple RUG Template" %}</strong>
-</p>
+<p><strong>{% trans "Simple RUG Template" %}</strong></p>
 <p>{% trans "Some more text" %}</p>
 {% endblock %}

polyclinic_scheduling/apps/RUG_template/templates/menu.html

@@ -1,13 +1,10 @@
 {% load i18n %}
 
 <li class="rug-nav--secondary__item">
-<a class="rug-nav--secondary__link js--togglable-switch" data-toggle-class="rug-nav--secondary__link--selected" data-toggle-group="submenu" data-toggle-id="menu-2427370b-9435-44d9-bca7-b93ec9d03cc0-33.31" data-toggle-mode="togglable">{% trans "Section" %}</a>
-
-<ul class="rug-nav--secondary__sub rug-nav--secondary__sub--hidden js--togglable-item" data-toggle-class="rug-block" data-toggle-group="submenu" data-toggle-id="menu-2427370b-9435-44d9-bca7-b93ec9d03cc0-33.31">
-
-<li class="rug-nav--secondary__sub__item" data-menu-id="b512aa55-f0cb-4588-9054-302caa5fa951-33.34">
-<a class="rug-nav--secondary__sub__link" href="#"><span class="rug-nav--secondary__sub__link-text">{% trans "Menu item" %}</span></a>
-</li>
-
-</ul>
+  <a class="rug-nav--secondary__link js--togglable-switch" data-toggle-class="rug-nav--secondary__link--selected" data-toggle-group="submenu" data-toggle-id="menu-2427370b-9435-44d9-bca7-b93ec9d03cc0-33.31" data-toggle-mode="togglable">{% trans "Section" %}</a>
+  <ul class="rug-nav--secondary__sub rug-nav--secondary__sub--hidden js--togglable-item" data-toggle-class="rug-block" data-toggle-group="submenu" data-toggle-id="menu-2427370b-9435-44d9-bca7-b93ec9d03cc0-33.31">
+    <li class="rug-nav--secondary__sub__item" data-menu-id="b512aa55-f0cb-4588-9054-302caa5fa951-33.34">
+      <a class="rug-nav--secondary__sub__link" href="#"><span class="rug-nav--secondary__sub__link-text">{% trans "Menu item" %}</span></a>
+    </li>
+  </ul>
 </li>

polyclinic_scheduling/apps/RUG_template/templates/registration/login.html

@@ -5,9 +5,12 @@
 {% block pagetitle %}{% trans "Login" %}{% endblock %}
 {% block content %}
 <p>
-<strong>{% trans "Login" %}</strong>
+  <strong>{% trans "Login" %}</strong>
+  <br />
+  {% blocktrans %}
+  You can login here to create your schedules. If you do not have a login, please contact: some_one@rug.nl
+  {% endblocktrans %}
 </p>
-
 <form method="post" action="{% url 'login' %}">
   {% csrf_token %}
   <input type="hidden" name="next" value="{{ next }}">
@@ -18,7 +21,7 @@
     </tr>
   </table>
 </form>
-
+<br />
 {# Assumes you setup the password_reset view in your URLconf #}
 <p><a href="{% url 'password_reset' %}">{% trans "Lost password?" %}</a></p>
 {% endblock %}

polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_complete.html

@@ -4,9 +4,7 @@
 {% block title %}{% trans "Password reset complete" %}{% endblock %}
 {% block pagetitle %}{% trans "Password reset complete" %}{% endblock %}
 {% block content %}
-<p>
-<strong>{% trans "Password reset complete" %}</strong>
-<br />
-<p>Your new password has been set. You can log in now on the <a href="{% url 'login' %}">log in page</a>.</p>
-</p>
+<p><strong>{% trans "Password reset complete" %}</strong></p>
+{% url 'login' as login_url %}
+<p>{% blocktrans %}Your new password has been set. You can log in now on the <a href="{{ login_url }}">log in page</a>.{% endblocktrans %}</p>
 {% endblock %}

polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_confirm.html

@@ -4,22 +4,23 @@
 {% block title %}{% trans "Set a new password!" %}{% endblock %}
 {% block pagetitle %}{% trans "Set a new password!" %}{% endblock %}
 {% block content %}
-<p>
-<strong>{% trans "Set a new password!" %}</strong>
+<p><strong>{% trans "Set a new password!" %}</strong><br />
 {% if validlink %}
-<form method="POST">
-<table>
-  {% csrf_token %}
-  {{ form.as_table }}
-  <tr>
-  <td>
-        <input type="submit" value="Change my password">
-  </td>
-  </tr>
-  </table>
-</form>
+  {% blocktrans %}Here you can set a new password.{% endblocktrans %}
+  </p>
+  <form method="POST">
+    <table>
+      {% csrf_token %}
+      {{ form.as_table }}
+      <tr>
+        <td colspan="2">
+          <input type="submit" value="{% trans "Change my password" %}">
+        </td>
+      </tr>
+    </table>
+  </form>
 {% else %}
-<p>{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}</p>
+  {% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}</p>
 {% endif %}
-</p>
+
 {% endblock %}

polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_done.html

@@ -8,6 +8,6 @@
 <strong>{% trans "Reset password, email sent" %}</strong>
 <br />
 <br />
-We've emailed you instructions for setting your password. You should receive the email shortly!
+{% blocktrans %}We've emailed you instructions for setting your password. You should receive the email shortly!{% endblocktrans %}
 </p>
 {% endblock %}

polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_email.html

@@ -0,0 +1,27 @@
+{% load i18n %}
+
+<html>
+<head>
+<title>{% trans "Password reset" %}</title>
+</head>
+<body>
+<img src="data:image/jpeg;base64, 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 truncated
+<h1>{% trans "Password reset" %}</h1>
+<p>
+{% url 'password_reset_confirm' uidb64=uid token=token as reset_url%}
+{% blocktrans %}
+You're receiving this email because you requested a password reset for your user account at {{ site_name }}.
+<br />
+Please go to the following page and choose a new password:
+<br />
+{{ protocol}}://{{ domain }}{{ reset_url }}
+<br />
+Your username, in case you’ve forgotten: {{ user }}
+<br />
+Thanks for using our site!
+<br />
+The {{ site_name }} team
+{% endblocktrans %}
+</p>
+</body>
+</html>

polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_form.html

@@ -6,19 +6,16 @@
 {% block content %}
 <p>
 <strong>{% trans "Reset password" %}</strong>
+<br />
+{% blocktrans %}Here you can request a password reset. Please enter your email address that is used for registration.{% endblocktrans %}
 </p>
-
-
 <form method="post" action="{% url 'password_reset' %}">
-{% csrf_token %}
-<table>
-<tr>
-    <td>{{ form.email.label_tag }}</td>
-    <td>{{ form.email }}</td>
-</tr>
-</table>
-
-<input type="submit" value="Reset my password">
+    {% csrf_token %}
+    <table>
+        {{ form.as_table }}
+        <tr>
+            <td colspan="2"><input type="submit" value="{% trans "Reset my password"%} "></td>
+        </tr>
+    </table>
 </form>
-
-{% endblock %}
+{% endblock %}

polyclinic_scheduling/apps/RUG_template/templates/singup.html

@@ -4,9 +4,7 @@
 {% block title %}{% trans "Singup" %}{% endblock %}
 {% block pagetitle %}{% trans "Singup" %}{% endblock %}
 {% block content %}
-<p>
-<strong>{% trans "Singup" %}</strong>
-</p>
+<p><strong>{% trans "Singup" %}</strong></p>
 
 <form method="post" action="{% url 'signup' %}">
   {% csrf_token %}

polyclinic_scheduling/apps/schedule/management/commands/send_reports.py

@@ -0,0 +1,24 @@
+from django.core.management.base import BaseCommand, CommandError
+from apps.schedule.models import Schedule
+#from polls.models import Question as Poll
+
+class Command(BaseCommand):
+    help = 'Send out all the new reports'
+
+    # def add_arguments(self, parser):
+    #     parser.add_argument('poll_ids', nargs='+', type=int)
+
+    def handle(self, *args, **options):
+        Schedule.objects.filter(peregrine_result__isnull=False).filter(report_sent__isnull=True)
+
+
+        # for poll_id in options['poll_ids']:
+        #     try:
+        #         poll = Poll.objects.get(pk=poll_id)
+        #     except Poll.DoesNotExist:
+        #         raise CommandError('Poll "%s" does not exist' % poll_id)
+
+        #     poll.opened = False
+        #     poll.save()
+
+        #     self.stdout.write(self.style.SUCCESS('Successfully closed poll "%s"' % poll_id))

polyclinic_scheduling/apps/schedule/migrations/0002_auto_20200514_1318.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.0.6 on 2020-05-14 13:18
+
+import collections
+from django.db import migrations, models
+import jsonfield.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('schedule', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='schedule',
+            name='peregrine_result',
+            field=jsonfield.fields.JSONField(blank=True, help_text='The results from the Peregrine job in JSON', load_kwargs={'object_pairs_hook': collections.OrderedDict}, verbose_name='Peregrine JSON output'),
+        ),
+        migrations.AddField(
+            model_name='schedule',
+            name='report_sent',
+            field=models.DateTimeField(blank=True, help_text='The date and time when the report has sended to the user.', null=True, verbose_name='Report is send to user'),
+        ),
+    ]

polyclinic_scheduling/apps/schedule/models.py

@@ -15,12 +15,17 @@ class Schedule(MetaDataModel):
     email = models.CharField(_('Email address'), max_length=100, help_text=_('Email address where the results will be sent to.'))
 
     planning_source = JSONField(_('Schedule input'), blank=True, load_kwargs={'object_pairs_hook': collections.OrderedDict}, help_text=_('The schedule input in JSON format based on the form data'))
+
     planning_peregrine = models.TextField(_('Peregrine input'), blank=True, help_text=_('This is the translated content from the source for use with Peregrine cluster'))
 
     peregrine_accepted = models.BooleanField(_('Peregrine accepted'),default=False, help_text=_('When true, the Peregrine cluster has picked up the job.'))
 
+    peregrine_result = JSONField(_('Peregrine JSON output'), blank=True, load_kwargs={'object_pairs_hook': collections.OrderedDict}, help_text=_('The results from the Peregrine job in JSON'))
+
     output_peregrine = models.BinaryField(_('Peregrine binary output'), blank=True, help_text=_('This is the output in binary format from the Peregrine cluster'))
 
+    report_sent = models.DateTimeField(_('Report is send to user'), blank=True, null=True, help_text=_('The date and time when the report has sended to the user.'))
+
     def __str__(self):
         """str: Returns a readable name for the schedule. Format is [schedule_name] (employee_name)."""
         return '{} ({})'.format(self.name, self.employee)

polyclinic_scheduling/polyclinic_scheduling/settings.py

@@ -159,4 +159,6 @@ EMAIL_USE_TLS = config('EMAIL_USE_TLS', default=False, cast=bool)
 
 if DEBUG:
     EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
-    EMAIL_FILE_PATH = os.path.join(BASE_DIR, 'sent_emails')
+    EMAIL_FILE_PATH = os.path.join(BASE_DIR, 'sent_emails')
+
+REPORTS_OUTPUT = os.path.join(BASE_DIR, 'reports')

polyclinic_scheduling/templates/menu.html

@@ -1,23 +1,18 @@
 {% load i18n %}
 
 <li class="rug-nav--secondary__item">
-<a class="rug-nav--secondary__link js--togglable-switch" data-toggle-class="rug-nav--secondary__link--selected" data-toggle-group="submenu" data-toggle-id="menu-2427370b-9435-44d9-bca7-b93ec9d03cc0-33.31" data-toggle-mode="togglable">{% trans "Menu" %}</a>
-
-<ul class="rug-nav--secondary__sub rug-nav--secondary__sub--hidden js--togglable-item" data-toggle-class="rug-block" data-toggle-group="submenu" data-toggle-id="menu-2427370b-9435-44d9-bca7-b93ec9d03cc0-33.31">
-
-<li class="rug-nav--secondary__sub__item" data-menu-id="b512aa55-f0cb-4588-9054-302caa5fa951-33.34">
-<a class="rug-nav--secondary__sub__link" href="{% url 'schedule:list' %}"><span class="rug-nav--secondary__sub__link-text">{% trans "Schedules" %}</span></a>
-</li>
-
-<li class="rug-nav--secondary__sub__item" data-menu-id="b512aa55-f0cb-4588-9054-302caa5fa951-33.35">
-<a class="rug-nav--secondary__sub__link" href="{% url 'schedule:new' %}"><span class="rug-nav--secondary__sub__link-text">{% trans "New schedule" %}</span></a>
-</li>
-
-
-<li class="rug-nav--secondary__sub__item" data-menu-id="b512aa55-f0cb-4588-9054-302caa5fa951-33.36">
-<a class="rug-nav--secondary__sub__link" href="{% url 'logout' %}"><span class="rug-nav--secondary__sub__link-text">{% trans "Logout" %}</span></a>
-</li>
-
-
-</ul>
+  <a class="rug-nav--secondary__link js--togglable-switch" data-toggle-class="rug-nav--secondary__link--selected" data-toggle-group="submenu" data-toggle-id="menu-2427370b-9435-44d9-bca7-b93ec9d03cc0-33.31" data-toggle-mode="togglable">{% trans "Menu" %}</a>
+  <ul class="rug-nav--secondary__sub rug-nav--secondary__sub--hidden js--togglable-item" data-toggle-class="rug-block" data-toggle-group="submenu" data-toggle-id="menu-2427370b-9435-44d9-bca7-b93ec9d03cc0-33.31">
+    <li class="rug-nav--secondary__sub__item" data-menu-id="b512aa55-f0cb-4588-9054-302caa5fa951-33.34">
+      <a class="rug-nav--secondary__sub__link" href="{% url 'schedule:list' %}"><span class="rug-nav--secondary__sub__link-text">{% trans "Schedules" %}</span></a>
+    </li>
+    <li class="rug-nav--secondary__sub__item" data-menu-id="b512aa55-f0cb-4588-9054-302caa5fa951-33.35">
+      <a class="rug-nav--secondary__sub__link" href="{% url 'schedule:new' %}"><span class="rug-nav--secondary__sub__link-text">{% trans "New schedule" %}</span></a>
+    </li>
+    {% if user.is_authenticated %}
+    <li class="rug-nav--secondary__sub__item" data-menu-id="b512aa55-f0cb-4588-9054-302caa5fa951-33.36">
+      <a class="rug-nav--secondary__sub__link" href="{% url 'logout' %}"><span class="rug-nav--secondary__sub__link-text">{% trans "Logout" %}</span></a>
+    </li>
+    {% endif %}
+  </ul>
 </li>

polyclinic_scheduling/templates/singup.html

@@ -1,13 +1,12 @@
 {% extends 'base.html' %} <!-- Add this for inheritance -->
 {% load i18n %}
 
-{% block title %}{% trans "Singup" %}{% endblock %}
-{% block pagetitle %}{% trans "Singup" %}{% endblock %}
+{% block title %}{% trans "Signup" %}{% endblock %}
+{% block pagetitle %}{% trans "Signup" %}{% endblock %}
 {% block content %}
 <p>
-<strong>{% trans "Singup" %}</strong>
+<strong>{% trans "Signup" %}</strong>
 <br />
-Please contact x@y.z
+{% blocktrans %}Please contact x@y.z{% endblocktrans %}
 </p>
-
 {% endblock %}