From 6862a3dfca56fdd0a3e87baf23a5ee679282b20b Mon Sep 17 00:00:00 2001 From: iamzachb Date: Mon, 9 Oct 2023 15:58:22 -0500 Subject: [PATCH 1/3] Started fully looking into Assignment 1 --- src/main/java/TechJobs.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/TechJobs.java b/src/main/java/TechJobs.java index 099f4efb..f34034db 100644 --- a/src/main/java/TechJobs.java +++ b/src/main/java/TechJobs.java @@ -4,7 +4,7 @@ import java.util.Scanner; /** - * Created by LaunchCode + * Created by LaunchCode4 */ public class TechJobs { @@ -120,6 +120,13 @@ private static String getUserSelection(String menuHeader, HashMap> someJobs) { + String asterisks = "*****"; + boolean results = true; + + + //Working on Implementing this printJobs Method + + System.out.println("printJobs is not implemented yet"); } } From 4000e4f109f9654ba3f6d9f1d25e1cc3c5ccb4ab Mon Sep 17 00:00:00 2001 From: iamzachb Date: Wed, 25 Oct 2023 21:15:30 -0500 Subject: [PATCH 2/3] Up to Task 3cle --- src/main/java/JobData.java | 14 +++++++++++++- src/main/java/TechJobs.java | 17 ++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/main/java/JobData.java b/src/main/java/JobData.java index bcb4912f..eb8db826 100644 --- a/src/main/java/JobData.java +++ b/src/main/java/JobData.java @@ -95,7 +95,19 @@ public static ArrayList> findByValue(String value) { loadData(); // TODO - implement this method - return null; + + ArrayList> jobList = new ArrayList<>(); + + for(HashMap job : allJobs) { + for(String aValue : job.values()) { + if(aValue.contains(value)) { + jobList.add(job); + break; + } + } + } + + return jobList; } /** diff --git a/src/main/java/TechJobs.java b/src/main/java/TechJobs.java index f34034db..e6f6f948 100644 --- a/src/main/java/TechJobs.java +++ b/src/main/java/TechJobs.java @@ -1,3 +1,5 @@ +import javax.swing.*; +import java.sql.SQLOutput; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -121,12 +123,21 @@ private static String getUserSelection(String menuHeader, HashMap> someJobs) { String asterisks = "*****"; - boolean results = true; + + if (!someJobs.isEmpty()) { + for (HashMap job : someJobs) { + System.out.println(asterisks); + for (String key : job.keySet()) { + System.out.println(key + ": " + job.get(key)); + } + System.out.println(asterisks + "\n"); + } + } else { + System.out.println("No Results"); + } - //Working on Implementing this printJobs Method - System.out.println("printJobs is not implemented yet"); } } From 64f495754db716c30e6526d84b28fcbb1489f5ac Mon Sep 17 00:00:00 2001 From: iamzachb Date: Mon, 30 Oct 2023 20:28:20 -0500 Subject: [PATCH 3/3] Completed assignment --- src/main/java/JobData.java | 16 ++++++++-------- src/main/java/TechJobs.java | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/JobData.java b/src/main/java/JobData.java index eb8db826..a19f3a81 100644 --- a/src/main/java/JobData.java +++ b/src/main/java/JobData.java @@ -5,10 +5,7 @@ import java.io.FileReader; import java.io.IOException; import java.io.Reader; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; +import java.util.*; /** * Created by LaunchCode @@ -75,7 +72,7 @@ public static ArrayList> findByColumnAndValue(String col String aValue = row.get(column); - if (aValue.contains(value)) { + if (aValue.toLowerCase().contains(value.toLowerCase())) { jobs.add(row); } } @@ -96,13 +93,16 @@ public static ArrayList> findByValue(String value) { // TODO - implement this method +// String valueLowerCase = value.toLowerCase(); + + ArrayList> jobList = new ArrayList<>(); for(HashMap job : allJobs) { - for(String aValue : job.values()) { - if(aValue.contains(value)) { + for(Map.Entry aValue : job.entrySet()) { + + if (aValue.getValue().toLowerCase().contains(value.toLowerCase())) { jobList.add(job); - break; } } } diff --git a/src/main/java/TechJobs.java b/src/main/java/TechJobs.java index e6f6f948..b0069711 100644 --- a/src/main/java/TechJobs.java +++ b/src/main/java/TechJobs.java @@ -60,7 +60,7 @@ public static void main (String[] args) { String searchField = getUserSelection("Search by:", columnChoices); // What is their search term? - System.out.println("\nSearch term:"); + System.out.print("\nSearch term:" + "\n"); String searchTerm = in.nextLine(); if (searchField.equals("all")) { @@ -124,16 +124,16 @@ private static void printJobs(ArrayList> someJobs) { String asterisks = "*****"; - if (!someJobs.isEmpty()) { + if (someJobs.isEmpty()) { + System.out.print("No Results"); + } else { for (HashMap job : someJobs) { - System.out.println(asterisks); + System.out.println("\n" + asterisks); for (String key : job.keySet()) { System.out.println(key + ": " + job.get(key)); } - System.out.println(asterisks + "\n"); + System.out.println(asterisks); } - } else { - System.out.println("No Results"); }