Merge pull request 'refactor: refs #6780 Deleted references to warehouse vn2008' (!47) from 6780-changeViewDependencesVn2008 into dev
gitea/hedera-web/pipeline/head This commit looks good Details

Reviewed-on: #47
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
This commit is contained in:
Guillermo Bonet 2024-02-02 08:16:55 +00:00
commit c6120af93b
2 changed files with 151 additions and 147 deletions

View File

@ -1,42 +1,44 @@
<vn> <vn>
<vn-lot id="lot"/> <vn-lot id="lot"/>
<div id="title"> <div id="title">
<h1><t>Item list</t></h1> <h1><t>Item list</t></h1>
</div> </div>
<div id="actions" class="action-bar"> <div id="actions" class="action-bar">
<htk-bar-button <htk-bar-button
icon="print" icon="print"
tip="_Preview" tip="_Preview"
on-click="this.onPreviewClick()"/> on-click="this.onPreviewClick()"/>
</div> </div>
<div id="form" class="items"> <div id="form" class="items">
<div class="form box vn-w-sm vn-pa-lg"> <div class="form box vn-w-sm vn-pa-lg">
<div class="form-group"> <div class="form-group">
<label><t>Store</t></label> <label><t>Store</t></label>
<htk-combo form="lot" column="warehouse"> <htk-combo form="lot" column="warehouse">
<db-model property="model"> <db-model property="model">
SELECT id, name FROM vn2008.warehouse SELECT id, name
WHERE reserve ORDER BY name FROM vn.warehouse
</db-model> WHERE hasAvailable
</htk-combo> ORDER BY name
</div> </db-model>
<div class="form-group"> </htk-combo>
<label><t>Realm</t></label> </div>
<htk-combo form="lot" column="realm" not-null="false"> <div class="form-group">
<db-model property="model"> <label><t>Realm</t></label>
SELECT id, reino FROM vn2008.reinos <htk-combo form="lot" column="realm" not-null="false">
WHERE display != FALSE ORDER BY reino <db-model property="model">
</db-model> SELECT id, reino FROM vn2008.reinos
</htk-combo> WHERE display != FALSE ORDER BY reino
</div> </db-model>
<div class="form-group"> </htk-combo>
<label><t>Rate</t></label> </div>
<select id="rate"> <div class="form-group">
<option>3</option> <label><t>Rate</t></label>
<option>2</option> <select id="rate">
<option>1</option> <option>3</option>
</select> <option>2</option>
</div> <option>1</option>
</div> </select>
</div> </div>
</vn> </div>
</div>
</vn>

View File

