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

add cards and all for merging with auth

parent 101326ca
Loading
Loading
Loading
Loading
+21 −13
Original line number Diff line number Diff line
package com.example.demo;

import java.util.Map;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;

import com.example.demo.HelpPropositionRepository;


@@ -21,12 +24,6 @@ public class HelpPropositionController {
		return "allHelpProposition";
	}

	@GetMapping("/allOpenProposition")
	public String getOpen(Map<String, Object> model) {
		model.put("helpPropositions", helpPropositionRepository.findAll());
		return "allHelpProposition";
	}

	@GetMapping("/formHelpProposition")
	public String helpPropositionForm(Model model) {
		model.addAttribute("helpProposition", new HelpProposition());
@@ -35,24 +32,35 @@ public class HelpPropositionController {
	
	@PostMapping("/insertHelpProposition")
	public String insertHelpProposition(@ModelAttribute HelpProposition helpProposition, Model model) {
		//TODO : recup le mentor loggé
		//TODO 
		Mentor mentor = new Mentor();
		mentor.setId(1);
		mentor.setId(30);
		helpProposition.setMentor(mentor);

		helpPropositionRepository.save(helpProposition);
		return "formHelpProposition";
	}

	
	@GetMapping("/allPropositionByMentor")
	public String getallPropositionByMentor(Map<String, Object> model) {

		//TODO : recup le mentor loggé
		//TODO 
		Mentor mentor = new Mentor();
		mentor.setId(1);
		mentor.setId(30);
		model.put("helpPropositions", helpPropositionRepository.findByMentor(mentor));
		return "allHelpProposition";
		return "ProfileHelpProposition";
	}

	@GetMapping("/editProposition/{id}")
	public String editProposition(@PathVariable("id") Integer helpId, Model model) {
		HelpProposition helpProposition = helpPropositionRepository.findById(helpId);
		
	   //TODO 
		Poulain poulain = new Poulain();
		poulain.setId(32);
		helpProposition.setPoulain(poulain);

		helpPropositionRepository.save(helpProposition);
		return "allHelpProposition";
	}
}
+1 −0
Original line number Diff line number Diff line
@@ -8,4 +8,5 @@ import com.example.demo.HelpProposition;

public interface HelpPropositionRepository extends JpaRepository <HelpProposition, Long>  {
    List<HelpProposition> findByMentor(Mentor mentor);
    HelpProposition findById(Integer id);
}
+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class HelpRequest {
		this.poulain = poulain;
	}

	public void setMentor(Poulain poulain) {
		this.poulain = poulain;
	public void setMentor(Mentor mentor) {
		this.mentor = mentor;
	}
}
+34 −2
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;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import com.example.demo.HelpRequestRepository;

@@ -32,11 +32,43 @@ public class HelpRequestController {
	public String insertHelpRequest(@ModelAttribute HelpRequest helpRequest, Model model) {
		//TODO : recup le poulain loggé
		Poulain poulain= new Poulain();
		poulain.setId(0);
		poulain.setId(32);
		helpRequest.setPoulain(poulain);

		helpRequestRepository.save(helpRequest);
		return "formHelpRequest";
	}
	@GetMapping("/allRequestByPoulain")
	public String getallPropositionByPoulain(Map<String, Object> model) {

		//TODO : recup le mentor loggé
		Poulain poulain= new Poulain();
		poulain.setId(32);
		model.put("helpRequests", helpRequestRepository.findByPoulain(poulain));
		return "ProfileHelpRequest";
	}
	
	@PostMapping("/acceptRequest")
	public String acceptRequest(@ModelAttribute HelpRequest helpRequest, Model model) {
		//TODO 
		Mentor mentor = new Mentor();
		mentor.setId(30);
		helpRequest.setMentor(mentor);
		helpRequestRepository.save(helpRequest);
		return "allHelpProposition";
	}

	@GetMapping("/editRequest/{id}")
	public String editRequest(@PathVariable("id") Integer helpId, Model model) {
		HelpRequest helpRequest = helpRequestRepository.findById(helpId);
			
		//TODO 
		Mentor mentor = new Mentor();
		mentor.setId(30);
		helpRequest.setMentor(mentor);

		helpRequestRepository.save(helpRequest);
		return "allHelpRequest";
	}

}
+1 −0
Original line number Diff line number Diff line
@@ -8,5 +8,6 @@ import com.example.demo.HelpRequest;

public interface HelpRequestRepository extends JpaRepository <HelpRequest, Long>  {
    List<HelpRequest> findByPoulain(Poulain poulain);
    HelpRequest findById(Integer id);

}
Loading