Commit 1bf563ac authored by roxane.carraux's avatar roxane.carraux
Browse files

merging

parents e14817d9 3462fb12

.gitignore

+119 −0
Original line number Diff line number Diff line 
src/main/resources/application.properties



HELP.md

target/

!.mvn/wrapper/maven-wrapper.jar

!**/src/main/**

!**/src/test/**



src/main/resources/application.properties

*.DS_Store





### STS ###

.apt_generated

.classpath
@@ -29,3 +35,116 @@ build/ 


### VS Code ###

.vscode/





# Created by https://www.gitignore.io/api/java,maven,eclipse

# Edit at https://www.gitignore.io/?templates=java,maven,eclipse



### Eclipse ###

.metadata

bin/

tmp/

*.tmp

*.bak

*.swp

*~.nib

local.properties

.settings/

.loadpath

.recommenders



# External tool builders

.externalToolBuilders/



# Locally stored "Eclipse launch configurations"

*.launch



# PyDev specific (Python IDE for Eclipse)

*.pydevproject



# CDT-specific (C/C++ Development Tooling)

.cproject



# CDT- autotools

.autotools



# Java annotation processor (APT)

.factorypath



# PDT-specific (PHP Development Tools)

.buildpath



# sbteclipse plugin

.target



# Tern plugin

.tern-project



# TeXlipse plugin

.texlipse



# STS (Spring Tool Suite)

.springBeans



# Code Recommenders

.recommenders/



# Annotation Processing

.apt_generated/



# Scala IDE specific (Scala & Java development for Eclipse)

.cache-main

.scala_dependencies

.worksheet



### Eclipse Patch ###

# Eclipse Core

.project



# JDT-specific (Eclipse Java Development Tools)

.classpath



# Annotation Processing

.apt_generated



.sts4-cache/



### Java ###

# Compiled class file

*.class



# Log file

*.log



# BlueJ files

*.ctxt



# Mobile Tools for Java (J2ME)

.mtj.tmp/



# Package Files #

*.jar

*.war

*.nar

*.ear

*.zip

*.tar.gz

*.rar



# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml

hs_err_pid*



### Maven ###

target/

pom.xml.tag

pom.xml.releaseBackup

pom.xml.versionsBackup

pom.xml.next

release.properties

dependency-reduced-pom.xml

buildNumber.properties

.mvn/timing.properties

.mvn/wrapper/maven-wrapper.jar

.flattened-pom.xml



# End of https://www.gitignore.io/api/java,maven,eclipse

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

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ import javax.persistence.ManyToOne; 
import javax.persistence.Table;

import com.example.demo.Poulain;



import org.springframework.format.annotation.DateTimeFormat;





@Entity

@Table(name = "helprequest")
@@ -24,6 +26,7 @@ public class HelpRequest { 
	private String matiere;

	

	@Column

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

	private Date date;

	

	@Column

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

+2 −1
Original line number Diff line number Diff line 
package com.example.demo;



import java.util.Date;

import java.util.Map;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Controller;
@@ -28,7 +29,7 @@ public class HelpRequestController { 
	}

	

	@PostMapping("/insertHelpRequest")

	public String insertPerson(@ModelAttribute HelpRequest helpRequest, Model model) {

	public String insertHelpRequest(@ModelAttribute HelpRequest helpRequest, Model model) {

		//TODO : recup le poulain loggé

		Poulain poulain= new Poulain();

		poulain.setId(0);

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

+22 −23
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ public class Mentor { 
	private String lastName;

	

	public Mentor() {



    }



    public Integer getId() {

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

+2 −2
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ public class MentorController { 
	}

			

	@GetMapping("/formMentor")

	public String personForm(Model model) {

	public String mentorForm(Model model) {

		model.addAttribute("mentor", new Mentor());	

		return "formMentor";

	}

	

	@PostMapping("/insertMentor")

	public String insertPerson(@ModelAttribute Mentor mentor, Model model) {

	public String insertMentor(@ModelAttribute Mentor mentor, Model model) {

		mentorRepository.save(mentor);

		return "formMentor";

	}