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

Adjusted display of applicant/employee and optimised the DB

Browse Source
This commit is contained in:
linuxero
2025-02-14 17:50:11 +01:00
parent 5ff4749247
commit b468c3d078
3 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Gui/EmployeesTable.qml
View File

@@ -70,17 +70,42 @@ Item
ButtonGroup.group: criterion
//onClicked: viewEmployees(showEmployee)
}
CheckBox
{
id: showEveryone
text: qsTr("Alle Stati")
checked: true
onClicked: viewEmployees(criterion.checkedButton.text)
onCheckedChanged:
{
showFired.checked = false
showProcessed.checked = false
}
}
CheckBox
{
id: showProcessed
text: qsTr("Erledigt")
onClicked: viewEmployees(criterion.checkedButton.text)
enabled: !showEveryone.checked
checked: false
onClicked:
{
showFired.checked = false
viewEmployees(criterion.checkedButton.text)
}
}
CheckBox
{
id: showFired
text: qsTr("Ausgeschieden")
onClicked: viewEmployees(criterion.checkedButton.text)
enabled: !showEveryone.checked
checked: false
onClicked:
{
showProcessed.checked = false
viewEmployees(criterion.checkedButton.text)
}
}
}
@@ -190,7 +215,7 @@ Item
function viewEmployees(criterion)
{
employee_model.viewCriterion(criterion, showProcessed.checked, showFired.checked)
employee_model.viewCriterion(criterion, showProcessed.checked, showFired.checked, showEveryone.checked)
}
Component.onCompleted: employeesStack.pop()
}

4
lib/DB/EmployeeDAO.py
View File

@@ -17,10 +17,10 @@ class EmployeeDAO(QObject):
if self.__con:
self.__cur = self.__con.cursor()
def getEmployees(self, enc_key, criterion = "Alle", processed = False, fired = False):
def getEmployees(self, enc_key, criterion = "Alle", processed = False, fired = False, every_state = True):
try:
if self.__cur:
self.__cur.callproc("getEmployeeTable", (criterion, processed, fired, enc_key, ))
self.__cur.callproc("getEmployeeTable", (criterion, processed, fired, every_state, enc_key, ))
self.__all_cols = [desc[0] for desc in self.__cur.description]
return self.__cur.fetchall(), self.__all_cols
else:

26
lib/DB/EmployeeModel.py
View File

@@ -11,6 +11,8 @@ class EmployeeModel(QAbstractTableModel):
__visible_columns = None
__col_name = ""
__employee_dao = None
__col_skip = 2
__everyone = True
def __init__(self):
super().__init__()
@@ -34,9 +36,9 @@ class EmployeeModel(QAbstractTableModel):
def __refreshView(self):
self.__getData()
def __getData(self, criterion = "Alle", processed = False, fired = False):
def __getData(self, criterion = "Alle", processed = False, fired = False, every_state = True):
self.beginResetModel()
rows, self.__visible_columns = self.__employee_dao.getEmployees(self.__key, criterion, processed, fired)
rows, self.__visible_columns = self.__employee_dao.getEmployees(self.__key, criterion, processed, fired, every_state)
self.__data = rows
self.endResetModel()
@@ -44,16 +46,24 @@ class EmployeeModel(QAbstractTableModel):
return len (self.__data)
def columnCount(self, parent= QModelIndex()):
return len(self.__visible_columns) - 2
return len(self.__visible_columns) - self.__col_skip
@Slot(str, bool, bool)
def viewCriterion(self, criterion, processed, fired):
self.__getData(criterion, processed, fired)
@Slot(str, bool, bool, bool)
def viewCriterion(self, criterion, processed, fired, every_state):
self.__everyone = True if criterion == 'Alle' else False
if self.__everyone and criterion != "Alle":
self.__col_skip = 2
else:
self.__col_skip = 2
self.__getData(criterion, processed, fired, every_state)
def data(self, index, role= Qt.DisplayRole):
if role == Qt.DisplayRole:
row = self.__data[index.row()]
tr = row[index.column() + 2] #if type(row[index.column() + 2]) is str else str(row[index.column() + 2], "utf-8")
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")
if applicant_col == 2 and self.__everyone:
tr = 'Ja' if tr == 1 else 'Nein'
#print(f"Data: {tr}")
# return row[index.column() + 2]
return tr
@@ -61,7 +71,7 @@ class EmployeeModel(QAbstractTableModel):
def headerData(self, section, orientation, role = Qt.DisplayRole):
if orientation == Qt.Horizontal and role == Qt.DisplayRole:
self.__col_name = self.__visible_columns[section + 2]
self.__col_name = self.__visible_columns[section + self.__col_skip]
return self.__col_name
return super().headerData(section, orientation, role)