@ -1,105 +1,107 @@
<vn> <vn>
<vn-lot-query id="params"> <vn-lot-query id="params">
<vn-spec name="config" type="Number"/> <vn-spec name="config" type="Number"/>
</vn-lot-query> </vn-lot-query>
<vn-lot id="lot"/> <vn-lot id="lot"/>
<div id="title"> <div id="title">
<h1><t>Shelves</t></h1> <h1><t>Shelves</t></h1>
</div> </div>
<div id="actions" class="action-bar"> <div id="actions" class="action-bar">
<htk-bar-button <htk-bar-button
icon="print" icon="print"
tip="_Preview" tip="_Preview"
on-click="this.onPreviewClick()"/> on-click="this.onPreviewClick()"/>
</div> </div>
<div id="form" class="shelves"> <div id="form" class="shelves">
<div class="form box vn-w-sm vn-pa-lg"> <div class="form box vn-w-sm vn-pa-lg">
<div class="form-group"> <div class="form-group">
<label><t>Configuration</t></label> <label><t>Configuration</t></label>
<htk-combo <htk-combo
id="config" id="config"
placeholder="_Select config" placeholder="_Select config"
form="params" form="params"
column="config" column="config"
on-changed="this.onConfigChange()" on-changed="this.onConfigChange()"
on-ready="this.onConfigChange()"> on-ready="this.onConfigChange()">
<db-model property="model"> <db-model property="model">
SELECT c.id, c.name reportTitle, c.namePrefix, c.warehouse, c.family, SELECT c.id, c.name reportTitle, c.namePrefix, c.warehouse, c.family,
c.shelf, c.maxAmount, c.showPacking, c.stack, t.reino_id realm c.shelf, c.maxAmount, c.showPacking, c.stack, t.reino_id realm
FROM shelfConfig c FROM shelfConfig c
JOIN vn2008.Tipos t ON t.tipo_id = c.family JOIN vn2008.Tipos t ON t.tipo_id = c.family
</db-model> </db-model>
</htk-combo> </htk-combo>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><t>Date</t></label> <label><t>Date</t></label>
<htk-date-chooser form="lot" name="date"/> <htk-date-chooser form="lot" name="date"/>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><t>Reign</t></label> <label><t>Reign</t></label>
<htk-combo form="lot" name="realm"> <htk-combo form="lot" name="realm">
<db-model property="model"> <db-model property="model">
SELECT id, reino FROM vn2008.reinos SELECT id, reino FROM vn2008.reinos
WHERE display != FALSE ORDER BY reino WHERE display != FALSE ORDER BY reino
</db-model> </db-model>
</htk-combo> </htk-combo>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><t>Family</t></label> <label><t>Family</t></label>
<htk-combo form="lot" name="family"> <htk-combo form="lot" name="family">
<db-model property="model" lot="lot"> <db-model property="model" lot="lot">
SELECT tipo_id, Tipo FROM vn2008.Tipos SELECT tipo_id, Tipo FROM vn2008.Tipos
WHERE reino_id = #realm ORDER BY Tipo WHERE reino_id = #realm ORDER BY Tipo
</db-model> </db-model>
</htk-combo> </htk-combo>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><t>Store</t></label> <label><t>Store</t></label>
<htk-combo form="lot"> <htk-combo form="lot">
<db-model property="model"> <db-model property="model">
SELECT id, name FROM vn2008.warehouse SELECT id, name
WHERE reserve ORDER BY name FROM vn.warehouse
</db-model> WHERE hasAvailable
</htk-combo> ORDER BY name
</div> </db-model>
<div class="form-group"> </htk-combo>
<label><t>Shelf</t></label> </div>
<htk-combo form="lot" name="shelf"> <div class="form-group">
<db-model property="model"> <label><t>Shelf</t></label>
SELECT id, name FROM shelf <htk-combo form="lot" name="shelf">
</db-model> <db-model property="model">
</htk-combo> SELECT id, name FROM shelf
</div> </db-model>
<div class="form-group"> </htk-combo>
<label><t>Name prefix</t></label> </div>
<htk-entry form="lot" name="namePrefix"/> <div class="form-group">
</div> <label><t>Name prefix</t></label>
<div class="form-group"> <htk-entry form="lot" name="namePrefix"/>
<label><t>Limit amount per item</t></label> </div>
<htk-entry form="lot" name="maxAmount"/> <div class="form-group">
</div> <label><t>Limit amount per item</t></label>
<div class="form-group"> <htk-entry form="lot" name="maxAmount"/>
<label><t>Title</t></label> </div>
<htk-entry form="lot" name="reportTitle"/> <div class="form-group">
</div> <label><t>Title</t></label>
<div class="form-group"> <htk-entry form="lot" name="reportTitle"/>
<label> </div>
<htk-check form="lot" name="showPacking"/> <div class="form-group">
<t>Show packing</t> <label>
</label> <htk-check form="lot" name="showPacking"/>
</div> <t>Show packing</t>
<div class="form-group"> </label>
<label> </div>
<htk-check form="lot" name="stack"/> <div class="form-group">
<t>Stack different items</t> <label>
</label> <htk-check form="lot" name="stack"/>
</div> <t>Stack different items</t>
<div class="form-group"> </label>
<label> </div>
<htk-check form="lot" name="useIds"/> <div class="form-group">
<t>Use ids instead of names</t> <label>
</label> <htk-check form="lot" name="useIds"/>
</div> <t>Use ids instead of names</t>
</div> </label>
</div> </div>
</vn> </div>
</div>
</vn>