Merge branch 'master' of https://git.bukova.info/repos/git/isspst

src/main/webapp/WEB-INF/locales/zk-label.properties

@@ -237,9 +237,20 @@ ReportNoOptions=Žádná nestavení
 
 MailForm=Odeslání e-mailu
 MailFor=Komu:
+MailCc=Kopie:
+MailBcc=Skrytá:
 MailSubject=Předmět:
 MailSend=Odeslat
 MailAttachement=Příloha:
+MailAddressBook=Adresář:
+MailUsers=Uživatelé
+MailSuppliers=Dodavatelé
+MailName=Jméno
+MailCompany=Firma
+MailToButton=Komu ->
+MailCcButton=Kopie ->
+MailBccButton=Skrytá ->
+
 
 Error=Chyba
 ErrorRights=K vykobání této operace nemáte dostatečná oprávnění
@@ -258,7 +269,6 @@ false=Ne
 
 
 Information=Informace
-Requirements=Požadavky
 Orders=Objednávky
 
 MaterialRequirement=Požadavek na materiál
@@ -270,7 +280,6 @@ ApprovedRequirementItems=Schválené položky požadavků
 CurrentRequirements=Aktuální požadavky
 ApprovedOrders=Schválené objednávky
 BussinessTrips=Služební cesty
-TravelOrders=Cestovní příkazy
 Lists=Seznamy
 Settings=Nastavení
 Administration=Administrace

src/main/webapp/WEB-INF/mail.properties

@@ -1,7 +1,8 @@
-mail.from=kosef.rokos@gmail.com
+mail.from=josef.rokos@gmail.com
 mail.host=smtp.gmail.com
 mail.port=587
 mail.useauth=true
 mail.usessl=true
 mail.username=josef.rokos@gmail.com
-mail.password=XXXXXX
+mail.password=XXXXXXXX
+mail.overrideFrom=false

src/main/webapp/WEB-INF/spring/mail-services.xml

@@ -20,6 +20,7 @@
 	<bean id="mailer" class="info.bukova.isspst.mail.MailerWithAttachement">
 		<constructor-arg ref="mailSender"/>
 		<property name="from" value="${mail.from}"/>
+		<property name="overrideFrom" value="${mail.overrideFrom}"/>
 	</bean>
 	
 	<bean id="simpleMailer" class="info.bukova.isspst.mail.SimpleMailer">

src/main/webapp/WEB-INF/spring/root-context.xml

@@ -243,6 +243,10 @@
     	<property name="sessionFactory" ref="sessionFactory"/>
     </bean>
     
+    <bean id="orderDao" class="info.bukova.isspst.dao.jpa.OrderDaoJPA">
+    	<property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+    
     <!-- Business logic -->
     <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
     
@@ -400,4 +404,10 @@
 		<property name="validator" ref="validator"/>
 	</bean>
 	
+	<bean id="orderService" class="info.bukova.isspst.services.approved.OrderServiceImpl">
+		<property name="dao" ref="orderDao"/>
+		<property name="validator" ref="validator"/>
+		<property name="numberSeriesService" ref="numericSeriesService"/>
+	</bean>
+	
 </beans>

src/main/webapp/app/mailForm.zul

@@ -2,30 +2,81 @@
 <zk>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <window id="mailWin" border="normal" apply="org.zkoss.bind.BindComposer"
-viewModel="@id('vm') @init('info.bukova.isspst.ui.mail.MailForm')" width="500px" closable="true">
+viewModel="@id('vm') @init('info.bukova.isspst.ui.mail.MailForm')" width="800px" closable="true">
 	<caption zclass="form-caption" label="${labels.MailForm}" />
