Merge main

This commit is contained in:
2025-03-24 11:28:57 +01:00
5 changed files with 10 additions and 15 deletions

View File

@@ -7,7 +7,6 @@ import Qt.labs.qmlmodels
Item { Item {
anchors.fill: parent anchors.fill: parent
property var availableFilters: ["Name", "Adresse", "PLZ", "Ort"] property var availableFilters: ["Name", "Adresse", "PLZ", "Ort"]
id: test
StackView StackView
{ {

View File

@@ -4,12 +4,16 @@ import QtQuick.Controls
import Qt.labs.qmlmodels import Qt.labs.qmlmodels
ColumnLayout { ColumnLayout {
function viewCriterion(criterion) function viewCriterion(criterion)
{ {
business_model.viewCriterion(criterion.text); business_model.viewCriterion(criterion.text);
} }
anchors.fill: parent anchors.fill: parent
spacing: Dimensions.l
Component.onCompleted: customersStack.pop() Component.onCompleted: customersStack.pop()

View File

@@ -3,17 +3,15 @@ import QtQuick.Layouts
import QtQuick.Controls import QtQuick.Controls
import Qt.labs.qmlmodels import Qt.labs.qmlmodels
Item {
anchors.fill: parent
Item StackView {
{
StackView
{
id: employeesStack id: employeesStack
anchors.fill: parent anchors.fill: parent
initialItem: "EmployeesTable.qml" initialItem: "EmployeesTable.qml"
anchors.topMargin: Dimensions.m anchors.topMargin: Dimensions.m
} }
} }

View File

@@ -50,12 +50,7 @@ ColumnLayout
text: qsTr("Kunde") text: qsTr("Kunde")
selected: false selected: false
} }
ListElement
{
name: "Lieferant"
text: qsTr("Lieferant")
selected: false
}
ListElement ListElement
{ {
name: "Erledigt" name: "Erledigt"

View File

@@ -146,8 +146,7 @@ GridLayout
} }
TextField TextField
{ {id: gesamtnetto
id: gesamtnetto
Layout.fillWidth: true Layout.fillWidth: true
Layout.columnSpan: 3 Layout.columnSpan: 3
} }