From 67320359fe1d3bdd1860a83cf090ee03dfa73cd8 Mon Sep 17 00:00:00 2001 From: Joshua Rubingh Date: Mon, 18 May 2020 16:53:40 +0200 Subject: [PATCH] Add schedule status column --- doc/documentation.pdf | Bin 228127 -> 237999 bytes .../locale/en/LC_MESSAGES/django.po | 2 +- .../locale/nl/LC_MESSAGES/django.po | 2 +- .../employee/locale/en/LC_MESSAGES/django.po | 16 +-- .../employee/locale/nl/LC_MESSAGES/django.po | 16 +-- .../hospital/locale/en/LC_MESSAGES/django.po | 26 ++--- .../hospital/locale/nl/LC_MESSAGES/django.po | 26 ++--- .../locale/en/LC_MESSAGES/django.po | 16 +-- .../locale/nl/LC_MESSAGES/django.po | 16 +-- polyclinic_scheduling/apps/schedule/admin.py | 11 +- .../schedule/locale/en/LC_MESSAGES/django.po | 89 +++++++++------ .../schedule/locale/nl/LC_MESSAGES/django.po | 102 ++++++++++++------ .../migrations/0004_auto_20200518_1425.py | 26 +++++ polyclinic_scheduling/apps/schedule/models.py | 61 ++++++++++- polyclinic_scheduling/apps/schedule/views.py | 1 + .../locale/en/LC_MESSAGES/django.po | 2 +- .../locale/nl/LC_MESSAGES/django.po | 8 +- .../locale/en/LC_MESSAGES/django.po | 2 +- .../locale/nl/LC_MESSAGES/django.po | 2 +- 19 files changed, 278 insertions(+), 146 deletions(-) create mode 100644 polyclinic_scheduling/apps/schedule/migrations/0004_auto_20200518_1425.py diff --git a/doc/documentation.pdf b/doc/documentation.pdf index e7e3e58fe9c3df3dd47875851330109e357d0c74..ceab9b8b31baccd589deca3bed02095d602343a2 100644 GIT binary patch delta 29539 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\n" "Language-Team: LANGUAGE \n" diff --git a/polyclinic_scheduling/apps/RUG_template/locale/nl/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/RUG_template/locale/nl/LC_MESSAGES/django.po index e33e6eb..26e846e 100644 --- a/polyclinic_scheduling/apps/RUG_template/locale/nl/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/apps/RUG_template/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" "PO-Revision-Date: 2020-05-15 12:52+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n" diff --git a/polyclinic_scheduling/apps/employee/locale/en/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/employee/locale/en/LC_MESSAGES/django.po index a16da5a..24cb4e8 100644 --- a/polyclinic_scheduling/apps/employee/locale/en/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/apps/employee/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,30 +26,30 @@ msgstr "" msgid "Employees" msgstr "" -#: apps/employee/models.py:13 +#: apps/employee/models.py:28 msgid "employee" msgstr "" -#: apps/employee/models.py:14 +#: apps/employee/models.py:29 msgid "employees" msgstr "" -#: apps/employee/models.py:16 +#: apps/employee/models.py:31 msgid "Django user" msgstr "" -#: apps/employee/models.py:18 +#: apps/employee/models.py:33 msgid "Select the hospital for this employee" msgstr "" -#: apps/employee/models.py:20 +#: apps/employee/models.py:35 msgid "Select the polyclinic(s) for this employee" msgstr "" -#: apps/employee/models.py:21 +#: apps/employee/models.py:36 msgid "Phone number" msgstr "" -#: apps/employee/models.py:21 +#: apps/employee/models.py:36 msgid "The direct phone number of this employee" msgstr "" diff --git a/polyclinic_scheduling/apps/employee/locale/nl/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/employee/locale/nl/LC_MESSAGES/django.po index f29b8f7..7b679b0 100644 --- a/polyclinic_scheduling/apps/employee/locale/nl/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/apps/employee/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" "PO-Revision-Date: 2020-05-15 12:46+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n" @@ -26,30 +26,30 @@ msgstr "Medewerker" msgid "Employees" msgstr "Medewerkers" -#: apps/employee/models.py:13 +#: apps/employee/models.py:28 msgid "employee" msgstr "medewerker" -#: apps/employee/models.py:14 +#: apps/employee/models.py:29 msgid "employees" msgstr "medewerkers" -#: apps/employee/models.py:16 +#: apps/employee/models.py:31 msgid "Django user" msgstr "Django gebruiker" -#: apps/employee/models.py:18 +#: apps/employee/models.py:33 msgid "Select the hospital for this employee" msgstr "Selecteer het ziekenhuis voor deze medewerker" -#: apps/employee/models.py:20 +#: apps/employee/models.py:35 msgid "Select the polyclinic(s) for this employee" msgstr "Selecteer de poliklinieken voor deze medewerker" -#: apps/employee/models.py:21 +#: apps/employee/models.py:36 msgid "Phone number" msgstr "Telefoonummer" -#: apps/employee/models.py:21 +#: apps/employee/models.py:36 msgid "The direct phone number of this employee" msgstr "Het directe telefoonnummer van deze werknemer" diff --git a/polyclinic_scheduling/apps/hospital/locale/en/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/hospital/locale/en/LC_MESSAGES/django.po index 70c9d58..a1ec575 100644 --- a/polyclinic_scheduling/apps/hospital/locale/en/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/apps/hospital/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,50 +26,50 @@ msgstr "" msgid "Hospitals" msgstr "" -#: apps/hospital/models.py:10 +#: apps/hospital/models.py:27 msgid "hospital" msgstr "" -#: apps/hospital/models.py:11 +#: apps/hospital/models.py:28 msgid "hospitals" msgstr "" -#: apps/hospital/models.py:13 +#: apps/hospital/models.py:30 msgid "Name" msgstr "" -#: apps/hospital/models.py:13 +#: apps/hospital/models.py:30 msgid "The name of this hospital" msgstr "" -#: apps/hospital/models.py:14 +#: apps/hospital/models.py:31 msgid "Address" msgstr "" -#: apps/hospital/models.py:14 +#: apps/hospital/models.py:31 msgid "The address of this hospital" msgstr "" -#: apps/hospital/models.py:15 +#: apps/hospital/models.py:32 msgid "Postal code" msgstr "" -#: apps/hospital/models.py:15 +#: apps/hospital/models.py:32 msgid "The postal code of this hospital" msgstr "" -#: apps/hospital/models.py:16 +#: apps/hospital/models.py:33 msgid "City" msgstr "" -#: apps/hospital/models.py:16 +#: apps/hospital/models.py:33 msgid "The city of this hospital" msgstr "" -#: apps/hospital/models.py:17 +#: apps/hospital/models.py:34 msgid "Phone number" msgstr "" -#: apps/hospital/models.py:17 +#: apps/hospital/models.py:34 msgid "The general phone number of this hospital" msgstr "" diff --git a/polyclinic_scheduling/apps/hospital/locale/nl/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/hospital/locale/nl/LC_MESSAGES/django.po index dd28682..200fb71 100644 --- a/polyclinic_scheduling/apps/hospital/locale/nl/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/apps/hospital/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" "PO-Revision-Date: 2020-05-15 12:43+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n" @@ -26,50 +26,50 @@ msgstr "Ziekenhuis" msgid "Hospitals" msgstr "Ziekenhuizen" -#: apps/hospital/models.py:10 +#: apps/hospital/models.py:27 msgid "hospital" msgstr "ziekenhuis" -#: apps/hospital/models.py:11 +#: apps/hospital/models.py:28 msgid "hospitals" msgstr "ziekenhuizen" -#: apps/hospital/models.py:13 +#: apps/hospital/models.py:30 msgid "Name" msgstr "Naam" -#: apps/hospital/models.py:13 +#: apps/hospital/models.py:30 msgid "The name of this hospital" msgstr "De naam van dit ziekenhuis" -#: apps/hospital/models.py:14 +#: apps/hospital/models.py:31 msgid "Address" msgstr "Adres" -#: apps/hospital/models.py:14 +#: apps/hospital/models.py:31 msgid "The address of this hospital" msgstr "Het adres van dit ziekenhuis" -#: apps/hospital/models.py:15 +#: apps/hospital/models.py:32 msgid "Postal code" msgstr "Postcode" -#: apps/hospital/models.py:15 +#: apps/hospital/models.py:32 msgid "The postal code of this hospital" msgstr "De postcode van dit ziekenhuis" -#: apps/hospital/models.py:16 +#: apps/hospital/models.py:33 msgid "City" msgstr "Stad" -#: apps/hospital/models.py:16 +#: apps/hospital/models.py:33 msgid "The city of this hospital" msgstr "De stad waar dit ziekenhuis gelegen is" -#: apps/hospital/models.py:17 +#: apps/hospital/models.py:34 msgid "Phone number" msgstr "Telefoonnummer" -#: apps/hospital/models.py:17 +#: apps/hospital/models.py:34 msgid "The general phone number of this hospital" msgstr "Het algemene telefoonummer van dit ziekenhuis" diff --git a/polyclinic_scheduling/apps/polyclinic/locale/en/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/polyclinic/locale/en/LC_MESSAGES/django.po index e063728..25bcf90 100644 --- a/polyclinic_scheduling/apps/polyclinic/locale/en/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/apps/polyclinic/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,30 +26,30 @@ msgstr "" msgid "Polyclinics" msgstr "" -#: apps/polyclinic/models.py:11 +#: apps/polyclinic/models.py:24 msgid "polyclinic" msgstr "" -#: apps/polyclinic/models.py:12 +#: apps/polyclinic/models.py:25 msgid "polyclinics" msgstr "" -#: apps/polyclinic/models.py:14 +#: apps/polyclinic/models.py:27 msgid "To which hospital belongs this polyclinic" msgstr "" -#: apps/polyclinic/models.py:15 +#: apps/polyclinic/models.py:28 msgid "Name" msgstr "" -#: apps/polyclinic/models.py:15 +#: apps/polyclinic/models.py:28 msgid "The name of this polyclinic" msgstr "" -#: apps/polyclinic/models.py:16 +#: apps/polyclinic/models.py:29 msgid "Phone number" msgstr "" -#: apps/polyclinic/models.py:16 +#: apps/polyclinic/models.py:29 msgid "The general/direct phone number of this polyclinic" msgstr "" diff --git a/polyclinic_scheduling/apps/polyclinic/locale/nl/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/polyclinic/locale/nl/LC_MESSAGES/django.po index e96fe1a..4e867e3 100644 --- a/polyclinic_scheduling/apps/polyclinic/locale/nl/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/apps/polyclinic/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" "PO-Revision-Date: 2020-05-15 12:47+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n" @@ -26,30 +26,30 @@ msgstr "Polikliniek" msgid "Polyclinics" msgstr "Poliklinieken" -#: apps/polyclinic/models.py:11 +#: apps/polyclinic/models.py:24 msgid "polyclinic" msgstr "polikliniek" -#: apps/polyclinic/models.py:12 +#: apps/polyclinic/models.py:25 msgid "polyclinics" msgstr "poliklinieken" -#: apps/polyclinic/models.py:14 +#: apps/polyclinic/models.py:27 msgid "To which hospital belongs this polyclinic" msgstr "Bij welke ziekenhuis hoort deze polikliniek" -#: apps/polyclinic/models.py:15 +#: apps/polyclinic/models.py:28 msgid "Name" msgstr "Naam" -#: apps/polyclinic/models.py:15 +#: apps/polyclinic/models.py:28 msgid "The name of this polyclinic" msgstr "De naam van deze polikliniek" -#: apps/polyclinic/models.py:16 +#: apps/polyclinic/models.py:29 msgid "Phone number" msgstr "Telefoonnummer" -#: apps/polyclinic/models.py:16 +#: apps/polyclinic/models.py:29 msgid "The general/direct phone number of this polyclinic" msgstr "De algemene/directe telefoonnummer van deze polikliniek" diff --git a/polyclinic_scheduling/apps/schedule/admin.py b/polyclinic_scheduling/apps/schedule/admin.py index 682b631..1647a8a 100644 --- a/polyclinic_scheduling/apps/schedule/admin.py +++ b/polyclinic_scheduling/apps/schedule/admin.py @@ -5,11 +5,12 @@ from .models import Schedule # Register your models here. @admin.register(Schedule) class ScheduleAdmin(admin.ModelAdmin): - list_display = ('name', 'employee', 'email', 'created_at', 'processed') - ordering = ('created_at', 'name',) + list_display = ('name', 'employee', 'email', 'created_at', 'status','done') + ordering = ('-created_at', 'name',) search_fields = ('name', 'email') + list_filter = ('status',) - def processed(self,obj): - return len(obj.output_peregrine) > 0 + def done(self,obj): + return obj.done - processed.boolean = True + done.boolean = True diff --git a/polyclinic_scheduling/apps/schedule/locale/en/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/schedule/locale/en/LC_MESSAGES/django.po index dcb8ad1..95039a1 100644 --- a/polyclinic_scheduling/apps/schedule/locale/en/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/apps/schedule/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -42,89 +42,108 @@ msgstr "" msgid "When the job is done, the results will be sent to this email address" msgstr "" -#: apps/schedule/models.py:14 +#: apps/schedule/models.py:27 msgid "schedule" msgstr "" -#: apps/schedule/models.py:15 +#: apps/schedule/models.py:28 msgid "schedules" msgstr "" -#: apps/schedule/models.py:18 +#: apps/schedule/models.py:31 +msgid "New" +msgstr "" + +#: apps/schedule/models.py:32 +msgid "Accepted" +msgstr "" + +#: apps/schedule/models.py:33 +msgid "Processing" +msgstr "" + +#: apps/schedule/models.py:34 +msgid "Processed" +msgstr "" + +#: apps/schedule/models.py:35 +msgid "Done" +msgstr "" + +#: apps/schedule/models.py:36 +msgid "Invalid" +msgstr "" + +#: apps/schedule/models.py:37 +msgid "Failure" +msgstr "" + +#: apps/schedule/models.py:39 msgid "Select the employee that is responsible for this schedule request" msgstr "" -#: apps/schedule/models.py:20 +#: apps/schedule/models.py:41 #: apps/schedule/templates/schedule/schedule_list.html:13 msgid "Name" msgstr "" -#: apps/schedule/models.py:20 +#: apps/schedule/models.py:41 msgid "Name of the schedule" msgstr "" -#: apps/schedule/models.py:21 +#: apps/schedule/models.py:42 msgid "Email address" msgstr "" -#: apps/schedule/models.py:21 +#: apps/schedule/models.py:42 msgid "Email address where the results will be sent to." msgstr "" -#: apps/schedule/models.py:23 +#: apps/schedule/models.py:44 +msgid "Status" +msgstr "" + +#: apps/schedule/models.py:44 +msgid "The status of this schedule." +msgstr "" + +#: apps/schedule/models.py:46 msgid "Schedule input" msgstr "" -#: apps/schedule/models.py:23 +#: apps/schedule/models.py:46 msgid "The schedule input in JSON format based on the form data" msgstr "" -#: apps/schedule/models.py:25 -msgid "Peregrine input" -msgstr "" - -#: apps/schedule/models.py:25 -msgid "" -"This is the translated content from the source for use with Peregrine cluster" -msgstr "" - -#: apps/schedule/models.py:27 -msgid "Peregrine accepted" -msgstr "" - -#: apps/schedule/models.py:27 -msgid "When true, the Peregrine cluster has picked up the job." -msgstr "" - -#: apps/schedule/models.py:29 +#: apps/schedule/models.py:51 msgid "Peregrine JSON output" msgstr "" -#: apps/schedule/models.py:29 +#: apps/schedule/models.py:51 msgid "The results from the Peregrine job in JSON" msgstr "" -#: apps/schedule/models.py:31 +#: apps/schedule/models.py:53 msgid "Peregrine binary output" msgstr "" -#: apps/schedule/models.py:31 +#: apps/schedule/models.py:53 msgid "This is the output in binary format from the Peregrine cluster" msgstr "" -#: apps/schedule/models.py:33 +#: apps/schedule/models.py:55 msgid "Report is send to user" msgstr "" -#: apps/schedule/models.py:33 +#: apps/schedule/models.py:55 msgid "The date and time when the report has sended to the user." msgstr "" -#: apps/schedule/models.py:35 +#: apps/schedule/models.py:57 msgid "Peregrine logging" msgstr "" -#: apps/schedule/models.py:35 +#: apps/schedule/models.py:57 msgid "Here you can see the logging of the Peregrine job." msgstr "" diff --git a/polyclinic_scheduling/apps/schedule/locale/nl/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/schedule/locale/nl/LC_MESSAGES/django.po index 1e3d19e..ccf5c9c 100644 --- a/polyclinic_scheduling/apps/schedule/locale/nl/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/apps/schedule/locale/nl/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" -"PO-Revision-Date: 2020-05-18 11:08+0200\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" +"PO-Revision-Date: 2020-05-18 16:39+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n" "Language: nl\n" @@ -42,88 +42,108 @@ msgstr "E-mailadres voor resultaten" msgid "When the job is done, the results will be sent to this email address" msgstr "Als de klus geklaard is, worden de resultaten naar dit e-mailadres gestuurd" -#: apps/schedule/models.py:14 +#: apps/schedule/models.py:27 msgid "schedule" msgstr "rooster" -#: apps/schedule/models.py:15 +#: apps/schedule/models.py:28 msgid "schedules" msgstr "roosters" -#: apps/schedule/models.py:18 +#: apps/schedule/models.py:31 +msgid "New" +msgstr "Nieuw" + +#: apps/schedule/models.py:32 +msgid "Accepted" +msgstr "Geaccepteerd" + +#: apps/schedule/models.py:33 +msgid "Processing" +msgstr "Verwerken" + +#: apps/schedule/models.py:34 +msgid "Processed" +msgstr "Verwerkt" + +#: apps/schedule/models.py:35 +msgid "Done" +msgstr "Klaar" + +#: apps/schedule/models.py:36 +msgid "Invalid" +msgstr "Ongeldig" + +#: apps/schedule/models.py:37 +msgid "Failure" +msgstr "Error" + +#: apps/schedule/models.py:39 msgid "Select the employee that is responsible for this schedule request" msgstr "Selecteer de medewerker die verantwoordelijk is voor dit roosterverzoek" -#: apps/schedule/models.py:20 +#: apps/schedule/models.py:41 #: apps/schedule/templates/schedule/schedule_list.html:13 msgid "Name" msgstr "Naam" -#: apps/schedule/models.py:20 +#: apps/schedule/models.py:41 msgid "Name of the schedule" msgstr "Naam van de rooster" -#: apps/schedule/models.py:21 +#: apps/schedule/models.py:42 msgid "Email address" msgstr "E-mailadres" -#: apps/schedule/models.py:21 +#: apps/schedule/models.py:42 msgid "Email address where the results will be sent to." msgstr "E-mailadres waar de resultaten naartoe worden gestuurd." -#: apps/schedule/models.py:23 +#: apps/schedule/models.py:44 +msgid "Status" +msgstr "Status" + +#: apps/schedule/models.py:44 +msgid "The status of this schedule." +msgstr "De status van dit rooster." + +#: apps/schedule/models.py:46 msgid "Schedule input" msgstr "Rooster invoer" -#: apps/schedule/models.py:23 +#: apps/schedule/models.py:46 msgid "The schedule input in JSON format based on the form data" msgstr "De rooster invoer in JSON-indeling op basis van de formuliergegevens" -#: apps/schedule/models.py:25 -msgid "Peregrine input" -msgstr "Peregrine invoer" - -#: apps/schedule/models.py:25 -msgid "This is the translated content from the source for use with Peregrine cluster" -msgstr "Dit is de vertaalde inhoud van de bron voor gebruik met Peregrine-cluster" - -#: apps/schedule/models.py:27 -msgid "Peregrine accepted" -msgstr "Peregrine geaccepteerd" - -#: apps/schedule/models.py:27 -msgid "When true, the Peregrine cluster has picked up the job." -msgstr "Als het waar is, heeft het Peregrine-cluster de taak opgepakt." - -#: apps/schedule/models.py:29 +#: apps/schedule/models.py:51 msgid "Peregrine JSON output" msgstr "Peregrine JSON uitvoer" -#: apps/schedule/models.py:29 +#: apps/schedule/models.py:51 msgid "The results from the Peregrine job in JSON" msgstr "De resultaten van de Peregrine-taak in JSON" -#: apps/schedule/models.py:31 +#: apps/schedule/models.py:53 msgid "Peregrine binary output" msgstr "Peregrine binaire uitvoer" -#: apps/schedule/models.py:31 +#: apps/schedule/models.py:53 msgid "This is the output in binary format from the Peregrine cluster" msgstr "Dit is de uitvoer in binair formaat van het Peregrine-cluster" -#: apps/schedule/models.py:33 +#: apps/schedule/models.py:55 msgid "Report is send to user" msgstr "Rapport is naar gebruiker gestuurd" -#: apps/schedule/models.py:33 +#: apps/schedule/models.py:55 msgid "The date and time when the report has sended to the user." msgstr "De datum en tijd waarop het rapport naar de gebruiker is verzonden." -#: apps/schedule/models.py:35 +#: apps/schedule/models.py:57 msgid "Peregrine logging" msgstr "Peregrine log" -#: apps/schedule/models.py:35 +#: apps/schedule/models.py:57 msgid "Here you can see the logging of the Peregrine job." msgstr "Hier kunt u de logfile van de Peregrine opdracht zien." @@ -157,3 +177,15 @@ msgstr "Geen roosters beschikbaar" #: apps/schedule/templates/schedule/schedule_new.html:6 msgid "New schedule" msgstr "Nieuwe rooster" + +#~ msgid "Peregrine input" +#~ msgstr "Peregrine invoer" + +#~ msgid "This is the translated content from the source for use with Peregrine cluster" +#~ msgstr "Dit is de vertaalde inhoud van de bron voor gebruik met Peregrine-cluster" + +#~ msgid "Peregrine accepted" +#~ msgstr "Peregrine geaccepteerd" + +#~ msgid "When true, the Peregrine cluster has picked up the job." +#~ msgstr "Als het waar is, heeft het Peregrine-cluster de taak opgepakt." diff --git a/polyclinic_scheduling/apps/schedule/migrations/0004_auto_20200518_1425.py b/polyclinic_scheduling/apps/schedule/migrations/0004_auto_20200518_1425.py new file mode 100644 index 0000000..7a1af30 --- /dev/null +++ b/polyclinic_scheduling/apps/schedule/migrations/0004_auto_20200518_1425.py @@ -0,0 +1,26 @@ +# Generated by Django 3.0.6 on 2020-05-18 14:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('schedule', '0003_auto_20200518_0902'), + ] + + operations = [ + migrations.RemoveField( + model_name='schedule', + name='peregrine_accepted', + ), + migrations.RemoveField( + model_name='schedule', + name='planning_peregrine', + ), + migrations.AddField( + model_name='schedule', + name='status', + field=models.CharField(choices=[('new', 'New'), ('accepted', 'Accepted'), ('processing', 'Processing'), ('processed', 'Processed'), ('done', 'Done'), ('invalid', 'Invalid'), ('failure', 'Failure')], db_index=True, default='new', help_text='The status of this schedule.', max_length=10, verbose_name='Status'), + ), + ] diff --git a/polyclinic_scheduling/apps/schedule/models.py b/polyclinic_scheduling/apps/schedule/models.py index 5422d69..4361435 100644 --- a/polyclinic_scheduling/apps/schedule/models.py +++ b/polyclinic_scheduling/apps/schedule/models.py @@ -21,24 +21,63 @@ class Schedule(MetaDataModel): The name of the schedule. Max length is 100 characters. email : str The email address where the results should be sent to. Max length is 100 characters. + status : ScheduleStatus + The status of the schedule. """ class Meta: verbose_name = _('schedule') verbose_name_plural = _('schedules') + class ScheduleStatus(models.TextChoices): + """This is a sub class of Schedule which holds all the possible schedule statuses + + .. data:: NEW + + The schedule is just created and waiting to be picked up by the Peregrine scripts. + + .. data:: ACCEPTED + + The Peregrine scripts have accepted the new schedule job. And the input is valid. + + .. data:: PROCESSING + + The Peregrine job is submitted to the job queue and should be starting soon. + + .. data:: PROCESSED + + The Peregrine job is finished, and the results will be futher processed in order to create a new report with the outcome. + + .. data:: DONE + + The schedule rapport is created and uploaded to the database. The Peregrine process is done. + + .. data:: INVALID + + The entered data is invalid. Either directly by the posting of the form. Or when the Peregrine script could not read the input. + + .. data:: FAILURE + + Something when wrong on Peregrine. Look at the logging output of the Peregrine job + + """ + NEW = 'new', _('New') + ACCEPTED = 'accepted', _('Accepted') + PROCESSING = 'processing', _('Processing') + PROCESSED = 'processed', _('Processed') + DONE = 'done', _('Done') + INVALID = 'invalid', _('Invalid') + FAILURE = 'failure', _('Failure') employee = models.ForeignKey(Employee, on_delete=models.CASCADE, help_text=_('Select the employee that is responsible for this schedule request')) name = models.CharField(_('Name'), max_length=100, help_text=_('Name of the schedule')) email = models.CharField(_('Email address'), max_length=100, help_text=_('Email address where the results will be sent to.')) + status = models.CharField(_('Status'), max_length=10, choices=ScheduleStatus.choices, default=ScheduleStatus.NEW, help_text=_('The status of this schedule.'), db_index=True, ) + 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')) @@ -47,6 +86,20 @@ class Schedule(MetaDataModel): peregrine_output_log = models.TextField(_('Peregrine logging'), blank=True, help_text=_('Here you can see the logging of the Peregrine job.')) + @property + def done(self): + """ + Checks if the processing of this schedule is done on the Peregrine cluster. This can be either with the status: + + 1. :attr:`~ScheduleStatus.DONE` + 2. :attr:`~ScheduleStatus.INVALID` + 3. :attr:`~ScheduleStatus.FAILURE` + + Returns: + boolean -- True when status is one of the above value. + """ + return self.status in [self.ScheduleStatus.DONE,self.ScheduleStatus.INVALID,self.ScheduleStatus.FAILURE] + def __str__(self): """str: Returns a readable name for the schedule. Format is [schedule_name] (employee_name).""" return '{} ({})'.format(self.name, self.employee) \ No newline at end of file diff --git a/polyclinic_scheduling/apps/schedule/views.py b/polyclinic_scheduling/apps/schedule/views.py index 66aa359..31dabf5 100644 --- a/polyclinic_scheduling/apps/schedule/views.py +++ b/polyclinic_scheduling/apps/schedule/views.py @@ -32,6 +32,7 @@ def new_or_update_study(request, schedule = None): new_schedule.planning_source = json.loads(schedule_form.cleaned_data['json']) except json.JSONDecodeError as ex: new_schedule.planning_source = json.loads(json.dumps({'error': str(ex)})) + new_schedule.status = Schedule.ScheduleStatus.INVALID new_schedule.employee = request.user.employee new_schedule.name = schedule_form.cleaned_data['name'] diff --git a/polyclinic_scheduling/locale/en/LC_MESSAGES/django.po b/polyclinic_scheduling/locale/en/LC_MESSAGES/django.po index 428e515..208b3b5 100644 --- a/polyclinic_scheduling/locale/en/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/polyclinic_scheduling/locale/nl/LC_MESSAGES/django.po b/polyclinic_scheduling/locale/nl/LC_MESSAGES/django.po index ad21f74..68ca7b3 100644 --- a/polyclinic_scheduling/locale/nl/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" "PO-Revision-Date: 2020-05-18 11:10+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n" @@ -62,9 +62,9 @@ msgid "" "please go to the Signup page " msgstr "" -"Hier kunt u inloggen om nieuwe roosters te maken. Als u geen login heeft, " -"ga dan naar de aanmeld page " +"Hier kunt u inloggen om nieuwe roosters te maken. Als u geen login heeft, ga " +"dan naar de aanmeld page " #: templates/registration/login.html:24 msgid "Lost password?" diff --git a/polyclinic_scheduling/polyclinic_scheduling/locale/en/LC_MESSAGES/django.po b/polyclinic_scheduling/polyclinic_scheduling/locale/en/LC_MESSAGES/django.po index c45dd9e..0c789d2 100644 --- a/polyclinic_scheduling/polyclinic_scheduling/locale/en/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/polyclinic_scheduling/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/polyclinic_scheduling/polyclinic_scheduling/locale/nl/LC_MESSAGES/django.po b/polyclinic_scheduling/polyclinic_scheduling/locale/nl/LC_MESSAGES/django.po index f14bda0..4ed80cf 100644 --- a/polyclinic_scheduling/polyclinic_scheduling/locale/nl/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/polyclinic_scheduling/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:07+0000\n" +"POT-Creation-Date: 2020-05-18 14:38+0000\n" "PO-Revision-Date: 2020-05-15 12:49+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n"