Commit ee0d28b7 authored by roxane.carraux's avatar roxane.carraux
Browse files

little fix

parent 5f20583a

src/main/java/com/example/demo/WebSecurityConfig.java

+3 −2
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { 
    @Autowired

    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {

        auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder());

        

    }



}
 
 No newline at end of file

src/main/resources/templates/ProfileHelpProposition.html

+27 −27
Original line number Diff line number Diff line
@@ -12,15 +12,15 @@ 
	<div th:each="help: ${helpPropositions}">

		<div class="row">

			<div class="col s12 m6">

                    <div class="card-panel  teal lighten-1">

				<div class="card  teal lighten-1">

					<div class="card-content white-text">

						<span class="card-title" th:text="${help.matiere}"></span>

						<p th:text="${help.comment}"></p>

						<p th:text="${#dates.format(help.dateBegin, 'dd-MM-yyyy HH:mm')}"></p>

						<p th:text="${#dates.format(help.dateEnd, 'dd-MM-yyyy HH:mm')}"></p>

                            <p th:text="${help.mentor.id}"></p>

						<p th:text="${help.mentor.firstName}"></p>

						<p th:if="${help.poulain != null}" th:text=" ${help.poulain.id}"></p>

                            <p th:unless="${help.poulain != null}">Personne</p>

						<p th:unless="${help.poulain != null}">null</p>

					</div>

				</div>

			</div>

src/main/resources/templates/ProfileHelpRequest.html

+27 −27
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
	<div th:each="help: ${helpRequests}">

		<div class="row">

			<div class="col s12 m6">

                    <div class="card-panel teal lighten-1">

				<div class="card teal lighten-1">

					<div class="card-content white-text">

						<span class="card-title" th:text="${help.matiere}"></span>

						<p th:text="${help.comment}"></p>

src/main/resources/templates/allHelpRequest.html

+31 −33
Original line number Diff line number Diff line 


<!DOCTYPE html>

<html xmlns:th="http://www.thymeleaf.org">



<head>

<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.0/css/materialize.min.css">

<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.0/js/materialize.min.js"></script>

<meta charset="ISO-8859-1">

<title>All Help Request</title>

</head>



<body>

	<header th:insert="fragments/nav.html :: header"> </header>

	<h1>All Help Request</h1>

	<div th:each="help: ${helpRequests}">

		<div class="row">

			<div class="col s12 m6">

                    <div class="card-panel teal lighten-1">

				<div class="card teal lighten-1">

					<div class="card-content white-text">

						<span class="card-title" th:text="${help.matiere}"></span>

						<p th:text="${help.comment}"></p>

src/main/resources/templates/formHelpProposition.html

+11 −3
Original line number Diff line number Diff line
@@ -2,9 +2,15 @@ 
<html xmlns:th="http://www.thymeleaf.org">

    <head>

        <meta charset="ISO-8859-1">

        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.0/css/materialize.min.css">

        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.0/js/materialize.min.js"></script>

       

        <link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">

        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.8/css/materialize.min.css">

        <script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>    

        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.8/js/materialize.min.js"></script>

    



        <title>Form HelpProposition</title>



    </head>

    <body>
@@ -14,9 +20,11 @@ 
        <form action="#" th:action="@{/insertHelpProposition}" th:object="${helpProposition}" method="post">

            <p>HelpProposition matiere: <input type="text" th:field="*{matiere}" /></p>

            <p>HelpProposition date begin: <input type="datetime-local" th:field="*{dateBegin}" /></p>

            <p>HelpProposition date end: <input type="datetime-local" th:field="*{dateEnd}" /></p>

            <p>HelpProposition date end: <input type="datetime-local" th:field="*{dateEnd}" class="datepicker" >  

            <p>HelpProposition comment: <input type="text" th:field="*{comment}" /></p>

            <p><input type="submit" value="Submit"  class="waves-effect waves-light btn right teal darken-2"/></p>

        </form>

    



    </body>

</html>