feat(timetable): a timetabler keeps hard and soft wishes on the school week grid

appinfo/routes.php

@@ -53,4 +53,6 @@
     ['name' => 'timetable#upsert', 'url' => '/api/timetable/sessions/upsert', 'verb' => 'POST'],
     // Admins publish a source's draft lessons in a window (timetable-draft-review).
     ['name' => 'timetable#publish', 'url' => '/api/timetable/sessions/publish', 'verb' => 'POST'],
+    // Admins upload the activities and rooms sheets for the timetable generator (timetabling-generator 2.2).
+    ['name' => 'timetableInput#upload', 'url' => '/api/timetable/input/upload', 'verb' => 'POST'],
 ]);

l10n/be.js

@@ -1008,7 +1008,23 @@ OC.L10N.register(
         "Reason": "Прычына",
         "Why the run failed": "Чаму запуск не ўдаўся",
         "Published at": "Апублікаваны",
-        "When the scenario was written out as draft lessons": "Калі сцэнарый запісаны як чарнавыя ўрокі"
+        "When the scenario was written out as draft lessons": "Калі сцэнарый запісаны як чарнавыя ўрокі",
+        "Edit wish": "Рэдагаваць пажаданне",
+        "New wish": "Новае пажаданне",
+        "Hard: the generator always keeps it": "Абавязковае: генератар заўсёды яго выконвае",
+        "Soft: the generator keeps it where it can": "Гнуткае: генератар выконвае яго, калі можа",
+        "Weight (1 to 3)": "Вага (ад 1 да 3)",
+        "Most lessons a day": "Не больш за столькі ўрокаў у дзень",
+        "Period": "Урок",
+        "{day} period {number}": "{day} урок {number}",
+        "Teacher (user name)": "Настаўнік (імя карыстальніка)",
+        "Activity (group:subject)": "Заняткі (група:прадмет)",
+        "Say who or what the wish is about.": "Пазначце, каго ці чаго датычыць пажаданне.",
+        "Choose at least one period.": "Выберыце хаця б адзін урок.",
+        "The limit is a whole number of 1 or more.": "Ліміт: цэлы лік ад 1.",
+        "Timetable": "Расклад",
+        "Wishes": "Пажаданні",
+        "Timetable wishes": "Пажаданні да раскладу"
     },
     "nplurals=2; plural=(n != 1);"
 )

l10n/be.json

@@ -1007,7 +1007,23 @@
         "Reason": "Прычына",
         "Why the run failed": "Чаму запуск не ўдаўся",
         "Published at": "Апублікаваны",
-        "When the scenario was written out as draft lessons": "Калі сцэнарый запісаны як чарнавыя ўрокі"
+        "When the scenario was written out as draft lessons": "Калі сцэнарый запісаны як чарнавыя ўрокі",
+        "Edit wish": "Рэдагаваць пажаданне",
+        "New wish": "Новае пажаданне",
+        "Hard: the generator always keeps it": "Абавязковае: генератар заўсёды яго выконвае",
+        "Soft: the generator keeps it where it can": "Гнуткае: генератар выконвае яго, калі можа",
+        "Weight (1 to 3)": "Вага (ад 1 да 3)",
+        "Most lessons a day": "Не больш за столькі ўрокаў у дзень",
+        "Period": "Урок",
+        "{day} period {number}": "{day} урок {number}",
+        "Teacher (user name)": "Настаўнік (імя карыстальніка)",
+        "Activity (group:subject)": "Заняткі (група:прадмет)",
+        "Say who or what the wish is about.": "Пазначце, каго ці чаго датычыць пажаданне.",
+        "Choose at least one period.": "Выберыце хаця б адзін урок.",
+        "The limit is a whole number of 1 or more.": "Ліміт: цэлы лік ад 1.",
+        "Timetable": "Расклад",
+        "Wishes": "Пажаданні",
+        "Timetable wishes": "Пажаданні да раскладу"
     },
     "plurals": {}
 }

l10n/bg.js

