Skip to content

Commit

Permalink
Add Inproceedings reference type
Browse files Browse the repository at this point in the history
  • Loading branch information
Blodir committed Apr 19, 2016
1 parent 8d817f7 commit 054140e
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 0 deletions.
17 changes: 17 additions & 0 deletions src/main/java/ohtuhatut/controller/ReferenceController.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import ohtuhatut.domain.ArticleReference;
import ohtuhatut.domain.BookReference;
import ohtuhatut.domain.BookletReference;
import ohtuhatut.domain.InproceedingsReference;
import ohtuhatut.domain.ManualReference;
import ohtuhatut.service.ReferenceService;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -107,6 +108,22 @@ public String newManualReferenceCreate(@ModelAttribute ManualReference reference
}
// <-- manual references

// -------------- inproceedings references
@RequestMapping(value = "/inproceedingsreferences/new", method = RequestMethod.GET)
public String newInproceedingsReference(Model model){
model.addAttribute("reference", new InproceedingsReference());
model.addAttribute("referenceType", "inproceedingsreferences");
return "reference_new";
}

@RequestMapping(value = "/inproceedingsreferences/new", method = RequestMethod.POST)
public String newInproceedingsReferenceCreate(@ModelAttribute InproceedingsReference reference, RedirectAttributes attr) {
referenceService.saveInproceedingsReference(reference);

attr.addAttribute("id", reference.getId());
return "redirect:/references/{id}";
}
// <-- manual references


}
Expand Down
35 changes: 35 additions & 0 deletions src/main/java/ohtuhatut/domain/InproceedingsReference.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package ohtuhatut.domain;

import java.util.ArrayList;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.Table;

@Table(name = "Reference")
@DiscriminatorValue("inproceedings")
@Entity
public class InproceedingsReference extends Reference{
public InproceedingsReference() {
setType("inproceedings");

mandatoryFields = new ArrayList<>();
mandatoryFields.add("author");
mandatoryFields.add("title");
mandatoryFields.add("booktitle");
mandatoryFields.add("year");

optionalFields = new ArrayList<>();
/*optionalFields.add("editor");
optionalFields.add("volume");
optionalFields.add("series");
optionalFields.add("pages");
optionalFields.add("address");
optionalFields.add("month");
optionalFields.add("organization");
optionalFields.add("publisher");
optionalFields.add("note");
optionalFields.add("key");*/

populateFields();
}
}
12 changes: 12 additions & 0 deletions src/main/java/ohtuhatut/domain/Reference.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class Reference extends AbstractPersistable<Long> {

protected String author;
protected String title;
protected String booktitle;
protected String publisher;
protected Integer year;
protected String journal;
Expand Down Expand Up @@ -74,6 +75,9 @@ public String getField(String field) {
case "title":
return getTitle();

case "booktitle":
return getBooktitle();

case "journal":
return getJournal();

Expand Down Expand Up @@ -165,6 +169,14 @@ public String getTitle() {
public void setTitle(String title) {;
this.title = title;
}

public String getBooktitle() {
return booktitle;
}

public void setBooktitle(String booktitle) {
this.booktitle = booktitle;
}

public String getPublisher() {
return publisher;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package ohtuhatut.repository;

import ohtuhatut.domain.InproceedingsReference;
import org.springframework.data.jpa.repository.JpaRepository;

public interface InproceedingsReferenceRepository extends JpaRepository<InproceedingsReference, Long> {
}
6 changes: 6 additions & 0 deletions src/main/java/ohtuhatut/service/ReferenceService.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public class ReferenceService {
private BookletReferenceRepository bookletReferenceRepository;
@Autowired
private ManualReferenceRepository manualReferenceRepository;
@Autowired
private InproceedingsReferenceRepository inproceedingsReferenceRepository;

public Reference getReference(Long id) {
return referenceRepository.findOne(id);
Expand All @@ -49,5 +51,9 @@ public void saveBookletReference(BookletReference reference) {
public void saveManualReference(ManualReference reference) {
manualReferenceRepository.save(reference);
}

public void saveInproceedingsReference(InproceedingsReference reference) {
inproceedingsReferenceRepository.save(reference);
}

}
1 change: 1 addition & 0 deletions src/main/resources/templates/reference_choose.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ <h1>Choose the type of reference you want to make:</h1>
<li><a th:href="@{/references/articlereferences/new}">Article reference</a></li>
<li><a th:href="@{/references/bookletreferences/new}">Booklet reference</a></li>
<li><a th:href="@{/references/manualreferences/new}">Manual reference</a></li>
<li><a th:href="@{/references/inproceedingsreferences/new}">Inproceedings reference</a></li>
</ul>
</div>
</body>
Expand Down

0 comments on commit 054140e

Please sign in to comment.