Compare commits

..

13 Commits

Author SHA256 Message Date
55a35d0931 rc deleted 2025-03-10 14:16:49 +01:00
f61f1e5c8f file not needed 2025-03-10 10:33:51 +01:00
4c07689a4a file not needed 2025-03-10 10:33:40 +01:00
5bf1d8de08 Fix icon on linuxero's branch 2025-03-10 10:26:59 +01:00
09a0daad66 Merge branch 'refs/heads/linuxero' 2025-03-10 10:24:13 +01:00
5b031e9d8d Fixed None type in EmployeeModel.py 2025-03-10 10:23:48 +01:00
155794e489 merge main 2025-03-10 09:54:46 +01:00
712df39383 Merge branch 'refs/heads/linuxero' 2025-03-08 12:24:49 +01:00
f5b32d6621 Ensure only one instance is running and publish company info. 2025-03-08 12:23:59 +01:00
c132b6830a Windows version 2025-03-07 15:29:45 +01:00
a6bed81aaf linuxversion 2025-03-07 15:29:04 +01:00
78ede0fad8 linux version 2025-03-07 15:28:51 +01:00
26759be1cb Resources for André 2025-03-07 14:47:37 +01:00
5 changed files with 45 additions and 8 deletions

View File

@@ -111,4 +111,17 @@ ColumnLayout
{
Layout.fillHeight: true
}
Component.onCompleted:
{
var c = config.getCompanyInfo()
if (Object.keys(c).length)
{
companyName.text = c['NAME']
street.text = c['STREET']
houseno.text = c['HOUSE']
zipcode.editText = c['ZIPCODE']
city.editText = c['CITY']
}
}
}

View File

@@ -175,7 +175,7 @@ Item
Text
{
text: model.display === null? "": model.display
text: (model.display === null || model.display === undefined)? "": model.display
elide: Text.ElideRight
width: parent.width
height: parent.height

View File

@@ -249,8 +249,12 @@ class ConfigLoader(QObject):
self.__saveConfig()
@Slot(result = dict)
def getCompanyInfo():
return self.__config['company']
def getCompanyInfo(self):
try:
return self.__config['company']
except KeyError as ex:
print(f"Missing company info: {ex}")
return None
@Slot(dict)
def saveMiscConf(self, misc_conf = None):
@@ -259,7 +263,11 @@ class ConfigLoader(QObject):
@Slot(result = bool)
def systray(self):
return self.__config['misc']['SYSTRAY']
try:
return self.__config['misc']['SYSTRAY']
except KeyError as ex:
print(f"Missing configuration: {ex}")
return False
@Slot(str, str)

View File

@@ -70,7 +70,8 @@ class EmployeeModel(QAbstractTableModel):
if applicant_col == 2 and self.__everyone:
tr = 'Ja' if tr == 1 else 'Nein'
else:
tr = re.sub("Keine Angabe ","", tr)
if tr:
tr = re.sub("Keine Angabe ","", tr)
#print(f"Data: {tr}")
# return row[index.column() + 2]
return tr

21
main.py
View File

@@ -2,10 +2,11 @@
import os
import sys
import logging
from PySide6.QtNetwork import QLocalServer, QLocalSocket
from PySide6.QtWidgets import QSystemTrayIcon
from PySide6.QtGui import QGuiApplication, QIcon
from PySide6.QtQml import QQmlApplicationEngine
#from PySide6.QtCore import QResource
from PySide6.QtCore import QIODevice #, QResource
from lib.ConfigLoader import ConfigLoader
from lib.DB.BusinessModel import BusinessModel
import rc_pyqcrm
@@ -34,6 +35,7 @@ os.environ['QML_XHR_ALLOW_FILE_READ'] = '1'
# name=""
# type=""
bad_config = False
db_con = False
address_model = None
@@ -85,6 +87,19 @@ if __name__ == "__main__":
app = QGuiApplication(sys.argv)
engine = QQmlApplicationEngine()
pyq_sok = QLocalSocket()
pyq_sok.connectToServer("PYQCRM_INSTANCE", QIODevice.ReadOnly)
if pyq_sok.state() == QLocalSocket.ConnectedState:
print("PYQCRM already running..")
print("Stop the running instance before running the application..")
sys.exit(-1)
else:
print("Starting PYQCRM_INSTANCE")
pyq_server = QLocalServer()
pyq_server.listen("PYQCRM_INSTANCE")
engine.addImportPath("qrc:/");
# qml_file = Path(__file__).resolve().parent / "Gui/main.qml"
@@ -92,7 +107,7 @@ if __name__ == "__main__":
qml_file = "qrc:/Gui/main.qml"
icon = QIcon(":/images/tero.jpg")
app.setWindowIcon(QIcon(icon))
app.setWindowIcon(icon)
tray = QSystemTrayIcon()
tray.setIcon(icon)
@@ -106,10 +121,10 @@ if __name__ == "__main__":
else:
initializeProgram()
engine.rootContext().setContextProperty("config", config)
engine.rootContext().setContextProperty("sys_printers", printers)
engine.rootContext().setContextProperty("bad_config", bad_config) # print(f"Fehler: {i}")
engine.rootContext().setContextProperty("db_con", db_con)
engine.rootContext().setContextProperty("config", config)
engine.rootContext().setContextProperty("systray", tray)
engine.load(qml_file)