@@ -1008,7 +1008,23 @@ OC.L10N.register(
         "Reason": "Причина",
         "Why the run failed": "Защо изпълнението е неуспешно",
         "Published at": "Публикуван на",
-        "When the scenario was written out as draft lessons": "Кога сценарият е записан като чернови часове"
+        "When the scenario was written out as draft lessons": "Кога сценарият е записан като чернови часове",
+        "Edit wish": "Редактиране на желание",
+        "New wish": "Ново желание",
+        "Hard: the generator always keeps it": "Задължително: генераторът винаги го спазва",
+        "Soft: the generator keeps it where it can": "Гъвкаво: генераторът го спазва, когато може",
+        "Weight (1 to 3)": "Тежест (от 1 до 3)",
+        "Most lessons a day": "Най-много часове на ден",
+        "Period": "Час",
+        "{day} period {number}": "{day} час {number}",
+        "Teacher (user name)": "Учител (потребителско име)",
+        "Activity (group:subject)": "Дейност (група:предмет)",
+        "Say who or what the wish is about.": "Посочете за кого или за какво е желанието.",
+        "Choose at least one period.": "Изберете поне един час.",
+        "The limit is a whole number of 1 or more.": "Лимитът е цяло число от 1 нагоре.",
+        "Timetable": "Разписание",
+        "Wishes": "Желания",
+        "Timetable wishes": "Желания за разписанието"
     },
     "nplurals=2; plural=(n != 1);"
 )

l10n/bg.json

@@ -1007,7 +1007,23 @@
         "Reason": "Причина",
         "Why the run failed": "Защо изпълнението е неуспешно",
         "Published at": "Публикуван на",
-        "When the scenario was written out as draft lessons": "Кога сценарият е записан като чернови часове"
+        "When the scenario was written out as draft lessons": "Кога сценарият е записан като чернови часове",
+        "Edit wish": "Редактиране на желание",
+        "New wish": "Ново желание",
+        "Hard: the generator always keeps it": "Задължително: генераторът винаги го спазва",
+        "Soft: the generator keeps it where it can": "Гъвкаво: генераторът го спазва, когато може",
+        "Weight (1 to 3)": "Тежест (от 1 до 3)",
+        "Most lessons a day": "Най-много часове на ден",
+        "Period": "Час",
+        "{day} period {number}": "{day} час {number}",
+        "Teacher (user name)": "Учител (потребителско име)",
+        "Activity (group:subject)": "Дейност (група:предмет)",
+        "Say who or what the wish is about.": "Посочете за кого или за какво е желанието.",
+        "Choose at least one period.": "Изберете поне един час.",
+        "The limit is a whole number of 1 or more.": "Лимитът е цяло число от 1 нагоре.",
+        "Timetable": "Разписание",
+        "Wishes": "Желания",
+        "Timetable wishes": "Желания за разписанието"
     },
     "plurals": null
 }

l10n/bs.js

@@ -1008,7 +1008,23 @@ OC.L10N.register(
         "Reason": "Razlog",
         "Why the run failed": "Zašto pokretanje nije uspjelo",
         "Published at": "Objavljeno",
-        "When the scenario was written out as draft lessons": "Kada je scenarij zapisan kao nacrti časova"
+        "When the scenario was written out as draft lessons": "Kada je scenarij zapisan kao nacrti časova",
+        "Edit wish": "Uredi želju",
+        "New wish": "Nova želja",
+        "Hard: the generator always keeps it": "Obavezno: generator je uvijek poštuje",
+        "Soft: the generator keeps it where it can": "Fleksibilno: generator je poštuje gdje može",
+        "Weight (1 to 3)": "Težina (1 do 3)",
+        "Most lessons a day": "Najviše časova dnevno",
+        "Period": "Čas",
+        "{day} period {number}": "{day} čas {number}",
+        "Teacher (user name)": "Nastavnik (korisničko ime)",
+        "Activity (group:subject)": "Aktivnost (grupa:predmet)",
+        "Say who or what the wish is about.": "Navedite na koga ili šta se želja odnosi.",
+        "Choose at least one period.": "Odaberite barem jedan čas.",
+        "The limit is a whole number of 1 or more.": "Ograničenje je cijeli broj od 1 ili više.",
+        "Timetable": "Raspored",
+        "Wishes": "Želje",
+        "Timetable wishes": "Želje za raspored"
     },
     "nplurals=2; plural=(n != 1);"
 )

