Merge branch 'master' of https://git.bukova.info/repos/git/isspst
Conflicts: src/main/java/info/bukova/isspst/AppInitListener.java src/main/java/info/bukova/isspst/Constants.java
This commit is contained in:
@@ -0,0 +1,108 @@
|
||||
<?page title="EMail" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
<window id="editWin" border="normal" closable="true" apply="org.zkoss.bind.BindComposer"
|
||||
viewModel="@id('vm') @init('info.bukova.isspst.ui.settings.GlobalSettingsVM')" width="620px"
|
||||
binder="@init(queueName='email')">
|
||||
<caption src="/img/settings.png" zclass="form-caption" label="${labels.GlobalSettings}" />
|
||||
|
||||
<tabbox orient="vertical" height="400px">
|
||||
<tabs width="100px">
|
||||
<tab label="${labels.Requirements}"/>
|
||||
<tab label="${labels.EMails}"/>
|
||||
</tabs>
|
||||
<tabpanels>
|
||||
<tabpanel>
|
||||
<div>
|
||||
<checkbox label="${labels.EnableRequirements}" checked="@bind(vm.settings.enableRequirements)"/>
|
||||
</div>
|
||||
</tabpanel>
|
||||
<tabpanel>
|
||||
<tabbox>
|
||||
<tabs>
|
||||
<tab label="${labels.NewRequirement}"/>
|
||||
<tab label="${labels.AuthRequirement}"/>
|
||||
<tab label="${labels.ConfirmRequirement}"/>
|
||||
</tabs>
|
||||
<tabpanels>
|
||||
<tabpanel>
|
||||
<grid>
|
||||
<columns>
|
||||
<column hflex="min"/>
|
||||
<column/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="${labels.MailSubject}"/> <textbox value="@bind(vm.settings.newReqTemplate.subject)" width="100%"/>
|
||||
</row>
|
||||
<row spans="2">
|
||||
<vbox>
|
||||
<ckeditor toolbar="Basic" value="@bind(vm.settings.newReqTemplate.text)" width="460px" height="180px"/>
|
||||
<button label="${labels.InsertField}" popup="fieldsNew, position=after_start"/>
|
||||
</vbox>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</tabpanel>
|
||||
<tabpanel>
|
||||
<grid>
|
||||
<columns>
|
||||
<column hflex="min"/>
|
||||
<column/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="${labels.MailSubject}"/> <textbox value="@bind(vm.settings.authReqTemplate.subject)" width="100%"/>
|
||||
</row>
|
||||
<row spans="2">
|
||||
<vbox>
|
||||
<ckeditor toolbar="Basic" value="@bind(vm.settings.authReqTemplate.text)" width="460px" height="180px"/>
|
||||
<button label="${labels.InsertField}" popup="fieldsAuth, position=after_start"/>
|
||||
</vbox>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</tabpanel>
|
||||
<tabpanel>
|
||||
<grid>
|
||||
<columns>
|
||||
<column hflex="min"/>
|
||||
<column/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="${labels.MailSubject}"/> <textbox value="@bind(vm.settings.confReqTemplate.subject)" width="100%"/>
|
||||
</row>
|
||||
<row spans="2">
|
||||
<vbox>
|
||||
<ckeditor toolbar="Basic" value="@bind(vm.settings.confReqTemplate.text)" width="460px" height="180px"/>
|
||||
<button label="${labels.InsertField}" popup="fieldsConfirm, position=after_start"/>
|
||||
</vbox>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</tabpanel>
|
||||
</tabpanels>
|
||||
</tabbox>
|
||||
<menupopup id="fieldsNew" children="@load(vm.requirementFields)">
|
||||
<template name="children">
|
||||
<menuitem label="@load(each) @converter(vm.locConverter)" onClick="@command('insertField', field=each, message=vm.settings.newReqTemplate)"/>
|
||||
</template>
|
||||
</menupopup>
|
||||
<menupopup id="fieldsAuth" children="@load(vm.requirementFields)">
|
||||
<template name="children">
|
||||
<menuitem label="@load(each) @converter(vm.locConverter)" onClick="@command('insertField', field=each, message=vm.settings.authReqTemplate)"/>
|
||||
</template>
|
||||
</menupopup>
|
||||
<menupopup id="fieldsConfirm" children="@load(vm.requirementFields)">
|
||||
<template name="children">
|
||||
<menuitem label="@load(each) @converter(vm.locConverter)" onClick="@command('insertField', field=each, message=vm.settings.confReqTemplate)"/>
|
||||
</template>
|
||||
</menupopup>
|
||||
</tabpanel>
|
||||
</tabpanels>
|
||||
</tabbox>
|
||||
|
||||
|
||||
<include src="/app/formButtons.zul"/>
|
||||
</window>
|
||||
</zk>
|
||||
@@ -0,0 +1,28 @@
|
||||
<?page title="NumberSeriesFormTitle" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
<window id="editWin" border="normal" apply="org.zkoss.bind.BindComposer"
|
||||
viewModel="@id('vm') @init('info.bukova.isspst.ui.settings.NumberSeriesVM')" closable="true" width="400px"
|
||||
binder="@init(queueName='numSeries')">
|
||||
<caption zclass="form-caption" label="${labels.NumberSeriesFormTitle}" />
|
||||
<!-- <combobox></combobox> -->
|
||||
<grid model="@load(vm.numberSeriesList)">
|
||||
<columns>
|
||||
<column hflex="min"/>
|
||||
<column/>
|
||||
<column hflex="min"/>
|
||||
<column hflex="min"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<template name="model">
|
||||
<row>
|
||||
<label value="@load(vm.moduleMap[each.module].name.concat(' - ').concat(labels.Prefix))"/>
|
||||
<textbox value="@bind(each.prefix)"/>
|
||||
<label value="${labels.Number}"/>
|
||||
<label value="@load(each.number)"/>
|
||||
</row>
|
||||
</template>
|
||||
</rows>
|
||||
</grid>
|
||||
<include src="/app/formButtons.zul"/>
|
||||
</window>
|
||||
</zk>
|
||||
@@ -0,0 +1,15 @@
|
||||
<?page title="Limit" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
<window id="editWin" border="normal" apply="org.zkoss.bind.BindComposer"
|
||||
viewModel="@id('vm') @init('info.bukova.isspst.ui.requirements.LimitVM')">
|
||||
<caption zclass="form-caption" label="${labels.LimitFormTitle}" />
|
||||
<vbox>
|
||||
<hbox>
|
||||
<label value="${labels.Limit}"/>
|
||||
<textbox value="@bind(vm.workflow.limit)"/>
|
||||
</hbox>
|
||||
<include src="/app/formButtons.zul" />
|
||||
</vbox>
|
||||
|
||||
</window>
|
||||
</zk>
|
||||
@@ -45,27 +45,45 @@
|
||||
<caption label="${labels.Workflow}"/>
|
||||
<vbox>
|
||||
<listbox id="wgWorkflow" model="@load(vm.selected.workflow)" droppable="workgroup"
|
||||
onDrop="@command('addRoleWg', event=event)">
|
||||
onDrop="@command('addRoleWg', event=event)"
|
||||
selectedItem="@bind(vm.wgSelWorkflow)">
|
||||
<listhead>
|
||||
<listheader label="${labels.WorkgroupWorkflow}"/>
|
||||
</listhead>
|
||||
<template name="model">
|
||||
<listitem label="@load(each.role.description)" visible="@load(not each.centre)"
|
||||
onDrop="@command('reorderWg', event=event)" draggable="workgroup" droppable="workgroup"/>
|
||||
onDrop="@command('reorderWg', event=event)" draggable="workgroup" droppable="workgroup"
|
||||
context="limitPopUpWg"
|
||||
style="@load(empty each.limit ? '' : 'background-color: #e1fdd5')"
|
||||
tooltiptext="@load(empty each.limit ? '' : labels.Limit.concat(' ').concat(each.limit))"/>
|
||||
</template>
|
||||
</listbox>
|
||||
<listbox id="centreWorkflow" model="@load(vm.selected.workflow)" droppable="centre"
|
||||
onDrop="@command('addRoleCentre', event=event)">
|
||||
onDrop="@command('addRoleCentre', event=event)"
|
||||
selectedItem="@bind(vm.centreSelWorkflow)">
|
||||
<listhead>
|
||||
<listheader label="${labels.CentreWorkflow}"/>
|
||||
</listhead>
|
||||
<template name="model">
|
||||
<listitem label="@load(each.role.description)" visible="@load(each.centre)"
|
||||
onDrop="@command('reorderCentre', event=event)" draggable="centre" droppable="centre"/>
|
||||
onDrop="@command('reorderCentre', event=event)" draggable="centre" droppable="centre"
|
||||
context="limitPopUp"
|
||||
style="@load(empty each.limit ? '' : 'background-color: #e1fdd5')"
|
||||
tooltiptext="@load(empty each.limit ? '' : labels.Limit.concat(' ').concat(each.limit))"/>
|
||||
</template>
|
||||
</listbox>
|
||||
</vbox>
|
||||
</groupbox>
|
||||
<menupopup id="limitPopUp">
|
||||
<menuitem label="${labels.OverLimit}" checkmark="true"
|
||||
checked="@load(not empty vm.centreSelWorkflow.limit)"
|
||||
onClick="@command('overLimit', workflow=centreWorkflow.selectedItem.value)"/>
|
||||
</menupopup>
|
||||
<menupopup id="limitPopUpWg">
|
||||
<menuitem label="${labels.OverLimit}" checkmark="true"
|
||||
checked="@load(not empty vm.wgSelWorkflow.limit)"
|
||||
onClick="@command('overLimit', workflow=wgWorkflow.selectedItem.value)"/>
|
||||
</menupopup>
|
||||
</div>
|
||||
</hbox>
|
||||
</vbox>
|
||||
|
||||
Reference in New Issue
Block a user