Commit 518998f1 authored by roxane.carraux's avatar roxane.carraux
Browse files

all text in english

parent da69bd2e

src/main/java/com/example/demo/model/HelpProposition.java

+5 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ public class HelpProposition { 
    private Integer id;



    @Column

    private String matiere;

    private String branch;

    

    @Column

    @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -57,8 +57,8 @@ public class HelpProposition { 
        return id;

    }



    public String getMatiere() {

        return matiere;

    public String getBranch() {

        return branch;

    }



    public Date getDateBegin() {
@@ -93,8 +93,8 @@ public class HelpProposition { 
        this.id = id;

    }



    public void setMatiere(String matiere) {

        this.matiere = matiere;

    public void setBranch(String branch) {

        this.branch = branch;

    }



    public void setDateBegin(Date date) {

src/main/java/com/example/demo/model/HelpRequest.java

+5 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ public class HelpRequest { 
    private Integer id;



    @Column

    private String matiere;

    private String branch;

    

    @Column

    @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -56,8 +56,8 @@ public class HelpRequest { 
        return id;

    }



    public String getMatiere() {

        return matiere;

    public String getBranch() {

        return branch;

    }

    public Date getDateBegin() {

        return dateBegin;
@@ -90,8 +90,8 @@ public class HelpRequest { 
        this.id = id;

    }



    public void setMatiere(String matiere) {

        this.matiere = matiere;

    public void setBranch(String branch) {

        this.branch = branch;

    }



    public void setDateBegin(Date date) {

src/main/resources/templates/ProfileHelpProposition.html

+7 −7
Original line number Diff line number Diff line
@@ -10,24 +10,24 @@ 


	<body>

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

		<h1 class="teal-text text-darken-4">All Help Proposition</h1>

		<h1 class="teal-text text-darken-4">Your help Proposition</h1>

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

			<div class="row">

				<div class="col s12 m6">

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

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

								<h5><strong>Matière </strong></h5>

								<span th:text="${help.matiere}"></span>

								<h5><strong>Branch</strong></h5>

								<span th:text="${help.branch}"></span>



								<h5><strong>Commentaire </strong></h5>

								<h5><strong>Comment</strong></h5>

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



								<h5><strong>Date et heure de début</strong></h5>

								<h5><strong>Date Begin</strong></h5>

								<p>

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

									<span th:text="${#dates.format(help.timeBegin, 'HH:mm')}"></span>

								</p>

								<h5><strong>Date et heure de fin</strong></h5>

								<h5><strong>Date end</strong></h5>



								<p>

									<span th:text="${#dates.format(help.dateEnd, 'dd-MM-yyyy')}"></span>
@@ -39,7 +39,7 @@ 


								<h5><strong>Poulain</strong></h5>

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

								<p th:unless="${help.poulain != null}">Pas encore de poulain assigné</p>

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

						</div>

					</div>

				</div>

src/main/resources/templates/ProfileHelpRequest.html

+7 −7
Original line number Diff line number Diff line
@@ -10,25 +10,25 @@ 


<body>

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

	<h1 class="teal-text text-darken-4">Your Help Request</h1>

	<h1 class="teal-text text-darken-4">Your help request</h1>

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

		<div class="row">

			<div class="col s12 m6">

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

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

				

						<h5><strong>Matière </strong></h5>

						<span th:text="${help.matiere}"></span>

						<h5><strong>Branch</strong></h5>

						<span th:text="${help.branch}"></span>



						<h5><strong>Commentaire </strong></h5>

						<h5><strong>Comment</strong></h5>

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



						<h5><strong>Date et heure de début</strong></h5>

						<h5><strong>Date begin</strong></h5>

						<p>

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

							<span th:text="${#dates.format(help.timeBegin, 'HH:mm')}"></span>

						</p>

						<h5><strong>Date et heure de fin</strong></h5>

						<h5><strong>Date end</strong></h5>



						<p>

							<span th:text="${#dates.format(help.dateEnd, 'dd-MM-yyyy')}"></span>
@@ -40,7 +40,7 @@ 


						<h5><strong>Mentor</strong></h5>

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

						<p th:unless="${help.mentor != null}">Pas encore de mentor assigné</p>

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

					</div>

				</div>

			</div>

src/main/resources/templates/admin.html

+14 −10
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
    <body>

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



        <h1 class="teal-text text-darken-4">All Users</h1>

        <h1 class="teal-text text-darken-4">All users</h1>

        

        <table class="table">

                <thead>
@@ -37,15 +37,16 @@ 
            </table>

        </div>



        <h1 class="teal-text text-darken-4">All Propositions</h1>

        <h1 class="teal-text text-darken-4">All propositions</h1>



        <table class="table">

                <thead>

                    <tr>

                        <th scope="col">Id</th>

                        <th scope="col">Commentaire</th>

                        <th scope="col">Date de début</th>

                        <th scope="col">Date de fin</th>

                        <th scope="col">Branch</th>

                        <th scope="col">Comment</th>

                        <th scope="col">Begin date</th>

                        <th scope="col">End date</th>

                        <th scope="col">Mentor id</th>

                        <th scope="col">Poulain id</th>

                    </tr>
@@ -53,6 +54,7 @@ 
                <tbody>

                    <tr th:each="help: ${helpPropositions}">

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

                        <td th:text="${help.branch}" />

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

                        <td>   

                            <span th:text="${#dates.format(help.dateBegin, 'dd-MM-yyyy')}"></span>
@@ -69,22 +71,24 @@ 
            </table>

        </div>



        <h1 class="teal-text text-darken-4">All Help Request</h1>

        <h1 class="teal-text text-darken-4">All requests</h1>



        <table class="table">

                <thead>

                    <tr>

                        <th scope="col">Id</th>

                        <th scope="col">Commentaire</th>

                        <th scope="col">Date de début</th>

                        <th scope="col">Date de fin</th>

                        <th scope="col">Branch</th>

                        <th scope="col">Comment</th>

                        <th scope="col">Begin date</th>

                        <th scope="col">End date</th>

                        <th scope="col">Poulain id</th>

                        <th scope="col">Mentor id</th>

                    </tr>

                </thead>

                <tbody>

                    <tr th:each="help: ${helpPropositions}">

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

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

                        <td th:text="${help.branch}" />

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

                        <td>   

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