diff --git a/.gitignore b/.gitignore
index eac8444..3e6c0cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -228,3 +228,4 @@ cython_debug/
rc_*.py
+.DS_STORE
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..c2083d3
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/discord.xml b/.idea/discord.xml
new file mode 100644
index 0000000..b25cd25
--- /dev/null
+++ b/.idea/discord.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..104102c
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..449e696
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..4719720
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..cad38cf
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/pyqcrm.iml b/.idea/pyqcrm.iml
new file mode 100644
index 0000000..1fff579
--- /dev/null
+++ b/.idea/pyqcrm.iml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..0faa797
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
new file mode 100644
index 0000000..887bd74
--- /dev/null
+++ b/.idea/watcherTasks.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Gui/AddNewObject.qml b/Gui/AddNewObject.qml
index 1641e18..7ad3205 100644
--- a/Gui/AddNewObject.qml
+++ b/Gui/AddNewObject.qml
@@ -114,6 +114,7 @@ GridLayout
from: 1
to: 100
value: 1
+ editable: true
}
Label
@@ -130,6 +131,7 @@ GridLayout
from: 1
to: 100
value: 1
+ editable: true
}
// New grid row
@@ -185,13 +187,11 @@ GridLayout
text: qsTr("Besonderheiten")
Layout.alignment: Qt.AlignRight
}
- ComboBox
+ TextField
{
property string name: "remarks"
id: remarks
Layout.fillWidth: true
- editable: false
- textRole: "display"
}
//// New grid row
diff --git a/Gui/AddObject.qml b/Gui/AddObject.qml
index 47262eb..d2a83e4 100644
--- a/Gui/AddObject.qml
+++ b/Gui/AddObject.qml
@@ -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()
diff --git a/Gui/DbConfiguration.qml b/Gui/DbConfiguration.qml
index a1c1a93..44e8238 100644
--- a/Gui/DbConfiguration.qml
+++ b/Gui/DbConfiguration.qml
@@ -5,7 +5,11 @@ import QtQuick.Layouts
GridLayout
{
- // property alias firstStart: firstStartGrid
+ property alias dbHost: dbHost
+ property alias dbPort: dbPort
+ property alias dbName: dbName
+ property alias dbUserName: dbUserName
+ property alias dbPassword: dbPassword
id: dbGrid
columns: 2
columnSpacing: 5
@@ -102,4 +106,17 @@ GridLayout
{
Layout.fillHeight: true
}
+
+ Component.onCompleted:
+ {
+ var db = config.getDbConf()
+ if (Object.keys(db).length)
+ {
+ dbHost.text = db['DB_HOST']
+ dbPort.text = db['DB_PORT']
+ dbName.text = db['DB_NAME']
+ dbUserName.text = db['DB_USER']
+ dbPassword.text = db['DB_PASS']
+ }
+ }
}
diff --git a/Gui/LoginScreen.qml b/Gui/LoginScreen.qml
index 9cf01a6..7fbe4d6 100644
--- a/Gui/LoginScreen.qml
+++ b/Gui/LoginScreen.qml
@@ -53,6 +53,7 @@ Item
font.pixelSize: 89
font.bold: true
Layout.alignment: Qt.AlignHCenter
+ color: "yellow"
}
Item
diff --git a/Gui/ObjectAddOnContactPerson.qml b/Gui/ObjectAddOnContactPerson.qml
index 1ffdb82..ab5ff82 100644
--- a/Gui/ObjectAddOnContactPerson.qml
+++ b/Gui/ObjectAddOnContactPerson.qml
@@ -9,17 +9,17 @@ GridLayout
Layout.fillWidth: true
Label
{
- text: qsTr("Kontaktdaten")
+ text: qsTr("Position")
Layout.alignment: Qt.AlignRight | Qt.AlignTop
}
ComboBox
{
//property string name: "contacttype"
- id: contacttype
+ id: posizion
Layout.fillWidth: true
editable: false
- model: [qsTr("Beirat"), qsTr("Hausmeister")]
+ model: [qsTr("Beirat"), qsTr("Hausmeister"), qsTr("Hausbewohner"), qsTr("Sonstiges")]
}
Label
@@ -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
@@ -88,18 +88,18 @@ GridLayout
}
- Label
- {
- text: qsTr("Position")
- Layout.alignment: Qt.AlignRight
- }
- TextField
- {
- id: posizion
- Layout.fillWidth: true
- placeholderText: "Pflichtfeld"
- placeholderTextColor: "red"
- }
+ // Label
+ // {
+ // text: qsTr("Position")
+ // Layout.alignment: Qt.AlignRight
+ // }
+ // TextField
+ // {
+ // id: posizion
+ // Layout.fillWidth: true
+ // placeholderText: "Pflichtfeld"
+ // placeholderTextColor: "red"
+ // }
RowLayout
{
@@ -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()
@@ -286,7 +286,7 @@ GridLayout
// header: headline
highlight: Rectangle { color: "slategray"; radius: 3}
highlightFollowsCurrentItem: false
- //focus: true
+ //focus: true test
onActiveFocusChanged: if(!focus) currentIndex = -1
delegate: Item
{
diff --git a/Gui/ObjectsTable.qml b/Gui/ObjectsTable.qml
index 5937100..8c3e91d 100644
--- a/Gui/ObjectsTable.qml
+++ b/Gui/ObjectsTable.qml
@@ -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("")
+ }
}
diff --git a/Gui/PyqcrmConf.qml b/Gui/PyqcrmConf.qml
index d112b85..7706ef5 100644
--- a/Gui/PyqcrmConf.qml
+++ b/Gui/PyqcrmConf.qml
@@ -112,7 +112,7 @@ Item
switch (confContainer.currentIndex)
{
case 1:
- console.log("Need to update DB paramenters")
+ updateDbConf()
break
case 2:
@@ -128,6 +128,23 @@ Item
}
}
+ function updateDbConf()
+ {
+ var db = {}
+ db['database'] = {}
+ db['database']['DB_HOST'] = dbConf.dbHost.text.trim()
+ db['database']['DB_PORT'] = dbConf.dbPort.text.trim()
+ db['database']['DB_NAME'] = dbConf.dbName.text.trim()
+ db['database']['DB_USER'] = dbConf.dbUserName.text.trim()
+ db['database']['DB_PASS'] = dbConf.dbPassword.text.trim()
+
+
+ if (db['database']['DB_HOST'] === '' || db['database']['DB_PORT'] === '' ||
+ db['database']['DB_NAME'] === '' || db['database']['DB_USER'] === '' ||
+ db['database']['DB_PASS'] === '');
+ else config.saveDbConf(company)
+ }
+
function updateCompanyInfo()
{
var company = {}
diff --git a/Gui/main.qml b/Gui/main.qml
index b68e806..cb21ac1 100644
--- a/Gui/main.qml
+++ b/Gui/main.qml
@@ -6,6 +6,7 @@ import QtCore
ApplicationWindow
{
+ //property alias appLoader: appLoader
id: appWindow
width: Screen.width * .75
height: Screen.height * .85
@@ -150,6 +151,15 @@ ApplicationWindow
}
}
+ onWindowStateChanged: (windowState) =>
+ {
+ if (windowState !== Qt.WindowMinimized)
+ {
+ systray.setVisible(false)
+ appWindow.show()
+ }
+ }
+
onClosing: (close) =>
{
if (false)
diff --git a/lib/ConfigLoader.py b/lib/ConfigLoader.py
index f6994fc..5867a34 100644
--- a/lib/ConfigLoader.py
+++ b/lib/ConfigLoader.py
@@ -243,6 +243,19 @@ class ConfigLoader(QObject):
self.__saveData(filename, password, conf_file)
+ @Slot(dict)
+ def saveDbConf(self, db = None):
+ self.__config.update(db)
+ self.__saveConfig()
+
+ @Slot(result = dict)
+ def getDbConf(self):
+ try:
+ return self.__config['database']
+ except KeyError as ex:
+ print(f"Missing database configuration: {ex}")
+ return None
+
@Slot(dict)
def saveCompanyInfo(self, company = None):
self.__config.update(company)
diff --git a/lib/DB/ContactDAO.py b/lib/DB/ContactDAO.py
index a5ba4df..5b61946 100644
--- a/lib/DB/ContactDAO.py
+++ b/lib/DB/ContactDAO.py
@@ -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:
diff --git a/lib/DB/ContactModel.py b/lib/DB/ContactModel.py
index 513b3b3..c4b8155 100644
--- a/lib/DB/ContactModel.py
+++ b/lib/DB/ContactModel.py
@@ -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()
diff --git a/lib/DB/ObjectDAO.py b/lib/DB/ObjectDAO.py
index 3d964c6..137a14b 100644
--- a/lib/DB/ObjectDAO.py
+++ b/lib/DB/ObjectDAO.py
@@ -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))
diff --git a/lib/DB/ObjectModel.py b/lib/DB/ObjectModel.py
index 405d011..5cbcf77 100644
--- a/lib/DB/ObjectModel.py
+++ b/lib/DB/ObjectModel.py
@@ -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