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

2
common/settings.py
View file

@ -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 = {

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():

6
templates/admin/base_site.html
View file

@ -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 %}<link rel="stylesheet" type="text/css" href="{% static 'css/stages.css' %}">{% endblock %}
{% block branding %}
<h1 id="site-name">École Pierre-Coullery<br>Gestion des stages</h1>
<h1 id="site-name">École Pierre-Coullery<br>Gestion de la pratique professionnelle</h1>
{% endblock %}
{% block nav-global %}{% endblock %}

6
templates/admin/index.html
View file

@ -78,7 +78,7 @@ document.addEventListener("DOMContentLoaded", function(event) {
<div class="module" id="custom-actions-module">
<h2>Interfaces spécifiques</h2>
<ul>
<li><a href="{% url 'attribution' %}">Attributions des stages</a></li>
<li><a href="{% url 'attribution' %}">Organisation de la pratique professionnelle</a></li>
</ul>
</div>
<div class="module" id="custom-actions-module">
@ -88,8 +88,8 @@ document.addEventListener("DOMContentLoaded", function(event) {
<li><a href="{% url 'import-students-ester' %}">Importer un fichier d'étudiants ESTER</a></li>
<li><a href="{% url 'import-hp' %}">Importer le fichier HP</a></li>
<li><a href="{% url 'import-hp-contacts' %}">Importer les formateurs (fichier HP)</a></li>
<li style="margin-top: 1em;"><a href="{% url 'stages_export' %}">Exporter les données de stages</a> (récentes)</li>
<li><a href="{% url 'stages_export' 'all' %}">Exporter les données de stages</a> (toutes)</li>
<li style="margin-top: 1em;"><a href="{% url 'stages_export' %}">Exporter les données de pratique professionnelle</a> (récentes)</li>
<li><a href="{% url 'stages_export' 'all' %}">Exporter les données de pratique professionnelle</a> (toutes)</li>
<li><a href="{% url 'imputations_export' %}">Exporter les données comptables</a></li>
<li><a href="{% url 'export_sap' %}">Exporter les données SAP</a></li>
<li><a id="updateFormLink" href="{% url 'print_update_form' %}">Imprimer les formulaires de MAJ</a></li>

6
templates/attribution.html
View file

@ -90,20 +90,20 @@
<div id="contact_choice"><label for="contact_select">Contact institution:</label>
<select id="contact_select"><option value="">-------</option></select>
</div>
<div id="buttons_div"><input id="valid_training" type="button" value="Valider ce stage"></div>
<div id="buttons_div"><input id="valid_training" type="button" value="Valider cette pratique professionnelle"></div>
</form>
</div>
</div>
<div id="trainings">
<h3>Stages planifiés pour la période choisie</h3>
<h3>Pratiques professionnelles planifiées pour la période choisie</h3>
<ul id="training_list">-
</ul>
<form id="list_export" method="get" action="{% url 'stages_export' %}">{% csrf_token %}
<input id="period" name="period" type="hidden" value="">
<input id="non_attr" name="non_attr" type="hidden" value="0">
<input id="export" type="button" value="Exporter la liste">
<input id="export_non_attr" type="button" value="Exporter la liste des stages non attribués">
<input id="export_non_attr" type="button" value="Exporter la liste des places de PP non attribuées">
</form>
</div>
{% endblock %}

2
templates/class.html
View file

@ -20,7 +20,7 @@
</div>
<h3>Liste des éléves</h3>
<table>
<thead><th>Nom, prénom</th><th>Date naiss.</th>{% if klass.section.is_fe %}<th>Bulletins</th>{% endif %}<th>Récapitulatif des stages</th></thead>
<thead><th>Nom, prénom</th><th>Date naiss.</th>{% if klass.section.is_fe %}<th>Bulletins</th>{% endif %}<th>Récapitulatif des PP</th></thead>
{% for student in students %}
<tr class="{% cycle 'row1' 'row2' %}">
<td><a href="{% url 'admin:stages_student_change' student.pk %}">{{ student }}</a></td>

4
templates/student_summary.html
View file

@ -1,7 +1,7 @@
{% load static %}
<div id="previous_stages">
<div id="previous_stages_head">
<em><img src="{% static 'img/closed.png' %}" data-imgtoggle="{% static 'img/open.png' %}"> Stages précédents ({{ previous_stages|length }}) :</em>
<em><img src="{% static 'img/closed.png' %}" data-imgtoggle="{% static 'img/open.png' %}"> Pratiques professionnelles précédentes ({{ previous_stages|length }}) :</em>
</div>
<ul id="previous_stages_list">
{% for stage in previous_stages %}
@ -14,5 +14,5 @@
{{ object.first_name }} {{ object.last_name }}<br>
{{ object.pcode }} {{ object.city }}<br>
Date de naissance: {{ object.birth_date }}
{% if age_for_stage %}(<span title="Âge au début du stage" class="{{ age_style }}">{{ age_for_stage }}</span>){% endif %}
{% if age_for_stage %}(<span title="Âge au début de la pratique prof." class="{{ age_style }}">{{ age_for_stage }}</span>){% endif %}
</div>