-	<grid>
-		<columns>
-			<column hflex="min"/>
-			<column/>
-		</columns>
-		<rows>
-			<row>
-				<label value="${labels.MailFor}"/> <textbox value="@bind(vm.to)" width="100%"/>
-			</row>
-			<row>
-				<label value="${labels.MailSubject }"/> <textbox value="@bind(vm.message.subject)" width="100%"/>
-			</row>
-			<row>
-				<label value="${labels.MailAttachement}"/> <textbox value="@load(vm.attachement)" readonly="true" width="100%"/>
-			</row>
-		</rows>
-	</grid>
-	<vbox>
-		<ckeditor width="470px" height="200px" value="@bind(vm.message.text)" toolbar="Basic"/>
-		<hbox>
-			<button label="${labels.MailSend}" onClick="@command('send', window=mailWin)"/> <button label="${labels.ButtonStorno}" onClick="mailWin.detach()"/>
-		</hbox>
-	</vbox>
+	<hbox>
+		<vbox hflex="2">
+			<hbox>
+				<label value="${labels.MailAddressBook}"/> 
+				<combobox selectedIndex="@bind(vm.adbType)" readonly="true">
+					<comboitem label="${labels.MailUsers}"/>
+					<comboitem label="${labels.MailSuppliers}"/>
+				</combobox>
+			</hbox>
+			<textbox value="@bind(vm.findAddress)" instant="true" onChange="@command('find')" width="100%"/>
+			<listbox model="@load(vm.users)" 
+				visible="@load(vm.adbType eq 0)" 
+				multiple="true"
+				selectedItems="@bind(vm.selectedUsers)"
+				height="350px">
+				<listhead>
+					<listheader label="${labels.MailName}"/>
+				</listhead>
+				<template name="model">
+					<listitem disabled="@load(empty each.email)" draggable="true">
+						<listcell label="@load(each.fullName)"/>
+					</listitem>
+				</template>
+			</listbox>
+			<listbox model="@load(vm.addressbook)" 
+				visible="@load(vm.adbType eq 1)"
+				multiple="true"
+				selectedItems="@bind(vm.selectedAddresses)"
+				height="350px">
+				<listhead>
+					<listheader label="${labels.MailCompany}"/>
+				</listhead>
+				<template name="model">
+					<listitem disabled="@load(empty each.email)" draggable="true">
+						<listcell label="@load(each.company)"/>
+					</listitem>
+				</template>
+			</listbox>
+			<button label="${labels.MailToButton}" width="90%" sclass="nicebutton" onClick="@command('addTo')"/>
+			<button label="${labels.MailCcButton}" width="90%" sclass="nicebutton" onClick="@command('addCc')"/>
+			<button label="${labels.MailBccButton}" width="90%" sclass="nicebutton" onClick="@command('addBcc')"/>
+		</vbox>
+		<vbox hflex="5">
+			<grid>
+				<columns>
+					<column hflex="min"/>
+					<column/>
+				</columns>
+				<rows>
+					<row>
+						<label value="${labels.MailFor}"/> <textbox value="@bind(vm.to)" width="100%" droppable="true" onDrop="@command('addTo')"/>
+					</row>
+					<row>
+						<label value="${labels.MailCc}"/> <textbox value="@bind(vm.cc)" width="100%" droppable="true" onDrop="@command('addCc')"/>
+					</row>
+					<row>
+						<label value="${labels.MailBcc}"/> <textbox value="@bind(vm.bcc)" width="100%" droppable="true" onDrop="@command('addBcc')"/>
+					</row>
+					<row>
+						<label value="${labels.MailSubject }"/> <textbox value="@bind(vm.message.subject)" width="100%"/>
+					</row>
+					<row>
+						<label value="${labels.MailAttachement}"/> <textbox value="@load(vm.attachement)" readonly="true" width="100%"/>
+					</row>
+				</rows>
+			</grid>
+			<vbox>
+				<ckeditor width="540px" height="250px" value="@bind(vm.message.text)" toolbar="Basic"/>
+				<hbox>
+					<button label="${labels.MailSend}" onClick="@command('send', window=mailWin)" disabled="@load(empty vm.to)" sclass="nicebutton"/> <button label="${labels.ButtonStorno}" onClick="mailWin.detach()" sclass="nicebutton"/>
+				</hbox>
+			</vbox>
+		</vbox>
+	</hbox>
 </window>
 </zk>