Object contact logic implemented

This commit is contained in:
2025-03-12 09:50:06 +01:00
parent 767200096f
commit e3053be72e
8 changed files with 95 additions and 43 deletions

View File

@@ -8,6 +8,7 @@ import "../js/qmldict.js" as JsLib
ColumnLayout
{
property var new_object: null
property alias checkAddContact: checkAddContact
Layout.fillWidth: true
Layout.fillHeight: true
spacing: 15
@@ -74,18 +75,7 @@ ColumnLayout
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)
{
var list = []
object_model.addObject(new_object, list, false)
}
else
{
var new_objecto = addObjectLayout.getForm()
object_model.addObject(new_object, new_objecto, true)
}
object_model.addObject(new_object)
}
}
}
@@ -98,6 +88,7 @@ ColumnLayout
Component.onCompleted:
{
object_model.objectAdded.connect(onObjectAdded)
contact_model.objectContactAdded.connect(onObjectContact)
}
// Connections
@@ -112,11 +103,27 @@ ColumnLayout
// }
// }
function onObjectAdded(added)
function onObjectAdded(added, oid)
{
if (!added)
console.log(qsTr("Fehler beim Objekt-Anlegen!"))
appLoader.source = "ObjectTable.qml"
if (checkAddContact.checked && oid)
{
var new_objecto = addObjectLayout.getForm()
contact_model.addObjectContact(new_objecto, oid)
}
else appLoader.source = "ObjectTable.qml"
}
function onObjectContact(added)
{
if (!added)
console.log(qsTr("Fehler beim Objekt-Kontakt-Anlegen!"))
else
{
//object_model.viewCriterion("Alle")
appLoader.source = "ObjectTable.qml"
}
}
function checkFields()