P300021/poli_planning
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: P300021:2cd502caa5ed41b2f6e767fc0edf6ecd801e471e
Branches Tags
P300021:master
..
compare: P300021:de2e2005515a626c6eb0ab27ba30b24f25e28d2f
Branches Tags
P300021:master

No commits in common. "2cd502caa5ed41b2f6e767fc0edf6ecd801e471e" and "de2e2005515a626c6eb0ab27ba30b24f25e28d2f" have entirely different histories.
2cd502caa5 ... de2e200551

23 changed files with 41 additions and 129 deletions
Show Stats Expand all files Collapse all files

2
polyclinic_scheduling/apps/RUG_template/locale/en/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
polyclinic_scheduling/apps/RUG_template/locale/nl/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: 2020-05-19 12:05+0200\n"
"Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
"Language-Team: \n"

3
polyclinic_scheduling/apps/employee/admin.py
View File

@ -1,7 +1,6 @@
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.contrib.auth.models import User
from django.utils.translation import gettext_lazy as _
from .models import Employee
@ -10,7 +9,7 @@ from .models import Employee
class EmployeeInline(admin.StackedInline):
model = Employee
can_delete = False
verbose_name_plural = _('employee')
verbose_name_plural = 'employee'
# Define a new User admin
class UserAdmin(BaseUserAdmin):

10
polyclinic_scheduling/apps/employee/locale/en/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,10 +18,6 @@ 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 ""
@ -30,6 +26,10 @@ msgstr ""
msgid "Employees"
msgstr ""
#: apps/employee/models.py:28
msgid "employee"
msgstr ""
#: apps/employee/models.py:29
msgid "employees"
msgstr ""

10
polyclinic_scheduling/apps/employee/locale/nl/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: 2020-05-15 12:46+0200\n"
"Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
"Language-Team: \n"
@ -18,10 +18,6 @@ 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"
@ -30,6 +26,10 @@ msgstr "Medewerker"
msgid "Employees"
msgstr "Medewerkers"
#: apps/employee/models.py:28
msgid "employee"
msgstr "medewerker"
#: apps/employee/models.py:29
msgid "employees"
msgstr "medewerkers"

26
polyclinic_scheduling/apps/employee/migrations/0004_auto_20200519_1351.py
View File

@ -1,26 +0,0 @@
# Generated by Django 3.0.6 on 2020-05-19 13:51
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('hospital', '0003_auto_20200518_1227'),
('polyclinic', '0003_auto_20200518_1227'),
('employee', '0003_auto_20200518_1227'),
]
operations = [
migrations.AlterField(
model_name='employee',
name='hospital',
field=models.ForeignKey(help_text='Select the hospital for this employee', on_delete=django.db.models.deletion.CASCADE, to='hospital.Hospital', verbose_name='hospital'),
),
migrations.AlterField(
model_name='employee',
name='polyclinic',
field=models.ManyToManyField(blank=True, help_text='Select the polyclinic(s) for this employee', to='polyclinic.Polyclinic', verbose_name='polyclinic'),
),
]

4
polyclinic_scheduling/apps/employee/models.py
View File

@ -30,9 +30,9 @@ class Employee(MetaDataModel):
user = models.OneToOneField(User, on_delete=models.CASCADE, help_text=_('Django user'))
hospital = models.ForeignKey(Hospital, verbose_name=Hospital._meta.verbose_name, on_delete=models.CASCADE, help_text=_('Select the hospital for this employee'))
hospital = models.ForeignKey(Hospital, on_delete=models.CASCADE, help_text=_('Select the hospital for this employee'))
polyclinic = models.ManyToManyField(Polyclinic, verbose_name=Polyclinic._meta.verbose_name, blank=True, help_text=_('Select the polyclinic(s) for this employee'))
polyclinic = models.ManyToManyField(Polyclinic, blank=True, help_text=_('Select the polyclinic(s) for this employee'))
phone = models.CharField(_('Phone number'), max_length=20, blank=True, help_text=_('The direct phone number of this employee'))
def __str__(self):

2
polyclinic_scheduling/apps/hospital/locale/en/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
polyclinic_scheduling/apps/hospital/locale/nl/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: 2020-05-15 12:43+0200\n"
"Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
"Language-Team: \n"

2
polyclinic_scheduling/apps/polyclinic/locale/en/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
polyclinic_scheduling/apps/polyclinic/locale/nl/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: 2020-05-15 12:47+0200\n"
"Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
"Language-Team: \n"

20
polyclinic_scheduling/apps/polyclinic/migrations/0004_auto_20200519_1351.py
View File

@ -1,20 +0,0 @@
# Generated by Django 3.0.6 on 2020-05-19 13:51
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('hospital', '0003_auto_20200518_1227'),
('polyclinic', '0003_auto_20200518_1227'),
]
operations = [
migrations.AlterField(
model_name='polyclinic',
name='hospital',
field=models.ForeignKey(help_text='To which hospital belongs this polyclinic', on_delete=django.db.models.deletion.CASCADE, to='hospital.Hospital', verbose_name='hospital'),
),
]

