From 9ab83d43f90b6e5476b2aa1a87aa632421b4f29a Mon Sep 17 00:00:00 2001 From: Joe Henke Date: Thu, 3 Nov 2022 20:44:23 -0500 Subject: [PATCH 01/10] GA3 commit --- .../mvc/controllers/ListController.java | 1 + .../mvc/controllers/SearchController.java | 20 +++++++++++- src/main/resources/templates/list-jobs.html | 32 ++++++++++++++++++- src/main/resources/templates/list.html | 2 +- src/main/resources/templates/search.html | 31 +++++++++++++++++- 5 files changed, 82 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/launchcode/techjobs/mvc/controllers/ListController.java b/src/main/java/org/launchcode/techjobs/mvc/controllers/ListController.java index 71cb0cd..10b6f02 100644 --- a/src/main/java/org/launchcode/techjobs/mvc/controllers/ListController.java +++ b/src/main/java/org/launchcode/techjobs/mvc/controllers/ListController.java @@ -29,6 +29,7 @@ public ListController () { columnChoices.put("positionType", "Position Type"); columnChoices.put("coreCompetency", "Skill"); + tableChoices.put("all",JobData.findAll()); tableChoices.put("employer", JobData.getAllEmployers()); tableChoices.put("location", JobData.getAllLocations()); tableChoices.put("positionType", JobData.getAllPositionTypes()); diff --git a/src/main/java/org/launchcode/techjobs/mvc/controllers/SearchController.java b/src/main/java/org/launchcode/techjobs/mvc/controllers/SearchController.java index d75fd42..20e8484 100644 --- a/src/main/java/org/launchcode/techjobs/mvc/controllers/SearchController.java +++ b/src/main/java/org/launchcode/techjobs/mvc/controllers/SearchController.java @@ -1,9 +1,15 @@ package org.launchcode.techjobs.mvc.controllers; +import org.launchcode.techjobs.mvc.models.Job; +import org.launchcode.techjobs.mvc.models.JobData; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.ArrayList; import static org.launchcode.techjobs.mvc.controllers.ListController.columnChoices; @@ -22,5 +28,17 @@ public String search(Model model) { } // TODO #3 - Create a handler to process a search request and render the updated search view. - + @PostMapping("results") + public String displaySearchResults(Model model, @RequestParam String searchType, @RequestParam String searchTerm){ + ArrayList jobsReturned = new ArrayList<>(); + if(searchTerm.toLowerCase().equals("all") || searchTerm.isEmpty()){ + jobsReturned = JobData.findAll(); + model.addAttribute("jobs",jobsReturned); + } else { + jobsReturned = JobData.findByColumnAndValue(searchType,searchTerm); + model.addAttribute("columns",columnChoices); + } + model.addAttribute("jobs",jobsReturned); + return "search"; + } } diff --git a/src/main/resources/templates/list-jobs.html b/src/main/resources/templates/list-jobs.html index 9cd974d..f109b49 100644 --- a/src/main/resources/templates/list-jobs.html +++ b/src/main/resources/templates/list-jobs.html @@ -2,7 +2,7 @@ - +
@@ -12,6 +12,36 @@

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID
Name
Employer
Location
Position
Skill
+ diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 9bb81de..7ea064c 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -20,7 +20,7 @@

View Jobs By Category

- + view all