Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Codecrew
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
30
Merge Requests
2
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit e1670d23
authored
Oct 01, 2012
by
Petri Järvisalo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added EAN13 barcode for usercard (lower part of the card)
1 parent
0cbebcb7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
41 additions
and
11 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/BarcodeBean.java
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser_.java
code/LanBortalWeb/.classpath
code/LanBortalWeb/WebContent/resources/cditools/role/edit.xhtml
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/UserCardServlet.java
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/MapManageView.java
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/BarcodeBean.java
View file @
e1670d2
...
@@ -17,7 +17,11 @@ import org.jbarcode.JBarcodeFactory;
...
@@ -17,7 +17,11 @@ import org.jbarcode.JBarcodeFactory;
import
org.krysalis.barcode4j.BarcodeDimension
;
import
org.krysalis.barcode4j.BarcodeDimension
;
import
org.krysalis.barcode4j.BarcodeGenerator
;
import
org.krysalis.barcode4j.BarcodeGenerator
;
import
org.krysalis.barcode4j.impl.code128.Code128Bean
;
import
org.krysalis.barcode4j.impl.code128.Code128Bean
;
import
org.krysalis.barcode4j.impl.code128.EAN128Bean
;
import
org.krysalis.barcode4j.impl.code39.Code39
;
import
org.krysalis.barcode4j.impl.code39.Code39Bean
;
import
org.krysalis.barcode4j.impl.datamatrix.DataMatrixBean
;
import
org.krysalis.barcode4j.impl.datamatrix.DataMatrixBean
;
import
org.krysalis.barcode4j.impl.upcean.EAN13Bean
;
import
org.krysalis.barcode4j.output.bitmap.BitmapCanvasProvider
;
import
org.krysalis.barcode4j.output.bitmap.BitmapCanvasProvider
;
import
com.pdfjet.A4
;
import
com.pdfjet.A4
;
...
@@ -45,7 +49,24 @@ public class BarcodeBean {
...
@@ -45,7 +49,24 @@ public class BarcodeBean {
ByteArrayInputStream
istream
=
new
ByteArrayInputStream
(
out
.
toByteArray
());
ByteArrayInputStream
istream
=
new
ByteArrayInputStream
(
out
.
toByteArray
());
return
istream
;
return
istream
;
}
}
public
static
InputStream
getBarcodeEAN
(
String
message
)
throws
IOException
{
// BarcodeGenerator bean = new DataMatrixBean();
BarcodeGenerator
bean
=
new
EAN13Bean
();
ByteArrayOutputStream
out
=
new
ByteArrayOutputStream
();
// System.out.println("created: " + (new Date().getTime() - start));
BitmapCanvasProvider
canvas
=
new
BitmapCanvasProvider
(
out
,
"image/png"
,
150
,
BufferedImage
.
TYPE_BYTE_BINARY
,
false
,
0
);
canvas
.
establishDimensions
(
new
BarcodeDimension
(
200
,
15
));
bean
.
generateBarcode
(
canvas
,
message
);
canvas
.
finish
();
ByteArrayInputStream
istream
=
new
ByteArrayInputStream
(
out
.
toByteArray
());
return
istream
;
}
public
void
barcode4j
()
throws
FileNotFoundException
,
Exception
{
public
void
barcode4j
()
throws
FileNotFoundException
,
Exception
{
long
start
=
new
Date
().
getTime
();
long
start
=
new
Date
().
getTime
();
...
...
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
View file @
e1670d2
...
@@ -247,6 +247,7 @@ public class UserBean implements UserBeanLocal {
...
@@ -247,6 +247,7 @@ public class UserBean implements UserBeanLocal {
public
void
createNewUser
(
EventUser
user
,
String
password
)
{
public
void
createNewUser
(
EventUser
user
,
String
password
)
{
user
.
getUser
().
resetPassword
(
password
);
user
.
getUser
().
resetPassword
(
password
);
// todo add barcode
user
.
setEvent
(
eventBean
.
getCurrentEvent
());
user
.
setEvent
(
eventBean
.
getCurrentEvent
());
// Tallennetaan olio kantaan...
// Tallennetaan olio kantaan...
eventUserFacade
.
create
(
user
);
eventUserFacade
.
create
(
user
);
...
...
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser_.java
View file @
e1670d2
...
@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
...
@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
import
javax.persistence.metamodel.SingularAttribute
;
import
javax.persistence.metamodel.SingularAttribute
;
import
javax.persistence.metamodel.StaticMetamodel
;
import
javax.persistence.metamodel.StaticMetamodel
;
@Generated
(
value
=
"Dali"
,
date
=
"2012-09-
09T05:12:41.679
+0300"
)
@Generated
(
value
=
"Dali"
,
date
=
"2012-09-
27T09:58:55.015
+0300"
)
@StaticMetamodel
(
EventUser
.
class
)
@StaticMetamodel
(
EventUser
.
class
)
public
class
EventUser_
extends
GenericEntity_
{
public
class
EventUser_
extends
GenericEntity_
{
public
static
volatile
SingularAttribute
<
EventUser
,
User
>
user
;
public
static
volatile
SingularAttribute
<
EventUser
,
User
>
user
;
...
...
code/LanBortalWeb/.classpath
View file @
e1670d2
...
@@ -10,5 +10,6 @@
...
@@ -10,5 +10,6 @@
</classpathentry>
</classpathentry>
<classpathentry
kind=
"con"
path=
"org.eclipse.jdt.launching.JRE_CONTAINER"
/>
<classpathentry
kind=
"con"
path=
"org.eclipse.jdt.launching.JRE_CONTAINER"
/>
<classpathentry
combineaccessrules=
"false"
kind=
"src"
path=
"/lib-AuthModule-depends"
/>
<classpathentry
combineaccessrules=
"false"
kind=
"src"
path=
"/lib-AuthModule-depends"
/>
<classpathentry
kind=
"src"
path=
"/LanBortalBeans"
/>
<classpathentry
kind=
"output"
path=
"build/classes"
/>
<classpathentry
kind=
"output"
path=
"build/classes"
/>
</classpath>
</classpath>
code/LanBortalWeb/WebContent/resources/cditools/role/edit.xhtml
View file @
e1670d2
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
<p>
<p>
<h:form
id=
"roleform"
>
<h:form
id=
"roleform"
>
<f:facet
name=
"errorMessage"
>
<f:facet
name=
"errorMessage"
>
<h:outputText
value=
"#{i18n['nasty.user']}"
/>
<h:outputText
value=
"#{i18n['nasty.user']}"
/>
</f:facet>
</f:facet>
...
@@ -24,7 +23,7 @@
...
@@ -24,7 +23,7 @@
<h2>
#{i18n['role.permissionheader']}
</h2>
<h2>
#{i18n['role.permissionheader']}
</h2>
<p>
<p>
<h:form
id=
"permissionform"
>
<h:form
id=
"permissionform"
>
<
h:commandButton
id=
"save"
value=
"#{i18n['role.savePermissions']}"
action=
"#{roleView.savePermissions}"
/
>
<
!-- <h:commandButton id="save" value="#{i18n['role.savePermissions']}" action="#{roleView.savePermissions}" /> --
>
<h:dataTable
border=
"1"
id=
"bortalApps"
value=
"#{roleView.rolePermissions}"
var=
"bapp"
>
<h:dataTable
border=
"1"
id=
"bortalApps"
value=
"#{roleView.rolePermissions}"
var=
"bapp"
>
<h:column>
<h:column>
<f:facet
name=
"header"
>
<f:facet
name=
"header"
>
...
...
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/UserCardServlet.java
View file @
e1670d2
...
@@ -17,6 +17,10 @@ import javax.servlet.http.HttpServletResponse;
...
@@ -17,6 +17,10 @@ import javax.servlet.http.HttpServletResponse;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
com.pdfjet.Image
;
import
com.pdfjet.ImageType
;
import
fi.insomnia.bortal.beans.BarcodeBean
;
import
fi.insomnia.bortal.beans.CardTemplateBeanLocal
;
import
fi.insomnia.bortal.beans.CardTemplateBeanLocal
;
import
fi.insomnia.bortal.beans.PermissionBeanLocal
;
import
fi.insomnia.bortal.beans.PermissionBeanLocal
;
import
fi.insomnia.bortal.beans.UserBeanLocal
;
import
fi.insomnia.bortal.beans.UserBeanLocal
;
...
@@ -100,7 +104,7 @@ public class UserCardServlet extends GenericImageServlet {
...
@@ -100,7 +104,7 @@ public class UserCardServlet extends GenericImageServlet {
// g.drawImage(face, AffineTransform.getScaleInstance(0.31, 0.31),
// g.drawImage(face, AffineTransform.getScaleInstance(0.31, 0.31),
// null);
// null);
g
.
drawImage
(
face
,
50
,
32
0
,
320
,
400
,
null
);
g
.
drawImage
(
face
,
60
,
30
0
,
320
,
400
,
null
);
g
.
setFont
(
new
Font
(
"Century gothic"
,
Font
.
PLAIN
,
70
));
g
.
setFont
(
new
Font
(
"Century gothic"
,
Font
.
PLAIN
,
70
));
// g.drawString(nick, 595 -
// g.drawString(nick, 595 -
...
@@ -109,7 +113,7 @@ public class UserCardServlet extends GenericImageServlet {
...
@@ -109,7 +113,7 @@ public class UserCardServlet extends GenericImageServlet {
g
.
drawString
(
user
.
getUser
().
getNick
(),
50
,
810
);
g
.
drawString
(
user
.
getUser
().
getNick
(),
50
,
810
);
g
.
setFont
(
new
Font
(
"Century gothic"
,
Font
.
BOLD
,
3
5
));
g
.
setFont
(
new
Font
(
"Century gothic"
,
Font
.
BOLD
,
4
5
));
StringBuilder
wholeName
=
new
StringBuilder
();
StringBuilder
wholeName
=
new
StringBuilder
();
wholeName
.
append
(
user
.
getUser
().
getFirstnames
()).
append
(
" "
).
append
(
user
.
getUser
().
getLastname
());
wholeName
.
append
(
user
.
getUser
().
getFirstnames
()).
append
(
" "
).
append
(
user
.
getUser
().
getLastname
());
...
@@ -120,14 +124,20 @@ public class UserCardServlet extends GenericImageServlet {
...
@@ -120,14 +124,20 @@ public class UserCardServlet extends GenericImageServlet {
// 890);
// 890);
//
//
// g.drawString(owner.getId().toString(), 60, 948);
// g.drawString(owner.getId().toString(), 60, 948);
g
.
drawString
(
wholeName
.
toString
(),
60
,
865
);
g
.
drawString
(
wholeName
.
toString
(),
60
,
865
);
g
.
drawString
(
card
.
getTemplate
().
getName
(),
60
,
915
);
g
.
drawString
(
card
.
getTemplate
().
getName
(),
60
,
915
);
String
barcodeString
=
String
.
valueOf
(
user
.
getUser
().
getCreated
().
getTime
().
getTime
());
barcodeString
=
barcodeString
.
substring
(
barcodeString
.
length
()-
12
);
BufferedImage
image
=
ImageIO
.
read
(
BarcodeBean
.
getBarcodeEAN
(
barcodeString
));
g
.
drawImage
(
image
,
0
,
base
.
getHeight
()-
120
,
base
.
getWidth
(),
120
,
null
);
g
.
dispose
();
g
.
dispose
();
ByteArrayOutputStream
ostr
=
new
ByteArrayOutputStream
();
ByteArrayOutputStream
ostr
=
new
ByteArrayOutputStream
();
ImageIO
.
write
(
outimage
,
"jpeg"
,
ostr
);
ImageIO
.
write
(
outimage
,
"jpeg"
,
ostr
);
return
ostr
.
toByteArray
();
return
ostr
.
toByteArray
();
}
}
...
...
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/MapManageView.java
View file @
e1670d2
...
@@ -125,9 +125,7 @@ public class MapManageView extends GenericCDIView {
...
@@ -125,9 +125,7 @@ public class MapManageView extends GenericCDIView {
}
}
public
String
createMap
()
{
public
String
createMap
()
{
map
=
eventmapBean
.
create
(
getMapname
());
map
=
eventmapBean
.
create
(
getMapname
());
return
"edit"
;
return
"edit"
;
}
}
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment