Skip to content
Snippets Groups Projects
Commit a41f6626 authored by Martin Massenberg's avatar Martin Massenberg
Browse files

Merge branch '20240222' into 'master'

20240222

See merge request oss/libraries/javascript/monster!49
parents f1994b9a a2857f1b
No related branches found
No related tags found
No related merge requests found
...@@ -101,6 +101,18 @@ ...@@ -101,6 +101,18 @@
<div data-monster-replace="path:data.orderState ">xx</div> <div data-monster-replace="path:data.orderState ">xx</div>
<div data-monster-replace="path:data.orderLastStatusChange ">xx</div> <div data-monster-replace="path:data.orderLastStatusChange ">xx</div>
<select data-monster-bind="path:data.type" data-monster-attributes="value path:data.type">
<option value="">bitte wählen</option>
<option value="order">order</option>
<option value="22">22</option>
<option value="33">33</option>
</select>
<!-- Ckeckbox wird ausgewählt wenn archived den Wert TRUE hat -->
<label>Checkbox
<input type="checkbox" value="true" data-monster-bind="path:data.archived" data-monster-bind-type="boolean"
data-monster-defaultvalue="false" data-monster-attributes="checked path:data.archived | ?:true: "></label>
<div class="buttons"> <div class="buttons">
<monster-button <monster-button
data-monster-role="saveButton" data-monster-role="saveButton"
...@@ -116,6 +128,12 @@ ...@@ -116,6 +128,12 @@
</div> </div>
</div> </div>
<div>
<div data-monster-replace="path:data.oid ">xx</div>
<div data-monster-replace="path:data.type ">xx</div>
<div data-monster-replace="path:data.archived ">xx</div>
</div>
</div> </div>
</monster-dataset> </monster-dataset>
...@@ -155,6 +173,8 @@ ...@@ -155,6 +173,8 @@
</div> </div>
</div> </div>
</monster-dataset> </monster-dataset>
</monster-overlay> </monster-overlay>
</div> </div>
......
...@@ -4,6 +4,7 @@ const json = ...@@ -4,6 +4,7 @@ const json =
"dataset": [ "dataset": [
{ {
"erpID": "", "erpID": "",
"type": "order",
"erpName": "mix up erp1", "erpName": "mix up erp1",
"erpNumber": "", "erpNumber": "",
"erpLastUpdate": "2020-01-16T10:27:18", "erpLastUpdate": "2020-01-16T10:27:18",
...@@ -38,11 +39,12 @@ const json = ...@@ -38,11 +39,12 @@ const json =
}, },
{ {
"erpID": "", "erpID": "",
"type": "retoure",
"erpName": "erp 2", "erpName": "erp 2",
"erpNumber": "", "erpNumber": "",
"erpLastUpdate": "2020-01-16T10:27:18", "erpLastUpdate": "2020-01-16T10:27:18",
"erpCreation": "2020-01-16T10:27:18", "erpCreation": "2020-01-16T10:27:18",
"archived": false, "archived": true,
"oid": 1000, "oid": 1000,
"orderDate": "2019-01-16T10:27:18", "orderDate": "2019-01-16T10:27:18",
"orderState": 57, "orderState": 57,
...@@ -72,6 +74,7 @@ const json = ...@@ -72,6 +74,7 @@ const json =
}, },
{ {
"erpID": "", "erpID": "",
"type": "shipping",
"erpName": "erp4", "erpName": "erp4",
"erpNumber": "", "erpNumber": "",
"erpLastUpdate": "2020-01-16T10:27:18", "erpLastUpdate": "2020-01-16T10:27:18",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment