Skip to content

Commit 45c5062

Browse files
committed
Fix #820 Stabilize CI behat scenario and include language strings
1 parent 8a43a63 commit 45c5062

6 files changed

Lines changed: 17 additions & 20 deletions

File tree

amd/build/manager.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

amd/build/manager.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lang/en/customfield_sprogramme.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@
133133
$string['emailsenabled'] = 'Activate email notifications';
134134
$string['emailsenabled_desc'] = 'If enabled, email notifications will be sent when a change request is submitted.';
135135
$string['encoding'] = 'Encoding';
136-
$string['event_rfc_rejected'] = 'RFC rejected';
137136
$string['entity:competency'] = 'Competency';
138137
$string['entity:competency_assignment'] = 'Competency assignment';
139138
$string['entity:discipline'] = 'Discipline';
140139
$string['entity:discipline_assignment'] = 'Discipline assignment';
141140
$string['entity:module'] = 'Module';
142141
$string['entity:programme'] = 'Programme';
142+
$string['event_rfc_rejected'] = 'RFC rejected';
143143
$string['fmp_help'] = 'Professional Training in the context of a UC: Training periods that are an integral part of the study program, but are followed outside the institution and under the supervision of a non-academic teacher (for example, a practitioner).';
144144
$string['history'] = 'History';
145145
$string['intitule_seance_help'] = 'The name of the teaching exercise is entered in this field. It must match exactly the memo indicated in Hyperplanning. This title starts with the type of exercise (CM, TD, TP, etc.) and its order in the educational ribbon. For example: "CM03 - Dairy Cow Career 1/2".';
@@ -247,9 +247,9 @@
247247
$string['usernotfound'] = 'User not found';
248248
$string['value'] = 'Value';
249249
$string['visa'] = 'Visa';
250-
$string['visaapproved'] = 'Visaed';
251-
$string['visarejected'] = 'Visa rejected';
252250
$string['visa_help'] = 'When a programme change request is submitted, it must be validated by the relevant department head and
253251
the course leader before the changes are approved by the administrators. By clicking "Validate", you certify that the
254252
proposed changes comply with pedagogical and administrative requirements, and that you approve their
255253
implementation in the curriculum.';
254+
$string['visaapproved'] = 'Visaed';
255+
$string['visarejected'] = 'Visa rejected';

lang/fr/customfield_sprogramme.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,13 @@
137137
$string['emailsenabled'] = 'Activer les notifications par e-mail';
138138
$string['emailsenabled_desc'] = 'Si activé, les notifications par e-mail seront envoyées lors de la soumission de demandes de modification de programme.';
139139
$string['encoding'] = 'Encodage';
140-
$string['event_rfc_rejected'] = 'RFC rejetée';
141140
$string['entity:competency'] = 'Compétence';
142141
$string['entity:competency_assignment'] = 'Affectation de compétence';
143142
$string['entity:discipline'] = 'Discipline';
144143
$string['entity:discipline_assignment'] = 'Affectation de discipline';
145144
$string['entity:module'] = 'Module';
146145
$string['entity:programme'] = 'Programme';
146+
$string['event_rfc_rejected'] = 'RFC rejetée';
147147
$string['fmp_help'] = 'Formation en Milieu Professionnel dans le cadre d’une UC : Périodes de formation qui font partie intégrante du programme d’études, mais qui sont suivies en dehors de l’établissement et sous la supervision d’un enseignant non académique (par exemple un praticien).';
148148
$string['history'] = 'Historique';
149149
$string['intitule_seance_help'] = 'Le nom de l’exercice d’enseignement est renseigné dans cette case. Il doit correspondre exactement au mémo indiqué dans Hyperplanning. Cet intitulé commence par le type d’exercice (CM, TD, TP, …) et son ordre dans le ruban pédagogique. Par exemple : « CM03 - Carrière de la vache laitière 1/2 ».';
@@ -251,9 +251,9 @@
251251
$string['usernotfound'] = 'Utilisateur non trouvé';
252252
$string['value'] = 'Valeur';
253253
$string['visa'] = 'Visa';
254-
$string['visaapproved'] = 'Visé';
255-
$string['visarejected'] = 'Visa refusé';
256254
$string['visa_help'] = 'Quand une demande de modification de programme est soumise, elle doit être validée par le chef
257255
de département concerné et le responsable de cours avant que les modifications ne soient validées par les administrateur.
258256
En cliquant sur "Valider", vous certifiez que les modifications proposées sont conformes aux exigences pédagogiques
259257
et administratives, et que vous approuvez leur mise en œuvre dans le programme d’études.';
258+
$string['visaapproved'] = 'Visé';
259+
$string['visarejected'] = 'Visa refusé';