2
polyclinic_scheduling/apps/polyclinic/models.py
View File

@ -24,7 +24,7 @@ class Polyclinic(MetaDataModel):
verbose_name = _('polyclinic')
verbose_name_plural = _('polyclinics')
hospital = models.ForeignKey(Hospital, verbose_name=Hospital._meta.verbose_name, on_delete=models.CASCADE, help_text=_('To which hospital belongs this polyclinic'))
hospital = models.ForeignKey(Hospital, on_delete=models.CASCADE, help_text=_('To which hospital belongs this polyclinic'))
name = models.CharField(_('Name'), max_length=200, blank=True, help_text=_('The name of this polyclinic'))
phone = models.CharField(_('Phone number'), max_length=20, blank=True, help_text=_('The general/direct phone number of this polyclinic'))

2
polyclinic_scheduling/apps/schedule/admin.py
View File

@ -1,5 +1,4 @@
from django.contrib import admin
from django.utils.translation import gettext_lazy as _
from .models import Schedule
@ -15,4 +14,3 @@ class ScheduleAdmin(admin.ModelAdmin):
return obj.done
done.boolean = True
done.short_description = _('Done')

10
polyclinic_scheduling/apps/schedule/locale/en/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,10 +18,6 @@ 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 ""
@ -70,6 +66,10 @@ msgstr ""
msgid "Processed"
msgstr ""
#: apps/schedule/models.py:68
msgid "Done"
msgstr ""
#: apps/schedule/models.py:69
msgid "Invalid"
msgstr ""

23
polyclinic_scheduling/apps/schedule/locale/nl/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: 2020-05-19 12:07+0200\n"
"Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
"Language-Team: \n"
@ -18,10 +18,6 @@ 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"
@ -44,8 +40,7 @@ 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"
@ -71,6 +66,10 @@ msgstr "Verwerken"
msgid "Processed"
msgstr "Verwerkt"
#: apps/schedule/models.py:68
msgid "Done"
msgstr "Klaar"
#: apps/schedule/models.py:69
msgid "Invalid"
msgstr "Ongeldig"
@ -81,8 +80,7 @@ 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
@ -192,11 +190,8 @@ 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"

20
polyclinic_scheduling/apps/schedule/migrations/0006_auto_20200519_1351.py
View File

@ -1,20 +0,0 @@
# Generated by Django 3.0.6 on 2020-05-19 13:51
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('employee', '0004_auto_20200519_1351'),
('schedule', '0005_auto_20200519_0821'),
]
operations = [
migrations.AlterField(
model_name='schedule',
name='employee',
field=models.ForeignKey(help_text='Select the employee that is responsible for this schedule request', on_delete=django.db.models.deletion.CASCADE, to='employee.Employee', verbose_name='employee'),
),
]

2
polyclinic_scheduling/apps/schedule/models.py
View File

@ -69,7 +69,7 @@ class Schedule(MetaDataModel):
INVALID = 'invalid', _('Invalid')
FAILURE = 'failure', _('Failure')
employee = models.ForeignKey(Employee, verbose_name=Employee._meta.verbose_name, on_delete=models.CASCADE, help_text=_('Select the employee that is responsible for this schedule request'))
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.'))

18
polyclinic_scheduling/apps/schedule/templates/schedule/schedule_new.html
View File

@ -604,13 +604,6 @@
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;
@ -628,21 +621,14 @@
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 (
('text' == mode && value_x.val().toLowerCase() > value_y.val().toLowerCase()) ||
('number' == mode && (value_x.val() * 1) > (value_y.val() * 1))
) {
if (value_x.val().toLowerCase() > value_y.val().toLowerCase()) {
// If so, mark as a switch and break the loop:
shouldSwitch = true;
break;
}
} else if (dir == "desc") {
if (
('text' == mode && value_x.val().toLowerCase() < value_y.val().toLowerCase()) ||
('number' == mode && (value_x.val() * 1) < (value_y.val() * 1))
) {
if (value_x.val().toLowerCase() < value_y.val().toLowerCase()) {
// If so, mark as a switch and break the loop:
shouldSwitch = true;
break;

2
polyclinic_scheduling/locale/en/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
polyclinic_scheduling/locale/nl/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: 2020-05-18 11:10+0200\n"
"Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
"Language-Team: \n"

2
polyclinic_scheduling/polyclinic_scheduling/locale/en/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
polyclinic_scheduling/polyclinic_scheduling/locale/nl/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-19 14:11+0000\n"
"POT-Creation-Date: 2020-05-19 10:05+0000\n"
"PO-Revision-Date: 2020-05-15 12:49+0200\n"
"Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
"Language-Team: \n"