positioning searchbar and quickfilter

Gui/CustomersTable.qml

@@ -4,7 +4,8 @@ import QtQuick.Controls
 import Qt.labs.qmlmodels
 
 ColumnLayout {
-    function viewCriterion(criterion) {
+    function viewCriterion(criterion)
+    {
         business_model.viewCriterion(criterion.text);
     }
 
@@ -12,12 +13,15 @@ ColumnLayout {
 
     Component.onCompleted: customersStack.pop()
 
-    RowLayout {
+    RowLayout
-        Layout.fillWidth: true
+    {
-        Layout.horizontalStretchFactor: 1
+        // Layout.fillWidth: true
-        spacing: Dimensions.l
+        // Layout.horizontalStretchFactor: 1
+        // spacing: Dimensions.l
 
-        SearchBar {
+
+        SearchBar
+        {
         }
 
         QuickFilter {
@@ -27,46 +31,49 @@ ColumnLayout {
 
             model: ListModel {
                 ListElement {
+
                     name: "Alle"
                     text: qsTr("Alle")
                     selected: true
                 }
                 ListElement {
-                    name: "showProvider"
+                    name: "Interessent"
                     text: qsTr("Interessent")
                     selected: false
                 }
                 ListElement {
-                    name: "showClientele"
+                    name: "Kunde"
                     text: qsTr("Kunde")
                     selected: false
                 }
                 ListElement {
-                    name: "showProvider"
+                    name: "Lieferant"
                     text: qsTr("Lieferant")
                     selected: false
                 }
                 ListElement {
-                    name: "showFinished"
+                    name: "Erledigt"
                     text: qsTr("Erledigt")
                     selected: false
                 }
             }
         }
-        Button {
+        Button
+        {
             id: addCustomer
 
             Layout.alignment: Qt.AlignRight
             icon.source: "qrc:/images/PlusCircle.svg"
             text: qsTr("Kunde Hinzufügen")
-
             onClicked: appLoader.source = "AddCustomer.qml"
         }
     }
-    ColumnLayout {
+    ColumnLayout
+    {
         clip: true
 
-        HorizontalHeaderView {
+        HorizontalHeaderView
+        {
             id: horizontalHeader
 
             Layout.fillWidth: true
@@ -74,14 +81,16 @@ ColumnLayout {
             movableColumns: true //@disable-check M16
             syncView: customerTable
 
-            delegate: Rectangle {
+            delegate: Rectangle
+            {
                 Layout.fillWidth: true
                 border.color: addCustomer.palette.base
                 color: addCustomer.palette.alternateBase
                 implicitHeight: 40
                 implicitWidth: 1
 
-                Text {
+                Text
+                {
                     color: addCustomer.palette.text
                     elide: Text.ElideRight
                     height: parent.height
@@ -158,4 +167,5 @@ ColumnLayout {
             Layout.fillWidth: true
         }
     }
+
 }

Gui/EmployeesTable.qml

@@ -3,114 +3,170 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import Qt.labs.qmlmodels
 
-Item
+ColumnLayout
 {
-    property var availableFilters: ["Name", "Adresse", "PLZ", "Ort", "Status"]
 
+    function viewEmployees(criterion)
+    {
+        employee_model.viewCriterion(criterion)
+        // employee_model.viewCriterion(criterion, showProcessed.checked, showFired.checked, showEveryone.checked)
+    }
+
+    anchors.fill: parent
+
+    Component.onCompleted: employeesStack.pop()
+    // property var availableFilters: ["Name", "Adresse", "PLZ", "Ort", "Status"]
+    RowLayout
+    {
         SearchBar
         {
             id:searchBar
-        anchors.margins: 9
+        }
+        QuickFilter
+        {
+            onSelectedChanged: (name) =>
+                               {
+                business_model.viewCriterion(name)
             }
 
+            model: ListModel
+            {
+                ListElement
+                {
+
+                    name: "Alle"
+                    text: qsTr("Alle")
+                    selected: true
+                }
+                ListElement
+                {
+                    name: "Bewerber"
+                    text: qsTr("Bewerber")
+                    selected: false
+                }
+                ListElement
+                {
+                    name: "Mitarbeiter"
+                    text: qsTr("Kunde")
+                    selected: false
+                }
+                ListElement
+                {
+                    name: "Lieferant"
+                    text: qsTr("Lieferant")
+                    selected: false
+                }
+                ListElement
+                {
+                    name: "Erledigt"
+                    text: qsTr("Erledigt")
+                    selected: false
+                }
+            }
+        }
         Button
         {
             id: addEmployeeBtn
             text: qsTr("Mitarbeiter Hinzufügen")
             icon.source: "qrc:/images/PlusCircle.svg"
-        anchors.right: parent.right
+            Layout.alignment: Qt.AlignRight
             flat: true
             onClicked: appLoader.source = "AddApplicant.qml"
         }
-
-    ButtonGroup
-    {
-        id: criterion
-        // buttons: criterion.children
-        onClicked:
-        {
-            viewEmployees(criterion.checkedButton.text)
-        }
     }
 
-    ColumnLayout
-    {
-        id: tableParent
-        clip: true
-        anchors
-        {
 
-            top: searchBar.bottom
-            bottom: parent.bottom
-            left: parent.left
-            right: parent.right
-        }
 
-        RowLayout
-        {
-            id: viewCriterion
 
-            RadioButton
-            {
-                //id: showAll
-                checked: true
-                text: qsTr("Alle")
-                ButtonGroup.group: criterion
-                //onClicked: viewEmployees(showAll)
-            }
-            RadioButton
-            {
-                //id: showApplicant
-                text: qsTr("Bewerber")
-                ButtonGroup.group: criterion
-                //onClicked: viewEmployees(showApplicant)
-            }
-            RadioButton
-            {
-                //id: showEmployee
-                text: qsTr("Mitarbeiter")
-                ButtonGroup.group: criterion
-                //onClicked: viewEmployees(showEmployee)
-            }
 
-            CheckBox
+    // ButtonGroup
-            {
+    // {
-                id: showEveryone
+    //     id: criterion
-                text: qsTr("Alle Stati")
+    //     // buttons: criterion.children
-                checked: true
+    //     onClicked:
-                onClicked: viewEmployees(criterion.checkedButton.text)
+    //     {
-                onCheckedChanged:
+    //         viewEmployees(criterion.checkedButton.text)
-                {
+    //     }
-                    showFired.checked = false
+    // }
-                    showProcessed.checked = false
-                }
-            }
-            CheckBox
-            {
-                id: showProcessed
-                text: qsTr("Erledigt")
-                enabled: !showEveryone.checked
-                checked: false
-                onClicked:
-                {
-                    showFired.checked = false
-                    viewEmployees(criterion.checkedButton.text)
-                }
-            }
-            CheckBox
-            {
-                id: showFired
-                text: qsTr("Ausgeschieden")
-                enabled: !showEveryone.checked
-                checked: false
-                onClicked:
-                {
-                    showProcessed.checked = false
-                    viewEmployees(criterion.checkedButton.text)
-                }
-            }
 
-        }
+    // ColumnLayout
+    // {
+    //     id: tableParent
+    //     clip: true
+    //     anchors
+    //     {
+
+    //         top: searchBar.bottom
+    //         bottom: parent.bottom
+    //         left: parent.left
+    //         right: parent.right
+    //     }
+
+    //     RowLayout
+    //     {
+    //         id: viewCriterion
+
+    //         RadioButton
+    //         {
+    //             //id: showAll
+    //             checked: true
+    //             text: qsTr("Alle")
+    //             ButtonGroup.group: criterion
+    //             //onClicked: viewEmployees(showAll)
+    //         }
+    //         RadioButton
+    //         {
+    //             //id: showApplicant
+    //             text: qsTr("Bewerber")
+    //             ButtonGroup.group: criterion
+    //             //onClicked: viewEmployees(showApplicant)
+    //         }
+    //         RadioButton
+    //         {
+    //             //id: showEmployee
+    //             text: qsTr("Mitarbeiter")
+    //             ButtonGroup.group: criterion
+    //             //onClicked: viewEmployees(showEmployee)
+    //         }
+
+    //         CheckBox
+    //         {
+    //             id: showEveryone
+    //             text: qsTr("Alle Stati")
+    //             checked: true
+    //             onClicked: viewEmployees(criterion.checkedButton.text)
+    //             onCheckedChanged:
+    //             {
+    //                 showFired.checked = false
+    //                 showProcessed.checked = false
+    //             }
+    //         }
+    //         CheckBox
+    //         {
+    //             id: showProcessed
+    //             text: qsTr("Erledigt")
+    //             enabled: !showEveryone.checked
+    //             checked: false
+    //             onClicked:
+    //             {
+    //                 showFired.checked = false
+    //                 viewEmployees(criterion.checkedButton.text)
+    //             }
+    //         }
+    //         CheckBox
+    //         {
+    //             id: showFired
+    //             text: qsTr("Ausgeschieden")
+    //             enabled: !showEveryone.checked
+    //             checked: false
+    //             onClicked:
+    //             {
+    //                 showProcessed.checked = false
+    //                 viewEmployees(criterion.checkedButton.text)
+    //             }
+    //         }
+
+    //     }
 
         HorizontalHeaderView
         {
@@ -143,8 +199,9 @@ Item
         {
             id: appliEmpTable
             //Layout.fillHeight: true
-            height: tableParent.height - (viewCriterion.height + employeeTableHeader.height)
+            //height: tableParent.height - (viewCriterion.height + employeeTableHeader.height)
             Layout.fillWidth: true
+            Layout.fillHeight: true
             columnSpacing: 1
             rowSpacing: 2
             alternatingRows: true
@@ -216,9 +273,9 @@ Item
         }
     }
 
-    function viewEmployees(criterion)
+    // function viewEmployees(criterion)
-    {
+    // {
-        employee_model.viewCriterion(criterion, showProcessed.checked, showFired.checked, showEveryone.checked)
+    //     employee_model.viewCriterion(criterion, showProcessed.checked, showFired.checked, showEveryone.checked)
-    }
+    // }
-    Component.onCompleted: employeesStack.pop()
+    // Component.onCompleted: employeesStack.pop()
-}
+

Gui/ObjectsTable.qml

@@ -3,36 +3,88 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import Qt.labs.qmlmodels
 
-Item
+ColumnLayout
 {
-
+    function viewCriterion(criterion)
-    SearchBar
     {
-        id:searchBar
+        business_model.viewCriterion(criterion.text);
+    }
+    function onObjectContactAdded(added)
+    {
+        console.log(added)
+        if (added) object_model.viewCriterion("")
     }
 
+    anchors.fill: parent
+
+    Component.onCompleted:
+    {
+        contact_model.objectContactAdded.connect(onObjectContactAdded)
+        objectsStack.pop()
+    }
+    RowLayout
+    {
+        SearchBar
+        {
+
+        }
+        QuickFilter {
+            onSelectedChanged: (name) => {
+                business_model.viewCriterion(name)
+            }
+
+            model: ListModel {
+                ListElement {
+
+                    name: "Alle"
+                    text: qsTr("Alle")
+                    selected: true
+                }
+                ListElement {
+                    name: "Interessent"
+                    text: qsTr("Interessent")
+                    selected: false
+                }
+                ListElement {
+                    name: "Kunde"
+                    text: qsTr("Kunde")
+                    selected: false
+                }
+                ListElement {
+                    name: "Lieferant"
+                    text: qsTr("Lieferant")
+                    selected: false
+                }
+                ListElement {
+                    name: "Erledigt"
+                    text: qsTr("Erledigt")
+                    selected: false
+                }
+            }
+        }
         Button
         {
             id: addObjectBtn
             icon.source: "qrc:/images/PlusCircle.svg"
             text: qsTr("Objekt Hinzufügen")
-        anchors.right: parent.right
+            Layout.alignment: Qt.AlignRight
             onClicked: appLoader.source = "AddObject.qml"
         }
+    }
 
 
     ColumnLayout
     {
         id: tableColumn
         clip: true
-        anchors
+        // anchors
-        {
+        // {
-            top: searchBar.bottom
+        //     top: searchBar.bottom
-            bottom: parent.bottom
+        //     bottom: parent.bottom
-            left: parent.left
+        //     left: parent.left
-            right: parent.right
+        //     right: parent.right
-            topMargin: 15
+        //     topMargin: 15
-        }
+        // }
         HorizontalHeaderView
         {
             id: horizontalHeaderview
@@ -131,26 +183,32 @@ Item
             // }
         }
 
+
+    }
     Item
     {
 
-            Layout.fillWidth: true
+        Layout.fillHeight: true
-        }
     }
+    // function onObjectContactAdded(added)
+    // {
+    //     console.log(added)
+    //     if (added) object_model.viewCriterion("")
+    // }
     // function viewCriterion(criterion)
     // {
     //     object_model.viewCriterion(criterion.text)
     // }
 
-    Component.onCompleted:
+    // Component.onCompleted:
-    {
+    // {
-        contact_model.objectContactAdded.connect(onObjectContactAdded)
+    //     contact_model.objectContactAdded.connect(onObjectContactAdded)
-        objectsStack.pop()
+    //     objectsStack.pop()
-    }
+    // }
 
-    function onObjectContactAdded(added)
+    // function onObjectContactAdded(added)
-    {
+    // {
-        console.log(added)
+    //     console.log(added)
-        if (added) object_model.viewCriterion("")
+    //     if (added) object_model.viewCriterion("")
-    }
+    // }
 }

Gui/OffersTable.qml

@@ -3,12 +3,72 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import Qt.labs.qmlmodels
 
-Item
+ColumnLayout
 {
-    property var availableFilters: []
+    anchors.fill: parent
+    function viewOffers(criterion)
+    {
+        //offer_model.viewCriterion(criterion)
+    }
 
+    RowLayout
+    {
         SearchBar
         {
             id:searchBar
         }
+        QuickFilter
+        {
+            onSelectedChanged: (name) =>
+                               {
+                business_model.viewCriterion(name)
+            }
+
+            model: ListModel
+            {
+                ListElement
+                {
+
+                    name: "Alle"
+                    text: qsTr("Alle")
+                    selected: true
+                }
+                ListElement
+                {
+                    name: "Offen"
+                    text: qsTr("Offen")
+                    selected: false
+                }
+                ListElement
+                {
+                    name: "Abgeschlossen"
+                    text: qsTr("Abgeschlossen")
+                    selected: false
+                }
+
+                ListElement
+                {
+                    name: "Erledigt"
+                    text: qsTr("Erledigt")
+                    selected: false
+                }
+            }
+        }
+        Button
+        {
+            id: addOfferBtn
+            text: qsTr("Angebote Hinzufügen")
+            icon.source: "qrc:/images/PlusCircle.svg"
+            Layout.alignment: Qt.AlignRight
+            flat: true
+            //onClicked: appLoader.source = "AddOffer.qml"
+        }
+    }
+    Item {
+        id: spacer
+        Layout.fillHeight: true
+
+    }
+
+
 }

Gui/SearchBar.qml

@@ -3,78 +3,12 @@ import QtQuick.Controls
 import QtQuick.Layouts
 
 
-RowLayout
+TextField {
-{
-    id: searchBar
-
-    TextField
-    {
-        id: searchField
-        placeholderText: qsTr("Suche")
-        leftPadding: 3
-        rightPadding: 3
     Layout.preferredWidth: 300
+    placeholderText: qsTr("Suche")
 
-        Button
+    Button {
-        {
+        icon.source: "qrc:/images/MagnifyingGlass.svg"
-            icon.source: "qrc:/images/search.svg"
+        isFieldButton: true
-            icon.color: "olive"
-            x: parent.x + parent.width - width
-            height: parent.height
-            flat: true
-        }
-
-
-        Button
-        {
-            id: filterBtn
-            icon.source: "qrc:/images/filter.svg"
-            icon.color: "olive"
-            x: parent.x + parent.width
-            height: searchField.height
-            flat: true
-            onClicked: filterPopup.open()
-        }
-    }
-
-    Popup
-    {
-        id: filterPopup
-        x: filterBtn.x + filterBtn.width
-        y: filterBtn.y
-        width: 100
-        height: 150
-        modal: true
-        focus: true
-        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
-        contentItem: Item
-        {
-            ColumnLayout
-            {
-                anchors.fill: parent
-                //id: filterContent
-
-                Repeater
-                {
-                    model: availableFilters
-
-                    CheckBox
-                    {
-                        text: model.modelData
-                        onClicked:
-                        {
-                            setFilter(text, checkState)
-                        }
-                    }
-
-                }
-            }
-        }
-    }
-
-    function setFilter(filter,activated)
-    {
-        console.log(filter)
-        console.log(activated)
     }
 }

Gui/TopBar.qml

@@ -225,7 +225,8 @@ ColumnLayout
     BarButton
     {
         id: atajos
-
+        implicitWidth: 90
+        implicitHeight: 90
         checkable: false
         icon.source: "qrc:/images/Bars3.svg"
 

Gui/main.qml

@@ -21,7 +21,6 @@ ApplicationWindow
 
     TopBar
     {
-
         id:topBar
         visible: bad_config || !db_con ? false: true
     }
@@ -47,8 +46,13 @@ ApplicationWindow
 
         anchors
         {
+            left: topBar.right
+            right: parent.right
+            top: parent.top
+            bottom: parent.bottom
+
+
 
-            fill: parent
             topMargin: Dimensions.l
             bottomMargin: Dimensions.l
             rightMargin: Dimensions.l

TeroStyle/qmldir

@@ -11,3 +11,4 @@ Label Label.qml
 QuickFilter QuickFilter.qml
 
 
+

pyqcrm.qrc

@@ -16,7 +16,6 @@
         <file>fonts/RobotoCondensed.otf</file>
         <file>README</file>
         <file>LICENSE</file>
-<<<<<<< HEAD
         <file>images/tero.jpg</file>
         <file>images/dash.svg</file>
         <file>images/invoice.svg</file>
@@ -25,7 +24,5 @@
         <file>images/customer.svg</file>
         <file>images/contract.svg</file>
         <file>images/object.svg</file>
-=======
->>>>>>> main
     </qresource>
 </RCC>