Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/java/ojss/controller/JobSeekerController.java # src/main/java/ojss/repository/JobRecruiterRepository.java # src/main/java/ojss/service/JobRecruiterService.java
ProtoDeviln · May 23, 2018 · 77ffb71 · 77ffb71
1 parent 83f136b
commit 77ffb71
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 4 deletions.
diff --git a/src/main/java/ojss/controller/JobController.java b/src/main/java/ojss/controller/JobController.java
@@ -17,6 +17,14 @@ public class JobController {
     JobService jobService;
 
     @GetMapping(value="/homePage")
+    public ModelAndView displayHomePage(ModelAndView modelAndView, Job job) {
+        modelAndView.addObject("job", job);
+        modelAndView.setViewName("homePage");
+        return modelAndView;
+    }
+
+
+    @PostMapping(value="/homePage")
     public ModelAndView searchPage(ModelAndView modelAndView, Job job) {
         modelAndView.addObject("job", job);
         modelAndView.setViewName("homePage");
@@ -31,6 +39,7 @@ public ModelAndView searchPage(ModelAndView modelAndView, Job job) {
             return modelAndView;}
     }
 
+
     /*
     @PostMapping(value = "/jobListPage/{pageNum}/{pageSize}")
     public List<Job> getJob(@PathVariable("pageNum") Integer pageNum,

diff --git a/src/main/java/ojss/controller/PageController.java b/src/main/java/ojss/controller/PageController.java
@@ -1,6 +1,7 @@
 package ojss.controller;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -11,4 +12,8 @@ public class PageController {
     public String displayHomePage(){
         return "homePage";
     }
+
+    @GetMapping("/")
+    public String mainPage()
+    {return "mainPage";}
 }
diff --git a/src/main/java/ojss/domain/Application.java b/src/main/java/ojss/domain/Application.java
@@ -1,3 +1,4 @@
+/*
 package ojss.domain;
 
 import javax.persistence.*;
@@ -27,8 +28,9 @@ public class Application {
     @Column(name = "app_detail")
     private String applicationDescription;
 
+
     @ManyToOne
-    @JoinColumn(name = "job_job_id")
+    @JoinColumn(name = "job_job_id",referencedColumnName="jobId")
     private Job job;
 
     @ManyToOne
@@ -93,4 +95,5 @@ public JobSeeker getJobSeeker() {
     public void setJobSeeker(JobSeeker jobSeeker) {
         this.jobSeeker = jobSeeker;
     }
-}
+}
+*/
diff --git a/src/main/java/ojss/domain/Job.java b/src/main/java/ojss/domain/Job.java
@@ -24,7 +24,7 @@ public class Job implements Serializable {
             inverseJoinColumns = {@JoinColumn(name = "job_seeker_id")})
     private Set<JobSeeker> jobSeekers = new HashSet<>();
 
-    @ManyToOne
+    @ManyToOne(optional=false)
     @JoinColumn(name = "job_recruiter_id")
     private JobRecruiter jobRecruiter;
 

diff --git a/src/main/java/ojss/domain/JobSeeker.java b/src/main/java/ojss/domain/JobSeeker.java
@@ -17,8 +17,10 @@ public class JobSeeker extends User {
     @Column
     private String exp;
 
+
+    /*
     @OneToMany(mappedBy = "jobSeeker")
-    private Set<Application> applications = new HashSet<>();
+    private Set<Application> applications = new HashSet<>();*/
 
     @ManyToMany(mappedBy = "jobSeekers")
     private Set<Job> jobs = new HashSet<>();

diff --git a/src/main/java/ojss/repository/ApplicationRepository.java b/src/main/java/ojss/repository/ApplicationRepository.java
@@ -1,3 +1,4 @@
+/*
 package ojss.repository;
 
 import ojss.domain.Application;
@@ -15,3 +16,4 @@ public interface ApplicationRepository extends JpaRepository<Application, Long>
     List<Application> findApplicationByJobRecruiterId(Long JobId);
 
 }
+*/
diff --git a/src/main/java/ojss/service/ApplicationService.java b/src/main/java/ojss/service/ApplicationService.java
@@ -1,3 +1,4 @@
+/*
 package ojss.service;
 
 import ojss.domain.Application;
@@ -19,3 +20,4 @@ public void addNewApplication(Application application) {
     }
 
 }
+*/
diff --git a/src/main/resources/templates/mainPage.html b/src/main/resources/templates/mainPage.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>OJSS</title>
+</head>
+<body>
+<div align="center">
+    <h2>Online Job Seeking System</h2>
+<hr>
+<button type="button"><a href="http://localhost:8080/jobRecruiterRegistration">recruiter Registration</a></button>
+<hr>
+<button type="button"><<a href="http://localhost:8080/jobRecruiterLogin">recruiter Login</a></button>
+<hr>
+<button type="button"><<a href="http://localhost:8080/jobSeekerRegistration">seeker Registration</a></button>
+<hr>
+<button type="button"><<a href="http://localhost:8080/jobSeekerLogin">seeker login</a></button>
+<hr>
+
+</body>
+</html>