Skip to content

Commit 078e142

Browse files
author
laurent.abbal
committed
~
1 parent e1731f1 commit 078e142

File tree

3 files changed

+22
-46
lines changed

3 files changed

+22
-46
lines changed

‎resources/views/devoirs-v1/devoir-console.blade.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
2-
$devoir = App\Models\Devoir::where('jeton_secret', $jeton_secret)->first();
2+
//$devoir = App\Models\Devoir::where('jeton_secret', $jeton_secret)->first();
3+
$devoir = App\Models\Devoir::find(Crypt::decryptString($devoir_id));
34
if (!$devoir) {
45
echo "<pre>Ce devoir n'existe pas</pre>";
56
exit();
@@ -123,7 +124,7 @@
123124

124125
<div class="row mt-3">
125126
<div class="col-md-4 offset-4 text-center">
126-
<a class="btn btn-dark btn-sm d-block" href="/devoir-imprimer/{{$jeton_secret}}" role="button"><i class="fa-solid fa-print mr-2"></i> imprimer les comptes-rendus</a>
127+
<a class="btn btn-dark btn-sm d-block" href="/devoir-imprimer/{{ Crypt::encryptString($devoir->id) }}" role="button"><i class="fa-solid fa-print mr-2"></i> imprimer les comptes-rendus</a>
127128
<div class="text-muted small mt-1">pour les annoter si nécessaire et les distribuer aux élèves</div>
128129
</div>
129130
</div>

‎resources/views/devoirs-v1/devoir-imprimer.blade.php

+9-41
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2-
$devoir = App\Models\Devoir::where('jeton_secret', $jeton_secret)->first();
2+
//$devoir = App\Models\Devoir::where('jeton_secret', $jeton_secret)->first();
3+
$devoir = App\Models\Devoir::find(Crypt::decryptString($devoir_id));
34
if (!$devoir){
45
echo "<pre>Cet entraînement n'existe pas</pre>";
56
exit();
67
}
7-
$devoir_eleves = App\Models\Devoir_eleve::where('jeton_devoir', $devoir->jeton)->orderBy('pseudo')->get();
8+
$devoir_eleves = App\Models\Copie::where('jeton_devoir', $devoir->jeton)->orderBy('pseudo')->get();
89
?>
910
<!doctype html>
1011
<html lang="fr">
@@ -44,13 +45,13 @@
4445
</style>
4546
<title>ENTRAÎNEMENT / DEVOIR | {{$devoir->jeton}} | IMPRIMER</title>
4647
</head>
47-
<body class="no-mathjax">
48+
<body>
4849

4950
<div id="header" class="container pt-3">
5051
<div class="row pt-3">
5152
<div class="col-md-2">
5253
<div class="text-right mb-3">
53-
<a class="btn btn-light btn-sm" href="/devoir-console/{{strtoupper($jeton_secret)}}" role="button"><i class="fas fa-arrow-left"></i></a>
54+
<a class="btn btn-light btn-sm" href="/devoir-console/{{ $devoir->jeton_secret }}" role="button"><i class="fas fa-arrow-left"></i></a>
5455
</div>
5556
</div>
5657
<div class="col-md-8">
@@ -67,18 +68,7 @@
6768

6869
<!-- CONSIGNES -->
6970
<div class="text-monospace mt-3">{{strtoupper(__('consignes'))}}</div>
70-
<div class="mathjax" style="padding:10px 15px 0px 15px;border-radius:4px;border:solid 1px gray;background-color:white;">
71-
<?php
72-
include('lib/parsedownmath/ParsedownMath.php');
73-
$Parsedown = new ParsedownMath([
74-
'math' => [
75-
'enabled' => true, // Write true to enable the module
76-
'matchSingleDollar' => true // default false
77-
]
78-
]);
79-
echo $Parsedown->text($devoir->consignes_eleve);
80-
?>
81-
</div>
71+
<div class="markdown_content" style="padding:10px 15px 0px 15px;border-radius:4px;border:solid 1px gray;background-color:white;">{{ $devoir->consignes_eleve }}</div>
8272
<!-- CONSIGNES -->
8373

8474
<!-- SOLUTION -->
@@ -113,17 +103,7 @@
113103

114104
<!-- CONSIGNES -->
115105
<div class="text-monospace mt-3">{{strtoupper(__('consignes'))}}</div>
116-
<div class="mathjax" style="padding:12px 15px 0px 15px;border-radius:4px;border:solid 1px gray;background-color:white;">
117-
<?php
118-
$Parsedown = new ParsedownMath([
119-
'math' => [
120-
'enabled' => true, // Write true to enable the module
121-
'matchSingleDollar' => true // default false
122-
]
123-
]);
124-
echo $Parsedown->text($devoir->consignes_eleve);
125-
?>
126-
</div>
106+
<div class="markdown_content" style="padding:12px 15px 0px 15px;border-radius:4px;border:solid 1px gray;background-color:white;">{{ $devoir->consignes_eleve }}</div>
127107
<!-- CONSIGNES -->
128108

129109
<!-- CODE ELEVE -->
@@ -152,21 +132,9 @@
152132
{{-- /PRINT --}}
153133

154134
@include('inc-bottom-js')
135+
@include('markdown/inc-markdown-afficher-js')
155136

156-
<script>
157-
MathJax = {
158-
tex: {
159-
inlineMath: [['$', '$'], ['\\(', '\\)']],
160-
displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
161-
processEscapes: true
162-
},
163-
options: {
164-
ignoreHtmlClass: "no-mathjax",
165-
processHtmlClass: "mathjax"
166-
}
167-
};
168-
</script>
169-
<script type="text/javascript" id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js"></script>
137+
170138

171139

172140
<script src="{{ asset('js/ace/ace.js') }}" type="text/javascript" charset="utf-8"></script>

‎routes/web.php

+10-3
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,21 @@
203203
$devoir = App\Models\Devoir::where('jeton_secret', $jeton_secret)->first();
204204
if ($devoir->sujet_id == NULL){
205205
return view('devoirs-v1/devoir-console')->with('jeton_secret', $jeton_secret);
206-
}else{
206+
} else {
207207
return view('devoirs/devoir-console')->with('jeton_secret', $jeton_secret);
208208
}
209209
})->name('devoir-console');
210210

