Skip to content

Commit

Permalink
PrintClient now prints barcode instead of university identifier
Browse files Browse the repository at this point in the history
  • Loading branch information
mswiggers committed Sep 1, 2018
1 parent 931872d commit 5ccf9ab
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
14 changes: 14 additions & 0 deletions PrintClient/src/MembershipCard.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ public class MembershipCard {
*/
private String firstName;

/**
* Barcode of the card
*/
private String barcode;

/**
* Last name of the card owner
*/
Expand Down Expand Up @@ -79,6 +84,14 @@ public void setComment(String comment) {
this.comment = comment;
}

public String getBarcode() {
return barcode;
}

public void setBarcode(String barcode) {
this.barcode = barcode;
}

public static MembershipCard fromJson(String string) {
JSONObject jsonObject = JSONObject.fromObject(string);

Expand All @@ -87,6 +100,7 @@ public static MembershipCard fromJson(String string) {
card.setFirstName(jsonObject.getString("firstName"));
card.setLastName(jsonObject.getString("lastName"));
card.setComment(jsonObject.getString("comment"));
card.setBarcode(jsonObject.getString("barcode"));

return card;
}
Expand Down
2 changes: 1 addition & 1 deletion PrintClient/src/MembershipCardPrinter.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void printCard(MembershipCard card) {
TemplateModel templateModel = new TemplateModel("card.xml");

Map<String, String> map = new HashMap<String, String>();
map.put("barcode", card.getId());
map.put("barcode", card.getBarcode());
map.put("full_name", card.getFullName());
map.put("academic_year", card.getComment());

Expand Down

0 comments on commit 5ccf9ab

Please sign in to comment.