Skip to content

Riina Antikainen / Moya

Go to a project
Commit 153ca4f8 by Antti Tonkyra
Options

Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal 

Conflicts:
	code/LanBortalWeb/.metadata/WebContent/WEB-INF/faces-config.pageflow
2 parents 1b3330f4 7d449469
Inline Side-by-side
Showing with 103 additions and 37 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/NewsBean.java
......@@ -9,6 +9,7 @@ import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import fi.insomnia.bortal.enums.apps.ContentPermission;
import fi.insomnia.bortal.facade.NewsFacade;
import fi.insomnia.bortal.facade.NewsGroupFacade;
import fi.insomnia.bortal.model.News;
......@@ -19,7 +20,7 @@ import fi.insomnia.bortal.model.NewsGroup;
*/
@Stateless
@LocalBean
@DeclareRoles({ "NEWS/MANAGE" })
@DeclareRoles({ ContentPermission.S_MANAGE_NEWS })
public class NewsBean implements NewsBeanLocal {
@EJB
......@@ -38,26 +39,26 @@ public class NewsBean implements NewsBeanLocal {
}
@Override
@RolesAllowed("NEWS/MANAGE")
@RolesAllowed(ContentPermission.S_MANAGE_NEWS)
public List<NewsGroup> findAll() {
return ngfacade.findNews();
}
@Override
@RolesAllowed("NEWS/MANAGE")
@RolesAllowed(ContentPermission.S_MANAGE_NEWS)
public NewsGroup findById(int newsgroupid) {
return ngfacade.find(newsgroupid);
}
@Override
@RolesAllowed("NEWS/MANAGE")
@RolesAllowed(ContentPermission.S_MANAGE_NEWS)
public NewsGroup merge(NewsGroup newsgroup) {
return ngfacade.merge(newsgroup);
}
@Override
@RolesAllowed("NEWS/MANAGE")
@RolesAllowed(ContentPermission.S_MANAGE_NEWS)
public void createNewsgroup(NewsGroup newsgroup) {
newsgroup.setEvent(eventbean.getCurrentEvent());
ngfacade.create(newsgroup);
......@@ -70,7 +71,7 @@ public class NewsBean implements NewsBeanLocal {
{
newsgroup.setNews(new ArrayList<News>());
}
News ret = new News(newsgroup);
News ret = new News(newsgroup, permbean.getCurrentUser());
newsgroup.getNews().add(ret);
return ret;
}
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PermissionBean.java
......@@ -62,7 +62,7 @@ import fi.insomnia.bortal.model.User;
SpecialPermission.S_SUPERADMIN,
SpecialPermission.S_USER,
SpecialPermission.S_ANONYMOUS,
SpecialPermission.S_ANONYMOUS
})
public class PermissionBean implements PermissionBeanLocal {
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/News.java
......@@ -82,8 +82,9 @@ public class News extends GenericEntity {
this.priority = priority;
}
public News(NewsGroup newsgroup) {
public News(NewsGroup newsgroup, User creator) {
super();
this.creator = creator;
group = newsgroup;
}
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product.java
......@@ -42,6 +42,8 @@ public class Product extends GenericEntity {
@JoinColumn(name = EVENT_ID_COLUMN, nullable = false)
private LanEvent event;
private String color;
@Column(name = "product_name")
private String name;
......@@ -253,4 +255,12 @@ public class Product extends GenericEntity {
this.event = event;
}
public String getColor() {
return color;
}
public void setColor(String color) {
this.color = color;
}
}
code/LanBortalWeb/.metadata/WebContent/WEB-INF/faces-config.pageflow
......@@ -2,12 +2,14 @@
<pageflow:Pageflow xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pageflow="http://www.sybase.com/suade/pageflow" id="pf13012981621060" configfile="/LanBortalWeb/WebContent/WEB-INF/faces-config.xml">
<nodes xsi:type="pageflow:PFPage" name="*" x="120" y="60" id="pf131682121330014" referenceLink="//@navigationRule.0/@fromViewId|" outlinks="pf131682121330015 pf13196506256640" path="*"/>
<nodes xsi:type="pageflow:PFPage" name="auth/logoutResponse" x="288" y="60" id="pf131682121330016" referenceLink="//@navigationRule.0/@navigationCase.0/@toViewId|" inlinks="pf131682121330015" path="/auth/logoutResponse"/>
<nodes xsi:type="pageflow:PFPage" name="place/placemap" x="276" y="228" id="pf13168224196920" referenceLink="//@navigationRule.1/@navigationCase.0/@toViewId|" outlinks="pf13168224196921" inlinks="pf13168224196921" path="/place/placemap"/>
<nodes xsi:type="pageflow:PFPage" name="user/sendPicture" id="pf13196506256641" referenceLink="//@navigationRule.0/@navigationCase.1/@toViewId|" inlinks="pf13196506256640" path="/user/sendPicture"/>
<nodes xsi:type="pageflow:PFPage" name="actionlog/messagelist" id="pf13290472154543" referenceLink="//@navigationRule.2/@fromViewId|" outlinks="pf13290472154544" path="/actionlog/messagelist.xhtml"/>
<nodes xsi:type="pageflow:PFPage" name="actionlog/messagelist.xhtml" id="pf13290472154545" referenceLink="//@navigationRule.2/@navigationCase.0/@toViewId|" inlinks="pf13290472154544" path="/actionlog/messagelist.xhtml"/>
<nodes xsi:type="pageflow:PFPage" name="place/placemap" x="264" y="204" id="pf13168224196920" referenceLink="//@navigationRule.2/@navigationCase.0/@toViewId|" outlinks="pf13168224196921" inlinks="pf13168224196921" path="/place/placemap"/>
<nodes xsi:type="pageflow:PFPage" name="user/sendPicture" x="12" y="192" id="pf13196506256641" referenceLink="//@navigationRule.0/@navigationCase.1/@toViewId|" inlinks="pf13196506256640" path="/user/sendPicture"/>
<nodes xsi:type="pageflow:PFPage" name="news/edit" x="248" y="312" id="pf13241645918110" path="/news/edit.xhtml"/>
<nodes xsi:type="pageflow:PFPage" name="news/listAll" x="480" y="269" id="pf13241645918111" path="/news/listAll.xhtml"/>
<nodes xsi:type="pageflow:PFPage" name="news/editNews" id="pf13241648116130" referenceLink="//@navigationRule.1/@fromViewId|" outlinks="pf13241648116141" path="news/editNews"/>
<nodes xsi:type="pageflow:PFPage" name="news/listAll" id="pf13241648116142" referenceLink="//@navigationRule.1/@navigationCase.0/@toViewId|" inlinks="pf13241648116141" path="news/listAll"/>
<links id="pf131682121330015" target="pf131682121330016" source="pf131682121330014" outcome="logoutDone" redirect="true"/>
<links id="pf13168224196921" target="pf13168224196920" source="pf13168224196920" outcome="placesReserved" redirect="true"/>
<links id="pf13196506256640" target="pf13196506256641" source="pf131682121330014" outcome="redirToUserimage" redirect="true"/>
<links id="pf13290472154544" target="pf13290472154545" source="pf13290472154543" outcome="success" redirect="true"/>
<links id="pf13241648116141" target="pf13241648116142" source="pf13241648116130" outcome="news/listAll" redirect="true"/>
</pageflow:Pageflow>
code/LanBortalWeb/WebContent/WEB-INF/faces-config.xml
......@@ -63,6 +63,16 @@
</navigation-rule>
<navigation-rule>
<from-view-id>news/editNews</from-view-id>
<navigation-case>
<from-outcome>news/listAll</from-outcome>
<to-view-id>news/listAll</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
<!-- </navigation-rule> -->
<!-- <navigation-rule> -->
<!-- <from-view-id>/role/edit.xhtml</from-view-id> -->
......
code/LanBortalWeb/WebContent/news/editNews.xhtml
......@@ -10,6 +10,7 @@
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata>
<f:viewParam name="newsid" value="#{newsgroupView.newsid}" />
<f:viewParam name="newsgroupid" value="#{newsgroupView.newsgroupid}" />
<f:event type="preRenderView" listener="#{newsgroupView.initNews}" />
</f:metadata>
<ui:param name="thispage" value="page.user.edit" />
......@@ -18,7 +19,6 @@
<h:outputScript target="head" library="script" name="jquery.min.js" />
<h:outputScript target="head" library="script" name="textinputs_jquery.js" />
<h:button onclick="var sel = $('#newsform:editor').getSelection(); alert(sel.start +', ' + sel.end);" value="Click me"/>
<h:form id="newsform">
......
code/LanBortalWeb/WebContent/news/listAll.xhtml
......@@ -40,10 +40,17 @@
<h:outputText value="#{newsgroup.writerRole.name}" />
</h:column>
<h:column>
<h:link outcome="/news/edit" value="#{i18n['newsgroup.edit']}">
<f:param name="newsgroupid" value="#{newsgroup.id}" />
</h:link>
</h:column>
<h:column>
<h:link outcome="/news/editNews" value="#{i18n['newsgroup.create_news']}">
<f:param name="newsgroupid" value="#{newsgroup.id}" />
</h:link>
</h:column>
</h:dataTable>
</ui:define>
</ui:composition>
......
code/LanBortalWeb/WebContent/resources/cditools/products/edit.xhtml
......@@ -39,6 +39,10 @@
<h:outputLabel for="barcode" value="#{i18n['product.barcode']}:" />
<h:inputText id="barcode" value="#{productView.product.barcode}" />
<h:message for="barcode" />
<h:outputLabel for="color" value="#{i18n['product.color']}:" />
<h:inputText id="color" value="#{productView.product.color}" />
<h:message for="color" />
<h:outputLabel for="prepaid" value="#{i18n['product.prepaid']}" />
<h:selectBooleanCheckbox id="prepaid" value="#{productView.product.prepaid}" />
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n.properties
......@@ -104,6 +104,10 @@ page.poll.answer.pagegroup=poll
page.poll.answered.pagegroup=poll
poll.edit=edit
#Bill number
# Validationmessages
httpsession.id=ID
httpsession.creationTime=Luotu
httpsession.lastAccessedTime=Viimeksi nhty
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/PlaceMap.java
......@@ -39,10 +39,9 @@ import fi.insomnia.bortal.model.User;
*/
public class PlaceMap extends HttpServlet {
private static final Logger logger = LoggerFactory.getLogger(PlaceMap.class);
/**
*
*/
private static final Logger logger = LoggerFactory
.getLogger(PlaceMap.class);
private static final long serialVersionUID = 8769688627918936258L;
@EJB
private transient PlaceMapBeanLocal placemapBean;
......@@ -65,8 +64,8 @@ public class PlaceMap extends HttpServlet {
* @throws IOException
* if an I/O error occurs
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
protected void processRequest(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
logger.debug("Begin processing request");
// response.setContentType("text/html;charset=UTF-8");
......@@ -116,9 +115,12 @@ public class PlaceMap extends HttpServlet {
}
}
private void printPlaceMapToStream(OutputStream outputStream, String filetype, EventMap map) throws IOException, PermissionDeniedException {
private void printPlaceMapToStream(OutputStream outputStream,
String filetype, EventMap map) throws IOException,
PermissionDeniedException {
permbean.fatalPermission(MapPermission.VIEW, "User tried to print the placemap to Stream");
permbean.fatalPermission(MapPermission.VIEW,
"User tried to print the placemap to Stream");
long begin = new Date().getTime();
......@@ -141,7 +143,8 @@ public class PlaceMap extends HttpServlet {
User user = permbean.getCurrentUser();
// List<Place> selectedPlaces = placemapBean.findSelectedPlaces(map);
BufferedImage image = ImageIO.read(new ByteArrayInputStream(map.getMapData()));
BufferedImage image = ImageIO.read(new ByteArrayInputStream(map
.getMapData()));
Graphics2D g2d = image.createGraphics();
for (Place place : places) {
......@@ -163,7 +166,8 @@ public class PlaceMap extends HttpServlet {
* @param parameter
* @return
*/
private static Integer getIntegerParameter(HttpServletRequest request, String parameter) {
private static Integer getIntegerParameter(HttpServletRequest request,
String parameter) {
try {
String valueString = request.getParameter(parameter);
Integer value = Integer.parseInt(valueString);
......@@ -188,8 +192,8 @@ public class PlaceMap extends HttpServlet {
* if an I/O error occurs
*/
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
protected void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
processRequest(request, response);
}
......@@ -206,8 +210,8 @@ public class PlaceMap extends HttpServlet {
* if an I/O error occurs
*/
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
protected void doPost(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
processRequest(request, response);
}
......@@ -229,8 +233,7 @@ public class PlaceMap extends HttpServlet {
private static final int BORDER_WIDTH = 2;
private static void drawPlace(Place p, Graphics2D g, User user) {
if (p.isDisabled())
{
if (p.isDisabled()) {
return;
}
Color color = null;
......@@ -240,19 +243,33 @@ public class PlaceMap extends HttpServlet {
if (p.isReservedFor(user)) {
color = SELECTED_COLOR;
} else if (user.equals(p.getCurrentUser())
|| (p.getGroup() != null && user.equals(p.getGroup().getCreator()))
|| (p.getPlaceReserver() != null && user.equals(p.getPlaceReserver().getUser()))) {
|| (p.getGroup() != null && user.equals(p.getGroup()
.getCreator()))
|| (p.getPlaceReserver() != null && user.equals(p
.getPlaceReserver().getUser()))) {
color = OWNED_COLOR;
} else if (p.isTaken()) {
color = RESERVED_COLOR;
} else if (p.getProduct().getColor() != null) {
try {
color = Color.decode(p.getProduct().getColor());
} catch (NumberFormatException x) {
logger.error("Cannot convert string {} to color.", p
.getProduct().getColor());
}
}
g.setColor(BORDER_COLOR);
g.draw(new Rectangle(p.getMapX(), p.getMapY(), p.getWidth(), p.getHeight()));
g.draw(new Rectangle(p.getMapX(), p.getMapY(), p.getWidth(), p
.getHeight()));
if (color != null) {
g.setColor(color);
g.fill(new Rectangle(p.getMapX() + BORDER_WIDTH, p.getMapY() + BORDER_WIDTH, p.getWidth() - BORDER_WIDTH, p.getHeight() - BORDER_WIDTH));
g.fill(new Rectangle(p.getMapX() + BORDER_WIDTH, p.getMapY()
+ BORDER_WIDTH, p.getWidth() - BORDER_WIDTH, p.getHeight()
- BORDER_WIDTH));
}
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/content/NewsgroupView.java
......@@ -4,6 +4,8 @@ import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Named;
import fi.insomnia.bortal.beans.NewsBeanLocal;
import fi.insomnia.bortal.enums.apps.ContentPermission;
import fi.insomnia.bortal.model.News;
......@@ -38,7 +40,13 @@ public class NewsgroupView extends GenericCDIView {
public void initNews() {
if (super.requirePermissions(permbean.hasPermission(ContentPermission.MANAGE_NEWS)) && getNews() == null) {
super.beginConversation();
news = newsbean.findNews(newsid);
if(newsid == null) {
newsgroup = newsbean.findById(newsgroupid);
createNews();
}
else
news = newsbean.findNews(newsid);
}
}
......@@ -53,7 +61,7 @@ public class NewsgroupView extends GenericCDIView {
public String createNew() {
this.addFaceMessage("newsgroup.created");
newsbean.createNewsgroup(newsgroup);
return "/news/edit.xhtml";
return "/news/edit";
}
public String saveNewsgroup() {
......@@ -70,8 +78,9 @@ public class NewsgroupView extends GenericCDIView {
public String saveNews()
{
newsbean.saveNews(getNews());
setNews(newsbean.saveNews(getNews()));
newsgroup = getNews().getGroup();
super.addFaceMessage("news_save_success");
return null;
}
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlaceView.java
......@@ -67,6 +67,7 @@ public class PlaceView extends GenericCDIView {
return null;
}
public void placeSelectActionListener(ActionEvent e) throws PermissionDeniedException {
super.beginConversation();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!