Merge branch 'master' of https://gitlab.univ-lille.fr/valentin.degauchy.etu/tp_kotlin_1920

e852403c · Valentin Degauchy · 044b44f5 · 89bcf275 · e852403c · e852403c
Commit e852403c authored Nov 11, 2019 by Valentin Degauchy
--- a/tpkotlin/src/main/java/com/tpKotlin/glhf/tpkotlin/controller/SimpleController.java
+++ b/tpkotlin/src/main/java/com/tpKotlin/glhf/tpkotlin/controller/SimpleController.java
@@ -39,12 +39,18 @@ public class SimpleController {

 	@RequestMapping("/ex3")
 	public ModelAndView exo3() {
-		return new ModelAndView("ex3");
+		String s = dfs.getAllImagesFromFav();
+		ModelAndView mav = new ModelAndView("ex3");
+		mav.addObject("dirfav", s );
+		return mav;
 	}

 	@RequestMapping("/ex4")
 	public ModelAndView exo4() {
-		return new ModelAndView("ex4");
+		String s = dfs.getAllImagesFromFavFASTER();
+		ModelAndView mav = new ModelAndView("ex4");
+		mav.addObject("dirfav", s );
+		return mav;
 	}

 	@RequestMapping("/ex5")

--- a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/entity/Entities.kt
+++ b/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/entity/Entities.kt
@@ -52,7 +52,7 @@ object FavDir {
 	fun affiche(): String {
 		var s: String = ""
 		for (i in 0 until list.size) {
-			s = list.get(i).url + "&&&"+ s
+			s = list.get(i).nom + " " + list.get(i).url + "&&&"+ s
 		}
 		return s
 	}

--- a/tpkotlin/src/main/resources/files/monTonton.sappellePasRichard
+++ b/tpkotlin/src/main/resources/files/monTonton.sappellePasRichard
@@ -16,5 +16,4 @@ meme1 https://media.giphy.com/media/QyWBTLDn9WHt0FXGJS/200w_d.gif
 Ricardo Milos https://media1.tenor.com/images/85caab51be730a4e1290cd99d7d6e085/tenor.gif
 Ricardo Milos https://media1.tenor.com/images/85caab51be730a4e1290cd99d7d6e085/tenor.gif
 Ricardo Milos https://media1.tenor.com/images/85caab51be730a4e1290cd99d7d6e085/tenor.gif
-autre test sans deconné c'est pas gentil de faire de la merde
 look https://i.ytimg.com/vi/KEkrWRHCDQU/maxresdefault.jpg"><script>window.alert('mdr_je_me_suis_hack')</script><img"
--- a/tpkotlin/src/main/webapp/WEB-INF/jsp/ex1.jsp
+++ b/tpkotlin/src/main/webapp/WEB-INF/jsp/ex1.jsp
@@ -17,9 +17,11 @@
 			<h2>Mon Repo Favoris :</h2>
 			<br>
 			<br>
+			<ul>
 			<c:forTokens items="${dirfav}" delims="&&&" var="name">
-				<img src="${name}" />
+				 <li> ${name} </li>
 			</c:forTokens>
+			</ul>
 		</div>
 	</div>
 </body>

--- a/tpkotlin/src/main/webapp/WEB-INF/jsp/ex3.jsp
+++ b/tpkotlin/src/main/webapp/WEB-INF/jsp/ex3.jsp
@@ -10,6 +10,18 @@
 	</head>
 	<body>
 		<c:import url="/WEB-INF/jsp/footer.jsp" />
-	
+		<h1 class="content-title">Exercice 1 : Vue propre </h1>
+	<br>
+	<br>
+	<div class="row">
+		<div class="offset-sm-1 col-sm-10">
+			<h2>Mon Repo Favoris :</h2>
+			<br>
+			<br>
+			<c:forTokens items="${dirfav}" delims="&&&" var="name">
+				<img src="${name}" />
+			</c:forTokens>
+		</div>
+	</div>
 	</body>
 </html>
\ No newline at end of file
--- a/tpkotlin/src/main/webapp/WEB-INF/jsp/ex4.jsp
+++ b/tpkotlin/src/main/webapp/WEB-INF/jsp/ex4.jsp
@@ -9,12 +9,18 @@
 		<title>Exercice 4</title>
 	</head>
 	<body>
-		<h1 class="content-title">Exercice 4 : Les Coroutines</h1>
+		<h1 class="content-title">Exercice 4 : Coroutines</h1>
 	<br>
-		<h3 class="content-sub-title">EEEEEEEEHHHHHHHHHHH </h3>
-		<br><br>
-		<div class="container-fluid">
-			oui
+	<br>
+	<div class="row">
+		<div class="offset-sm-1 col-sm-10">
+			<h2>Mon Repo Favoris :</h2>
+			<br>
+			<br>
+			<c:forTokens items="${dirfav}" delims="&&&" var="name">
+				<img src="${name}" />
+			</c:forTokens>
+		</div>
 	</div>
 	</body>
 </html>
\ No newline at end of file