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

Conflicts: src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java
2014-11-10 08:10:41 +01:00
parent 4c033deffb 9088a88b9a
commit 9ca4908ce4
17 changed files with 307 additions and 25 deletions
@@ -172,6 +172,7 @@ GlobalSettingsHours=Hodin
 GlobalSettingsUploadStamp=Nahrát obrázek razítka
 GlobalSettingsStamp=Razítko
 GlobalSettingsReqEnable=Povolení požadavků
+GlobalSettingsInsertUrl=Vložit URL záznamu

 UserSettings=Uživatelské nastavení

@@ -30,6 +30,20 @@
 	
 	<bean id="messageBuilder" class="info.bukova.isspst.mail.EntityMessageBuilder">
 		<property name="html" value="true"/>
+		<property name="urlResolverHolder" ref="urlResolverHolder"/>
+	</bean>
+	
+	<bean id="commonUrlResolver" class="info.bukova.isspst.CommonUrlResolver"/>
+	
+	<bean id="requirementUrlResolver" class="info.bukova.isspst.RequirementUrlResolver"/>
+	
+	<bean id="urlResolverHolder" class="info.bukova.isspst.UrlResolverHolder">
+		<constructor-arg ref="commonUrlResolver"/>
+		<property name="resolvers">
+			<map>
+				<entry key="#{T(info.bukova.isspst.data.Requirement)}" value-ref="requirementUrlResolver"/>
+			</map>
+		</property>
 	</bean>
 	
 <!-- 	<bean id="mailer" class="info.bukova.rsfaktura.services.mail.ThreadMailer"> -->
@@ -51,6 +51,6 @@
 		<div id="mainData">
 			<u:include src="${gridZul}" />
 		</div>
-		<div id="footer"> </div>
+		<div id="footer"> Verze 1.0 </div>
 	</div>
 </html>
@@ -146,19 +146,29 @@
 									<row>
 										<cell sclass="row-title">${labels.SuppliersFormCompany} :</cell>
 										<cell colspan="3">
-											<combobox
-												ctrlKeys="${labels.HandleComboKey}"
-												onCtrlKey="@command('handleComboKey', ctrl=self, keyEvent=event)"
-												onChange="@command('doFillSuppAddress')"
-												width="100%"
-												selectedItem="@bind(vm.selectedSuppAddrItem)"
-												value="@bind(vm.suppCompany)"
-												model="@load(vm.suppAddresses)"
-												readonly="false">
-												<template name="model">
-													<comboitem label="@load(each)" />
-												</template>
-											</combobox>
+											<hbox hflex="1">
+												<combobox
+													ctrlKeys="${labels.HandleComboKey}"
+													onCtrlKey="@command('handleComboKey', ctrl=self, keyEvent=event)"
+													onChange="@command('doFillSuppAddress')"
+													hflex="4"
+													selectedItem="@bind(vm.selectedSuppAddrItem)"
+													value="@bind(vm.suppCompany)"
+													model="@load(vm.suppAddresses)"
+													instant="true"
+													readonly="false">
+													<template name="model">
+														<comboitem label="@load(each)" />
+													</template>
+												</combobox>
+												<hbox hflex="2">
+													<button image="/img/search.png" 
+														label="${labels.SuppliersFormFindInARES}" 
+														sclass="nicebutton" 
+														disabled="@load((not empty vm.selectedSuppAddrItem) or ((empty vm.suppCompany) and (fx.suplier.ic eq 0)))" 
+														onClick="@command('searchAddress')"/>
+												</hbox>
+											</hbox>
 										</cell>
 									</row>
 									<row>
@@ -166,7 +176,8 @@
 										<cell>
 											<textbox
 												id="idSuppIC"
-												value="@bind(fx.suplier.ic)" />
+												value="@bind(fx.suplier.ic)"
+												instant="true" />
 										</cell>
 										<cell sclass="row-title">${labels.SuppliersFormDIC} :</cell>
 										<cell>
@@ -21,7 +21,10 @@
 										<vbox>
 											<ckeditor toolbar="Basic" value="@bind(vm.settings.newReqTemplate.text)" width="460px" height="180px" if="${vm.canSave}"/>
 											<html content="@load(vm.settings.newReqTemplate.text)" width="460px" height="180px" if="${not vm.canSave}"/>
-											<button label="${labels.InsertField}" popup="fieldsNew, position=after_start" disabled="@load(not vm.canSave)"/>
+											<hbox>
+												<button label="${labels.InsertField}" popup="fieldsNew, position=after_start" disabled="@load(not vm.canSave)"/>
+												<button label="${labels.GlobalSettingsInsertUrl}" onClick="@command('insertUrl', message=vm.settings.newReqTemplate)" disabled="@load(not vm.canSave)"/>
+											</hbox>
 										</vbox>
 									</row>
 								</rows>
@@ -41,7 +44,10 @@
 										<vbox>
 											<ckeditor toolbar="Basic" value="@bind(vm.settings.authReqTemplate.text)" width="460px" height="180px" if="${vm.canSave}" />
 											<html content="@load(vm.settings.authReqTemplate.text)" width="460px" height="180px" if="${not vm.canSave}"/>
-											<button label="${labels.InsertField}" popup="fieldsAuth, position=after_start" disabled="@load(not vm.canSave)"/>
+											<hbox>
+												<button label="${labels.InsertField}" popup="fieldsAuth, position=after_start" disabled="@load(not vm.canSave)"/>
+												<button label="${labels.GlobalSettingsInsertUrl}" onClick="@command('insertUrl', message=vm.settings.authReqTemplate)" disabled="@load(not vm.canSave)"/>
+											</hbox>
 										</vbox>
 									</row>
 								</rows>