diff --git a/R3.01/tp/tp2/ex3/calculatrice.php b/R3.01/tp/tp2/ex3/calculatrice.php
index 5b9b228..2796fd1 100644
--- a/R3.01/tp/tp2/ex3/calculatrice.php
+++ b/R3.01/tp/tp2/ex3/calculatrice.php
@@ -1,34 +1,59 @@
 <?php
-include 'include/controller.php';
+include_once 'include/controller.php';
 ?>
 
 <!DOCTYPE html>
 <html lang="fr">
-	<head>
-		<meta charset="UTF-8" />
-		<title></title>
-<link
-  rel="stylesheet"
-  href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.min.css"
-/>
-		<link rel="stylesheet" href="./css/style.css">
-	</head>
-	<body>
-		<main class="container">
-			<h3>Calculatrice</h3>
-			<form  method="POST">
-				<div class="grid">
-					<input placeholder="un nombre" type="number" step="any" name="op1" value ="" required>
-					<select name="operation" required>
-						<option value="+">+</option>
-						<option value="-">-</option>
-						<option value="x">x</option>
-						<option value="/">/</option>
-					</select>
-					<input placeholder="un nombre" type="number" step="any" name="op2" required>
-					<button type="submit" name="soumis"> Calculer</button>
-					</grid>
-			</form>
-		</main>
-	</body>
+    <head>
+        <meta charset="UTF-8" />
+        <title>Exercice 3</title>
+        <link
+          rel="stylesheet"
+          href="https://cdn.jsdelivr.net/npm/@picocss/pico.min.css"
+        />
+        <link rel="stylesheet" href="./css/style.css">
+    </head>
+    <body>
+        <main class="container">
+            <h3>Calculatrice</h3>
+            <form method="POST">
+                <div class="grid">
+                    <input
+                        placeholder="un nombre"
+                        type="number"
+                        step="any"
+                        name="op1"
+                        value="<?php echo htmlspecialchars($valeurOp1, ENT_QUOTES, 'UTF-8'); ?>"
+                        required
+                    >
+                    <select name="operation" required>
+                        <option value="+" <?php echo $operation === '+' ? 'selected' : ''; ?>>+</option>
+                        <option value="-" <?php echo $operation === '-' ? 'selected' : ''; ?>>-</option>
+                        <option value="x" <?php echo $operation === 'x' ? 'selected' : ''; ?>>x</option>
+                        <option value="/" <?php echo $operation === '/' ? 'selected' : ''; ?>>/</option>
+                    </select>
+                    <input
+                        placeholder="un nombre"
+                        type="number"
+                        step="any"
+                        name="op2"
+                        value="<?php echo htmlspecialchars($valeurOp2, ENT_QUOTES, 'UTF-8'); ?>"
+                        required
+                    >
+                    <button type="submit" name="soumis">Calculer</button>
+                </div>
+            </form>
+
+            <?php if ($messageErreur !== '') : ?>
+                <p><?php echo htmlspecialchars($messageErreur, ENT_QUOTES, 'UTF-8'); ?></p>
+            <?php endif; ?>
+
+            <?php if ($aCalcule) : ?>
+                <p>
+                    RÃ©sultat :
+                    <?php echo htmlspecialchars($valeurOp1, ENT_QUOTES, 'UTF-8'); ?>
+                </p>
+            <?php endif; ?>
+        </main>
+    </body>
 </html>
diff --git a/R3.01/tp/tp2/ex3/include/controller.php b/R3.01/tp/tp2/ex3/include/controller.php
index e8fd322..266ba36 100644
--- a/R3.01/tp/tp2/ex3/include/controller.php
+++ b/R3.01/tp/tp2/ex3/include/controller.php
@@ -1,2 +1,56 @@
 <?php
-//TODO
+
+$op1Saisi = filter_input(INPUT_POST, 'op1', FILTER_UNSAFE_RAW);
+$op2Saisi = filter_input(INPUT_POST, 'op2', FILTER_UNSAFE_RAW);
+$operationSaisie = filter_input(INPUT_POST, 'operation', FILTER_UNSAFE_RAW);
+
+$op1Saisi = is_string($op1Saisi) ? trim($op1Saisi) : '';
+$op2Saisi = is_string($op2Saisi) ? trim($op2Saisi) : '';
+$operationSaisie = is_string($operationSaisie) ? trim($operationSaisie) : '+';
+
+$operationsAutorisees = ['+', '-', 'x', '/'];
+$operation = in_array($operationSaisie, $operationsAutorisees, true) ? $operationSaisie : '+';
+
+$resultat = null;
+$messageErreur = '';
+$aCalcule = false;
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $op1 = filter_var($op1Saisi, FILTER_VALIDATE_FLOAT);
+    $op2 = filter_var($op2Saisi, FILTER_VALIDATE_FLOAT);
+
+    if ($op1 === false || $op2 === false) {
+        $messageErreur = 'Veuillez saisir deux nombres valides.';
+    } elseif (!in_array($operation, $operationsAutorisees, true)) {
+        $messageErreur = 'Veuillez choisir une opÃ©ration valide.';
+    } elseif ($operation === '/' && (float) $op2 == 0.0) {
+        $messageErreur = 'La division par zÃ©ro est impossible.';
+    } else {
+        $aCalcule = true;
+
+        switch ($operation) {
+            case '+':
+                $resultat = $op1 + $op2;
+                break;
+
+            case '-':
+                $resultat = $op1 - $op2;
+                break;
+
+            case 'x':
+                $resultat = $op1 * $op2;
+                break;
+
+            case '/':
+                $resultat = $op1 / $op2;
+                break;
+
+            default:
+                $messageErreur = 'Veuillez choisir une opÃ©ration valide.';
+                $aCalcule = false;
+        }
+    }
+}
+
+$valeurOp1 = $aCalcule ? (string) $resultat : $op1Saisi;
+$valeurOp2 = $op2Saisi;