styles.css

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
border-radius: 0;
3333
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
3434
}
35-
.customfield-sprogramme .programm-input::placeholder,
36-
.customfield-sprogramme .programm-input::-webkit-input-placeholder {
35+
.customfield-sprogramme .programm-input::placeholder, .customfield-sprogramme .programm-input::-webkit-input-placeholder {
3736
color: #d7d7d8;
3837
}
3938
.customfield-sprogramme .programm-input:focus {
@@ -222,8 +221,7 @@
222221
max-width: 170px;
223222
padding: 0.4rem;
224223
}
225-
.customfield-sprogramme .programm-table th.float,
226-
.customfield-sprogramme .programm-table th.int {
224+
.customfield-sprogramme .programm-table th.float, .customfield-sprogramme .programm-table th.int {
227225
background-color: #f7f7f7;
228226
width: 55.55px;
229227
max-width: 55.55px;
@@ -281,8 +279,7 @@
281279
margin-left: 1rem;
282280
width: calc(100% - 1rem);
283281
}
284-
.customfield-sprogramme.syllabuspage .programm-table th.float,
285-
.customfield-sprogramme.syllabuspage .programm-table th.int,
282+
.customfield-sprogramme.syllabuspage .programm-table th.float, .customfield-sprogramme.syllabuspage .programm-table th.int,
286283
.customfield-sprogramme.syllabuspage .programm-table td.float,
287284
.customfield-sprogramme.syllabuspage .programm-table td.int {
288285
width: 30px;
@@ -297,8 +294,7 @@
297294
.customfield-sprogramme.syllabuspage .programm-table tr.tags {
298295
display: none;
299296
}
300-
.customfield-sprogramme.syllabuspage .programm-table tr.tags.show.has-disciplines,
301-
.customfield-sprogramme.syllabuspage .programm-table tr.tags.show.has-competencies {
297+
.customfield-sprogramme.syllabuspage .programm-table tr.tags.show.has-disciplines, .customfield-sprogramme.syllabuspage .programm-table tr.tags.show.has-competencies {
302298
display: table-row;
303299
}
304300
.customfield-sprogramme.syllabuspage .programm-table tr.show-disciplines,
@@ -387,8 +383,7 @@
387383
.customfield-sprogramme .tag-form .badge .btn {
388384
display: block;
389385
}
390-
.customfield-sprogramme .tag-form .btn.btn-icon:hover,
391-
.customfield-sprogramme .tag-form .btn.btn-icon:focus {
386+
.customfield-sprogramme .tag-form .btn.btn-icon:hover, .customfield-sprogramme .tag-form .btn.btn-icon:focus {
392387
background-color: #ead9d9;
393388
}
394389
.customfield-sprogramme .tag-form input,
@@ -505,4 +500,5 @@
505500
position: absolute;
506501
top: 1em;
507502
right: 0.5em;
508-
}
503+
z-index: 1;
504+
}

tests/behat/create_rfc.feature

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,9 @@ Feature: As a teacher I can create and manage RFCs (Request for Change) in custo
223223
And I navigate to "Settings" in current page administration
224224
And I expand all fieldsets
225225
And I click the programme edit button
226-
And I set mod "1" row "1" column "Session title or exercise" to "Séance Visa"
226+
And I set mod "1" row "1" column "TD" to "4.0"
227227
And I click on "Save" "button" in the "Edit" "dialogue"
228+
And "[data-action='submitrfc']" "css_element" should exist in the "Edit" "dialogue"
228229
And I click on the "submitrfc" data action
229230
And I log out
230231
And I log in as "manager1"

0 commit comments

Comments
 (0)