Linuxero/pyqcrm
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing ObjectAddOnContactPerson.qml conflict

Browse Source
This commit is contained in:
linuxero
2025-02-27 14:20:15 +01:00
parent 0f253c518d
commit 6bf6ff3111
15 changed files with 22567 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Gui/AddObject.qml
View File

@@ -20,19 +20,19 @@ ColumnLayout
}
CheckBox
{
id: checkAddObject
id: checkAddContact
text: qsTr("Ansprechpartner hinzufügen")
Layout.alignment: Qt.AlignRight
checked: false
onCheckStateChanged:
{
//checkFields()
checkFields()
}
}
RowLayout
{
id: addobject
id: addObject
Layout.fillWidth: true
Layout.fillHeight: true
spacing: 45
@@ -51,7 +51,7 @@ ColumnLayout
ObjectAddOns
{
id: addObjectLayout
visible: checkAddObject.checked
visible: checkAddContact.checked
}
}
RowLayout
@@ -65,24 +65,26 @@ ColumnLayout
}
Button
{
property var new_object: null
id: saveBtn
text: qsTr("Speichern")
enabled: false
onClicked:
{
if (!checkAddObject.checked)
new_object = JsLib.parseForm(newObject)
new_object['lift'] = new_object['lift'] === 'Ja' ? 1 : 0
new_object['mezzanin'] = new_object['mezzanin'] === 'Ja' ? 1 : 0
if (!checkAddContact.checked)
{
new_object = JsLib.parseForm(objectView)
// object_model.addObject(new_object, 0)
// appLoader.source = "ObjectTable.qml"
console.log(new_object)
var list = []
object_model.addObject(new_object, list, false)
}
else
{
new_object = JsLib.parseForm(objectView)
var new_objecto = JsLib.parseForm(addObjectLayout)
console.log(new_objecto)
//objecto_model.addObject(new_objecto)
var new_objecto = addObjectLayout.getForm()
object_model.addObject(new_object, new_objecto, true)
}
}
}
@@ -93,7 +95,10 @@ ColumnLayout
Layout.fillHeight: true
}
Component.onCompleted:
{
object_model.objectAdded.connect(onObjectAdded)
}
// Connections
// {
@@ -107,18 +112,18 @@ ColumnLayout
// }
// }
// function checkFields()
// {
// if(checkAddObject.checked)
// {
// if(!objectView.checkObjectField() || !addObjectLayout.checkObjectField())
// saveBtn.enabled = false
// else
// saveBtn.enabled = true
// }
// else if (!objectView.checkObjectField())
// saveBtn.enabled = false
// else
// saveBtn.enabled = true
// }
function checkFields()
{
if(checkAddContact.checked)
{
if(!newObject.checkObjectField() || !addObjectLayout.contactPerson.contacts || !addObjectLayout.contactPerson.contacts.length)
saveBtn.enabled = false
else
saveBtn.enabled = true
}
else if (!newObject.checkObjectField())
saveBtn.enabled = false
else
saveBtn.enabled = true
}
}