l10n/bs.json

@@ -1007,7 +1007,23 @@
         "Reason": "Razlog",
         "Why the run failed": "Zašto pokretanje nije uspjelo",
         "Published at": "Objavljeno",
-        "When the scenario was written out as draft lessons": "Kada je scenarij zapisan kao nacrti časova"
+        "When the scenario was written out as draft lessons": "Kada je scenarij zapisan kao nacrti časova",
+        "Edit wish": "Uredi želju",
+        "New wish": "Nova želja",
+        "Hard: the generator always keeps it": "Obavezno: generator je uvijek poštuje",
+        "Soft: the generator keeps it where it can": "Fleksibilno: generator je poštuje gdje može",
+        "Weight (1 to 3)": "Težina (1 do 3)",
+        "Most lessons a day": "Najviše časova dnevno",
+        "Period": "Čas",
+        "{day} period {number}": "{day} čas {number}",
+        "Teacher (user name)": "Nastavnik (korisničko ime)",
+        "Activity (group:subject)": "Aktivnost (grupa:predmet)",
+        "Say who or what the wish is about.": "Navedite na koga ili šta se želja odnosi.",
+        "Choose at least one period.": "Odaberite barem jedan čas.",
+        "The limit is a whole number of 1 or more.": "Ograničenje je cijeli broj od 1 ili više.",
+        "Timetable": "Raspored",
+        "Wishes": "Želje",
+        "Timetable wishes": "Želje za raspored"
     },
     "plurals": null
 }

l10n/ca.js

@@ -1008,7 +1008,23 @@ OC.L10N.register(
         "Reason": "Motiu",
         "Why the run failed": "Per què ha fallat l'execució",
         "Published at": "Publicat el",
-        "When the scenario was written out as draft lessons": "Quan es va escriure l'escenari com a classes esborrany"
+        "When the scenario was written out as draft lessons": "Quan es va escriure l'escenari com a classes esborrany",
+        "Edit wish": "Edita el desig",
+        "New wish": "Desig nou",
+        "Hard: the generator always keeps it": "Estricte: el generador sempre el respecta",
+        "Soft: the generator keeps it where it can": "Flexible: el generador el respecta quan pot",
+        "Weight (1 to 3)": "Pes (d'1 a 3)",
+        "Most lessons a day": "Màxim de classes al dia",
+        "Period": "Franja",
+        "{day} period {number}": "{day} franja {number}",
+        "Teacher (user name)": "Docent (nom d'usuari)",
+        "Activity (group:subject)": "Activitat (grup:assignatura)",
+        "Say who or what the wish is about.": "Indiqueu a qui o a què es refereix el desig.",
+        "Choose at least one period.": "Trieu almenys una franja.",
+        "The limit is a whole number of 1 or more.": "El límit és un nombre enter d'1 o més.",
+        "Timetable": "Horari",
+        "Wishes": "Desitjos",
+        "Timetable wishes": "Desitjos d'horari"
     },
     "nplurals=2; plural=(n != 1);"
 )

l10n/ca.json

@@ -1007,7 +1007,23 @@
         "Reason": "Motiu",
         "Why the run failed": "Per què ha fallat l'execució",
         "Published at": "Publicat el",
-        "When the scenario was written out as draft lessons": "Quan es va escriure l'escenari com a classes esborrany"
+        "When the scenario was written out as draft lessons": "Quan es va escriure l'escenari com a classes esborrany",
+        "Edit wish": "Edita el desig",
+        "New wish": "Desig nou",
+        "Hard: the generator always keeps it": "Estricte: el generador sempre el respecta",
+        "Soft: the generator keeps it where it can": "Flexible: el generador el respecta quan pot",
+        "Weight (1 to 3)": "Pes (d'1 a 3)",
+        "Most lessons a day": "Màxim de classes al dia",
+        "Period": "Franja",
+        "{day} period {number}": "{day} franja {number}",
+        "Teacher (user name)": "Docent (nom d'usuari)",
+        "Activity (group:subject)": "Activitat (grup:assignatura)",
+        "Say who or what the wish is about.": "Indiqueu a qui o a què es refereix el desig.",
+        "Choose at least one period.": "Trieu almenys una franja.",
+        "The limit is a whole number of 1 or more.": "El límit és un nombre enter d'1 o més.",
+        "Timetable": "Horari",
+        "Wishes": "Desitjos",
+        "Timetable wishes": "Desitjos d'horari"
     },
     "plurals": null
 }

