claudep/epcstages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed 'stage' occurrences to 'pratique professionnelle'

Browse source
This commit is contained in:
Claude Paroz 2019-02-01 14:24:32 +01:00
parent 59229c514b
commit 3d33787c74
11 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
stages/migrations/0001_squashed_0024_course_public_length2.py
View file

@ -122,7 +122,8 @@ class Migration(migrations.Migration):
('level', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='stages.Level', verbose_name='Niveau')),
],
options={
'verbose_name': 'Période de stage',
'verbose_name': 'Période de pratique professionnnelle',
'verbose_name_plural': 'Périodes de pratique professionnnelle',
'ordering': ('-start_date',),
},
),
@ -198,7 +199,8 @@ class Migration(migrations.Migration):
('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='stages.Student', verbose_name='Étudiant')),
],
options={
'verbose_name': 'Stage',
'verbose_name': 'Pratique professionnelle',
'verbose_name_plural': 'Pratiques professionnelles',
'ordering': ('-availability__period',),
},
),

2
stages/migrations/0010_add_fields_for_examEDEsession.py
View file

@ -63,7 +63,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='student',
name='training_referent',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rel_training_referent', to='stages.Teacher', verbose_name='Référent de stage'),
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rel_training_referent', to='stages.Teacher', verbose_name='Référent de PP'),
),
migrations.AlterField(
model_name='period',

8
stages/models.py
View file

@ -294,7 +294,7 @@ class Student(models.Model):
subject = models.TextField('TD: titre provisoire', blank=True)
title = models.TextField('TD: Titre définitif', blank=True)
training_referent = models.ForeignKey(Teacher, null=True, blank=True, related_name='rel_training_referent',
on_delete=models.SET_NULL, verbose_name='Référent de stage')
on_delete=models.SET_NULL, verbose_name='Référent de PP')
referent = models.ForeignKey(Teacher, null=True, blank=True, related_name='rel_referent',
on_delete=models.SET_NULL, verbose_name='Référent avant-projet')
internal_expert = models.ForeignKey(Teacher, related_name='rel_internal_expert', verbose_name='Expert interne',
@ -472,7 +472,8 @@ class Period(models.Model):
end_date = models.DateField(verbose_name='Date de fin')
class Meta:
verbose_name = "Période de stage"
verbose_name = "Période de pratique professionnelle"
verbose_name_plural = "Périodes de pratique professionnelle"
ordering = ('-start_date',)
def __str__(self):
@ -536,7 +537,8 @@ class Training(models.Model):
comment = models.TextField(blank=True, verbose_name='Remarques')
class Meta:
verbose_name = "Stage"
verbose_name = "Pratique professionnelle"
verbose_name_plural = "Pratiques professionnelles"
ordering = ("-availability__period",)
def __str__(self):

2
stages/static/js/attribution.js
View file

@ -95,7 +95,7 @@ function update_trainings(period_id) {
$('input#export').hide();
} else $('ul#training_list').load('/training/by_period/' + period_id + '/', function() {
$('img.delete_training').click(function() {
if (!confirm("Voulez-vous vraiment supprimer ce stage ?")) return;
if (!confirm("Voulez-vous vraiment supprimer cette pratique professionnelle ?")) return;
var li = $(this).parents('li');
$.post('/training/del/',
{pk: li.attr('id').split('_')[1],

10
stages/views/export.py
View file

@ -65,9 +65,9 @@ EXPORT_FIELDS = [
('Date de naissance', 'student__birth_date'),
('No AVS', 'student__avs'),
# Stage fields
('Nom du stage', 'availability__period__title'),
('Nom de la pratique professionnelle', 'availability__period__title'),
('Début', 'availability__period__start_date'), ('Fin', 'availability__period__end_date'),
('Remarques stage', 'comment'),
('Remarques pratique professionnelle', 'comment'),
('Prénom référent', 'referent__first_name'), ('Nom référent', 'referent__last_name'),
('Courriel référent', 'referent__email'),
('Institution', 'availability__corporation__name'),
@ -90,7 +90,7 @@ EXPORT_FIELDS = [
NON_ATTR_EXPORT_FIELDS = [
('Filière', 'period__section__name'),
('Nom du stage', 'period__title'),
('Nom de la pratique professionnelle', 'period__title'),
('Début', 'period__start_date'), ('Fin', 'period__end_date'),
('Institution', 'corporation__name'),
('Rue Inst', 'corporation__street'),
@ -156,7 +156,7 @@ def stages_export(request, scope=None):
if not default_contacts[contact.corporation.name][sname]:
default_contacts[contact.corporation.name][sname] = contact
export = OpenXMLExport('Stages')
export = OpenXMLExport('Pratiques professionnelles')
export.write_line(export_fields.keys(), bold=True) # Headers
# Data
query_keys = [f for f in export_fields.values() if f is not None]
@ -181,7 +181,7 @@ def stages_export(request, scope=None):
))
export.write_line(values)
return export.get_http_response('stages_export')
return export.get_http_response('pp_export')
def _ratio_Ede_Ase_Assc():