211-
Route::get('/devoir-supervision/{devoir_id}', function ($devoir_id){return view('devoirs/devoir-supervision')->with('devoir_id', $devoir_id);})->name('devoir-supervision');
212-
Route::get('/devoir-imprimer/{devoir_id}', function ($devoir_id){return view('devoirs/devoir-imprimer')->with('devoir_id', $devoir_id);})->name('devoir-imprimer');
211+
Route::get('/devoir-imprimer/{devoir_id}', function ($devoir_id){
212+
$devoir = App\Models\Devoir::find(Crypt::decryptString($devoir_id));
213+
if ($devoir->sujet_id == NULL){
214+
return view('devoirs-v1/devoir-imprimer')->with('devoir_id', $devoir_id);
215+
} else {
216+
return view('devoirs/devoir-imprimer')->with('devoir_id', $devoir_id);
217+
}
218+
})->name('devoir-imprimer');
213219

220+
Route::get('/devoir-supervision/{devoir_id}', function ($devoir_id){return view('devoirs/devoir-supervision')->with('devoir_id', $devoir_id);})->name('devoir-supervision');
214221
Route::get('/devoir-creer', [App\Http\Controllers\DevoirController::class, 'redirect']);
215222
Route::get('/devoir-creer/{sujet_id}', function ($sujet_id) {return view('devoirs/devoir-creer')->with('sujet_id', $sujet_id);});
216223
Route::get('/devoir-modifier/{devoir_id}', function ($devoir_id) {return view('devoirs/devoir-creer')->with('devoir_id', $devoir_id);});

0 commit comments

Comments
 (0)