l10n/cs.js

@@ -1008,7 +1008,23 @@ OC.L10N.register(
         "Reason": "Důvod",
         "Why the run failed": "Proč běh selhal",
         "Published at": "Zveřejněno",
-        "When the scenario was written out as draft lessons": "Kdy byl scénář zapsán jako koncepty hodin"
+        "When the scenario was written out as draft lessons": "Kdy byl scénář zapsán jako koncepty hodin",
+        "Edit wish": "Upravit přání",
+        "New wish": "Nové přání",
+        "Hard: the generator always keeps it": "Pevné: generátor je vždy dodrží",
+        "Soft: the generator keeps it where it can": "Měkké: generátor je dodrží, kde to jde",
+        "Weight (1 to 3)": "Váha (1 až 3)",
+        "Most lessons a day": "Nejvýše hodin denně",
+        "Period": "Hodina",
+        "{day} period {number}": "{day} hodina {number}",
+        "Teacher (user name)": "Učitel (uživatelské jméno)",
+        "Activity (group:subject)": "Aktivita (skupina:předmět)",
+        "Say who or what the wish is about.": "Uveďte, koho nebo čeho se přání týká.",
+        "Choose at least one period.": "Vyberte alespoň jednu hodinu.",
+        "The limit is a whole number of 1 or more.": "Limit je celé číslo 1 nebo vyšší.",
+        "Timetable": "Rozvrh",
+        "Wishes": "Přání",
+        "Timetable wishes": "Přání k rozvrhu"
     },
     "nplurals=2; plural=(n != 1);"
 )

l10n/cs.json

@@ -1007,7 +1007,23 @@
         "Reason": "Důvod",
         "Why the run failed": "Proč běh selhal",
         "Published at": "Zveřejněno",
-        "When the scenario was written out as draft lessons": "Kdy byl scénář zapsán jako koncepty hodin"
+        "When the scenario was written out as draft lessons": "Kdy byl scénář zapsán jako koncepty hodin",
+        "Edit wish": "Upravit přání",
+        "New wish": "Nové přání",
+        "Hard: the generator always keeps it": "Pevné: generátor je vždy dodrží",
+        "Soft: the generator keeps it where it can": "Měkké: generátor je dodrží, kde to jde",
+        "Weight (1 to 3)": "Váha (1 až 3)",
+        "Most lessons a day": "Nejvýše hodin denně",
+        "Period": "Hodina",
+        "{day} period {number}": "{day} hodina {number}",
+        "Teacher (user name)": "Učitel (uživatelské jméno)",
+        "Activity (group:subject)": "Aktivita (skupina:předmět)",
+        "Say who or what the wish is about.": "Uveďte, koho nebo čeho se přání týká.",
+        "Choose at least one period.": "Vyberte alespoň jednu hodinu.",
+        "The limit is a whole number of 1 or more.": "Limit je celé číslo 1 nebo vyšší.",
+        "Timetable": "Rozvrh",
+        "Wishes": "Přání",
+        "Timetable wishes": "Přání k rozvrhu"
     },
     "plurals": null
 }

l10n/da.js

