Skip to content

Commit 5cd593c

Browse files
committed
remove frontend-changes
1 parent 8aa4f0a commit 5cd593c

File tree

5 files changed

+9
-40
lines changed

5 files changed

+9
-40
lines changed

common/locales/de.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@
195195
"materialItem": {
196196
"fields": {
197197
"article": "Artikel",
198-
"done": "Erledigt",
199198
"list": "Materialliste",
200199
"quantity": "Menge",
201200
"reference": "Aktivität / Lagerabschnitt",

common/locales/en.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@
195195
"materialItem": {
196196
"fields": {
197197
"article": "Article",
198-
"done": "Done",
199198
"list": "Material list",
200199
"quantity": "Quantity",
201200
"reference": "Activity / Period",

frontend/src/components/activity/content/Material.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
:layout-mode="layoutMode"
77
:material-item-collection="materialItemCollection"
88
:disabled="disabled"
9-
:done-checklist-disabled="true"
109
hide-period-filter
1110
/>
1211
</ContentNodeCard>

frontend/src/components/material/MaterialCreateItem.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
class="newItemRow"
77
@keyup.enter="submitForm"
88
>
9-
<td class="pt-1"></td>
109
<td class="pt-1">
1110
<e-number-field
1211
ref="quantity"
@@ -29,7 +28,7 @@
2928
maxlength="64"
3029
/>
3130
</td>
32-
<td class="pt-1" :colspan="columns - 5">
31+
<td class="pt-1" :colspan="columns - 4">
3332
<e-select
3433
v-model="materialItem.materialList"
3534
dense

frontend/src/components/material/MaterialTable.vue

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@
2727
</tr>
2828
</template>
2929

30-
<template #[`item.done`]="{ item }">
31-
<api-checkbox
32-
:disabled="layoutMode || doneChecklistDisabled || disabled"
33-
:uri="item.uri"
34-
path="done"
35-
/>
36-
</template>
37-
3830
<template #[`item.quantity`]="{ item }">
3931
<api-number-field
4032
v-if="!item.readonly"
@@ -255,9 +247,6 @@ export default {
255247
256248
disabled: { type: Boolean, default: false },
257249
258-
// Done-Checkbox is disabled
259-
doneChecklistDisabled: { type: Boolean, required: false, default: false },
260-
261250
// layoutMode=true --> data editing is disabled
262251
layoutMode: { type: Boolean, required: false, default: false },
263252
@@ -290,13 +279,6 @@ export default {
290279
291280
if (this.isDefaultVariant) {
292281
headers.push(
293-
{
294-
text: this.$tc('entity.materialItem.fields.done'),
295-
value: 'done',
296-
align: 'start',
297-
sortable: false,
298-
width: '5%',
299-
},
300282
{
301283
text: this.$tc('entity.materialItem.fields.quantity'),
302284
value: 'quantity',
@@ -322,23 +304,14 @@ export default {
322304
}
323305
)
324306
} else {
325-
headers.push(
326-
{
327-
text: this.$tc('entity.materialItem.fields.done'),
328-
value: 'done',
329-
align: 'start',
330-
sortable: false,
331-
width: '25%',
332-
},
333-
{
334-
text: this.$tc('entity.materialItem.fields.article'),
335-
value: 'article',
336-
align: 'start',
337-
sortable: true,
338-
width: 'auto',
339-
cellClass: 'pl-0',
340-
}
341-
)
307+
headers.push({
308+
text: this.$tc('entity.materialItem.fields.article'),
309+
value: 'article',
310+
align: 'start',
311+
sortable: true,
312+
width: 'auto',
313+
cellClass: 'pl-0',
314+
})
342315
}
343316
344317
// Activity column only shown in period overview

0 commit comments

Comments
 (0)