Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 2a309d21 by Liv Haapala
Options

update

1 parent 3f4096af
Inline Side-by-side
Showing with 532 additions and 183 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java
......@@ -79,16 +79,8 @@ public class BootstrapBean implements BootstrapBeanLocal {
dbUpdates.add(new String[] {
"alter table compos add hidden boolean default false not null"
});
dbUpdates.add(new String[] {
"CREATE TABLE card_text_data (id SERIAL NOT NULL, font_name TEXT NOT NULL, font_style INTEGER NOT NULL, size INTEGER NOT NULL, text TEXT, text_alignment TEXT NOT NULL, card_text_data_type TEXT NOT NULL, x INTEGER NOT NULL, y INTEGER NOT NULL, z_index INTEGER NOT NULL, PRIMARY KEY (id));"
});
dbUpdates.add(new String[] {
"CREATE TABLE card_object_data (id SERIAL NOT NULL, card_object_data_type TEXT NOT NULL, size INTEGER NOT NULL, x INTEGER NOT NULL, y INTEGER NOT NULL, z_index INTEGER NOT NULL, PRIMARY KEY (id));"
});
dbUpdates.add(new String[] {
"ALTER TABLE card_text_data ADD COLUMN card_templates_id integer REFERENCES card_templates(id) DEFAULT null;",
"ALTER TABLE card_object_data ADD COLUMN card_templates_id integer REFERENCES card_templates(id) DEFAULT null;"
});
dbUpdates.add(alterTables("ADD COLUMN meta json",
"account_events",
"actionlog_message_responses",
......@@ -162,6 +154,18 @@ public class BootstrapBean implements BootstrapBeanLocal {
dbUpdates.add(new String[]{"CREATE TABLE network_associations (id SERIAL NOT NULL, create_time TIMESTAMPTZ NOT NULL, ip TEXT, mac TEXT, META TEXT, modify_time TIMESTAMPTZ NOT NULL, status TEXT NOT NULL, event INTEGER, event_user INTEGER, place INTEGER, PRIMARY KEY (id))"});
dbUpdates.add(new String[] {
"CREATE TABLE card_text_data (id SERIAL NOT NULL, font_name TEXT NOT NULL, font_style INTEGER NOT NULL, size INTEGER NOT NULL, text TEXT, text_alignment TEXT NOT NULL, card_text_data_type TEXT NOT NULL, x INTEGER NOT NULL, y INTEGER NOT NULL, z_index INTEGER NOT NULL, PRIMARY KEY (id));"
});
dbUpdates.add(new String[] {
"CREATE TABLE card_object_data (id SERIAL NOT NULL, card_object_data_type TEXT NOT NULL, size INTEGER NOT NULL, x INTEGER NOT NULL, y INTEGER NOT NULL, z_index INTEGER NOT NULL, PRIMARY KEY (id));"
});
dbUpdates.add(new String[] {
"ALTER TABLE card_text_data ADD COLUMN card_templates_id integer REFERENCES card_templates(id) DEFAULT null;",
"ALTER TABLE card_object_data ADD COLUMN card_templates_id integer REFERENCES card_templates(id) DEFAULT null;"
});
dbUpdates.add(alterTables("ADD COLUMN meta json",
"card_text_data",
"card_object_data"
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CardPrintBean.java
......@@ -138,8 +138,8 @@ public class CardPrintBean implements CardPrintBeanLocal {
CardTemplate cardTemplate = printedCard.getTemplate();
if(!templateHash.containsKey(cardTemplate)) {
List<CardTextData> textDatas = cardTemplateBean.findCardTextDatas(cardTemplate.getId());
List<CardObjectData> objectDatas = cardTemplateBean.findCardObjectDatas(cardTemplate.getId());
List<CardTextData> textDatas = cardTemplateBean.findCardTextDatas(cardTemplate);
List<CardObjectData> objectDatas = cardTemplateBean.findCardObjectDatas(cardTemplate);
if(textDatas == null)
textDatas = new ArrayList<CardTextData>();
......@@ -191,7 +191,10 @@ public class CardPrintBean implements CardPrintBeanLocal {
BufferedImage cardBackground = ImageIO.read(new ByteArrayInputStream(cardTemplate.getImage()));
BufferedImage faceBufferedImage = ImageIO.read(new ByteArrayInputStream(user.getCurrentImage().getImageData()));
BufferedImage faceBufferedImage = null;
if(user.getCurrentImage() != null && user.getCurrentImage().getImageData() != null)
faceBufferedImage = ImageIO.read(new ByteArrayInputStream(user.getCurrentImage().getImageData()));
/*
* if (faceBufferedImage.getWidth() > 1024 ||
......@@ -235,7 +238,7 @@ public class CardPrintBean implements CardPrintBeanLocal {
} else {
font = new com.pdfjet.Font(pdf, textData.getFontName());
}
font.setSize(textData.getSize());
font.setSize(textData.getSize().doubleValue());
int[] textColor = new int[] { textData.getFontColorR(), textData.getFontColorG(), textData.getFontColorB()};
......@@ -265,40 +268,42 @@ public class CardPrintBean implements CardPrintBeanLocal {
else if(objectData != null) {
if(objectData.getObjectDataType() == CardObjectDataType.USERS_PICTURE) {
int originalWidth = faceBufferedImage.getWidth();
int originalHeight = faceBufferedImage.getHeight();
if(faceBufferedImage != null) {
int originalWidth = faceBufferedImage.getWidth();
int originalHeight = faceBufferedImage.getHeight();
int width = (int)objectData.getSize();
int width = (int)objectData.getSize().doubleValue();
if(objectData.getSize() == 0)
width = originalWidth;
if(objectData.getSize().doubleValue() == 0)
width = originalWidth;
int height = (int) Math.round(width * (1 / ASPECT_RATIO));
int height = (int) Math.round(width * (1 / ASPECT_RATIO));
if (height > originalHeight) {
height = originalHeight;
width = (int) Math.round(originalHeight * ASPECT_RATIO);
}
if (height > originalHeight) {
height = originalHeight;
width = (int) Math.round(originalHeight * ASPECT_RATIO);
}
int offsetx = 0;
int offsety = 0;
int offsetx = 0;
int offsety = 0;
if(objectData.getSize() == 0)
offsetx = (originalWidth - width) / 2;
else
offsetx = ((int)objectData.getSize() - width) / 2;
if(objectData.getSize().doubleValue() == 0)
offsetx = (originalWidth - width) / 2;
else
offsetx = ((int)objectData.getSize().doubleValue() - width) / 2;
offsety = (originalHeight - height) / 2;
offsety = (originalHeight - height) / 2;
faceBufferedImage = faceBufferedImage.getSubimage(offsetx, offsety, width, height);
faceBufferedImage = faceBufferedImage.getSubimage(offsetx, offsety, width, height);
// Render face image
Image faceImage = new Image(pdf, convertBufferedImageToPng(faceBufferedImage), ImageType.PNG);
faceImage.setPosition(objectData.getX(), objectData.getY());
//faceImage.setPosition(175, 222);
// faceImage.scaleBy(0.32);
faceImage.scaleBy(((410.0 * 0.245) / faceImage.getHeight()));
faceImage.drawOn(page);
// Render face image
Image faceImage = new Image(pdf, convertBufferedImageToPng(faceBufferedImage), ImageType.PNG);
faceImage.setPosition(objectData.getX(), objectData.getY());
//faceImage.setPosition(175, 222);
// faceImage.scaleBy(0.32);
faceImage.scaleBy(((410.0 * 0.245) / faceImage.getHeight()));
faceImage.drawOn(page);
}
} else if(objectData.getObjectDataType() == CardObjectDataType.CARDS_BARCODE) {
BufferedImage barCodeBufferedImage = ImageIO.read(barcodeBean.getCardBarcode(printedCard));
Image barCodeImage = new Image(pdf, convertBufferedImageToPng(barCodeBufferedImage), ImageType.PNG);
......@@ -338,28 +343,28 @@ public class CardPrintBean implements CardPrintBeanLocal {
// card.getTemplate(), card.getTemplate().getImage());
EventUser user = card.getUser();
BufferedImage face = ImageIO.read(new ByteArrayInputStream(user.getUser().getCurrentImage().getImageData()));
//BufferedImage face = ImageIO.read(new ByteArrayInputStream(user.getUser().getCurrentImage().getImageData()));
BufferedImage base = ImageIO.read(new ByteArrayInputStream(card.getTemplate().getImage()));
//BufferedImage base = ImageIO.read(new ByteArrayInputStream(card.getTemplate().getImage()));
BufferedImage outimage = new BufferedImage(base.getWidth(), base.getHeight(), BufferedImage.TYPE_INT_RGB);
//BufferedImage outimage = new BufferedImage(base.getWidth(), base.getHeight(), BufferedImage.TYPE_INT_RGB);
Graphics2D g = outimage.createGraphics();
//Graphics2D g = outimage.createGraphics();
// g.drawImage(org, AffineTransform.getScaleInstance(0.31, 0.31), null);
g.drawImage(base, 0, 0, base.getWidth(), base.getHeight(), null);
//g.drawImage(base, 0, 0, base.getWidth(), base.getHeight(), null);
// g.drawImage(face, AffineTransform.getScaleInstance(0.31, 0.31),
// null);
g.drawImage(face, 250, 300, 301, 410, null);
//g.drawImage(face, 250, 300, 301, 410, null);
Font nickfont = new Font("Century gothic", Font.BOLD, 65);
//Font nickfont = new Font("Century gothic", Font.BOLD, 65);
Font font = new Font("Century gothic", Font.BOLD, 45);
//Font font = new Font("Century gothic", Font.BOLD, 45);
//int nickWidth = g.getFontMetrics(font).stringWidth(user.getUser().getNick());
//int nickX = (646 / 2) - (nickWidth / 2);
int nickX = 60;
int nickY = 800;
//int nickX = 60;
//int nickY = 800;
//Color transparentWhite = new Color(255, 255, 255, 140);
//g.setColor(transparentWhite);
......@@ -367,6 +372,7 @@ public class CardPrintBean implements CardPrintBeanLocal {
// int[] nickTextColor = new int[] { 197, 220, 85 };
//SKynett printCOlor
/*
Color nickColor = new Color(197, 220, 85);
g.setColor(nickColor);
g.setFont(nickfont);
......@@ -376,18 +382,18 @@ public class CardPrintBean implements CardPrintBeanLocal {
StringBuilder wholeName = new StringBuilder();
wholeName.append(user.getUser().getFirstnames()).append(" ").append(user.getUser().getLastname());
*/
// g.setFont(new Font("Arial", Font.BOLD, 35));
// g.drawString(name, 595 -
// g.getFontMetrics().charsWidth(name.toCharArray(), 0, name.length()),
// 890);
//
// g.drawString(owner.getId().toString(), 60, 948);
/*
g.setFont(new Font("Century gothic", Font.BOLD, 40));
g.drawString(wholeName.toString(), 60, 865);
g.drawString(card.getTemplate().getName(), 60, 915);
*/
//g.drawString(card.getTemplate().getName(), 60, 915);
//PrintedCard printedCard = cardTemplateBean.checkPrintedCard(user);
......@@ -405,6 +411,7 @@ public class CardPrintBean implements CardPrintBeanLocal {
g.setColor(Color.white);
}
*/
/*
g.fillRect(0, base.getHeight() - 20, base.getWidth(), base.getHeight());
g.dispose();
......@@ -433,18 +440,204 @@ public class CardPrintBean implements CardPrintBeanLocal {
}
break;
}
}*/
// ImageIO.write(outimage, "png", ostr);
byte[] ret = ostr.toByteArray();
logger.info("Returning {} bytes for pngimage", ret.length);
//byte[] ret = ostr.toByteArray();
//logger.info("Returning {} bytes for pngimage", ret.length);
// double meter2inchRatio = 1d / 0.0254d;
// int dpi = 300;
// int dim = (int) (dpi * meter2inchRatio) + 1;
return ret;
/*
PrintedCard printedCard = cardTemplateBean.checkPrintedCard(user);
if (printedCard == null)
continue;
CardTemplate cardTemplate = printedCard.getTemplate();
//if(!templateHash.containsKey(cardTemplate)) {
List<CardTextData> textDatas = cardTemplateBean.findCardTextDatas(cardTemplate.getId());
List<CardObjectData> objectDatas = cardTemplateBean.findCardObjectDatas(cardTemplate.getId());
if(textDatas == null)
textDatas = new ArrayList<CardTextData>();
if(objectDatas == null)
objectDatas = new ArrayList<CardObjectData>();
List<GenericEntity> objects = new ArrayList<GenericEntity>();
while(objectDatas.size() > 0 || textDatas.size() > 0) {
CardObjectData biggestObjectZ = null;
CardTextData biggestTextZ = null;
for(CardObjectData obj : objectDatas) {
if(biggestObjectZ == null)
biggestObjectZ = obj;
else if(obj.getzIndex() > biggestObjectZ.getzIndex())
biggestObjectZ = obj;
}
for(CardTextData obj : textDatas) {
if(biggestTextZ == null)
biggestTextZ = obj;
else if(obj.getzIndex() > biggestTextZ.getzIndex())
biggestTextZ = obj;
}
if(biggestObjectZ != null && biggestTextZ != null) {
if(biggestObjectZ.getzIndex() > biggestTextZ.getzIndex()) {
objects.add(biggestObjectZ);
objectDatas.remove(biggestObjectZ);
} else {
objects.add(biggestTextZ);
objectDatas.remove(biggestTextZ);
}
}
else if(biggestObjectZ != null) {
objects.add(biggestObjectZ);
objectDatas.remove(biggestObjectZ);
}
else if(biggestTextZ != null) {
objects.add(biggestTextZ);
textDatas.remove(biggestTextZ);
}
}
//templateHash.put(cardTemplate, objects);
//}
BufferedImage cardBackground = ImageIO.read(new ByteArrayInputStream(cardTemplate.getImage()));
BufferedImage faceBufferedImage = null;
if(user.getCurrentImage() != null && user.getCurrentImage().getImageData() != null)
faceBufferedImage = ImageIO.read(new ByteArrayInputStream(user.getCurrentImage().getImageData()));
/*
* if (faceBufferedImage.getWidth() > 1024 ||
* faceBufferedImage.getHeight() > 1024) { throw new
* Exception("Image dimensions too large, please take/upload smaller!"
* ); }
*/
//Page page = new Page(pdf, new float[] { pagex, pagey });
// Render background image
/*
Image templateImage = new Image(pdf, convertBufferedImageToPng(cardBackground), ImageType.PNG);
templateImage.setPosition(0, 0);
templateImage.scaleBy(0.245);
templateImage.drawOn(page);
List<GenericEntity> objects = templateHash.get(cardTemplate);
if(objects == null)
objects = new ArrayList<GenericEntity>();
for(GenericEntity obj : objects) {
// force image aspect ratio.
//for (CardObjectData cardObjectData : objectDatas) {
CardTextData textData = null;
CardObjectData objectData = null;
if(obj.getClass().equals(CardTextData.class)) {
textData = (CardTextData) obj;
} else if(obj.getClass().equals(CardObjectData.class)) {
objectData = (CardObjectData) obj;
}
if(textData != null) {
com.pdfjet.Font font;
if(textData.getFontStyle() == CardTextStyle.BOLD) {
font = new com.pdfjet.Font(pdf, textData.getFontName(), Font.BOLD);
}else if(textData.getFontStyle() == CardTextStyle.ITALIC) {
font = new com.pdfjet.Font(pdf, textData.getFontName(), Font.ITALIC);
} else if(textData.getFontStyle() == CardTextStyle.BOLDITALIC) {
font = new com.pdfjet.Font(pdf, textData.getFontName(), Font.BOLD + Font.ITALIC);
} else {
font = new com.pdfjet.Font(pdf, textData.getFontName());
}
font.setSize(textData.getSize());
int[] textColor = new int[] { textData.getFontColorR(), textData.getFontColorG(), textData.getFontColorB()};
TextLine text = new TextLine(font);
text.setPosition(textData.getX(), textData.getY());
text.setColor(textColor);
if(textData.getTextDataType() == CardTextDataType.NICK) {
text.setText(user.getUser().getNick());
} else if(textData.getTextDataType() == CardTextDataType.FIRSTNAME) {
text.setText(user.getUser().getFirstnames());
} else if(textData.getTextDataType() == CardTextDataType.LASTNAME) {
text.setText(user.getUser().getLastname());
} else if(textData.getTextDataType() == CardTextDataType.WHOLENAME) {
text.setText(user.getUser().getFirstnames() + " " + user.getUser().getLastname());
} else if(textData.getTextDataType() == CardTextDataType.ROLE) {
text.setText(cardTemplate.getName());
} else if(textData.getTextDataType() == CardTextDataType.AGE){
text.setText(user.getBirthday().toString());
} else if(textData.getTextDataType() == CardTextDataType.STATIC) {
text.setText(textData.getText());
}
text.drawOn(page);
}
else if(objectData != null) {
if(objectData.getObjectDataType() == CardObjectDataType.USERS_PICTURE) {
if(faceBufferedImage != null) {
int originalWidth = faceBufferedImage.getWidth();
int originalHeight = faceBufferedImage.getHeight();
int width = (int)objectData.getSize();
if(objectData.getSize() == 0)
width = originalWidth;
int height = (int) Math.round(width * (1 / ASPECT_RATIO));
if (height > originalHeight) {
height = originalHeight;
width = (int) Math.round(originalHeight * ASPECT_RATIO);
}
int offsetx = 0;
int offsety = 0;
if(objectData.getSize() == 0)
offsetx = (originalWidth - width) / 2;
else
offsetx = ((int)objectData.getSize() - width) / 2;
offsety = (originalHeight - height) / 2;
faceBufferedImage = faceBufferedImage.getSubimage(offsetx, offsety, width, height);
// Render face image
Image faceImage = new Image(pdf, convertBufferedImageToPng(faceBufferedImage), ImageType.PNG);
faceImage.setPosition(objectData.getX(), objectData.getY());
//faceImage.setPosition(175, 222);
// faceImage.scaleBy(0.32);
faceImage.scaleBy(((410.0 * 0.245) / faceImage.getHeight()));
faceImage.drawOn(page);
}
} else if(objectData.getObjectDataType() == CardObjectDataType.CARDS_BARCODE) {
BufferedImage barCodeBufferedImage = ImageIO.read(barcodeBean.getCardBarcode(printedCard));
Image barCodeImage = new Image(pdf, convertBufferedImageToPng(barCodeBufferedImage), ImageType.PNG);
barCodeImage.setPosition(objectData.getX(), objectData.getY());
barCodeImage.scaleBy(0.7);
barCodeImage.drawOn(page);
}
}
*/
//return ret;
return null;
}
private ByteArrayInputStream convertBufferedImageToPng(BufferedImage img)
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java
......@@ -252,14 +252,14 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
@Override
@RolesAllowed(UserPermission.S_WRITE_ROLES)
public List<CardTextData> findCardTextDatas(int templateId) {
return this.ctdFacade.findAll(templateId);
public List<CardTextData> findCardTextDatas(CardTemplate template) {
return this.ctdFacade.findAll(template);
}
@Override
@RolesAllowed(UserPermission.S_WRITE_ROLES)
public List<CardObjectData> findCardObjectDatas(int templateId) {
return this.codFacade.findAll(templateId);
public List<CardObjectData> findCardObjectDatas(CardTemplate template) {
return this.codFacade.findAll(template);
}
@RolesAllowed(UserPermission.S_WRITE_ROLES)
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/JaasBean.java
......@@ -277,7 +277,7 @@ public class JaasBean implements MoyaRealmBeanRemote {
throw new RuntimeException("Unknown application authtype!");
}
} else {
logger.warn("Rest auth failed: Calculated hash does not match received mac: Calculated {}, received {}", machash, mac);
logger.warn("Rest auth failed: Calculated hash does not match received mac: Calculated {}, received {}", macHash, mac);
}
return ret;
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/UserBean.java
......@@ -466,7 +466,7 @@ public class UserBean implements UserBeanLocal {
return true;
}
public PrintedCard rejectPrintedCard(PrintedCard card, String msg) {
public PrintedCard rejectPrintedCard(PrintedCard card) {
if(card != null) {
......@@ -482,18 +482,7 @@ public class UserBean implements UserBeanLocal {
LanEvent event = card.getEvent();
if(user != null && event != null) {
String info = "";
if(msg != null) {
info = msg;
}
mail.setTo(user);
mail.setSubject(I18n.get("rejectcard.mailSubject"));
mail.setMessage(I18n.get("rejectcard.mailBody", event.getName(), info));
logger.info("sending mail! user {}", new Object[] { user });
if(mail != null) {
if(!utilbean.sendMail(mail)) {
logger.info("Sending mail failed");
} else
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/CardObjectDataFacade.java
......@@ -34,9 +34,9 @@ public class CardObjectDataFacade extends IntegerPkGenericFacade<CardObjectData>
}
public List<CardObjectData> findAll(int templateId)
public List<CardObjectData> findAll(CardTemplate template)
{
CardTemplate template = ctbean.find(templateId);
//CardTemplate template = ctbean.find(templateId);
if(template != null) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<CardObjectData> cq = cb.createQuery(CardObjectData.class);
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/CardTextDataFacade.java
......@@ -32,9 +32,9 @@ public class CardTextDataFacade extends IntegerPkGenericFacade<CardTextData> {
}
public List<CardTextData> findAll(int templateId)
public List<CardTextData> findAll(CardTemplate template)
{
CardTemplate template = ctbean.find(templateId);
//CardTemplate template = ctbean.find(templateId);
if(template != null) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<CardTextData> cq = cb.createQuery(CardTextData.class);
......
code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/CardTemplateBeanLocal.java
......@@ -27,9 +27,9 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
List<PrintedCard> findActiveCards();
List<CardTextData> findCardTextDatas(int templateId);
List<CardTextData> findCardTextDatas(CardTemplate template);
List<CardObjectData> findCardObjectDatas(int templateId);
List<CardObjectData> findCardObjectDatas(CardTemplate template);
CardTemplate save(CardTemplate card);
......
code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/UserBeanLocal.java
......@@ -99,7 +99,7 @@ public interface UserBeanLocal {
boolean initPasswordResetForEmail(String email, String url);
PrintedCard rejectPrintedCard(PrintedCard card, String msg);
PrintedCard rejectPrintedCard(PrintedCard card);
boolean initPasswordResetForUsername(String username, String url);
......
code/MoyaDatabase/src/fi/codecrew/moya/model/CardObjectData.java
package fi.codecrew.moya.model;
import java.math.BigDecimal;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
......@@ -29,8 +31,8 @@ private static final long serialVersionUID = 307145499023412008L;
@Column(name = "y", nullable = false)
private int y;
@Column(name = "size", nullable = false)
private double size;
@Column(name = "size", nullable = false, precision = 5, scale = 2)
private BigDecimal size;
@Column(name = "z_index", nullable = false)
private int zIndex;
......@@ -63,11 +65,11 @@ private static final long serialVersionUID = 307145499023412008L;
return this.y;
}
public void setSize(int size) {
public void setSize(BigDecimal size) {
this.size = size;
}
public double getSize() {
public BigDecimal getSize() {
return this.size;
}
......
code/MoyaDatabase/src/fi/codecrew/moya/model/CardTextData.java
package fi.codecrew.moya.model;
import java.awt.Font;
import java.math.BigDecimal;
import javax.persistence.Column;
import javax.persistence.Entity;
......@@ -38,8 +39,8 @@ public class CardTextData extends GenericEntity{
@Column(name = "y", nullable = false)
private int y;
@Column(name = "size", nullable = false)
private double size;
@Column(name = "size", nullable = false, precision = 5, scale = 2)
private BigDecimal size;
@Column(name = "font_color_r", nullable = false)
private int fontColorR;
......@@ -49,8 +50,6 @@ public class CardTextData extends GenericEntity{
@Column(name = "font_color_b", nullable = false)
private int fontColorB;
@Column(name = "font_name", nullable = false)
private String fontName;
......@@ -93,11 +92,11 @@ public class CardTextData extends GenericEntity{
return this.y;
}
public void setSize(int size) {
public void setSize(BigDecimal size) {
this.size = size;
}
public double getSize() {
public BigDecimal getSize() {
return this.size;
}
......@@ -144,7 +143,7 @@ public class CardTextData extends GenericEntity{
public void setFont(Font font) {
//this.font = font;
this.fontName = font.getFontName();
this.size = font.getSize();
this.size = new BigDecimal(font.getSize());
if(font.isBold() && font.isItalic())
this.fontStyle = CardTextStyle.BOLDITALIC;
else if(font.isItalic())
......@@ -155,13 +154,13 @@ public class CardTextData extends GenericEntity{
public Font getFont() {
if(this.fontStyle == CardTextStyle.BOLD)
return new Font(this.fontName, Font.BOLD, this.size);
return new Font(this.fontName, Font.BOLD, this.size.intValue());
else if(this.fontStyle == CardTextStyle.ITALIC)
return new Font(this.fontName, Font.ITALIC, this.size);
return new Font(this.fontName, Font.ITALIC, this.size.intValue());
else if(this.fontStyle == CardTextStyle.PLAIN)
return new Font(this.fontName, Font.PLAIN, this.size);
return new Font(this.fontName, Font.PLAIN, this.size.intValue());
else
return new Font(this.fontName, Font.PLAIN, this.size);
return new Font(this.fontName, Font.PLAIN, this.size.intValue());
}
public void setCardTemplate(CardTemplate template) {
......
code/MoyaWeb/WebContent/useradmin/charts.xhtml
......@@ -32,7 +32,7 @@
<f:selectItem value="0" itemLabel="Kokonaismäärä"></f:selectItem>
</h:selectOneRadio>
</h:panelGroup>
<h:commandButton action="#{chartView.updateAgesChart()}" value="Päivitä kuvaaja"></h:commandButton>
<!-- <h:commandButton action="#{chartView.updateAgesChart()}" value="Päivitä kuvaaja"></h:commandButton> -->
</h:panelGrid>
</h:panelGroup>
<h:panelGroup>
......
code/MoyaWeb/WebContent/useradmin/editCardTextData.xhtml
......@@ -28,21 +28,12 @@
<h:outputLabel for="typeObjectData" rendered="#{!empty cardTemplateDataEditView.cardObjectData}" value="#{i18n['cardObjectData.type']}:" />
<p:selectOneMenu id="typeTextData" rendered="#{!empty cardTemplateDataEditView.cardTextData}" value="#{cardTemplateDataEditView.cardTextData.textDataType}">
<f:selectItem id="textunknown" itemLabel="#{i18n['cardTextData.type.UNKNOWN']}" itemValue="UNKNOWN" />
<f:selectItem id="nick" itemLabel="#{i18n['cardTextData.type.NICK']}" itemValue="NICK" />
<f:selectItem id="wholename" itemLabel="#{i18n['cardTextData.type.WHOLENAME']}" itemValue="WHOLENAME" />
<f:selectItem id="firstname" itemLabel="#{i18n['cardTextData.type.FIRSTNAME']}" itemValue="FIRSTNAME" />
<f:selectItem id="lastname" itemLabel="#{i18n['cardTextData.type.LASTNAME']}" itemValue="LASTNAME" />
<f:selectItem id="static" itemLabel="#{i18n['cardTextData.type.STATIC']}" itemValue="STATIC" />
<f:selectItem id="age" itemLabel="#{i18n['cardTextData.type.AGE']}" itemValue="AGE" />
<f:selectItem id="role" itemLabel="#{i18n['cardTextData.type.ROLE']}" itemValue="ROLE" />
<f:selectItems var="textDataType" itemLabel="#{i18n['cardTextData.type.#{textDataType}']}" itemValue="#{cardTemplateDataEditView.cardTextDataTypes}" />
</p:selectOneMenu>
<h:message for="typeTextData" rendered="#{!empty cardTemplateDataEditView.cardTextData}" />
<p:selectOneMenu id="typeObjectData" rendered="#{!empty cardTemplateDataEditView.cardObjectData}" value="#{cardTemplateDataEditView.cardObjectData.objectDataType}">
<f:selectItem id="objectunknown" itemLabel="#{i18n['cardObjectData.type.UNKNOWN']}" itemValue="UNKNOWN" />
<f:selectItem id="users_picture" itemLabel="#{i18n['cardObjectData.type.USERS_PICTURE']}" itemValue="USERS_PICTURE" />
<f:selectItem id="users_barcode" itemLabel="#{i18n['cardObjectData.type.USERS_BARCODE']}" itemValue="USERS_BARCODE" />
<f:selectItem id="cards_bardoce" itemLabel="#{i18n['cardObjectData.type.CARDS_BARCODE']}" itemValue="CARDS_BARCODE" />
<f:selectItems var="objectDataType" itemLabel="#{i18n['cardObjectData.type.#{objectDataType}']}" itemValue="#{cardTemplateDataEditView.cardObjectDataTypes}" />
</p:selectOneMenu>
<h:message for="typeObjectData" rendered="#{!empty cardTemplateDataEditView.cardObjectData}" />
......@@ -84,19 +75,13 @@
<h:message for="fontNameTextData" rendered="#{!empty cardTemplateDataEditView.cardTextData}" />
<h:outputLabel for="fontStyleTextData" rendered="#{!empty cardTemplateDataEditView.cardTextData}" value="#{i18n['cardTextData.fontstyle']}:" />
<p:selectOneMenu id="fontStyleTextData" rendered="#{!empty cardTemplateDataEditView.cardTextData}" value="#{cardTemplateDataEditView.cardTextData.fontStyle}">
<f:selectItem id="PLAIN" itemLabel="#{i18n['cardTextData.fontstyle.PLAIN']}" itemValue="PLAIN" />
<f:selectItem id="BOLD" itemLabel="#{i18n['cardTextData.fontstyle.BOLD']}" itemValue="BOLD" />
<f:selectItem id="ITALIC" itemLabel="#{i18n['cardTextData.fontstyle.ITALIC']}" itemValue="ITALIC" />
<f:selectItem id="BOLDITALIC" itemLabel="#{i18n['cardTextData.fontstyle.BOLDITALIC']}" itemValue="BOLDITALIC" />
<f:selectItems var="fontStyle" itemLabel="#{i18n['cardTextData.fontstyle.#{fontStyle}']}" itemValue="#{cardTemplateDataEditView.fontStyles}" />
</p:selectOneMenu>
<h:message for="fontStyleTextData" rendered="#{!empty cardTemplateDataEditView.cardTextData}" />
<h:outputLabel for="fontAlignmentTextData" rendered="#{!empty cardTemplateDataEditView.cardTextData}" value="#{i18n['cardTextData.fontalignment']}:" />
<p:selectOneMenu id="fontAlignmentTextData" rendered="#{!empty cardTemplateDataEditView.cardTextData}" value="#{cardTemplateDataEditView.cardTextData.textAlignment}">
<f:selectItem id="LEFT" itemLabel="#{i18n['cardTextData.fontalignment.LEFT']}" itemValue="LEFT" />
<f:selectItem id="CENTER" itemLabel="#{i18n['cardTextData.fontalignment.CENTER']}" itemValue="CENTER" />
<f:selectItem id="RIGHT" itemLabel="#{i18n['cardTextData.fontalignment.RIGHT']}" itemValue="RIGHT" />
<f:selectItems var="fontAlignment" itemLabel="#{i18n['cardTextData.fontalignment.#{fontAlignment}']}" itemValue="#{cardTemplateDataEditView.textAlignments}" />
</p:selectOneMenu>
<h:message for="fontAlignmentTextData" rendered="#{!empty cardTemplateDataEditView.cardTextData}" />
......
code/MoyaWeb/WebContent/useradmin/list.xhtml
......@@ -87,7 +87,7 @@
<h:commandButton value="#{i18n['usercart.downloadExport']}">
<p:fileDownload value="#{userCartView.userExport}" />
</h:commandButton>
<h:commandButton action="#{userCartView.showOverview}" value="#{i18n['usercart.showoverview']}" />
<h:commandButton action="#{userCartView.showOverview(i18n['rejectcard.mailSubject'], i18n['rejectcard.mailBody'])}" value="#{i18n['usercart.showoverview']}" />
<h:commandButton rendered="#{creditTransferView.transferPermissions}" action="#{userCartView.transferCredits}" value="#{i18n['usercart.transferCredits']}" />
......
code/MoyaWeb/WebContent/useradmin/overview.xhtml
......@@ -6,7 +6,7 @@
<h:body>
<ui:composition template="#{sessionHandler.template}">
<f:metadata>
<f:event type="preRenderView" listener="#{userOverviewView.initView()}" />
<f:event type="preRenderView" listener="#{userOverviewView.initView(#{i18n['rejectcard.mailSubject']}, #{i18n['rejectcard.mailBody']})}" />
</f:metadata>
<ui:define name="content">
......@@ -54,13 +54,29 @@
<p:commandButton id="Reject#{table.rowIndex}" value="Reject" onclick="PF('dialog#{table.rowIndex}').show();" type="button" onerror="location.reload(true);"/>
<p:dialog id="rejectDialog" widgetVar="dialog#{table.rowIndex}">
<p>{0} -tapahtuman profiiliisi sy\u00E4tetty kuva on hyl\u00E4tty soveltumattomana. Sy\u00E4t\u00E4 uusi kuva v\u00E4litt\u00E4m\u00E4sti. Kuvan saat asetettua profiili-sivulta. Hyv\u00E4ksytt\u00E4v\u00E4ss\u00E4 kuvassa kasvosi n\u00E4kyvät selke\u00E4sti ja tunnistettavasti.</p>
<h:selectManyCheckbox>
<f:selectItem value="#{cardItem.sendRejectionMail}" itemLabel="#{i18n['rejectcard.sendRejectionMail']}"></f:selectItem>
</h:selectManyCheckbox>
<h:panelGrid columns="2" border="0" >
<h:outputText value="#{i18n['rejectcard.toAddr']}:" />
<h:inputText value="#{cardItem.rejectionMsgToAddr}"/>
<h:outputText value="#{i18n['rejectcard.toName']}:" />
<h:inputText value="#{cardItem.rejectionMsgToName}"/>
<h:outputText value="#{i18n['rejectcard.subject']}:" />
<h:inputText value="#{cardItem.rejectionMsgSubject}"/>
<h:outputText value="#{i18n['rejectcard.body']}:" />
<h:inputText value="#{cardItem.rejectionMsgBody}" />
<p:inputTextarea value="#{userOverviewView.rejectionMsg}"/>
<br />
<p:commandButton oncomplete="PF('dialog#{table.rowIndex}').hide()" actionListener="#{userOverviewView.rejectCard()}" value="Apply" ajax="true" onerror="location.reload(true);"/>
<p:commandButton onclick="PF('dialog#{table.rowIndex}').hide()" type="button" value="Cancel" onerror="location.reload(true);"/>
</p:dialog>
<p:inputTextarea cols="2" value="#{cardItem.rejectionMsg}"/>
<br />
</h:panelGrid>
<p:commandButton oncomplete="PF('dialog#{table.rowIndex}').hide()" actionListener="#{userOverviewView.rejectCard()}" value="Apply" ajax="true" onerror="location.reload(true);"/>
<p:commandButton onclick="PF('dialog#{table.rowIndex}').hide()" type="button" value="Cancel" onerror="location.reload(true);"/>
</p:dialog>
<!--<p:commandButton id="Reject" value="Reject" onclick="#{userOverviewView.rejectCard()}" type="button" onerror="location.reload(true);" update="schneider cardinfo"/>-->
</p:column>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
......@@ -866,12 +866,21 @@ readerview.cards = Card ( printcount )
registerleaflet.title = Register leaflet
rejectcard.mailSubject = Profile picture rejected
rejectcard.mailBody = {0} -tapahtuman profiiliisi sy\u00E4tetty kuva on hyl\u00E4tty soveltumattomana. Sy\u00E4t\u00E4 uusi kuva v\u00E4litt\u00E4m\u00E4sti. Kuvan saat asetettua profiili-sivulta. Hyv\u00E4ksytt\u00E4v\u00E4ss\u00E4 kuvassa kasvosi n\u00E4kyvät selke\u00E4sti ja tunnistettavasti. \n\n
rejectcard.toAddr = Email address
rejectcard.toName = Name
rejectcard.body = Body
rejectcard.subject = Subject
rejectcard.sendRejectionMail = Send mail
resetMail.body = You can change a forgotten password by inserting your username or email address to the field below. A link where you can change the password will be sent to the email address associated to that.
resetMail.email = Email address
resetMail.header = Reset lost password
resetMail.send = Send
resetMail.username = Username
resetmailSent.body = Email has been sent containing a link where you can change the password.
resetmailSent.header = Email sent
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
......@@ -852,6 +852,14 @@ readerview.cards = Kortit ( tulostuslkm )
registerleaflet.title = Rekisteriseloste
rejectcard.mailSubject = Kuva hyltty
rejectcard.mailBody = {0} -tapahtuman profiiliisi sy\u00E4tetty kuva on hyl\u00E4tty soveltumattomana. Sy\u00E4t\u00E4 uusi kuva v\u00E4litt\u00E4m\u00E4sti. Kuvan saat asetettua profiili-sivulta. Hyv\u00E4ksytt\u00E4v\u00E4ss\u00E4 kuvassa kasvosi n\u00E4kyvt selke\u00E4sti ja tunnistettavasti. \n\n
rejectcard.toAddr = Shkpostiosoite
rejectcard.toName = Nimi
rejectcard.body = Viestin sislt
rejectcard.subject = Viestin otsikko
rejectcard.sendRejectionMail = Lhet shkpostia
resetMail.body = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi tai tunnukseen liitetyn s\u00E4hk\u00F6postiosoitteen allaolevaan kentt\u00E4\u00E4n. Tunnukseen liitettyyn s\u00E4hk\u00F6postiosoitteeseen l\u00E4hetet\u00E4\u00E4n kertak\u00E4ytt\u00F6inen osoite jossa voit vaihtaa sy\u00F6tt\u00E4m\u00E4si k\u00E4ytt\u00E4j\u00E4tunnuksen salasanan.
resetMail.email = S\u00E4hk\u00F6postiosoite
resetMail.header = Salasana unohtunut?
......@@ -1297,8 +1305,7 @@ user.wholeName = Nimi
user.wholename = Koko nimi
user.zipCode = Postinumero
rejectcard.mailSubject = Kuva hyltty
rejectcard.mailBody = {0} -tapahtuman profiiliisi sy\u00E4tetty kuva on hyl\u00E4tty soveltumattomana. Sy\u00E4t\u00E4 uusi kuva v\u00E4litt\u00E4m\u00E4sti. Kuvan saat asetettua profiili-sivulta. Hyv\u00E4ksytt\u00E4v\u00E4ss\u00E4 kuvassa kasvosi n\u00E4kyvt selke\u00E4sti ja tunnistettavasti. \n\n {0}
userImport.commit = Hyv\u00E4ksy
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/card/CardTemplateDataEditView.java
......@@ -3,9 +3,12 @@ package fi.codecrew.moya.web.cdiview.card;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Named;
import javax.json.Json;
import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.enums.CardObjectDataType;
import fi.codecrew.moya.enums.CardTextAlignment;
import fi.codecrew.moya.enums.CardTextDataType;
import fi.codecrew.moya.enums.CardTextStyle;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.CardObjectData;
import fi.codecrew.moya.model.CardTemplate;
......@@ -29,6 +32,12 @@ public class CardTemplateDataEditView extends GenericCDIView {
private CardTextData cardTextData;
private CardObjectData cardObjectData;
private CardObjectDataType[] cardObjectDataTypes = CardObjectDataType.values();
private CardTextDataType[] cardTextDataTypes = CardTextDataType.values();
private CardTextStyle[] fontStyles = CardTextStyle.values();
private CardTextAlignment[] fontAlignments = CardTextAlignment.values();
@EJB
private transient CardTemplateBeanLocal cfbean;
......@@ -37,58 +46,70 @@ public class CardTemplateDataEditView extends GenericCDIView {
public void initCardTextData() {
if (super.requirePermissions(UserPermission.VIEW_ALL))
{
setCardTextData(cfbean.findTextData(cardTextDataId));
super.beginConversation();
if(cardTextData == null) {
setCardTextData(cfbean.findTextData(cardTextDataId));
super.beginConversation();
}
}
}
public void initCardObjectData() {
if (super.requirePermissions(UserPermission.VIEW_ALL))
{
setCardObjectData(cfbean.findObjectData(cardObjectDataId));
super.beginConversation();
if(cardObjectData == null) {
setCardObjectData(cfbean.findObjectData(cardObjectDataId));
super.beginConversation();
}
}
}
public void initCardTemplate() {
if (super.requirePermissions(UserPermission.VIEW_ALL))
{
setCardTemplate(cfbean.find(templateId));
if(cardTextData != null)
cardTextData.setCardTemplate(cardTemplate);
else if(cardObjectData != null)
cardObjectData.setCardTemplate(cardTemplate);
super.beginConversation();
if(cardTemplate == null) {
setCardTemplate(cfbean.find(templateId));
if(cardTextData != null)
cardTextData.setCardTemplate(cardTemplate);
else if(cardObjectData != null)
cardObjectData.setCardTemplate(cardTemplate);
super.beginConversation();
}
}
}
public void initCardTextDataCreate() {
if (super.requirePermissions(UserPermission.VIEW_ALL))
{
setCardTextData(new CardTextData());
//cardTextData.setMeta(Json.createObjectBuilder().build());
super.beginConversation();
if(cardTextData == null) {
setCardTextData(new CardTextData());
//cardTextData.setMeta(Json.createObjectBuilder().build());
super.beginConversation();
}
}
}
public void initCardTextObjectCreate() {
if (super.requirePermissions(UserPermission.VIEW_ALL))
{
setCardObjectData(new CardObjectData());
//cardObjectData.setMeta(Json.createObjectBuilder().build());
super.beginConversation();
if(cardObjectData == null) {
setCardObjectData(new CardObjectData());
//cardObjectData.setMeta(Json.createObjectBuilder().build());
super.beginConversation();
}
}
}
public void initCreateObjectType() {
if (super.requirePermissions(UserPermission.VIEW_ALL))
{
if(createObjectType == 1)
setCardTextData(new CardTextData());
else if(createObjectType == 2)
setCardObjectData(new CardObjectData());
super.beginConversation();
if(createObjectType == 0) {
if(createObjectType == 1)
setCardTextData(new CardTextData());
else if(createObjectType == 2)
setCardObjectData(new CardObjectData());
super.beginConversation();
}
}
}
......@@ -159,4 +180,36 @@ public class CardTemplateDataEditView extends GenericCDIView {
public void setCardTemplate(CardTemplate cardTemplate) {
this.cardTemplate = cardTemplate;
}
public CardObjectDataType[] getCardObjectDataTypes() {
return cardObjectDataTypes;
}
public void setCardObjectDataTypes(CardObjectDataType[] cardObjectDataTypes) {
this.cardObjectDataTypes = cardObjectDataTypes;
}
public CardTextDataType[] getCardTextDataTypes() {
return cardTextDataTypes;
}
public void setCardTextDataTypes(CardTextDataType[] cardTextDataTypes) {
this.cardTextDataTypes = cardTextDataTypes;
}
public CardTextStyle[] getFontStyles() {
return fontStyles;
}
public void setFontStyles(CardTextStyle[] fontStyles) {
this.fontStyles = fontStyles;
}
public CardTextAlignment[] getFontAlignments() {
return fontAlignments;
}
public void setFontAlignments(CardTextAlignment[] fontAlignments) {
this.fontAlignments = fontAlignments;
}
}
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/card/CardTemplateDataView.java
......@@ -43,35 +43,41 @@ public class CardTemplateDataView extends GenericCDIView {
public void initCardTextDatas() {
if (super.requirePermissions(UserPermission.VIEW_ALL))
{
setCardTextDatas(cfbean.findCardTextDatas(templateId));
super.beginConversation();
if(cardTextDatas == null) {
setCardTextDatas(cfbean.findCardTextDatas(cardTemplate));
super.beginConversation();
}
}
}
public void initCardObjectDatas() {
if (super.requirePermissions(UserPermission.VIEW_ALL))
{
setCardObjectDatas(cfbean.findCardObjectDatas(templateId));
super.beginConversation();
if(cardObjectDatas == null) {
setCardObjectDatas(cfbean.findCardObjectDatas(cardTemplate));
super.beginConversation();
}
}
}
public void initCardTemplate() {
if (super.requirePermissions(UserPermission.VIEW_ALL))
{
setCardTemplate(cfbean.find(templateId));
if(cardTemplate != null)
{
setCardTextDatas(cfbean.findCardTextDatas(templateId));
setCardObjectDatas(cfbean.findCardObjectDatas(templateId));
if(cardTemplate == null) {
setCardTemplate(cfbean.find(templateId));
if(cardTemplate != null)
{
setCardTextDatas(cfbean.findCardTextDatas(cardTemplate));
setCardObjectDatas(cfbean.findCardObjectDatas(cardTemplate));
}
}
super.beginConversation();
}
}
public String saveTextData() {
if(cardTextData.getMeta() == null)
cardTextData.setMeta(Json.createObjectBuilder().build());
//if(cardTextData.getMeta() == null)
// cardTextData.setMeta(Json.createObjectBuilder().build());
cardTextData = cfbean.save(cardTextData);
return null;
}
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserCartView.java
......@@ -154,8 +154,8 @@ public class UserCartView extends GenericCDIView {
return "/useradmin/list";
}
public String showOverview() {
userOverviewView.initView();
public String showOverview(String mailSubject, String mailBody) {
userOverviewView.initView(mailSubject, mailBody);
return "/useradmin/overview";
}
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserOverviewView.java
......@@ -11,11 +11,14 @@ import javax.inject.Named;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.sun.xml.rpc.streaming.Event;
import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.CardState;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.util.MailMessage;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.helpers.UserOverviewItem;
......@@ -35,23 +38,28 @@ public class UserOverviewView extends GenericCDIView {
private ListDataModel<UserOverviewItem> userOverviewItems = null;
private String rejectionMsg;
private static final Logger logger = LoggerFactory.getLogger(UserOverviewView.class);
public void initView() {
public void initView(String rejectionSubject, String rejectionBody) {
if (userOverviewItems == null) {
ArrayList<UserOverviewItem> ovlist = new ArrayList<UserOverviewItem>();
for (EventUser eu : getUserCartView().getUsercart()) {
PrintedCard pc = cardTemplateBean.checkPrintedCard(eu);
UserOverviewItem uoi = new UserOverviewItem(eu, pc);
if(rejectionSubject == null)
rejectionSubject = "";
if(rejectionBody == null)
rejectionBody = "";
UserOverviewItem uoi = new UserOverviewItem(eu, pc, rejectionSubject, rejectionBody);
ovlist.add(uoi);
}
userOverviewItems = new ListDataModel<>(ovlist);
super.beginConversation();
}
}
public ListDataModel<UserOverviewItem> getUserOverviewItems() {
return userOverviewItems;
}
......@@ -61,6 +69,7 @@ public class UserOverviewView extends GenericCDIView {
UserOverviewItem cardItem = null;
try {
cardItem = userOverviewItems.getRowData();
logger.info("rejectCard() cardItem {}", cardItem);
}catch(Exception ex) {
logger.info(ex.getMessage());
}
......@@ -69,12 +78,23 @@ public class UserOverviewView extends GenericCDIView {
PrintedCard card = cardItem.getPrintedCard();
if(rejectionMsg == null)
rejectionMsg = "";
if(card != null) {
card = userBean.rejectPrintedCard(card, rejectionMsg);
cardItem.setPrintedCard(card);
logger.info("rejectCard(): Rejected card {}, state {}", card, card.getCardState() );
MailMessage mail = null;
if(cardItem.isSendRejectionMail()) {
mail = new MailMessage();
mail.setToAddress(cardItem.getRejectionMsgToAddr());
mail.setToName(cardItem.getRejectionMsgToName());
mail.setTo(card.getUser().getUser());
mail.setSubject(cardItem.getRejectionMsgSubject());
mail.setMessage(cardItem.getRejectionMsgBody() + "\r\n" + cardItem.getRejectionMsg());
}
card = userBean.rejectPrintedCard(card);
cardItem.setPrintedCard(card);
logger.info("rejectCard(): Rejected card {}, state {}", card, card.getCardState() );
}
}
// cardTemplateBean.setCardState(cardItem.getPrintedCard(), CardState.REJECTED);
}
......@@ -102,13 +122,4 @@ public class UserOverviewView extends GenericCDIView {
public void setUserCartView(UserCartView userCartView) {
this.userCartView = userCartView;
}
public void setRejectionMsg(String msg) {
this.rejectionMsg = msg;
}
public String getRejectionMsg() {
return this.rejectionMsg;
}
}
code/MoyaWeb/src/fi/codecrew/moya/web/helpers/UserOverviewItem.java
......@@ -11,9 +11,36 @@ public class UserOverviewItem {
private EventUser eventUser;
private PrintedCard printedCard;
public UserOverviewItem(EventUser eu, PrintedCard pc) {
private boolean sendRejectionMail;
private String rejectionMsg;
private String rejectionMsgSubject;
private String rejectionMsgBody;
private String rejectionMsgToAddr;
private String rejectionMsgToName;
public UserOverviewItem(EventUser eu, PrintedCard pc, String mailSubject, String mailBody) {
eventUser = eu;
printedCard = pc;
sendRejectionMail = false;
if(mailSubject != null)
this.rejectionMsgSubject = mailSubject;
else
this.rejectionMsgSubject = "";
if(mailBody != null)
this.rejectionMsgBody = mailBody;
else
this.rejectionMsgBody = "";
if(this.rejectionMsgBody.contains("{0}") && eventUser != null && eventUser.getEvent() != null)
this.rejectionMsgBody = this.rejectionMsgBody.replace("{0}", eventUser.getEvent().getName());
this.rejectionMsgToAddr = eventUser.getEmail();
this.rejectionMsgToName = eventUser.getWholeName();
}
public void acceptCard(ActionEvent ae) {
......@@ -35,4 +62,52 @@ public class UserOverviewItem {
public void setPrintedCard(PrintedCard printedCard) {
this.printedCard = printedCard;
}
public boolean isSendRejectionMail() {
return sendRejectionMail;
}
public void setSendRejectionMail(boolean rejectionSendMail) {
this.sendRejectionMail = rejectionSendMail;
}
public String getRejectionMsg() {
return rejectionMsg;
}
public void setRejectionMsg(String rejectionMsg) {
this.rejectionMsg = rejectionMsg;
}
public String getRejectionMsgSubject() {
return rejectionMsgSubject;
}
public void setRejectionMsgSubject(String rejectionMsgSubject) {
this.rejectionMsgSubject = rejectionMsgSubject;
}
public String getRejectionMsgBody() {
return rejectionMsgBody;
}
public void setRejectionMsgBody(String rejectionMsgBody) {
this.rejectionMsgBody = rejectionMsgBody;
}
public String getRejectionMsgToAddr() {
return rejectionMsgToAddr;
}
public void setRejectionMsgToAddr(String rejectionMsgToAddr) {
this.rejectionMsgToAddr = rejectionMsgToAddr;
}
public String getRejectionMsgToName() {
return rejectionMsgToName;
}
public void setRejectionMsgToName(String rejectionMsgToName) {
this.rejectionMsgToName = rejectionMsgToName;
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!