@@ -1008,7 +1008,23 @@ OC.L10N.register(
         "Reason": "Årsag",
         "Why the run failed": "Hvorfor kørslen mislykkedes",
         "Published at": "Udgivet",
-        "When the scenario was written out as draft lessons": "Hvornår scenariet blev skrevet ud som kladdelektioner"
+        "When the scenario was written out as draft lessons": "Hvornår scenariet blev skrevet ud som kladdelektioner",
+        "Edit wish": "Rediger ønske",
+        "New wish": "Nyt ønske",
+        "Hard: the generator always keeps it": "Hårdt: generatoren overholder det altid",
+        "Soft: the generator keeps it where it can": "Blødt: generatoren overholder det, hvor den kan",
+        "Weight (1 to 3)": "Vægt (1 til 3)",
+        "Most lessons a day": "Højst antal lektioner om dagen",
+        "Period": "Lektion",
+        "{day} period {number}": "{day} lektion {number}",
+        "Teacher (user name)": "Lærer (brugernavn)",
+        "Activity (group:subject)": "Aktivitet (gruppe:fag)",
+        "Say who or what the wish is about.": "Angiv hvem eller hvad ønsket gælder.",
+        "Choose at least one period.": "Vælg mindst én lektion.",
+        "The limit is a whole number of 1 or more.": "Grænsen er et helt tal på 1 eller mere.",
+        "Timetable": "Skema",
+        "Wishes": "Ønsker",
+        "Timetable wishes": "Skemaønsker"
     },
     "nplurals=2; plural=(n != 1);"
 )

l10n/da.json

@@ -1007,7 +1007,23 @@
         "Reason": "Årsag",
         "Why the run failed": "Hvorfor kørslen mislykkedes",
         "Published at": "Udgivet",
-        "When the scenario was written out as draft lessons": "Hvornår scenariet blev skrevet ud som kladdelektioner"
+        "When the scenario was written out as draft lessons": "Hvornår scenariet blev skrevet ud som kladdelektioner",
+        "Edit wish": "Rediger ønske",
+        "New wish": "Nyt ønske",
+        "Hard: the generator always keeps it": "Hårdt: generatoren overholder det altid",
+        "Soft: the generator keeps it where it can": "Blødt: generatoren overholder det, hvor den kan",
+        "Weight (1 to 3)": "Vægt (1 til 3)",
+        "Most lessons a day": "Højst antal lektioner om dagen",
+        "Period": "Lektion",
+        "{day} period {number}": "{day} lektion {number}",
+        "Teacher (user name)": "Lærer (brugernavn)",
+        "Activity (group:subject)": "Aktivitet (gruppe:fag)",
+        "Say who or what the wish is about.": "Angiv hvem eller hvad ønsket gælder.",
+        "Choose at least one period.": "Vælg mindst én lektion.",
+        "The limit is a whole number of 1 or more.": "Grænsen er et helt tal på 1 eller mere.",
+        "Timetable": "Skema",
+        "Wishes": "Ønsker",
+        "Timetable wishes": "Skemaønsker"
     },
     "plurals": null
 }

l10n/de.js

@@ -1008,7 +1008,23 @@ OC.L10N.register(
         "Reason": "Grund",
         "Why the run failed": "Warum der Lauf fehlschlug",
         "Published at": "Veröffentlicht am",
-        "When the scenario was written out as draft lessons": "Wann das Szenario als Entwurfsstunden geschrieben wurde"
+        "When the scenario was written out as draft lessons": "Wann das Szenario als Entwurfsstunden geschrieben wurde",
+        "Edit wish": "Wunsch bearbeiten",
+        "New wish": "Neuer Wunsch",
+        "Hard: the generator always keeps it": "Hart: der Generator hält ihn immer ein",
+        "Soft: the generator keeps it where it can": "Weich: der Generator hält ihn ein, wo er kann",
+        "Weight (1 to 3)": "Gewicht (1 bis 3)",
+        "Most lessons a day": "Höchstens Stunden pro Tag",
+        "Period": "Stunde",
+        "{day} period {number}": "{day} Stunde {number}",
+        "Teacher (user name)": "Lehrkraft (Benutzername)",
+        "Activity (group:subject)": "Aktivität (Gruppe:Fach)",
+        "Say who or what the wish is about.": "Geben Sie an, wen oder was der Wunsch betrifft.",
+        "Choose at least one period.": "Wählen Sie mindestens eine Stunde.",
+        "The limit is a whole number of 1 or more.": "Das Limit ist eine ganze Zahl ab 1.",
+        "Timetable": "Stundenplan",
+        "Wishes": "Wünsche",
+        "Timetable wishes": "Stundenplanwünsche"
     },
     "nplurals=2; plural=(n != 1);"
 )