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

change datetime picker to materialize pickers

parent ad2a492e

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

+26 −2
Original line number Diff line number Diff line
@@ -25,13 +25,23 @@ public class HelpProposition { 
    private String matiere;

    

    @Column

    @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")

    @DateTimeFormat(pattern = "yyyy-MM-dd")



    private Date dateBegin;



    @Column

    @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")

    @DateTimeFormat(pattern = "yyyy-MM-dd")

    private Date dateEnd;



    @Column

    @DateTimeFormat(pattern = "HH:mm")

    private Date timeBegin;



    @Column

    @DateTimeFormat(pattern = "HH:mm")

    private Date timeEnd;

    

    

    @Column

    private String comment;
@@ -61,6 +71,14 @@ public class HelpProposition { 
        return dateEnd;

    }



    public Date getTimeBegin(){

        return timeBegin;

    }

    

    public Date getTimeEnd(){

        return timeEnd;

    }

    

    public String getComment() {

        return comment;

    }
@@ -88,6 +106,12 @@ public class HelpProposition { 
    public void setDateEnd(Date date) {

        this.dateEnd = date;

    }

    public void setTimeBegin(Date date) {

        this.timeBegin = date;

    }

    public void setTimeEnd(Date date) {

        this.timeEnd = date;

    }



    public void setComment(String comment) {

        this.comment = comment;

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

+26 −4
Original line number Diff line number Diff line
@@ -24,13 +24,22 @@ public class HelpRequest { 
    private String matiere;

    

    @Column

    @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")

    @DateTimeFormat(pattern = "yyyy-MM-dd")



    private Date dateBegin;



    @Column

    @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")

    @DateTimeFormat(pattern = "yyyy-MM-dd")

    private Date dateEnd;



    @Column

    @DateTimeFormat(pattern = "HH:mm")

    private Date timeBegin;



    @Column

    @DateTimeFormat(pattern = "HH:mm")

    private Date timeEnd;

    

    @Column

    private String comment;
@@ -52,7 +61,6 @@ public class HelpRequest { 
    public String getMatiere() {

        return matiere;

    }



    public Date getDateBegin() {

        return dateBegin;

    }
@@ -60,6 +68,14 @@ public class HelpRequest { 
        return dateEnd;

    }



    public Date getTimeBegin(){

        return timeBegin;

    }

    

    public Date getTimeEnd(){

        return timeEnd;

    }

    

    public String getComment() {

        return comment;

    }
@@ -87,6 +103,12 @@ public class HelpRequest { 
    public void setDateEnd(Date date) {

        this.dateEnd = date;

    }

    public void setTimeBegin(Date date) {

        this.timeBegin = date;

    }

    public void setTimeEnd(Date date) {

        this.timeEnd = date;

    }



    public void setComment(String comment) {

        this.comment = comment;

src/main/resources/data.sql

+5 −0
Original line number Diff line number Diff line 
DELETE from `auth_user_role` where 1;

DELETE from `auth_role` where 1;

DELETE from `auth_user` where 1;





INSERT INTO `auth_role` (`auth_role_id`, `role_desc`, `role_name`) VALUES

(1, 'This user have all rights', 'ADMIN'),

(2, 'This user can ask for assisstance', 'POULAIN'),

src/main/resources/templates/ProfileHelpProposition.html

+9 −3
Original line number Diff line number Diff line
@@ -16,9 +16,15 @@ 
					<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.firstName}"></p>

						<p>

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

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

						</p>

						<p>

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

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

						</p>

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

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

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

					</div>

src/main/resources/templates/ProfileHelpRequest.html

+8 −2
Original line number Diff line number Diff line
@@ -17,8 +17,14 @@ 
					<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>

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

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

						</p>

						<p>

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

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

						</p>

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

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

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