diff --git a/polyclinic_scheduling/apps/RUG_template/locale/en/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/RUG_template/locale/en/LC_MESSAGES/django.po index c8af815..fedf463 100644 --- a/polyclinic_scheduling/apps/RUG_template/locale/en/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/apps/RUG_template/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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+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/apps/RUG_template/locale/nl/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/RUG_template/locale/nl/LC_MESSAGES/django.po index abf9594..1c3f962 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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+0000\n" "PO-Revision-Date: 2020-05-19 12:05+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 84ef30d..3d7dfe1 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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: apps/employee/admin.py:13 apps/employee/models.py:28 +msgid "employee" +msgstr "" + #: apps/employee/apps.py:7 msgid "Employee" msgstr "" @@ -26,10 +30,6 @@ msgstr "" msgid "Employees" msgstr "" -#: apps/employee/models.py:28 -msgid "employee" -msgstr "" - #: apps/employee/models.py:29 msgid "employees" 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 d94f592..9b2c607 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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+0000\n" "PO-Revision-Date: 2020-05-15 12:46+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n" @@ -18,6 +18,10 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.6\n" +#: apps/employee/admin.py:13 apps/employee/models.py:28 +msgid "employee" +msgstr "medewerker" + #: apps/employee/apps.py:7 msgid "Employee" msgstr "Medewerker" @@ -26,10 +30,6 @@ msgstr "Medewerker" msgid "Employees" msgstr "Medewerkers" -#: apps/employee/models.py:28 -msgid "employee" -msgstr "medewerker" - #: apps/employee/models.py:29 msgid "employees" msgstr "medewerkers" 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 ab6d77e..55450c5 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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+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/apps/hospital/locale/nl/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/hospital/locale/nl/LC_MESSAGES/django.po index 3ea7f57..d579638 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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+0000\n" "PO-Revision-Date: 2020-05-15 12:43+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n" 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 f8095e8..434b7d6 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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+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/apps/polyclinic/locale/nl/LC_MESSAGES/django.po b/polyclinic_scheduling/apps/polyclinic/locale/nl/LC_MESSAGES/django.po index b8e29ca..c8f0605 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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+0000\n" "PO-Revision-Date: 2020-05-15 12:47+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n" 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 d0bca19..9b82456 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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: apps/schedule/admin.py:18 apps/schedule/models.py:68 +msgid "Done" +msgstr "" + #: apps/schedule/apps.py:7 msgid "Schedule" msgstr "" @@ -66,10 +70,6 @@ msgstr "" msgid "Processed" msgstr "" -#: apps/schedule/models.py:68 -msgid "Done" -msgstr "" - #: apps/schedule/models.py:69 msgid "Invalid" 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 ac120fc..126566c 100644 --- a/polyclinic_scheduling/apps/schedule/locale/nl/LC_MESSAGES/django.po +++ b/polyclinic_scheduling/apps/schedule/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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+0000\n" "PO-Revision-Date: 2020-05-19 12:07+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n" @@ -18,6 +18,10 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.6\n" +#: apps/schedule/admin.py:18 apps/schedule/models.py:68 +msgid "Done" +msgstr "Klaar" + #: apps/schedule/apps.py:7 msgid "Schedule" msgstr "Rooster" @@ -40,7 +44,8 @@ msgstr "E-mailadres voor resultaten" #: apps/schedule/forms.py:8 apps/schedule/forms.py:9 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" +msgstr "" +"Als de klus geklaard is, worden de resultaten naar dit e-mailadres gestuurd" #: apps/schedule/models.py:29 msgid "schedule" @@ -66,10 +71,6 @@ msgstr "Verwerken" msgid "Processed" msgstr "Verwerkt" -#: apps/schedule/models.py:68 -msgid "Done" -msgstr "Klaar" - #: apps/schedule/models.py:69 msgid "Invalid" msgstr "Ongeldig" @@ -80,7 +81,8 @@ msgstr "Error" #: apps/schedule/models.py:72 msgid "Select the employee that is responsible for this schedule request" -msgstr "Selecteer de medewerker die verantwoordelijk is voor dit roosterverzoek" +msgstr "" +"Selecteer de medewerker die verantwoordelijk is voor dit roosterverzoek" #: apps/schedule/models.py:74 #: apps/schedule/templates/schedule/schedule_list.html:13 @@ -190,8 +192,11 @@ 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 "" +#~ "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" diff --git a/polyclinic_scheduling/apps/schedule/templates/schedule/schedule_new.html b/polyclinic_scheduling/apps/schedule/templates/schedule/schedule_new.html index e0cdb1e..27aa02c 100644 --- a/polyclinic_scheduling/apps/schedule/templates/schedule/schedule_new.html +++ b/polyclinic_scheduling/apps/schedule/templates/schedule/schedule_new.html @@ -604,6 +604,13 @@ dir = "asc"; /* Make a loop that will continue until no switching has been done: */ + + // Normal sorting is done on text based. + mode = 'text'; + if ([1,4,5].indexOf(n) !== -1) { + // but for some colums, we want to use number soring. + mode = 'number'; + } while (switching) { // Start by saying: no switching is done: switching = false; @@ -621,14 +628,21 @@ based on the direction, asc or desc: */ var value_x = jQuery(x).find('select').length > 0 ? jQuery(x).find('select') : jQuery(x).find('input'); var value_y = jQuery(y).find('select').length > 0 ? jQuery(y).find('select') : jQuery(y).find('input'); + if (dir == "asc") { - if (value_x.val().toLowerCase() > value_y.val().toLowerCase()) { + if ( + ('text' == mode && value_x.val().toLowerCase() > value_y.val().toLowerCase()) || + ('number' == mode && (value_x.val() * 1) > (value_y.val() * 1)) + ) { // If so, mark as a switch and break the loop: shouldSwitch = true; break; } } else if (dir == "desc") { - if (value_x.val().toLowerCase() < value_y.val().toLowerCase()) { + if ( + ('text' == mode && value_x.val().toLowerCase() < value_y.val().toLowerCase()) || + ('number' == mode && (value_x.val() * 1) < (value_y.val() * 1)) + ) { // If so, mark as a switch and break the loop: shouldSwitch = true; break; diff --git a/polyclinic_scheduling/locale/en/LC_MESSAGES/django.po b/polyclinic_scheduling/locale/en/LC_MESSAGES/django.po index 465a76d..10a4c5e 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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+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 078880e..2a6f748 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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+0000\n" "PO-Revision-Date: 2020-05-18 11:10+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n" 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 23609a4..3d02dbe 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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+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 d8ba78b..8b35af3 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-19 10:05+0000\n" +"POT-Creation-Date: 2020-05-19 14:11+0000\n" "PO-Revision-Date: 2020-05-15 12:49+0200\n" "Last-Translator: Joshua Rubingh \n" "Language-Team: \n"