billlines to billList

code/moya-web/WebContent/place/myEtickets.xhtml

@@ -57,7 +57,8 @@
                                     <h:outputText value="#{i18n['etickets.user']}"/>
                                 </f:facet>
 
-                                <h:outputText value="#{member.user.wholeName} (#{member.user.nick})"/>
+                                <h:outputText rendered="#{!empty member.user}" value="#{member.user.wholeName} (#{member.user.nick})"/>
+                                <h:outputText rendered="#{empty member.user}" value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" />
                             </p:column>
                         </p:dataTable>
                     </p:fieldset>

code/moya-web/WebContent/place/myGroups.xhtml

@@ -32,7 +32,15 @@
 						</f:facet>
 						<h:outputText value="#{member.placeReservation.product.name}" />
 					</p:column>
-					<p:column>
+					<p:column rendered="#{placeGroupView.printOnlyOwn}">
+						<f:facet name="header">
+							<h:outputText value="#{i18n['placegroupview.owner']}" />
+						</f:facet>
+						<h:outputText rendered="#{empty member.user}" value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" />
+						<h:outputText rendered="#{(!empty member.user) and placeGroupView.canModifyCurrent}" value="#{member.user.firstnames} #{member.user.lastname} (#{member.user.nick})" />
+						<h:outputText rendered="#{(!empty member.user) and !placeGroupView.canModifyCurrent}" value="#{i18n['placegroupview.placetransferred']}" />
+					</p:column>
+					<p:column rendered="#{!placeGroupView.printOnlyOwn}">
 						<f:facet name="header">
 							<h:outputText value="#{i18n['placegroupview.token']}" />
 						</f:facet>
@@ -52,11 +60,11 @@
 						<h:commandButton rendered="#{placeGroupView.currentReleaseAllowed}" action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" />
 
 						<p:inputText id="inviteEmail" immediate="true" rendered="#{placeGroupView.canSendInviteCurrent}" value="#{placeGroupView.inviteMail}" />
-						<p:commandButton  rendered="#{placeGroupView.canSendInviteCurrent}"  value="#{i18n['user.invite']}" actionListener="#{placeGroupView.sendInvite}" update=":messages placestable" />
+						<p:commandButton  rendered="#{placeGroupView.canSendInviteCurrent}"  value="#{i18n['place.send']}" actionListener="#{placeGroupView.sendInvite}" update=":messages placestable" />
 						<p:watermark for="inviteEmail" rendered="#{placeGroupView.canSendInviteCurrent}"  value="#{i18n['user.email']}" id="inviteEmailWatermark"  />
 
 						<h:outputText rendered="#{placeGroupView.showCancelInviteCurrent}" value="#{member.inviteEmail}" />&nbsp;&nbsp;
-						<p:commandButton  rendered="#{placeGroupView.showCancelInviteCurrent}"  value="#{i18n['user.cancelInvite']}" actionListener="#{placeGroupView.cancelInvite}" update=":messages placestable" />
+						<p:commandButton  rendered="#{placeGroupView.showCancelInviteCurrent}"  value="#{i18n['place.cancelSend']}" actionListener="#{placeGroupView.cancelInvite}" update=":messages placestable" />
 
 					</p:column>
 

code/moya-web/WebContent/resources/cditools/bills/list.xhtml

@@ -18,8 +18,11 @@
 
 	<h:form rendered="#{billListView.bills.rowCount gt 0}">
 
-		<p:dataTable styleClass="bordertable" id="billList" value="#{billListView.bills}" var="bill" rowStyleClass="#{bill.expired ? 'expired' : (bill.paidDate != null ? 'paid' : null)}">
+		<p:dataTable styleClass="bordertable" id="billList" value="#{billListView.bills}" var="bill" rowStyleClass="#{bill.expired ? 'expired' : (bill.paidDate != null ? 'paid' : null)}" expandedRow="true">
 
+			<p:column style="width:16px" rendered="#{billListView.bills.rowCount lt 20}">
+				<p:rowToggler  />
+			</p:column>
 			<p:column rendered="#{billListView.canWriteBill}">
 				<f:facet name="header">
 					<h:outputText value="#{i18n['bill.payer']}" />
@@ -97,6 +100,18 @@
 				<h:outputText rendered="#{bill.paidDate == null}" value="#{i18n['bill.isNotPaid']}" />
 			</p:column>
 
+			<p:rowExpansion rendered="#{billListView.bills.rowCount lt 20}">
+				<h:dataTable styleClass="border" border="1" value="#{bill.billLines}" var="line">
+					<h:column>
+						<h:outputText value="#{line.name}" />
+					</h:column>
+					<h:column>
+						<h:outputText value="#{line.quantity}">
+							<f:convertNumber minFractionDigits="2" maxFractionDigits="2" />
+						</h:outputText>
+					</h:column>
+				</h:dataTable>
+			</p:rowExpansion>
 		</p:dataTable>
 
 	</h:form>

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/PlacegroupView.java

@@ -165,6 +165,10 @@ public class PlacegroupView extends GenericCDIView {
 			return false;
 
 
+		// change for assembly
+		// TODO: kun lantrekit on ohi niin kato tää logiikka niin että koko "vapauta" -napin konseptista luovutaan ja pelkästään maililla paikansiirto.
+		if(isPrintOnlyOwn())
+			return false;
 
 
 		// And ofcourse you can free it, if you are superadmin

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties

@@ -500,3 +500,18 @@ page.auth.login.loginerror.pagegroup=
 page.product.create.pagegroup=
 page.product.validateBillProducts.header=
 page.role.create.pagegroup=
+page.role.edit.pagegroup=
+page.role.list.pagegroup=
+page.shop.readerevents.header=
+page.product.list.pagegroup=
+page.tests.placemap.pagegroup=
+place.groupremove=
+placegroupView.editplace=
+placegroupview.owner=Omistaja
+placegroupview.groupCreator=Tilaaja
+placegroupview.placeReleased=
+place.mapX=
+place.send=Siirr\u00E4 paikka
+place.mapY=
+place.cancelSend=Peruuta siirto
+place.buyable=

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties

@@ -908,7 +908,7 @@ placegroup.printPdf = Print tickets
 
 placegroupView.editplace = Edit place
 
-placegroupview.groupCreator = Reserver
+placegroupview.groupCreator = Orderer
 placegroupview.header       = My places
 placegroupview.noMemberships = No places
 placegroupview.placeReleaseFailed = Releasing of place failed!
@@ -1659,3 +1659,6 @@ shop.product.name=Ticket
 submenu.place.viewplacemap=Places status
 page.svm.error.header=Payment failed
 bill.isNotPaid=Not paid
+placegroupview.owner=Owner
+place.send=Transfer place
+place.cancelSend=Cancel transfer

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties

@@ -891,7 +891,7 @@ placegroup.printPdf = Tulosta lipputositteet
 
 placegroupView.editplace = Muokkaa paikkaa
 
-placegroupview.groupCreator = Varaaja
+placegroupview.groupCreator = Tilaaja
 placegroupview.header       = Omat paikat
 placegroupview.noMemberships = Ei omia paikkoja
 placegroupview.placeReleaseFailed = Paikan vapauttaminen ep\u00E4onnistui!
@@ -1640,3 +1640,6 @@ shop.product.name=Lippu
 submenu.place.viewplacemap=Paikkatilanne
 page.svm.error.header=Verkkomaksu ep\u00E4onnistui
 bill.isNotPaid=Maksamatta
+placegroupview.owner=Omistaja
+place.send=Siirr\u00E4 paikka
+place.cancelSend=Peruuta siirto