Skip to content

Linnea Samila / Moya

Go to a project
Commit c7a3397a by Tuomas Riihimäki
Options

Merge branch 'incomingMuutoksia' into 'master' 

Incoming muutoksia

jotain pikkumuutoksia tonne

See merge request !201
2 parents d4bfb5f2 8cbecf52
Inline Side-by-side
Showing with 28 additions and 43 deletions
code/.gitignore
...@@ -4,3 +4,5 @@ ...@@ -4,3 +4,5 @@
*/nbproject/faces-config.NavData */nbproject/faces-config.NavData
*.orig *.orig
*/bin */bin
*.iml
.idea/
code/moya-web/WebContent/info/cardlessIncoming.xhtml
...@@ -12,13 +12,16 @@ ...@@ -12,13 +12,16 @@
<ui:define name="content"> <ui:define name="content">
<reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{cardlessIncomingView.polledRead}" /> <reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{cardlessIncomingView.polledRead}" />
<br /><br />
<h:form> <h:form>
<p:autoComplete styleClass="usermultisearch" id="acsb" value="#{infoView.multiSearchUser}" completeMethod="#{infoView.matchMulti}" converter="#{eventUserConverter}" var="usrx" itemLabel="#{usrx.shortUserDescriptor}" itemValue="#{usrx}"> <p:autoComplete styleClass="usermultisearch" id="acsb" value="#{infoView.multiSearchUser}" completeMethod="#{infoView.matchMulti}" converter="#{eventUserConverter}" var="usrx" itemLabel="#{usrx.shortUserDescriptor}" itemValue="#{usrx}">
<p:ajax event="itemSelect" listener="#{cardlessIncomingView.changeUser}" /> <p:ajax event="itemSelect" listener="#{cardlessIncomingView.changeUser}" />
</p:autoComplete> </p:autoComplete>
<p:watermark for="acsb" value="#{i18n['infoview.multisearch']}" /> <p:watermark for="acsb" value="#{i18n['infoview.multisearch']}" />
</h:form> </h:form>
<br />
<h1> <h1>
<p:outputLabel value="#{userView.selectedUser.firstnames}" /> <p:outputLabel value="#{userView.selectedUser.firstnames}" />
......
code/moya-web/WebContent/info/index.xhtml
...@@ -24,10 +24,7 @@ ...@@ -24,10 +24,7 @@
</f:metadata> </f:metadata>
<ui:define name="headercontent">
</ui:define>
<ui:define name="content"> <ui:define name="content">
<infoview:userselector /> <infoview:userselector />
<br /><br /><br /><br /><br /><br /> <br /><br /><br /><br /><br /><br />
......
code/moya-web/WebContent/resources/cditools/reader/backendReader.xhtml
...@@ -28,6 +28,7 @@ xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader" ...@@ -28,6 +28,7 @@ xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
<p:poll rendered="#{readerView.pollingMode}" interval="2" listener="#{cc.attrs.selectaction}" onerror="location.reload();" /> <p:poll rendered="#{readerView.pollingMode}" interval="2" listener="#{cc.attrs.selectaction}" onerror="location.reload();" />
</h:panelGroup> </h:panelGroup>
<!--
<p:dataTable rendered="#{empty readerNameContainer.readerId}" border="1" id="reader" value="#{readerListDataView.readers}" var="rr"> <p:dataTable rendered="#{empty readerNameContainer.readerId}" border="1" id="reader" value="#{readerListDataView.readers}" var="rr">
<p:column> <p:column>
<f:facet name="header"> <f:facet name="header">
...@@ -43,17 +44,16 @@ xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader" ...@@ -43,17 +44,16 @@ xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
<f:param value="#{rr.id}" name="readerId" /> <f:param value="#{rr.id}" name="readerId" />
</h:link> </h:link>
</p:column> </p:column>
</p:dataTable> </p:dataTable>
-->
<p:outputLabel value="#{i18n['reader.autopoll']}" />&nbsp; <p:outputLabel rendered="#{!empty readerNameContainer.readerId}" value="#{i18n['reader.autopoll']}" />
<p:inputSwitch offLabel="#{i18n['off']}" onLabel="#{i18n['on']}" value="#{readerView.pollingMode}" immediate="true"> <p:inputSwitch rendered="#{!empty readerNameContainer.readerId}" offLabel="#{i18n['off']}" onLabel="#{i18n['on']}" value="#{readerView.pollingMode}" immediate="true" style="width: 81px;">
<p:ajax update="reader_autopoll,readerevents" /> <p:ajax update="reader_autopoll,readerevents" />
</p:inputSwitch> </p:inputSwitch>
<br />
<p:commandLink actionListener="#{readerView.changeReader}" value="#{i18n['incomingflow.changereader']}" update="@all" /> <p:commandLink actionListener="#{readerView.changeReader}" value="#{i18n['incomingflow.changereader']}" update="@all" />
<h:panelGroup id="readerevents"> <h:panelGroup id="readerevents">
......
code/moya-web/WebContent/resources/cditools/reader/readerevents.xhtml
...@@ -18,30 +18,24 @@ ...@@ -18,30 +18,24 @@
<p:poll interval="3" onerror="location.reload();" update="eventlist" /> <p:poll interval="3" onerror="location.reload();" update="eventlist" />
<br />
<p:dataTable border="1" id="eventlist" value="#{readerView.readerEvents}" var="event"> <p:dataTable border="1" scrollHeight="100" id="eventlist" value="#{readerView.readerEvents}" scrollable="true" var="event">
<f:facet name="header"> <f:facet name="header">
<p:outputLabel value="#{readerView.currentReader.identification}" /> <p:outputLabel value="#{readerView.currentReader.identification}" />
</f:facet> </f:facet>
<p:column> <p:column>
<f:facet name="header">
<h:outputText value="${i18n['readerevent.tagname']}" />
</f:facet>
<h:outputText rendered="#{empty event.printedCard}" id="newtag" value="#{event.value}" /> <h:outputText rendered="#{empty event.printedCard}" id="newtag" value="#{event.value}" />
</p:column> </p:column>
<p:column> <p:column>
<f:facet name="header">
<h:outputText value="${i18n['reader.user']}" />
</f:facet>
<h:outputText rendered="#{!empty event.user}" value="#{event.user.wholeName} (#{event.user.nick})" /> <h:outputText rendered="#{!empty event.user}" value="#{event.user.wholeName} (#{event.user.nick})" />
</p:column> </p:column>
<p:column> <p:column>
<f:facet name="header">
<h:outputText value="${i18n['readerevent.seenSince']}" />
</f:facet>
<h:outputText value="#{event.seenSince}" /> <h:outputText value="#{event.seenSince}" />
</p:column> </p:column>
<p:column> <p:column>
...@@ -50,21 +44,6 @@ ...@@ -50,21 +44,6 @@
</h:link> </h:link>
<p:commandLink rendered="#{!empty cc.attrs.selectaction}" actionListener="#{cc.attrs.selectaction}" value="#{cc.attrs.selectvalue}" update="@all" /> <p:commandLink rendered="#{!empty cc.attrs.selectaction}" actionListener="#{cc.attrs.selectaction}" value="#{cc.attrs.selectvalue}" update="@all" />
<!--
<h:link rendered="#{empty event.printedCard and !empty cc.attrs.showAssociateToUser}" outcome="/shop/assocToUser" value="#{i18n['readerevent.associateToUser']}">
<f:param name="eventid" value="#{event.id}" />
</h:link>
<h:link rendered="#{!empty event.printedCard }" outcome="/shop/shopToUser" value="#{i18n['readerevent.shopToUser']}">
<f:param name="userid" value="#{event.printedCard.user.user.id}" />
</h:link>
<h:link rendered="#{empty event.printedCard}" outcome="/shop/assocToUser" value="#{i18n['readerevent.associateToUser']}">
<f:param name="eventid" value="#{event.id}" />
</h:link> -->
</p:column> </p:column>
</p:dataTable> </p:dataTable>
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java
...@@ -102,7 +102,7 @@ public class CardlessIncomingView extends GenericCDIView { ...@@ -102,7 +102,7 @@ public class CardlessIncomingView extends GenericCDIView {
public void changeUser(SelectEvent event) { public void changeUser(SelectEvent event) {
if (infoView.getMultiSearchUser() != null) { if (infoView.getMultiSearchUser() != null) {
super.navihandler.redirectNavigation("incoming.jsf?userid=" super.navihandler.redirectNavigation("cardlessIncoming.jsf?userid="
+ infoView.getMultiSearchUser().getUser().getId()); + infoView.getMultiSearchUser().getUser().getId());
infoView.setMultiSearchUser(null); infoView.setMultiSearchUser(null);
} }
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
...@@ -474,8 +474,12 @@ yes = Kyll\u00E4 ...@@ -474,8 +474,12 @@ yes = Kyll\u00E4
infoview.multisearch=K\u00E4ytt\u00E4j\u00E4haku infoview.multisearch=K\u00E4ytt\u00E4j\u00E4haku
incomingflow.placesummary=Paikkayhteenveto incomingflow.placesummary=Paikkayhteenveto
incomingFlow.leftCount=Noutamatta incomingFlow.leftCount=Noutamatta
incomingFlow.ount=M\u00E4\u00E4r\u00E4
incomingflow.markEverythingGiven=Anna kaikki antamattomat tuotteet incomingflow.markEverythingGiven=Anna kaikki antamattomat tuotteet
submenu.admin.incoming.index=Sis\u00E4\u00E4ntulo submenu.admin.incoming.index=Sis\u00E4\u00E4ntulo
submenu.admin.incoming.printCard= submenu.admin.incoming.printCard=
submenu.info.cardlessIncoming=Sis\u00E4\u00E4ntulo submenu.info.cardlessIncoming=Sis\u00E4\u00E4ntulo
incomingflow.changereader=Vaihda / valitse lukija
incomingFlow.count=M\u00E4\u00E4r\u00E4
user.birthday=
user.confirmUserToEventAdding=
user.invalidLoginCredentials=
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
...@@ -544,7 +544,7 @@ incomingflow.alreadyShowingUser.title = Already selected ...@@ -544,7 +544,7 @@ incomingflow.alreadyShowingUser.title = Already selected
incomingflow.barcode = Barcode incomingflow.barcode = Barcode
incomingflow.cardCodes = Barcodes in card incomingflow.cardCodes = Barcodes in card
incomingflow.cardfiling.label = Card filing: incomingflow.cardfiling.label = Card filing:
incomingflow.changereader = Change Reader incomingflow.changereader = Select or Change Reader
incomingflow.codeattached.message = Code attached to current user's card incomingflow.codeattached.message = Code attached to current user's card
incomingflow.codeattached.title = Code attached incomingflow.codeattached.title = Code attached
incomingflow.giveplace = Mark given incomingflow.giveplace = Mark given
...@@ -1696,6 +1696,6 @@ yes = Yes ...@@ -1696,6 +1696,6 @@ yes = Yes
infoview.multisearch=Usersearch infoview.multisearch=Usersearch
incomingflow.placesummary=Placesummary incomingflow.placesummary=Placesummary
incomingFlow.leftCount=Ungiven incomingFlow.leftCount=Ungiven
incomingFlow.ount=Count
incomingflow.markEverythingGiven=Give ewerything ungiven stuff incomingflow.markEverythingGiven=Give ewerything ungiven stuff
submenu.info.cardlessIncoming=Incoming submenu.info.cardlessIncoming=Incoming
incomingFlow.count=Count
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -552,7 +552,7 @@ incomingflow.alreadyShowingUser.title = Valmiiksi valittu ...@@ -552,7 +552,7 @@ incomingflow.alreadyShowingUser.title = Valmiiksi valittu
incomingflow.barcode = Viivakoodi incomingflow.barcode = Viivakoodi
incomingflow.cardCodes = Korttiin liitetyt koodit incomingflow.cardCodes = Korttiin liitetyt koodit
incomingflow.cardfiling.label = Kortin kansiointi: incomingflow.cardfiling.label = Kortin kansiointi:
incomingflow.changereader = Vaihda lukijaa incomingflow.changereader = Vaihda / valitse lukija
incomingflow.codeattached.message = Piipattu koodi liitetty aktiiviseen k\u00E4ytt\u00E4j\u00E4\u00E4n incomingflow.codeattached.message = Piipattu koodi liitetty aktiiviseen k\u00E4ytt\u00E4j\u00E4\u00E4n
incomingflow.codeattached.title = Koodi liitetty incomingflow.codeattached.title = Koodi liitetty
incomingflow.giveplace = Merkitse annetuksi incomingflow.giveplace = Merkitse annetuksi
...@@ -1680,6 +1680,6 @@ infoview.multisearch=K\u00E4ytt\u00E4j\u00E4haku ...@@ -1680,6 +1680,6 @@ infoview.multisearch=K\u00E4ytt\u00E4j\u00E4haku
incomingflow.placesummary=Paikkayhteenveto incomingflow.placesummary=Paikkayhteenveto
incomingFlow.leftCount=Noutamatta incomingFlow.leftCount=Noutamatta
user.unauthenticated= user.unauthenticated=
incomingFlow.ount=M\u00E4\u00E4r\u00E4
incomingflow.markEverythingGiven=Anna kaikki antamattomat tuotteet incomingflow.markEverythingGiven=Anna kaikki antamattomat tuotteet
submenu.info.cardlessIncoming=Sis\u00E4\u00E4ntulo submenu.info.cardlessIncoming=Sis\u00E4\u00E4ntulo
incomingFlow.count=M\u00E4\u00E4r\u00E4
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!