From 3d33787c74daa1fc80783701fdb27342412b7750 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 1 Feb 2019 14:24:32 +0100 Subject: [PATCH] Renamed 'stage' occurrences to 'pratique professionnelle' --- common/settings.py | 2 +- .../0001_squashed_0024_course_public_length2.py | 6 ++++-- .../migrations/0010_add_fields_for_examEDEsession.py | 2 +- stages/models.py | 8 +++++--- stages/static/js/attribution.js | 2 +- stages/views/export.py | 10 +++++----- templates/admin/base_site.html | 6 +++--- templates/admin/index.html | 6 +++--- templates/attribution.html | 6 +++--- templates/class.html | 2 +- templates/student_summary.html | 4 ++-- 11 files changed, 29 insertions(+), 25 deletions(-) diff --git a/common/settings.py b/common/settings.py index b6dabcc..6aca6a5 100644 --- a/common/settings.py +++ b/common/settings.py @@ -106,7 +106,7 @@ ALLOWED_HOSTS = ['localhost', 'stages.pierre-coullery.ch'] # candidats admin shows confirmation_date readonly field twice. SILENCED_SYSTEM_CHECKS = ['admin.E012'] -FABRIC_HOST = 'stages.pierre-coullery.ch' +FABRIC_HOST = 'gestion.pierre-coullery.ch' FABRIC_USERNAME = '' INSTRUCTOR_IMPORT_MAPPING = { diff --git a/stages/migrations/0001_squashed_0024_course_public_length2.py b/stages/migrations/0001_squashed_0024_course_public_length2.py index e2adba6..d1fc0c9 100644 --- a/stages/migrations/0001_squashed_0024_course_public_length2.py +++ b/stages/migrations/0001_squashed_0024_course_public_length2.py @@ -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',), }, ), diff --git a/stages/migrations/0010_add_fields_for_examEDEsession.py b/stages/migrations/0010_add_fields_for_examEDEsession.py index 9798a6a..5fac8bb 100644 --- a/stages/migrations/0010_add_fields_for_examEDEsession.py +++ b/stages/migrations/0010_add_fields_for_examEDEsession.py @@ -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', diff --git a/stages/models.py b/stages/models.py index 78028fb..47b2a12 100644 --- a/stages/models.py +++ b/stages/models.py @@ -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): diff --git a/stages/static/js/attribution.js b/stages/static/js/attribution.js index ec16dd6..1172a09 100644 --- a/stages/static/js/attribution.js +++ b/stages/static/js/attribution.js @@ -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], diff --git a/stages/views/export.py b/stages/views/export.py index 8fa4dd6..3591a11 100644 --- a/stages/views/export.py +++ b/stages/views/export.py @@ -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(): diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html index ccb4abc..a02106a 100644 --- a/templates/admin/base_site.html +++ b/templates/admin/base_site.html @@ -1,12 +1,12 @@ {% extends "admin/base.html" %} -{% load i18n static %} +{% load static %} -{% block title %}{{ title }} | {% trans 'Gestion stages' %}{% endblock %} +{% block title %}{{ title }} | Gestion de la pratique professionnelle{% endblock %} {% block extrastyle %}{% endblock %} {% block branding %} -

École Pierre-Coullery
Gestion des stages

+

École Pierre-Coullery
Gestion de la pratique professionnelle

{% endblock %} {% block nav-global %}{% endblock %} diff --git a/templates/admin/index.html b/templates/admin/index.html index 7551e89..d42f43c 100644 --- a/templates/admin/index.html +++ b/templates/admin/index.html @@ -78,7 +78,7 @@ document.addEventListener("DOMContentLoaded", function(event) {

Interfaces spécifiques

@@ -88,8 +88,8 @@ document.addEventListener("DOMContentLoaded", function(event) {
  • Importer un fichier d'étudiants ESTER
  • Importer le fichier HP
  • Importer les formateurs (fichier HP)
    • -
  • Exporter les données de stages (récentes)
    • -
  • Exporter les données de stages (toutes)
    • +
  • Exporter les données de pratique professionnelle (récentes)
    • +
  • Exporter les données de pratique professionnelle (toutes)
  • Exporter les données comptables
  • Exporter les données SAP
  • Imprimer les formulaires de MAJ
    • diff --git a/templates/attribution.html b/templates/attribution.html index 3872ae7..a68ebf8 100644 --- a/templates/attribution.html +++ b/templates/attribution.html @@ -90,20 +90,20 @@
    -
    +
    -

    Stages planifiés pour la période choisie

    +

    Pratiques professionnelles planifiées pour la période choisie

    {% csrf_token %} - +
    {% endblock %} diff --git a/templates/class.html b/templates/class.html index 71ad870..11f12d6 100644 --- a/templates/class.html +++ b/templates/class.html @@ -20,7 +20,7 @@

    Liste des éléves

    - {% if klass.section.is_fe %}{% endif %} + {% if klass.section.is_fe %}{% endif %} {% for student in students %} diff --git a/templates/student_summary.html b/templates/student_summary.html index df27c66..80784db 100644 --- a/templates/student_summary.html +++ b/templates/student_summary.html @@ -1,7 +1,7 @@ {% load static %}
    - Stages précédents ({{ previous_stages|length }}) : + Pratiques professionnelles précédentes ({{ previous_stages|length }}) :
    Nom, prénomDate naiss.BulletinsRécapitulatif des stages
    Nom, prénomDate naiss.BulletinsRécapitulatif des PP
    {{ student }}