Skip to content

Linnea Samila / Moya

Go to a project
Commit 0e84e27d by Tuomas Riihimäki
Options

Merge branch 'newtemplate' into 'master' 

Usersearch ui updates

 Käyttäjähaun tarkennetun haun ja käyttäjäkorin ui-komponentteja muotoiltu

See merge request !317
2 parents 4c2e05a7 9cbd2ae3
Inline Side-by-side
Showing with 98 additions and 74 deletions
code/moya-web/WebContent/useradmin/list.xhtml
...@@ -21,78 +21,99 @@ ...@@ -21,78 +21,99 @@
<h:form id="pageform" styleClass="useradmin_list"> <h:form id="pageform" styleClass="useradmin_list">
<h:panelGrid columns="2"> <p:panelGrid style="width: 100%;">
<h:panelGroup> <p:row>
<a id="show_advanced_search" onclick="$('#advancedSearch').show(); $(this).hide();"> <p:column>
<h:outputText value="#{i18n['userlist.showAdvancedSearch']}" /></a> <p:commandButton onclick="$('#advancedSearch').toggle(); return false;" value="#{i18n['userlist.showAdvancedSearch']}" ajax="false" />
<div id="advancedSearch" style="display: none;">
<h:selectBooleanCheckbox id="placeassoc" value="#{userSearchView.searchQuery.placeAssoc}" /> <div id="advancedSearch" style="display: none;">
<h:outputLabel for="placeassoc" value="#{i18n['userlist.placeassoc']}" />
<!--
<strong><p:outputLabel for="rolefilter" value="#{i18n['userlist.rolefilter']}" /></strong>
<br />
<br />
<h:outputLabel for="rolefilter" value="#{i18n['userlist.rolefilter']}" />
<h:selectManyCheckbox layout="pageDirection" styleClass="nowrap" id="rolefilter"
value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}">
</h:inputText>
-->
<p:selectManyCheckbox layout="pageDirection" styleClass="nowrap" id="rolefilter" value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}">
<f:selectItems value="#{roleDataView.roles}" var="r" itemLabel="#{r.name}" />
</p:selectManyCheckbox>
<h3>
<h:outputText value="#{i18n['userlist.cardfilter']}" />
</h3>
<p:selectManyCheckbox id="cardstatusfilter" layout="pageDirection" styleClass="nowrap" value="#{userSearchView.searchQuery.hasCardState}" converter="#{cardStateConverter}">
<f:selectItems value="#{userSearchView.searchQuery.cardStates}" var="r" itemLabel="#{r}" />
</p:selectManyCheckbox>
<h3>
Muut
</h3>
<p:selectBooleanCheckbox id="placeassoc" value="#{userSearchView.searchQuery.placeAssoc}" />
<p:outputLabel for="placeassoc" value="#{i18n['userlist.placeassoc']}" />
<br />
<p:outputLabel for="saldofilter" value="#{i18n['userlist.saldofilter']}" />
<h:selectOneMenu id="saldofilter" value="#{userSearchView.searchQuery.accountSaldoCompare}">
<f:selectItems value="#{userSearchView.searchQuery.accountCompareValues}" />
</h:selectOneMenu>
<p:inputText value="#{userSearchView.searchQuery.accountSaldo}">
<f:convertNumber minFractionDigits="0" maxFractionDigits="2" />
</p:inputText>
<br />
<p:selectBooleanCheckbox id="onlythisevent" value="#{userSearchView.searchQuery.onlyThisEvent}" />
<p:outputLabel for="onlythisevent" value="#{i18n['userlist.onlythisevent']}" />
<br />
<p:selectBooleanCheckbox id="userswithunusedcodes" value="#{userSearchView.searchQuery.usersWithUnusedCodes}" />
<p:outputLabel for="userswithunusedcodes" value="#{i18n['userlist.usersWithUnusedCodes']}" />
</div>
<br /> <br />
<h:outputLabel for="saldofilter" value="#{i18n['userlist.saldofilter']}" />
<h:selectOneMenu value="#{userSearchView.searchQuery.accountSaldoCompare}"> </p:column>
<f:selectItems value="#{userSearchView.searchQuery.accountCompareValues}" />
</h:selectOneMenu> <p:column>
<!-- <a id="show_user_cart" style="display: #{((userCartView.isEmpty())?'block':'none')};" onclick="$('#pageform\\:usercart').slideToggle(300);"><h:outputText value="#{i18n['usercart.showCart']}" /></a> -->
<h:inputText value="#{userSearchView.searchQuery.accountSaldo}">
<f:convertNumber minFractionDigits="0" maxFractionDigits="2" /> <p:commandButton onclick="$('#pageform\\:usercart').toggle(); return false;" value="#{i18n['usercart.showCart']}" ajax="false" />
</h:inputText>
<br /><br /> <p:panelGrid columns="1" id="usercart" styleClass="noborderTable" style="display: #{((userCartView.isEmpty())?'none':'block')};">
<!-- <p:commandButton actionListener="#{userSearchView.addToCart}" value="#{i18n['usercart.addSearchedUsers']}" ajax="false" />
<br /> <h:panelGroup>
<h:outputLabel for="rolefilter" value="#{i18n['userlist.rolefilter']}" /> <h:outputText value="#{i18n['usercart.cartsize']} #{userCartView.userCartSize}" />
<h:selectManyCheckbox layout="pageDirection" styleClass="nowrap" id="rolefilter" <p:commandButton action="#{userCartView.clearCart()}" value="#{i18n['usercart.clear']}" ajax="false" />
value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}"> </h:panelGroup>
</h:inputText> <p:commandButton action="#{userCartView.traverse}" value="#{i18n['usercart.traverse']}" ajax="false" />
--> <p:commandButton value="#{i18n['usercart.downloadCsv']}" ajax="false">
<p:fileDownload value="#{userCartView.downloadCsv}" />
<strong><h:outputLabel for="rolefilter" value="#{i18n['userlist.rolefilter']}" /></strong><br /> </p:commandButton>
<h:selectManyCheckbox layout="pageDirection" styleClass="nowrap" id="rolefilter" value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}"> <p:commandButton value="#{i18n['usercart.downloadExport']}" ajax="false">
<f:selectItems value="#{roleDataView.roles}" var="r" itemLabel="#{r.name}" /> <p:fileDownload value="#{userCartView.userExport}" />
</h:selectManyCheckbox> </p:commandButton>
<p:commandButton action="#{userCartView.showOverview()}" value="#{i18n['usercart.showoverview']}" ajax="false" />
<h:outputLabel for="cardstatusfilter" value="#{i18n['userlist.cardfilter']}" />
<h:selectManyCheckbox layout="pageDirection" styleClass="nowrap" id="cardfilter" value="#{userSearchView.searchQuery.hasCardState}" converter="#{cardStateConverter}"> <p:commandButton rendered="#{creditTransferView.transferPermissions}" action="#{userCartView.transferCredits}" value="#{i18n['usercart.transferCredits']}" ajax="false" />
<f:selectItems value="#{userSearchView.searchQuery.cardStates}" var="r" itemLabel="#{r}" />
</h:selectManyCheckbox> </p:panelGrid>
</p:column>
</div> </p:row>
<br /> <p:row>
<p:column colspan="2">
<h:selectBooleanCheckbox id="onlythisevent" value="#{userSearchView.searchQuery.onlyThisEvent}" /> <p:inputText value="#{userSearchView.search}" />
<h:outputLabel for="onlythisevent" value="#{i18n['userlist.onlythisevent']}" /> <p:commandButton value="#{i18n['userlist.search']}" action="#{userSearchView.newSearch()}" ajax="false" />
<br /> </p:column>
</p:row>
<h:selectBooleanCheckbox id="userswithunusedcodes" value="#{userSearchView.searchQuery.usersWithUnusedCodes}" /> </p:panelGrid>
<h:outputLabel for="userswithunusedcodes" value="#{i18n['userlist.usersWithUnusedCodes']}" />
<br />
<h:inputText value="#{userSearchView.search}" />
<h:commandButton value="#{i18n['userlist.search']}" action="#{userSearchView.newSearch()}" />
</h:panelGroup>
<h:panelGroup>
<a id="show_user_cart" style="display: #{((userCartView.isEmpty())?'block':'none')};" onclick="$('#pageform\\:usercart').slideToggle(300);"><h:outputText value="#{i18n['usercart.showCart']}" /></a>
<p:panelGrid columns="1" id="usercart" styleClass="noborderTable" style="display: #{((userCartView.isEmpty())?'none':'block')};">
<h:commandButton actionListener="#{userSearchView.addToCart}" value="#{i18n['usercart.addSearchedUsers']}" />
<h:panelGroup>
<h:outputText value="#{i18n['usercart.cartsize']} #{userCartView.userCartSize}" />
<h:commandButton action="#{userCartView.clearCart()}" value="#{i18n['usercart.clear']}" />
</h:panelGroup>
<h:commandButton action="#{userCartView.traverse}" value="#{i18n['usercart.traverse']}" />
<h:commandButton value="#{i18n['usercart.downloadCsv']}">
<p:fileDownload value="#{userCartView.downloadCsv}" />
</h:commandButton>
<h:commandButton value="#{i18n['usercart.downloadExport']}">
<p:fileDownload value="#{userCartView.userExport}" />
</h:commandButton>
<h:commandButton action="#{userCartView.showOverview()}" value="#{i18n['usercart.showoverview']}" />
<h:commandButton rendered="#{creditTransferView.transferPermissions}" action="#{userCartView.transferCredits}" value="#{i18n['usercart.transferCredits']}" />
</p:panelGrid>
</h:panelGroup>
</h:panelGrid>
</h:form> </h:form>
<p> <p>
<users:list rendered="#{!userSearchView.searchQuery.onlyThisEvent}" /> <users:list rendered="#{!userSearchView.searchQuery.onlyThisEvent}" />
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
...@@ -1447,6 +1447,7 @@ usercart.traverse = Check ...@@ -1447,6 +1447,7 @@ usercart.traverse = Check
userimage.webcam = Take picture with webcam userimage.webcam = Take picture with webcam
userlist.cardfilter = Card status
userlist.header = Search users userlist.header = Search users
userlist.onlythisevent = Limit to users of this event userlist.onlythisevent = Limit to users of this event
userlist.placeassoc = Assigned to place userlist.placeassoc = Assigned to place
...@@ -1500,7 +1501,7 @@ voting.allcompos.curEntries = No. of entries ...@@ -1500,7 +1501,7 @@ voting.allcompos.curEntries = No. of entries
voting.allcompos.descri = Description voting.allcompos.descri = Description
voting.allcompos.description = List of all compos and their information. voting.allcompos.description = List of all compos and their information.
voting.allcompos.endTime = End time voting.allcompos.endTime = End time
voting.allcompos.header = All compos voting.allcompos.header = Compos
voting.allcompos.hidden = Hidden voting.allcompos.hidden = Hidden
voting.allcompos.holdVoting = Hold voting voting.allcompos.holdVoting = Hold voting
voting.allcompos.maxParts = Max participants voting.allcompos.maxParts = Max participants
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
...@@ -1719,6 +1719,7 @@ usercart.traverse = Check ...@@ -1719,6 +1719,7 @@ usercart.traverse = Check
userimage.webcam = Take picture with webcam userimage.webcam = Take picture with webcam
userlist.cardfilter = Card status
userlist.header = Search users userlist.header = Search users
userlist.onlythisevent = Limit to users of this event userlist.onlythisevent = Limit to users of this event
userlist.placeassoc = Assigned to place userlist.placeassoc = Assigned to place
...@@ -1772,7 +1773,7 @@ voting.allcompos.curEntries = No. of entries ...@@ -1772,7 +1773,7 @@ voting.allcompos.curEntries = No. of entries
voting.allcompos.descri = Description voting.allcompos.descri = Description
voting.allcompos.description = List of all compos and their information. voting.allcompos.description = List of all compos and their information.
voting.allcompos.endTime = End time voting.allcompos.endTime = End time
voting.allcompos.header = All compos voting.allcompos.header = Compos
voting.allcompos.hidden = Hidden voting.allcompos.hidden = Hidden
voting.allcompos.holdVoting = Hold voting voting.allcompos.holdVoting = Hold voting
voting.allcompos.maxParts = Max participants voting.allcompos.maxParts = Max participants
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -1706,6 +1706,7 @@ usercart.traverse = K\u00E4y l\u00E4pi ...@@ -1706,6 +1706,7 @@ usercart.traverse = K\u00E4y l\u00E4pi
userimage.webcam = Ota kuva webkameralla userimage.webcam = Ota kuva webkameralla
userlist.cardfilter = Kortin tila
userlist.header = Etsi k\u00E4ytt\u00E4ji\u00E4 userlist.header = Etsi k\u00E4ytt\u00E4ji\u00E4
userlist.onlythisevent = Vain t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4j\u00E4t userlist.onlythisevent = Vain t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4j\u00E4t
userlist.placeassoc = Liitetty paikkaan userlist.placeassoc = Liitetty paikkaan
...@@ -1759,7 +1760,7 @@ voting.allcompos.curEntries = Entryja ...@@ -1759,7 +1760,7 @@ voting.allcompos.curEntries = Entryja
voting.allcompos.descri = Kuvaus voting.allcompos.descri = Kuvaus
voting.allcompos.description = Compojen informaatiot. voting.allcompos.description = Compojen informaatiot.
voting.allcompos.endTime = Lopetusaika voting.allcompos.endTime = Lopetusaika
voting.allcompos.header = Kaikki compot voting.allcompos.header = Compot
voting.allcompos.hidden = Piilotettu voting.allcompos.hidden = Piilotettu
voting.allcompos.holdVoting = Hold voting voting.allcompos.holdVoting = Hold voting
voting.allcompos.maxParts = Max osallistujam\u00E4\u00E4r\u00E4 voting.allcompos.maxParts = Max osallistujam\u00E4\u00E4r\u00E4
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!