Merge branch 'schnacke'

Scrollview in all Forms, Debugged Error in AddEmployee.qml
This commit is contained in:
2025-05-23 14:17:58 +02:00
3 changed files with 241 additions and 223 deletions

View File

@@ -1,13 +1,14 @@
import QtQuick import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import QtQuick.Controls
import TeroStyle import TeroStyle
import Js import Js
ScrollView
{
ColumnLayout { ColumnLayout {
anchors.fill: parent
spacing: Dimensions.l spacing: Dimensions.l
Component.onCompleted: { Component.onCompleted: {
employee_model.addedNewEmployee.connect(successful => { employee_model.addedNewEmployee.connect(successful => {
if (successful) if (successful)
@@ -48,3 +49,4 @@ ColumnLayout {
} }
} }
} }
}

View File

@@ -2,9 +2,9 @@ import QtQuick
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import Js import Js
ColumnLayout {
id: colPar
ScrollView
{
function checkFields() { function checkFields() {
if (!personalData.checkPersonalField()) if (!personalData.checkPersonalField())
saveBtn.enabled = false; saveBtn.enabled = false;
@@ -19,6 +19,10 @@ ColumnLayout {
console.log('failedtoadd'); console.log('failedtoadd');
} }
} }
ColumnLayout {
id: colPar
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
@@ -40,6 +44,9 @@ ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: Dimensions.l spacing: Dimensions.l
Frame { Frame {
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
Layout.fillWidth: true Layout.fillWidth: true
@@ -99,3 +106,4 @@ ColumnLayout {
} }
} }
} }
}

View File

@@ -4,12 +4,18 @@ import QtQuick.Controls
import QtQuick.Dialogs import QtQuick.Dialogs
import Js import Js
ScrollView
{
id: scroll
width: parent.width
height: parent.height
ColumnLayout ColumnLayout
{ {
height: Screen.desktopAvailableHeight
width: scroll.width
property var new_object: null property var new_object: null
//property alias checkAddContact: checkAddContact //property alias checkAddContact: checkAddContact
Layout.fillWidth: true
Layout.fillHeight: true
spacing: 15 spacing: 15
Label Label
{ {
@@ -138,6 +144,8 @@ ColumnLayout
// } // }
// } // }
}
function checkFields() function checkFields()
{ {
if(checkAddObjectContact.checked) if(checkAddObjectContact.checked)