-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Wprowadza mechanizm gwarantowanych miejsc w grupach zajęciowych. Dzięki temu rozwiązaniu administratorzy mogą, poza ogólnym limitem miejsc w grupie, wprowadzić pule miejsc gwarantowanych dla wybranych grup studentów (np. dla studentów ISIM-u). Istnienie dodatkowej puli nie ogranicza od góry liczby studentów z tej promowanej grupy (może ich być najwyżej limit grupy + pula dodatkowa).
- Loading branch information
1 parent
cf91612
commit 6ad287a
Showing
19 changed files
with
455 additions
and
368 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
18 changes: 18 additions & 0 deletions
18
zapisy/apps/enrollment/courses/migrations/0027_auto_20190822_1414.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 2.1.9 on 2019-08-22 14:14 | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('courses', '0026_courseinformation_discipline'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='group', | ||
name='extra', | ||
field=models.CharField(blank=True, choices=[('', ''), ('pierwsze 7 tygodni', 'pierwsze 7 tygodni'), ('drugie 7 tygodni', 'drugie 7 tygodni'), ('grupa rezerwowa', 'grupa rezerwowa'), ('grupa licencjacka', 'grupa licencjacka'), ('grupa magisterska', 'grupa magisterska'), ('grupa zaawansowana', 'grupa zaawansowana'), ('zajecia na mat.', 'zajęcia na matematyce'), ('wykład okrojony', 'wykład okrojony'), ('grupa 1', 'grupa 1'), ('grupa 2', 'grupa 2'), ('grupa 3', 'grupa 3'), ('grupa 4', 'grupa 4'), ('grupa 5', 'grupa 5'), ('pracownia linuksowa', 'pracownia linuksowa'), ('grupa anglojęzyczna', 'grupa anglojęzyczna'), ('I rok', 'I rok'), ('II rok', 'II rok'), ('ISIM', 'ISIM'), ('hidden', 'grupa ukryta')], default='', max_length=20, verbose_name='dodatkowe informacje'), | ||
), | ||
] |
25 changes: 25 additions & 0 deletions
25
zapisy/apps/enrollment/courses/migrations/0028_guaranteedspots.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# Generated by Django 2.1.9 on 2019-08-22 15:11 | ||
|
||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('auth', '0009_alter_user_last_name_max_length'), | ||
('courses', '0027_auto_20190822_1414'), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name='GuaranteedSpots', | ||
fields=[ | ||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
('limit', models.PositiveSmallIntegerField(verbose_name='liczba miejsc')), | ||
('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='guaranteed_spots', to='courses.Group', verbose_name='grupa zajęciowa')), | ||
('role', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='auth.Group', verbose_name='grupa użytkowników')), | ||
], | ||
options={'verbose_name': 'miejsca gwarantowane', 'verbose_name_plural': 'miejsca gwarantowane'}, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.