Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 1-navigation
  • 15-choses-a-faire-css
  • 2-gitlab-deploy
  • 3-qcu-features
  • add-tat-sample
  • gitlab-ci-debug
  • macao3-export
  • main
  • test
9 results

Target

Select target project
  • macao/macao-hugo
  • dbeniamine/macao-hugo
2 results
Select Git revision
  • 1-navigation
  • 15-choses-a-faire-css
  • 2-gitlab-deploy
  • 3-qcu-features
  • add-tat-sample
  • gitlab-ci-debug
  • macao3-export
  • main
  • test
9 results
Show changes
Commits on Source (22)
Show whitespace changes
Inline Side-by-side
Showing
with 280 additions and 348 deletions
.idea/dbnavigator.xml
View file @ 30f829e1
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DBNavigator.Project.DDLFileAttachmentManager">
<mappings />
<preferences />
</component>
<component name="DBNavigator.Project.DatabaseAssistantManager">
<assistants />
</component>
<component name="DBNavigator.Project.DatabaseBrowserManager">
<autoscroll-to-editor value="false" />
<autoscroll-from-editor value="true" />
......@@ -22,6 +29,7 @@
<display-mode value="TABBED" />
<navigation-history-size value="100" />
<show-object-details value="false" />
<enable-sticky-paths value="true" />
</general>
<filters>
<object-type-filter>
......@@ -47,9 +55,15 @@
<object-type name="TYPE" enabled="true" />
<object-type name="TYPE_ATTRIBUTE" enabled="true" />
<object-type name="ARGUMENT" enabled="true" />
<object-type name="JAVA_CLASS" enabled="true" />
<object-type name="JAVA_INNER_CLASS" enabled="true" />
<object-type name="JAVA_FIELD" enabled="true" />
<object-type name="JAVA_METHOD" enabled="true" />
<object-type name="DIMENSION" enabled="true" />
<object-type name="CLUSTER" enabled="true" />
<object-type name="DBLINK" enabled="true" />
<object-type name="CREDENTIAL" enabled="true" />
<object-type name="AI_PROFILE" enabled="true" />
</object-type-filter>
</filters>
<sorting>
......@@ -86,9 +100,15 @@
<object-type name="FUNCTION" enabled="true" />
<object-type name="PACKAGE" enabled="true" />
<object-type name="TYPE" enabled="true" />
<object-type name="JAVA CLASS" enabled="true" />
<object-type name="INNER CLASS" enabled="true" />
<object-type name="JAVA FIELD" enabled="true" />
<object-type name="JAVA METHOD" enabled="true" />
<object-type name="JAVA PARAMETER" enabled="true" />
<object-type name="DIMENSION" enabled="false" />
<object-type name="CLUSTER" enabled="false" />
<object-type name="DBLINK" enabled="true" />
<object-type name="CREDENTIAL" enabled="false" />
</lookup-objects>
<force-database-load value="false" />
<prompt-connection-selection value="true" />
......@@ -363,9 +383,6 @@
<compile-dependencies value="ASK" />
<always-show-controls value="false" />
</compiler>
<debugger>
<debugger-type value="JDBC" />
</debugger>
</operation-settings>
<ddl-file-settings>
<extensions>
......@@ -379,6 +396,7 @@
<mapping file-type-id="TYPE" extensions="tpe" />
<mapping file-type-id="TYPE_SPEC" extensions="tps" />
<mapping file-type-id="TYPE_BODY" extensions="tpb" />
<mapping file-type-id="JAVA_SOURCE" extensions="sql" />
</extensions>
<general>
<lookup-ddl-files value="true" />
......@@ -388,6 +406,11 @@
<make-scripts-rerunnable value="true" />
</general>
</ddl-file-settings>
<assistant-settings>
<credential-settings>
<credentials />
</credential-settings>
</assistant-settings>
<general-settings>
<regional-settings>
<date-format value="MEDIUM" />
......
macao/assets/_custom.scss
View file @ 30f829e1
......@@ -8,6 +8,62 @@ body {
// ***********************************
// Global
// ***********************************
img.inlineImage {
vertical-align: middle;
height: 1em;
}
img.inlineImage12 {
vertical-align: middle;
height: 1.2em;
}
img.inlineImage14 {
vertical-align: middle;
height: 1.4em;
}
img.inlineImage16 {
vertical-align: middle;
height: 1.6em;
}
img.inlineImage18 {
vertical-align: middle;
height: 1.8em;
}
img.inlineImage2 {
vertical-align: middle;
height: 2em;
}
img.inlineImage22 {
vertical-align: middle;
height: 2.2em;
}
img.inlineImage24 {
vertical-align: middle;
height: 2.4em;
}
img.inlineImage26 {
vertical-align: middle;
height: 2.6em;
}
img.inlineImage28 {
vertical-align: middle;
height: 2.8em;
}
img.inlineImage3 {
vertical-align: middle;
height: 3em;
}
.btn-play {
cursor: pointer;
background-color: var(--macao-primary-color);
......@@ -16,6 +72,14 @@ body {
padding: 5px 10px;
}
.notextplay {
font-size: 0; /* hides text */
}
.notextplay i {
font-size: medium; /* keep icon visible */
}
p#gapfill-container {
white-space: pre-wrap;
line-height: 3em;
......@@ -70,7 +134,7 @@ select.sd-dropdown.inline-dropdown, input.sd-input.inline-input {
.sd-question__header {
margin-top: 0;
max-width: 150px;
max-width: 400px;
}
}
......@@ -97,6 +161,10 @@ a {
color: var(--macao-primary-color);
}
a:visited {
color: var(--macao-primary-color) !important;
}
a.active {
color: var(--macao-secondary-font-color) !important;
background-color: var(--macao-primary-color);
......@@ -132,6 +200,20 @@ em:not(:has(strong)) {
padding: 3px;
padding-right: 4px;
border-radius: 5px;
}
// ***********************************
// Dropdowns
// ***********************************
// Min width for dropdowns
.sv-dropdown_select-wrapper {
min-width: 150px !important;
}
// ***********************************
// Buttons play
// ***********************************
@import "plugins/_scrollbars.scss";
macao/assets/quiz.js
View file @ 30f829e1
......@@ -3,18 +3,18 @@
*/
function checkAllQuestions(questions, surveyConfig, converter) {
let allCorrect = true;
questions.forEach((question) => {
if (!question.isAnswerCorrect()) {
allCorrect = false;
}
});
if (allCorrect) {
correctIndic.node.className = "correct";
surveyConfig.correctComment = surveyConfig.correctComment.replace(/\n\n/g, "<br>");
correctIndic.commentNode.innerHTML = converter.renderInline(surveyConfig.correctComment) || "All answers are correct!";
} else {
correctIndic.node.className = "incorrect";
surveyConfig.incorrectComment = surveyConfig.incorrectComment.replace(/\n\n/g, "<br>");
correctIndic.commentNode.innerHTML = converter.renderInline(surveyConfig.incorrectComment) || "Some answers are incorrect!";
}
}
......@@ -26,11 +26,27 @@ function clearAllQuestions(questions) {
questions.forEach((question) => {
question.value = undefined;
});
correctIndic.node.className = "hidden";
correctIndic.commentNode.innerHTML = "";
}
/**
* Toggles the visibility of the help comment for a question.
*/
function toggleHelpComment(question, htmlElement) {
const helpCommentElement = htmlElement.querySelector('.help-comment');
if (helpCommentElement) {
// If help comment is already shown, remove it
helpCommentElement.remove();
} else {
// Otherwise, create and show the help comment
const newHelpCommentElement = document.createElement('div');
newHelpCommentElement.className = 'help-comment';
newHelpCommentElement.innerHTML = question.helpComment;
htmlElement.appendChild(newHelpCommentElement);
}
}
let correctIndic;
$(function () {
......@@ -40,14 +56,43 @@ $(function () {
};
Survey.JsonObject.metaData.addProperty("question", {
name: "customFormat", type: "text", category: "general", default: "", visibleIndex: 0,
name: "customFormat",
type: "text",
category: "general",
default: "",
visibleIndex: 0,
});
Survey.JsonObject.metaData.addProperty("survey", {
name: "isSurveySummaryVisible",
type: "boolean",
category: "general",
default: "false",
visibleIndex: 0,
});
Survey.JsonObject.metaData.addProperty("question", {
name: "helpComment",
type: "text",
category: "general",
default: "",
visibleIndex: 0,
});
// Add compComment to the metadata
Survey.JsonObject.metaData.addProperty("question", {
name: "compComment",
type: "text",
category: "general",
default: "",
visibleIndex: 0,
});
// Load survey model from JSON
const survey = new Survey.Model(jsonStatic);
const questions = survey.getAllQuestions();
if (questions.length === 1) {
console.log("Survey has only one question");
console.log(questions[0]);
......@@ -63,12 +108,7 @@ $(function () {
});
survey.onTextMarkdown.add((_, options) => {
// Convert Markdown to HTML
let str = converter.renderInline(options.text);
// ...
// Sanitize the HTML markup using a third-party library here
// ...
// Set HTML markup to render
options.html = str;
});
......@@ -81,8 +121,36 @@ $(function () {
$(options.htmlElement).addClass("hide-disabled-checkboxes");
}
}
});
// Display compComment if present
if (options.question.compComment) {
const compCommentElement = document.createElement('div');
compCommentElement.className = 'comp-comment';
compCommentElement.innerHTML = options.question.compComment;
options.htmlElement.appendChild(compCommentElement);
}
// Add "Corrigé" button if helpComment is present
if (options.question.helpComment) {
const helpButton = document.createElement('button');
helpButton.innerHTML = 'Corrigé';
helpButton.className = 'sd-btn sd-btn--action nav-input';
helpButton.onclick = () => toggleHelpComment(options.question, options.htmlElement);
options.htmlElement.appendChild(helpButton);
}
if( options.question.getType() === "dropdown" ) {
// Very ugly fix to avoid sliding dropdown on focus
$('.book-article').css({
'will-change' : 'unset',
'transition': 'none',
});
$('.book-page').css({
'will-change' : 'unset',
'transition': 'none',
});
}
});
// Add "Check answers" button
survey.addNavigationItem({
......@@ -106,16 +174,48 @@ $(function () {
innerCss: "sd-btn nav-input"
});
// Ugly tricks to avoid to create a new theme
survey.onComplete.add(function (sender) {
if (sender.isSurveySummaryVisible) {
console.log("Survey summary is visible");
const userData = sender.data;
const summaryDiv = document.createElement("div");
summaryDiv.id = "surveySummary";
let html = "<h3>Your Results:</h3><ul>";
sender.getAllQuestions().forEach(q => {
const userAnswer = userData[q.name];
const correctAnswer = q.correctAnswer;
const isCorrect = userAnswer === correctAnswer;
html += `<li><b>${q.title}</b><br>
Your answer: ${userAnswer} <br>
Correct answer: ${correctAnswer} <br>
<span style="color:${isCorrect ? 'green' : 'red'};">
${isCorrect ? "Correct" : "Incorrect"}
</span>
</li><br>`;
});
html += "</ul>";
summaryDiv.innerHTML = html;
// Append the summary after the survey container
document.getElementById("surveyContainer").appendChild(summaryDiv);
}
});
// Ugly tricks to avoid creating a new theme
const customTheme = SurveyTheme.DefaultLightPanelless;
const primColor = getComputedStyle(document.documentElement, null).getPropertyValue('--macao-primary-color');
customTheme.cssVariables["--sjs-primary-backcolor"] = primColor;
customTheme.cssVariables["--sjs-primary-backcolor-dark"] = primColor;
// Apply theme
survey.applyTheme(SurveyTheme.DefaultLightPanelless);
console.log("Survey theme applied", SurveyTheme.DefaultLightPanelless);
survey.showCompleteButton = false;
// Inflate the survey in the page
......
macao/content/activities/MosOrg1/seq100407/act153876/pg1888/quiz.json
View file @ 30f829e1
{
"elements": [
{
{"type": "html",
"name": "pg1888_seg0",
"correctAnswer": "",
"titleLocation": "hidden",
"isRequired": true,
"width": "100%",
"minWidth": "256px",
"maxWidth": "",
"startWithNewLine": false,
"html": "\n\n***| <img style=\"vertical-align:middle;\" src=\"/macao-hugo/media/ecouteur_macao.png\" id=\"ecouteur_macao.png\"/> | <div><audio id=\"ecran191_04.mp3\" ><source src=\"/macao-hugo/media/ecran191/ecran191_04.mp3\" type=\"audio/mpeg\"></audio><button onclick=\"document.getElementById('ecran191_04.mp3').play()\">Play</button></div><div><audio id=\"ecran191_01.mp3\" ><source src=\"/macao-hugo/media/ecran191/ecran191_01.mp3\" type=\"audio/mpeg\"></audio><button onclick=\"document.getElementById('ecran191_01.mp3').play()\">Play</button></div> |\n| --- | --- |***\n\nZurich?\n\n| <img style=\"vertical-align:middle;\" src=\"/macao-hugo/media/ecouteur_macao.png\" id=\"ecouteur_macao.png\"/> | <div><audio id=\"ecran192_04.mp3\" ><source src=\"/macao-hugo/media/ecran192/ecran192_04.mp3\" type=\"audio/mpeg\"></audio><button onclick=\"document.getElementById('ecran192_04.mp3').play()\">Play</button></div><div><audio id=\"ecran192_01.mp3\" ><source src=\"/macao-hugo/media/ecran192/ecran192_01.mp3\" type=\"audio/mpeg\"></audio><button onclick=\"document.getElementById('ecran192_01.mp3').play()\">Play</button></div> |\n| --- | --- |\n\nZorba?",
"choices": []}
}
]
,
"correctComment": "\n\nBien.\n\nDans ces énoncés, la présence de **BE** est requise, sous la forme ***is*** prononcée\nici : **/z/**.\n\nComme les mots qui suivent commencent par le phonème **/z/**, on ne peut pas\nvraiment distinguer la prononciation de ***is***.\n\n",
......
macao/content/activities/MosOrg1/seq100407/act153876/pg191/index.md
View file @ 30f829e1
......@@ -7,8 +7,8 @@ weight = 60
Ecoutez l'énoncé :
| <img style="vertical-align:middle;" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div> |
| --- | --- |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div>
---
Cet énoncé renvoie-t-il à une situation réelle ?
......
macao/content/activities/MosOrg1/seq100407/act153876/pg191/quiz.json
View file @ 30f829e1
{
"elements": [
{"name": "pg191",
{
"name": "pg191",
"titleLocation": "hidden",
"type": "radiogroup",
"choices": [
......@@ -14,8 +14,8 @@
"text": "NON\n"
}
],
"correctAnswer": 1}
"correctAnswer": 1
}
]
,
"correctComment": "\n\nBonne réponse !\n\n"}
macao/content/activities/MosOrg1/seq100407/act153876/pg2429/index.md
View file @ 30f829e1
......@@ -5,8 +5,8 @@ weight = 100
Ecoutez :
| <img style="vertical-align:middle;" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | <div><audio id="ecran26_01.mp3" ><source src="/macao-hugo/media/ecran26/ecran26_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran26_01.mp3').play()">Play</button></div> |
| --- | --- |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> <div><audio id="ecran26_01.mp3" ><source src="/macao-hugo/media/ecran26/ecran26_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran26_01.mp3').play()">Play</button></div>
---
Sélectionnez ce que vous avez entendu.
......
macao/content/activities/MosOrg1/seq100407/act153876/pg2429/quiz.json
View file @ 30f829e1
{
"elements": [
{"type": "html",
"name": "pg2429_seg0",
"correctAnswer": "",
"titleLocation": "hidden",
"isRequired": true,
"width": "100%",
"minWidth": "256px",
"maxWidth": "",
"startWithNewLine": false,
"html": "\nYou don't find many independent companies in the cinema\nindustries.\nMost of the time,",
"choices": []},
{"type": "dropdown",
"name": "pg2429_seg1",
"correctAnswer": "rep471",
"titleLocation": "hidden",
"isRequired": true,
"width": "100%",
"minWidth": "256px",
"maxWidth": "",
"startWithNewLine": false,
"choices": [{
"value": "rep247",
"text": "there are"
},
{
"value": "rep471",
"text": "they are"
}]},
{"type": "html",
"name": "pg2429_seg2",
"correctAnswer": "",
"titleLocation": "hidden",
"isRequired": true,
"width": "100%",
"minWidth": "256px",
"maxWidth": "",
"startWithNewLine": false,
"html": " confronted by financial difficulties.\n",
"choices": []}
}
]
,
"correctComment": "\n\nBien. En effet seul ***they are*** convient : ***they*** reprend ***independent\ncompanies*** et ***are*** ***confronted*** renvoie au passif (**BE + V** au\nparticipe passé).\n\n***There are*** aurait été suivi d'un groupe nominal.\n\n",
......
macao/content/activities/MosOrg1/seq100407/act153876/pg3602/index.md
View file @ 30f829e1
......@@ -8,9 +8,9 @@ Ecoutez l'énoncé et remettez les éléments ci-dessous dans
l'ordre de
l'énoncé entendu :
| <img style="vertical-align:middle;" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | |
| --- | --- |
| <div><audio id="ecran17_04.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_04.mp3').play()">Play</button></div><div><audio id="ecran17_01.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_01.mp3').play()">Play</button></div> | |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/>
---
<div><audio id="ecran17_04.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_04.mp3').play()">Play</button></div><div><audio id="ecran17_01.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_01.mp3').play()">Play</button></div>
<div class="commentaireInfoGroup" hidden="True">
......
macao/content/activities/MosOrg1/seq100407/act153876/pg3602/quiz.json
View file @ 30f829e1
{
"elements": [
{
}
]
,
"correctComment": "\n\nBien !\n\n",
......
macao/content/activities/MosOrg1/seq100407/act153876/pg3746/index.md
View file @ 30f829e1
......@@ -7,10 +7,10 @@ weight = 40
Ecoutez les deux énoncés suivants.
| <img style="vertical-align:middle;" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | |
| --- | --- |
| <div><audio id="ecran201_04.mp3" ><source src="/macao-hugo/media/ecran201/ecran201_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran201_04.mp3').play()">Play</button></div><div><audio id="ecran201_01.mp3" ><source src="/macao-hugo/media/ecran201/ecran201_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran201_01.mp3').play()">Play</button></div> | Whenever I phone her <div><audio id="mots20itape1_01.mp3" ><source src="/macao-hugo/media/mots20itape1/mots20itape1_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots20itape1_01.mp3').play()">Play</button></div> the conversation. |
| <div><audio id="ecran202_04.mp3" ><source src="/macao-hugo/media/ecran202/ecran202_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran202_04.mp3').play()">Play</button></div><div><audio id="ecran202_01.mp3" ><source src="/macao-hugo/media/ecran202/ecran202_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran202_01.mp3').play()">Play</button></div> | If I had a tape recorder <div><audio id="mots20id_tape1_01.mp3" ><source src="/macao-hugo/media/mots20id_tape1/mots20id_tape1_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots20id_tape1_01.mp3').play()">Play</button></div> the conversation. |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/>
---
<div><audio id="ecran201_04.mp3" ><source src="/macao-hugo/media/ecran201/ecran201_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran201_04.mp3').play()">Play</button></div><div><audio id="ecran201_01.mp3" ><source src="/macao-hugo/media/ecran201/ecran201_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran201_01.mp3').play()">Play</button></div> Whenever I phone her <div><audio id="mots20itape1_01.mp3" ><source src="/macao-hugo/media/mots20itape1/mots20itape1_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots20itape1_01.mp3').play()">Play</button></div> the conversation.
<div><audio id="ecran202_04.mp3" ><source src="/macao-hugo/media/ecran202/ecran202_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran202_04.mp3').play()">Play</button></div><div><audio id="ecran202_01.mp3" ><source src="/macao-hugo/media/ecran202/ecran202_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran202_01.mp3').play()">Play</button></div> If I had a tape recorder <div><audio id="mots20id_tape1_01.mp3" ><source src="/macao-hugo/media/mots20id_tape1/mots20id_tape1_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots20id_tape1_01.mp3').play()">Play</button></div> the conversation.
Que diriez-vous des blocs mis en valeur ?
......
macao/content/activities/MosOrg1/seq100407/act153876/pg3746/quiz.json
View file @ 30f829e1
{
"elements": [
{"name": "pg3746",
{
"name": "pg3746",
"titleLocation": "hidden",
"type": "radiogroup",
"choices": [
......@@ -14,8 +14,8 @@
"text": "la\nprononciation est nettement différente.\n"
}
],
"correctAnswer": 0}
"correctAnswer": 0
}
]
,
"correctComment": "\n\nEffectivement, on entend pratiquement la même chose. Toutefois on peut reconstruire la structure des énoncés.\n\n***Whenever***\n+ présent en **DO** expriment qu'on réfère à un ensemble de situations vues au présent, à une situation\nrépétée, d'où le présent simple (présent en **DO**) dans la proposition principale : ***I tape the\nconversation**.\n\n**If*** pose une condition, une hypothèse et ***had*** indique\nune rupture avec le réel (un irréel). Parallèlement, la présence du modal ***would*** (ou :\n***'d***) situe la proposition principale ***I'd tape the conversation*** dans\nl'hypothétique.\n\n"}
macao/content/activities/MosOrg1/seq100407/act153876/pg6329/index.md
View file @ 30f829e1
......@@ -7,11 +7,11 @@ weight = 20
Réécoutez l'énoncé :
| <img style="vertical-align:middle;" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | <div><audio id="ecran17_04.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_04.mp3').play()">Play</button></div><div><audio id="ecran17_01.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_01.mp3').play()">Play</button></div> |
| --- | --- |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> <div><audio id="ecran17_04.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_04.mp3').play()">Play</button></div><div><audio id="ecran17_01.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_01.mp3').play()">Play</button></div>
---
| Est-ce qu'on entend distinctement | | **'s** | | --- | | ? |
| --- | --- | --- | --- |
Est-ce qu'on entend distinctement **'s** ?
--- ---
<div class="commentaireInfoGroup" hidden="True">
......
macao/content/activities/MosOrg1/seq100407/act153876/pg6329/quiz.json
View file @ 30f829e1
{
"elements": [
{"name": "pg6329",
{
"name": "pg6329",
"titleLocation": "hidden",
"type": "radiogroup",
"choices": [
......@@ -14,8 +14,8 @@
"text": "NON\n"
}
],
"correctAnswer": 1}
"correctAnswer": 1
}
]
,
"correctComment": "\n\nExact. Il est vrai que dans cet énoncé, ***'s*** (forme de **BE**) ne s'entend pas distinctement.\nAvec une question en ***What**…?* dans laquelle ***what*** n'est pas sujet, la présence d'un\nauxiliaire est requise. Celui qui parle choisit d'employer **BE + -ING** ; l'auxiliaire **BE** prend\nla forme ***'s***. C'est donc bien la connaissance d'éléments grammaticaux qui permet de\nreconstruire la structure de l'énoncé et d'interpréter l'énoncé correctement.\n\n"}
macao/content/activities/MosOrg1/seq100407/act153876/pg6866/index.md
View file @ 30f829e1
......@@ -6,8 +6,8 @@ weight = 80
Ecoutez à nouveau l'énoncé et complétez.
| <img style="vertical-align:middle;" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div> |
| --- | --- |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div>
---
<div class="commentaireInfoGroup" hidden="True">
......
macao/content/activities/MosOrg1/seq100407/act153876/pg6866/quiz.json
View file @ 30f829e1
{
"elements": [
{"type": "html",
"name": "pg6866_seg0",
"correctAnswer": "",
"titleLocation": "hidden",
"isRequired": true,
"width": "100%",
"minWidth": "256px",
"maxWidth": "",
"startWithNewLine": false,
"html": "I",
"choices": []},
{"type": "dropdown",
"name": "pg6866_seg1",
"correctAnswer": "rep117",
"titleLocation": "hidden",
"isRequired": true,
"width": "100%",
"minWidth": "256px",
"maxWidth": "",
"startWithNewLine": false,
"choices": [{
"value": "rep117",
"text": "Would do"
},
{
"value": "rep312",
"text": " 'd do"
},
{
"value": "rep356",
"text": " Would do"
},
{
"value": "rep577",
"text": "would do"
},
{
"value": "rep891",
"text": " would do"
},
{
"value": "rep935",
"text": "'d do"
}]},
{"type": "dropdown",
"name": "pg6866_seg1",
"correctAnswer": "rep312",
"titleLocation": "hidden",
"isRequired": true,
"width": "100%",
"minWidth": "256px",
"maxWidth": "",
"startWithNewLine": false,
"choices": [{
"value": "rep117",
"text": "Would do"
},
{
"value": "rep312",
"text": " 'd do"
},
{
"value": "rep356",
"text": " Would do"
},
{
"value": "rep577",
"text": "would do"
},
{
"value": "rep891",
"text": " would do"
},
{
"value": "rep935",
"text": "'d do"
}]},
{"type": "dropdown",
"name": "pg6866_seg1",
"correctAnswer": "rep356",
"titleLocation": "hidden",
"isRequired": true,
"width": "100%",
"minWidth": "256px",
"maxWidth": "",
"startWithNewLine": false,
"choices": [{
"value": "rep117",
"text": "Would do"
},
{
"value": "rep312",
"text": " 'd do"
},
{
"value": "rep356",
"text": " Would do"
},
{
"value": "rep577",
"text": "would do"
},
{
"value": "rep891",
"text": " would do"
},
{
"value": "rep935",
"text": "'d do"
}]},
{"type": "dropdown",
"name": "pg6866_seg1",
"correctAnswer": "rep577",
"titleLocation": "hidden",
"isRequired": true,
"width": "100%",
"minWidth": "256px",
"maxWidth": "",
"startWithNewLine": false,
"choices": [{
"value": "rep117",
"text": "Would do"
},
{
"value": "rep312",
"text": " 'd do"
},
{
"value": "rep356",
"text": " Would do"
},
{
"value": "rep577",
"text": "would do"
},
{
"value": "rep891",
"text": " would do"
},
{
"value": "rep935",
"text": "'d do"
}]},
{"type": "dropdown",
"name": "pg6866_seg1",
"correctAnswer": "rep891",
"titleLocation": "hidden",
"isRequired": true,
"width": "100%",
"minWidth": "256px",
"maxWidth": "",
"startWithNewLine": false,
"choices": [{
"value": "rep117",
"text": "Would do"
},
{
"value": "rep312",
"text": " 'd do"
},
{
"value": "rep356",
"text": " Would do"
},
{
"value": "rep577",
"text": "would do"
},
{
"value": "rep891",
"text": " would do"
},
{
"value": "rep935",
"text": "'d do"
}]},
{"type": "dropdown",
"name": "pg6866_seg1",
"correctAnswer": "rep935",
"titleLocation": "hidden",
"isRequired": true,
"width": "100%",
"minWidth": "256px",
"maxWidth": "",
"startWithNewLine": false,
"choices": [{
"value": "rep117",
"text": "Would do"
},
{
"value": "rep312",
"text": " 'd do"
},
{
"value": "rep356",
"text": " Would do"
},
{
"value": "rep577",
"text": "would do"
},
{
"value": "rep891",
"text": " would do"
},
{
"value": "rep935",
"text": "'d do"
}]},
{"type": "html",
"name": "pg6866_seg2",
"correctAnswer": "",
"titleLocation": "hidden",
"isRequired": true,
"width": "100%",
"minWidth": "256px",
"maxWidth": "",
"startWithNewLine": false,
"html": "medical\nstudies if I could start again.\n",
"choices": []}
}
]
,
"correctComment": "\n\nBravo. A l'oreille, il est difficile de distinguer la présence de ***would***, avec ***do***\nqui le suit. Il est donc utile dans ce cas de se servir d'indices grammaticaux figurant dans le contexte.\n\n",
......
macao/content/activities/MosOrg1/seq100407/act153876/pg7434/index.md
View file @ 30f829e1
......@@ -7,8 +7,8 @@ weight = 50
Ecoutez l'énoncé :
| <img style="vertical-align:middle;" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div> |
| --- | --- |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div>
---
Cet énoncé comporte-t-il une hypothèse ?
......
macao/content/activities/MosOrg1/seq100407/act153876/pg7434/quiz.json
View file @ 30f829e1
{
"elements": [
{"name": "pg7434",
{
"name": "pg7434",
"titleLocation": "hidden",
"type": "radiogroup",
"choices": [
......@@ -14,8 +14,8 @@
"text": "NON\n"
}
],
"correctAnswer": 0}
"correctAnswer": 0
}
]
,
"correctComment": "\n\nBien !\n\n"}
macao/content/activities/MosOrg1/seq100407/act153876/pg7664/index.md
View file @ 30f829e1
......@@ -7,10 +7,10 @@ weight = 90
Ecoutez les deux énoncés suivants.
| <img style="vertical-align:middle;" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | |
| --- | --- |
| <div><audio id="ecran251_04.mp3" ><source src="/macao-hugo/media/ecran251/ecran251_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran251_04.mp3').play()">Play</button></div><div><audio id="ecran251_01.mp3" ><source src="/macao-hugo/media/ecran251/ecran251_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran251_01.mp3').play()">Play</button></div> | I wish I could go to Africa. <div><audio id="mots25there_01.mp3" ><source src="/macao-hugo/media/mots25there/mots25there_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots25there_01.mp3').play()">Play</button></div> so many different languages there. |
| <div><audio id="ecran252_04.mp3" ><source src="/macao-hugo/media/ecran252/ecran252_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran252_04.mp3').play()">Play</button></div><div><audio id="ecran252_01.mp3" ><source src="/macao-hugo/media/ecran252/ecran252_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran252_01.mp3').play()">Play</button></div> | They've moved back to London. <div><audio id="mots25they_01.mp3" ><source src="/macao-hugo/media/mots25they/mots25they_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots25they_01.mp3').play()">Play</button></div> so happy to live in the capital again. |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/>
---
<div><audio id="ecran251_04.mp3" ><source src="/macao-hugo/media/ecran251/ecran251_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran251_04.mp3').play()">Play</button></div><div><audio id="ecran251_01.mp3" ><source src="/macao-hugo/media/ecran251/ecran251_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran251_01.mp3').play()">Play</button></div> I wish I could go to Africa. <div><audio id="mots25there_01.mp3" ><source src="/macao-hugo/media/mots25there/mots25there_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots25there_01.mp3').play()">Play</button></div> so many different languages there.
<div><audio id="ecran252_04.mp3" ><source src="/macao-hugo/media/ecran252/ecran252_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran252_04.mp3').play()">Play</button></div><div><audio id="ecran252_01.mp3" ><source src="/macao-hugo/media/ecran252/ecran252_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran252_01.mp3').play()">Play</button></div> They've moved back to London. <div><audio id="mots25they_01.mp3" ><source src="/macao-hugo/media/mots25they/mots25they_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots25they_01.mp3').play()">Play</button></div> so happy to live in the capital again.
Que diriez-vous des blocs mis en valeur ?
......
macao/content/activities/MosOrg1/seq100407/act153876/pg7664/quiz.json
View file @ 30f829e1
{
"elements": [
{"name": "pg7664",
{
"name": "pg7664",
"titleLocation": "hidden",
"type": "radiogroup",
"choices": [
......@@ -14,8 +14,8 @@
"text": "la\nprononciation est nettement différente.\n"
}
],
"correctAnswer": 0}
"correctAnswer": 0
}
]
,
"correctComment": "\n\nEffectivement, on entend pratiquement la même chose. Les voyelles\ntendues /***eɪ***/ (de ***they***) et ***/eə/*** (de ***there***) sont\nmodifiées par la présence de ***are***. Le plus souvent, on entend ***/ðeə/*** aussi bien\npour ***there are*** que pour ***they are***.\n\nPourtant, sur le plan grammatical, ils\nne sont pas interchangeables. En effet, ***there are*** signifie ***il y a*** et ***they\nare*** signifie ***ils / elles sont***.\n\nRéécoutez les énoncés.\n\n"}
"correctComment": "\n\nEffectivement, on entend pratiquement la même chose. Les <span spanId=\"commentfile_doc266709.htm\">voyelles</span>\ntendues /***eɪ***/ (de ***they***) et ***/eə/*** (de ***there***) sont\nmodifiées par la présence de ***are***. Le plus souvent, on entend ***/ðeə/*** aussi bien\npour ***there are*** que pour ***they are***.\n\nPourtant, sur le plan grammatical, ils\nne sont pas interchangeables. En effet, ***there are*** signifie ***il y a*** et ***they\nare*** signifie ***ils / elles sont***.\n\nRéécoutez les énoncés.\n\n"}