Opraveno generovani vyuctovani sluzebni cesty spolucestujicich, pokud je pozadovana zaloha- zaloha se nyni neprenese.

closes #229 Po schvaleni pozadavku na sluzebni cestu se spolucestujicimi se posle mail o schvaleni i spolucestujicim. closes #228
2015-06-13 00:00:00 +02:00
parent aaa89a2653
commit c2ca2e45ec
10 changed files with 96 additions and 22 deletions
@@ -1,10 +1,13 @@
 <?page title="email" contentType="text/html;charset=UTF-8"?>
-<zk>
+<zk xmlns="http://www.zkoss.org/2005/zul"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.zkoss.org/2005/zul http://www.zkoss.org/2005/zul/zul.xsd">
 <tabbox>
 					<tabs>
 						<tab label="${labels.NewRequirement}"/>
 						<tab label="${labels.AuthRequirement}"/>
 						<tab label="${labels.ConfirmRequirement}"/>
+						<tab label="Scvaleni SC - spolucestujici"/>
 					</tabs>
 					<tabpanels>
 						<tabpanel>
@@ -88,6 +91,31 @@
 								</rows>
 							</grid>
 						</tabpanel>
+						<tabpanel>
+							<grid>
+								<columns>
+									<column hflex="min"/>
+									<column/>
+								</columns>
+								<rows>
+									<row>
+										<label value="${labels.MailSubject}" />
+										<textbox
+												value="@bind(vm.settings.confReqTripPassenger.subject)"
+												width="100%"
+												maxlength="@load(vm.lengthText)"
+												readonly="@load(not vm.canSave)" />
+									</row>
+									<row spans="2">
+										<vbox>
+											<ckeditor toolbar="Basic" value="@bind(vm.settings.confReqTripPassenger.text)" width="460px" height="180px" if="${vm.canSave}" />
+											<html content="@load(vm.settings.confReqTemplate.text)" width="460px" height="180px" if="${not vm.canSave}"/>
+											<button label="${labels.InsertField}" popup="fieldsConfirmPass, position=after_start" disabled="@load(not vm.canSave)"/>
+										</vbox>
+									</row>
+								</rows>
+							</grid>
+						</tabpanel>
 					</tabpanels>
 				</tabbox>
 				<menupopup id="fieldsNew" children="@load(vm.requirementFields)">
@@ -105,4 +133,9 @@
 						<menuitem label="@load(each) @converter(vm.locConverter)" onClick="@command('insertField', field=each, message=vm.settings.confReqTemplate)"/>
 					</template>	
 				</menupopup>
+				<menupopup id="fieldsConfirmPass" children="@load(vm.requirementFields)">
+					<template name="children">
+						<menuitem label="@load(each) @converter(vm.locConverter)" onClick="@command('insertField', field=each, message=vm.settings.confReqTripPassenger)"/>
+					</template>
+				</menupopup>
 </zk>