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

Object contact logic implemented

Browse Source
This commit is contained in:
linuxero
2025-03-12 09:50:06 +01:00
parent 767200096f
commit e3053be72e
8 changed files with 95 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Gui/AddObject.qml
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,12 +103,28 @@ ColumnLayout
// }
// }
function onObjectAdded(added)
function onObjectAdded(added, oid)
{
if (!added)
console.log(qsTr("Fehler beim Objekt-Anlegen!"))
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()
{

16
Gui/ObjectAddOnContactPerson.qml
View File

@@ -16,7 +16,7 @@ GridLayout
ComboBox
{
//property string name: "contacttype"
id: contacttype
id: posizion
Layout.fillWidth: true
editable: false
model: [qsTr("Beirat"), qsTr("Hausmeister"), qsTr("Hausbewohner"), qsTr("Sonstiges")]
@@ -30,7 +30,7 @@ GridLayout
ComboBox
{
id: title
model: [qsTr("Herr"), qsTr("Frau"), qsTr("keine Angabe")]
model: [qsTr("Herr"), qsTr("Frau"), qsTr("Keine Angabe")]
Layout.fillWidth: true
}
Label
@@ -140,23 +140,22 @@ GridLayout
{
id: addContact
text: qsTr("Hinzufügen")
enabled: firstname.text.trim() && lastname.text.trim() && (phonenumber.text.trim() || mobile.text.trim()) && posizion.text.trim() && (contacts === null || Object.keys(contacts).length < 3)
enabled: firstname.text.trim() && lastname.text.trim() && (phonenumber.text.trim() || mobile.text.trim()) && (contacts === null || Object.keys(contacts).length < 3)
onClicked:
{
var num_contacts = 0
if (contacts !== null && contacts !== undefined) num_contacts = Object.keys(contacts).length
else contacts = []
if (num_contacts < 3 && firstname.text.trim() !== "" && lastname.text.trim() !== "" && (phonenumber.text.trim() !== "" || mobile.text.trim() !== "") && posizion.text.trim() !== "")
if (num_contacts < 3 && firstname.text.trim() !== "" && lastname.text.trim() !== "" && (phonenumber.text.trim() !== "" || mobile.text.trim() !== ""))
{
contacts[num_contacts] = {}
contacts[num_contacts]["title"] = title.currentText
contacts[num_contacts]["ctype"] = contacttype.currentText
contacts[num_contacts]["position"] = posizion.currentText
contacts[num_contacts]["fname"] = firstname.text.trim()
contacts[num_contacts]["lname"] = lastname.text.trim()
contacts[num_contacts]["phone"] = phonenumber.text.trim()
contacts[num_contacts]["mobile"] = mobile.text.trim()
contacts[num_contacts]["position"] = posizion.text.trim()
contactModel.append({name: title.currentText + " " + firstname.text.trim() + " " + lastname.text.trim(), phone: phonenumber.text.trim(), mobile: mobile.text.trim(), posizion: posizion.text.trim(), cdata: contacttype.currentText})
contactModel.append({name: title.currentText + " " + firstname.text.trim() + " " + lastname.text.trim(), phone: phonenumber.text.trim(), mobile: mobile.text.trim(), posizion: posizion.currentText})
if (checkFields())
{
saveBtn.enabled = true
@@ -165,7 +164,8 @@ GridLayout
lastname.text = ""
phonenumber.text = ""
mobile.text = ""
posizion.text = ""
posizion.currentIndex = 0
title.currentIndex = 0
removeContact.enabled = true
checkFields()

12
Gui/ObjectsTable.qml
View File

@@ -142,5 +142,15 @@ Item
// object_model.viewCriterion(criterion.text)
// }
Component.onCompleted: objectsStack.pop()
Component.onCompleted:
{
contact_model.objectContactAdded.connect(onObjectContactAdded)
objectsStack.pop()
}
function onObjectContactAdded(added)
{
console.log(added)
if (added) object_model.viewCriterion("")
}
}

9
Gui/main.qml
View File

@@ -6,6 +6,7 @@ import QtCore
ApplicationWindow
{
//property alias appLoader: appLoader
id: appWindow
width: Screen.width * .75
height: Screen.height * .85
@@ -150,6 +151,14 @@ ApplicationWindow
}
}
onWindowStateChanged: (windowState) => {
if (windowState !== Qt.WindowMinimized)
{
systray.setVisible(false)
appWindow.show()
}
}
onClosing: (close) =>
{
if (false)

26
lib/DB/ContactDAO.py
View File

@@ -1,10 +1,14 @@
from .DbManager import DbManager
from PySide6.QtCore import QObject, Signal
import json
import mariadb
class ContactDAO:
class ContactDAO(QObject):
newObjectContactAdded = Signal(bool)
def __init__(self):
super().__init__()
#print(f"*** File: {__file__}, __init__()")
self.__con = DbManager().getConnection()
if self.__con:
@@ -18,18 +22,28 @@ class ContactDAO:
if self.__cur:
self.__cur.callproc("addContactPerson", (enc_key, json.dumps(contact),))
self.__con.commit()
self.__cur.callproc("getLastInsertId")
contact_id = self.__cur.fetchone()
self.__cur.callproc("logger",(contact_id[0], "INSERT", "addContactPerson: New Contact added",))
self.__con.commit()
return contact_id[0]
else:
return None
except mariadb.Error as e:
print("MDB: " + str(e))
except Exception as e:
print("PYT: " + str(e))
def addObjectContact(self, contact, objectid, enc_key):
try:
if self.__cur:
self.__cur.callproc("addObjectContact", (enc_key, json.dumps(contact), objectid,))
self.__con.commit()
self.__cur.callproc("logObjectContact")
self.__con.commit()
self.newObjectContactAdded.emit(True)
except mariadb.Error as e:
print("MDB (addObjectContact): " + str(e))
self.newObjectContactAdded.emit(False)
except Exception as e:
print("PYT: " + str(e))
self.newObjectContactAdded.emit(False)
def getContact(self, contact_id, enc_key = None):
try:
if self.__cur:

8
lib/DB/ContactModel.py
View File

@@ -5,6 +5,7 @@ import logging
class ContactModel(QObject):
contactIdReady = Signal(int)
objectContactAdded = Signal(bool)
__contact = None
__contact_dict = {'contact':{}}
@@ -15,6 +16,8 @@ class ContactModel(QObject):
#self.logger = logging.getLogger()
self.__conf = ConfigLoader().getConfig()
self.__key = self.__conf['pyqcrm']['ENCRYPTION_KEY']
self.__contact_dao = ContactDAO()
self.__contact_dao.newObjectContactAdded.connect(self.objectContactAdded)
self.__data = self.__getData()
def getContacts(self):
@@ -31,6 +34,11 @@ class ContactModel(QObject):
i = ContactDAO().addContact(contact, self.__key)
self.contactIdReady.emit(i)
@Slot(dict, int)
def addObjectContact(self, contact, objectid):
ContactDAO().addObjectContact(contact, objectid, self.__key)
#self.contactIdReady.emit(i)
def __getContact(self, contact):
self.__contact = ContactDAO().getContact(contact, self.__key)
self.__getContactInfo()

13
lib/DB/ObjectDAO.py
View File

@@ -6,7 +6,7 @@ from ..PyqcrmFlags import PyqcrmAppliEmpyFlags
class ObjectDAO(QObject):
newObjectAdded = Signal(bool)
newObjectAdded = Signal(bool, int)
def __init__(self):
super().__init__()
@@ -15,12 +15,17 @@ class ObjectDAO(QObject):
if self.__con:
self.__cur = self.__con.cursor()
def addObject(self, new_object, new_objcontact, enc_key):
def addObject(self, new_object):
try:
if self.__cur:
self.__cur.callproc("addObject", (json.dumps(new_object), json.dumps(new_objcontact), enc_key,))
self.__cur.callproc("addObject", (json.dumps(new_object),))
self.__con.commit()
self.newObjectAdded.emit(True)
self.__cur.callproc("getLastInsertId")
object_id = self.__cur.fetchone()
self.newObjectAdded.emit(True, object_id[0])
return object_id[0]
else:
return None
except mariadb.Error as e:
self.newObjectAdded.emit(False)
print(str(e))

19
lib/DB/ObjectModel.py
View File

@@ -6,7 +6,7 @@ import re
import json
class ObjectModel(QAbstractTableModel):
objectAdded = Signal(bool)
objectAdded = Signal(bool, int)
__data = None
__object_dao = None
@@ -27,13 +27,11 @@ class ObjectModel(QAbstractTableModel):
self.__object_dao.newObjectAdded.connect(self.objectAdded)
self.__getData()
@Slot(dict, list, bool)
def addObject(self, new_object, new_objcontact = None, new_contact = False):
@Slot(dict)
def addObject(self, new_object):
#print(new_object)
print(new_objcontact)
#self.__object_dao.addObject(new_object, new_objcontact, self.__key)
o = self.__object_dao.addObject(new_object)
# @Slot(str)
# def viewCriterion(self, criterion, processed = False, fired = False):
@@ -57,15 +55,16 @@ class ObjectModel(QAbstractTableModel):
@Slot(str)
def viewCriterion(self, criterion):
print(f"Criterion: {criterion}")
self.__getData(criterion)
def data(self, index, role= Qt.DisplayRole):
if role == Qt.DisplayRole:
row = self.__data[index.row()]
applicant_col = index.column() + self.__col_skip
tr = row[applicant_col] #if type(row[index.column() + 2]) is str else str(row[index.column() + 2], "utf-8")
#print(f"Data: {tr}")
# return row[index.column() + 2]
object_col = index.column() + self.__col_skip
tr = row[object_col] #if type(row[index.column() + 2]) is str else str(row[index.column() + 2], "utf-8")
if object_col > 4 and tr:
tr = re.sub("Keine Angabe ","", tr)
return tr
return None