Skip to content

Linnea Samila / Moya

Go to a project
Commit 699596dd by Tuomas Riihimäki
Options

hurr.

1 parent 71ad2c55
Inline Side-by-side
Showing with 45 additions and 33 deletions
code/MoyaWeb/WebContent/admin/incoming/printCard.xhtml
......@@ -16,26 +16,28 @@
<p:poll interval="1" listener="#{incomingView.polledRead}" onerror="location.reload();" />
</h:form>
<h1>#{i18n['incomingflow.userdetails']} (RFID-lukija: #{incomingView.readerId})</h1>
<h:panelGrid columns="3">
<h:panelGrid id="cropper" columns="3">
<h:panelGroup>
<user:edit commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" camAlwaysOn="true" />
<user:edit id="usereditor" commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" camAlwaysOn="true" />
</h:panelGroup>
<h:panelGroup>
<h:form>
<h:form id="imgCropperForm" rendered="#{!empty userView.user.currentImage}">
<p:commandButton value="#{i18n['user.imageCropRefresh']}" ajax="false" update="imgCropperForm" />
<h:outputLabel value="#{i18n['user.cropUserImage']}:" />
<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" />
<p:imageCropper id="imgCropper" value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.img" />
<br />
<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
</h:form>
</h:panelGroup>
<h:panelGroup>
<h:form>
<h:form >
<p:graphicImage url="/dydata/usercard/#{userView.user.user.id}.png" width="300" /><br />
<h:commandButton action="#{incomingView.printCard}" value="#{i18n['print']}" /> (status: #{incomingView.printedStatus})
</h:form>
</h:panelGroup>
</h:panelGrid>
<h1>#{i18n['incomingflow.search']}</h1>
......
code/MoyaWeb/WebContent/resources/cditools/user/edit.xhtml
......@@ -6,6 +6,7 @@
<composite:interface>
<composite:attribute name="photocamupdate" required="false" default="userform" />
<composite:attribute name="creating" required="false" default="false" />
<composite:attribute name="commitaction" required="true" method-signature="java.lang.String action()" />
<composite:attribute name="camAlwaysOn" required="false" default="false" />
......@@ -37,10 +38,12 @@
<br />
<br />
<ui:fragment rendered="#{cc.attrs.camAlwaysOn}">
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" />
photoupdate: #{cc.attrs.photocamupdate}
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="#{cc.attrs.photocamupdate}" />
<p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" />
</ui:fragment>
<!-- -->
&nbsp;
<p:fileUpload id="uploadfile" value="#{userView.image}" mode="simple" required="true" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" />
<p:message for="uploadfile" />
......
code/MoyaWeb/WebContent/user/sendPicture.xhtml
......@@ -47,7 +47,7 @@
<h2>#{i18n['user.thisIsCurrentImage']}</h2>
<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
<img width="300" rendered="#{!empty userView.user.currentImage}" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.jpg" alt="image" />
<img width="300" rendered="#{!empty userView.user.currentImage}" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
<!-- <ui:fragment rendered="#{!empty userView.user.currentImage}">
......
code/MoyaWeb/WebContent/useradmin/sendPicture.xhtml
......@@ -35,10 +35,10 @@
<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
<ui:fragment rendered="#{!empty userView.user.currentImage}">
<h:panelGrid columns="2">
<img width="300" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.jpg" alt="image" />
<img width="300" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
<ui:fragment rendered="#{userView.canManage()}">
<h:form>
<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" />
<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.img" />
<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
</h:form>
</ui:fragment>
......
code/MoyaWeb/WebContent/useradmin/userCartShow.xhtml
......@@ -67,7 +67,7 @@
</h:form>
<h:form>
<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" />
<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.img" />
<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
</h:form>
</ui:define>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
......@@ -1159,6 +1159,7 @@ user.game.manage = Manage
user.game.remove_gameid = Remove
user.hasImage = Image
user.image = Image
user.imageCropRefresh = Refresh page
user.imageTooBig = Image is too big
user.imagelist = Saved images
user.imagesubmit = Send image
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
......@@ -1143,6 +1143,7 @@ user.game.gameid_removed = Peli-ID poistettu
user.game.manage = Hallitse
user.game.remove_gameid = Poista
user.hasImage = Kuva
user.imageCropRefresh = P\u00E4ivit\u00E4
user.imageTooBig = Kuva on liian suuri
user.imageUpload.imageNotFound = Valitse ensin kuva jonka haluat l\u00E4hett\u00E4\u00E4
user.imageUploaded = Kuva l\u00E4hetetty.
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/AccountEventView.java
......@@ -33,7 +33,7 @@ public class AccountEventView extends GenericCDIView {
public void initView() {
accountevent = accounteventbean.find(getAccountid());
if (requirePermissions(permbean.isCurrentUser(accountevent.getUser()) || permbean.hasPermission(UserPermission.VIEW_ACCOUNTEVENTS))) {
if (accountevent != null && requirePermissions(permbean.isCurrentUser(accountevent.getUser()) || permbean.hasPermission(UserPermission.VIEW_ACCOUNTEVENTS))) {
userview.setUser(accountevent.getUser());
beginConversation();
setCanSave(permbean.hasPermission(UserPermission.MODIFY_ACCOUNTEVENTS));
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserView.java
......@@ -43,6 +43,7 @@ import fi.codecrew.moya.web.annotations.LoggedIn;
import fi.codecrew.moya.web.annotations.SelectedUser;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.reader.ReaderView;
import fi.codecrew.moya.web.helper.LayoutView;
@Named()
@ConversationScoped
......@@ -105,6 +106,8 @@ public class UserView extends GenericCDIView {
private boolean waitForAcceptance = false;
private String captureForwardUrl = "";
private PrintedCard printedCard;
@Inject
private LayoutView layoutview;
public PrintedCard getPrintedCard() {
if (printedCard == null) {
......@@ -139,8 +142,9 @@ public class UserView extends GenericCDIView {
UserImage img = userbean.uploadImage(user, "image/png", data, "userimage.png", "Uploaded image");
user = userbean.getEventUser(img.getUser());
// super.navihandler.forward("/admin/adduser/capturesuccess");
if (getCaptureForwardUrl().equals(""))
if (getCaptureForwardUrl() != null && !getCaptureForwardUrl().isEmpty())
super.navihandler.forward(getCaptureForwardUrl());
}
@Produces
......@@ -486,4 +490,12 @@ public class UserView extends GenericCDIView {
{
return CardState.values();
}
public LayoutView getLayoutview() {
return layoutview;
}
public void setLayoutview(LayoutView layoutview) {
this.layoutview = layoutview;
}
}
code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java
......@@ -16,7 +16,6 @@ import fi.codecrew.moya.beans.BarcodeBeanLocal;
import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.PlaceBeanLocal;
import fi.codecrew.moya.beans.ReaderBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.CardState;
import fi.codecrew.moya.enums.apps.UserPermission;
......@@ -25,7 +24,6 @@ import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.util.UserSearchQuery;
import fi.codecrew.moya.utilities.SearchResult;
import fi.codecrew.moya.utilities.jsf.MessageHelper;
import fi.codecrew.moya.web.annotations.SelectedUser;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.reader.ReaderNameContainer;
......@@ -86,7 +84,7 @@ public class IncomingView extends GenericCDIView {
public List<String> matchBarcode(String matchWhat) {
List<GroupMembership> gms = placeBean.matchGroupMembershipsByInviteToken(matchWhat);
ArrayList<String> arl = new ArrayList<>();
for(GroupMembership gm : gms) {
for (GroupMembership gm : gms) {
arl.add(gm.getInviteToken());
}
......@@ -103,14 +101,14 @@ public class IncomingView extends GenericCDIView {
}
public void changeUser(SelectEvent event) {
if(!searchBarcode.equals("")) {
if (!searchBarcode.equals("")) {
// TODO: if user barcode is place code thingy, do this, otherwise do other..
GroupMembership gm = placeBean.findGroupMembershipsByToken(this.searchBarcode);
if(gm != null) {
super.navihandler.redirectNavigation("printCard.jsf?userid="+gm.getUser().getUser().getId());
if (gm != null) {
super.navihandler.redirectNavigation("printCard.jsf?userid=" + gm.getUser().getUser().getId());
}
} else if(searchMulti != null) {
super.navihandler.redirectNavigation("printCard.jsf?userid="+searchMulti.getUser().getId());
} else if (searchMulti != null) {
super.navihandler.redirectNavigation("printCard.jsf?userid=" + searchMulti.getUser().getId());
searchMulti = null;
}
}
......@@ -118,7 +116,7 @@ public class IncomingView extends GenericCDIView {
private boolean initialized = false;
public void initPrintCardView() {
if(!permbean.hasPermission(UserPermission.MODIFY) || namecontainer.getReaderId() == null || namecontainer.getReaderId() <= 0) {
if (!permbean.hasPermission(UserPermission.MODIFY) || namecontainer.getReaderId() == null || namecontainer.getReaderId() <= 0) {
super.navihandler.redirectNavigation("index.jsf");
}
......@@ -146,7 +144,7 @@ public class IncomingView extends GenericCDIView {
public String changeToIncomingView() {
//super.navihandler.redirectNavigation("printCard.jsf?userid="+user.getUser().getId());
return "printCard.jsf?userid="+user.getUser().getId();
return "printCard.jsf?userid=" + user.getUser().getId();
}
public void polledRead() {
......@@ -164,7 +162,7 @@ public class IncomingView extends GenericCDIView {
userview.setUser(user);
// userview.prepareCardDownload();
// PURKKAAA, sori tästä, koitan refaktoroida kauniiksi ku kerkiän -TKwtf
super.navihandler.redirectNavigation("printCard.jsf?userid="+user.getUser().getId());
super.navihandler.redirectNavigation("printCard.jsf?userid=" + user.getUser().getId());
}
} else {
......@@ -196,9 +194,12 @@ public class IncomingView extends GenericCDIView {
public CardState getPrintedStatus() {
PrintedCard card = cardBean.checkPrintedCard(user);
return card.getCardState();
CardState ret = null;
if (card != null) {
ret = card.getCardState();
}
return ret;
}
public String printCard() {
PrintedCard card = cardBean.checkPrintedCard(user);
......@@ -216,11 +217,3 @@ public class IncomingView extends GenericCDIView {
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!