ui changes

src/ui/sources/Ui_dialog_settings.py

@@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(422, 184)
+        Dialog.resize(492, 306)
         self.formLayout = QtWidgets.QFormLayout(Dialog)
         self.formLayout.setObjectName("formLayout")
         self.label = QtWidgets.QLabel(parent=Dialog)
@@ -24,54 +24,95 @@ class Ui_Dialog(object):
         self.label_2 = QtWidgets.QLabel(parent=Dialog)
         self.label_2.setObjectName("label_2")
         self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_2)
-        self.default_loan_duration = QtWidgets.QLineEdit(parent=Dialog)
-        self.default_loan_duration.setObjectName("default_loan_duration")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.default_loan_duration)
         self.label_3 = QtWidgets.QLabel(parent=Dialog)
         self.label_3.setObjectName("label_3")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_3)
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_3)
-        self.gridLayout = QtWidgets.QGridLayout()
+        self.databasesettings = QtWidgets.QGridLayout()
-        self.gridLayout.setObjectName("gridLayout")
+        self.databasesettings.setObjectName("databasesettings")
         self.database_name = QtWidgets.QLineEdit(parent=Dialog)
         self.database_name.setObjectName("database_name")
-        self.gridLayout.addWidget(self.database_name, 1, 1, 1, 1)
+        self.databasesettings.addWidget(self.database_name, 1, 1, 1, 1)
         self.label_4 = QtWidgets.QLabel(parent=Dialog)
         self.label_4.setObjectName("label_4")
-        self.gridLayout.addWidget(self.label_4, 0, 0, 1, 1)
+        self.databasesettings.addWidget(self.label_4, 0, 0, 1, 1)
         self.label_6 = QtWidgets.QLabel(parent=Dialog)
         self.label_6.setObjectName("label_6")
-        self.gridLayout.addWidget(self.label_6, 2, 0, 1, 1)
+        self.databasesettings.addWidget(self.label_6, 2, 0, 1, 1)
         self.database_path = QtWidgets.QLineEdit(parent=Dialog)
         self.database_path.setObjectName("database_path")
-        self.gridLayout.addWidget(self.database_path, 0, 1, 1, 1)
+        self.databasesettings.addWidget(self.database_path, 0, 1, 1, 1)
         self.database_backupLocation = QtWidgets.QLineEdit(parent=Dialog)
         self.database_backupLocation.setObjectName("database_backupLocation")
-        self.gridLayout.addWidget(self.database_backupLocation, 2, 1, 1, 1)
+        self.databasesettings.addWidget(self.database_backupLocation, 2, 1, 1, 1)
         self.label_5 = QtWidgets.QLabel(parent=Dialog)
         self.label_5.setObjectName("label_5")
-        self.gridLayout.addWidget(self.label_5, 1, 0, 1, 1)
+        self.databasesettings.addWidget(self.label_5, 1, 0, 1, 1)
         self.btn_select_database_path = QtWidgets.QToolButton(parent=Dialog)
         self.btn_select_database_path.setObjectName("btn_select_database_path")
-        self.gridLayout.addWidget(self.btn_select_database_path, 0, 2, 1, 1)
+        self.databasesettings.addWidget(self.btn_select_database_path, 0, 2, 1, 1)
         self.btn_select_database_name = QtWidgets.QToolButton(parent=Dialog)
         self.btn_select_database_name.setObjectName("btn_select_database_name")
-        self.gridLayout.addWidget(self.btn_select_database_name, 1, 2, 1, 1)
+        self.databasesettings.addWidget(self.btn_select_database_name, 1, 2, 1, 1)
         self.btn_select_database_backupLocation = QtWidgets.QToolButton(parent=Dialog)
         self.btn_select_database_backupLocation.setObjectName("btn_select_database_backupLocation")
-        self.gridLayout.addWidget(self.btn_select_database_backupLocation, 2, 2, 1, 1)
+        self.databasesettings.addWidget(self.btn_select_database_backupLocation, 2, 2, 1, 1)
-        self.formLayout.setLayout(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.gridLayout)
+        self.formLayout.setLayout(3, QtWidgets.QFormLayout.ItemRole.FieldRole, self.databasesettings)
+        self.label_7 = QtWidgets.QLabel(parent=Dialog)
+        self.label_7.setObjectName("label_7")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_7)
+        self.default_loan_duration = QtWidgets.QSpinBox(parent=Dialog)
+        self.default_loan_duration.setProperty("value", 7)
+        self.default_loan_duration.setObjectName("default_loan_duration")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.default_loan_duration)
+        self.delete_inactive_user_duration = QtWidgets.QSpinBox(parent=Dialog)
+        self.delete_inactive_user_duration.setMaximum(9999)
+        self.delete_inactive_user_duration.setProperty("value", 365)
+        self.delete_inactive_user_duration.setObjectName("delete_inactive_user_duration")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.delete_inactive_user_duration)
         self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
         self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
         self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Discard|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
-        self.formLayout.setWidget(3, QtWidgets.QFormLayout.ItemRole.FieldRole, self.buttonBox)
+        self.formLayout.setWidget(5, QtWidgets.QFormLayout.ItemRole.FieldRole, self.buttonBox)
+        self.label_9 = QtWidgets.QLabel(parent=Dialog)
+        self.label_9.setObjectName("label_9")
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_9)
+        self.gridLayout = QtWidgets.QGridLayout()
+        self.gridLayout.setObjectName("gridLayout")
+        self.btn_select_report_path = QtWidgets.QToolButton(parent=Dialog)
+        self.btn_select_report_path.setObjectName("btn_select_report_path")
+        self.gridLayout.addWidget(self.btn_select_report_path, 2, 2, 1, 1)
+        self.label_10 = QtWidgets.QLabel(parent=Dialog)
+        self.label_10.setText("")
+        self.label_10.setObjectName("label_10")
+        self.gridLayout.addWidget(self.label_10, 1, 0, 1, 1)
+        self.check_generate_report = QtWidgets.QCheckBox(parent=Dialog)
+        self.check_generate_report.setObjectName("check_generate_report")
+        self.gridLayout.addWidget(self.check_generate_report, 1, 1, 1, 1)
+        self.report_path = QtWidgets.QLineEdit(parent=Dialog)
+        self.report_path.setObjectName("report_path")
+        self.gridLayout.addWidget(self.report_path, 2, 1, 1, 1)
+        self.label_8 = QtWidgets.QLabel(parent=Dialog)
+        self.label_8.setObjectName("label_8")
+        self.gridLayout.addWidget(self.label_8, 2, 0, 1, 1)
+        self.label_11 = QtWidgets.QLabel(parent=Dialog)
+        self.label_11.setObjectName("label_11")
+        self.gridLayout.addWidget(self.label_11, 0, 0, 1, 1)
+        self.report_day = QtWidgets.QComboBox(parent=Dialog)
+        self.report_day.setObjectName("report_day")
+        self.report_day.addItem("")
+        self.report_day.addItem("")
+        self.report_day.addItem("")
+        self.report_day.addItem("")
+        self.report_day.addItem("")
+        self.gridLayout.addWidget(self.report_day, 0, 1, 1, 1)
+        self.formLayout.setLayout(4, QtWidgets.QFormLayout.ItemRole.FieldRole, self.gridLayout)
 
         self.retranslateUi(Dialog)
         self.buttonBox.accepted.connect(Dialog.accept) # type: ignore
         self.buttonBox.rejected.connect(Dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(Dialog)
-        Dialog.setTabOrder(self.institution_name, self.default_loan_duration)
+        Dialog.setTabOrder(self.institution_name, self.database_path)
-        Dialog.setTabOrder(self.default_loan_duration, self.database_path)
         Dialog.setTabOrder(self.database_path, self.database_name)
         Dialog.setTabOrder(self.database_name, self.database_backupLocation)
         Dialog.setTabOrder(self.database_backupLocation, self.btn_select_database_path)
@@ -90,3 +131,15 @@ class Ui_Dialog(object):
         self.btn_select_database_path.setText(_translate("Dialog", "..."))
         self.btn_select_database_name.setText(_translate("Dialog", "..."))
         self.btn_select_database_backupLocation.setText(_translate("Dialog", "..."))
+        self.label_7.setText(_translate("Dialog", "Inaktive Nutzer\n"
+"Löschen nach"))
+        self.label_9.setText(_translate("Dialog", "Bericht"))
+        self.btn_select_report_path.setText(_translate("Dialog", "..."))
+        self.check_generate_report.setText(_translate("Dialog", "Bericht erstellen"))
+        self.label_8.setText(_translate("Dialog", "Speicherpfad"))
+        self.label_11.setText(_translate("Dialog", "Tag"))
+        self.report_day.setItemText(0, _translate("Dialog", "Montag"))
+        self.report_day.setItemText(1, _translate("Dialog", "Dienstag"))
+        self.report_day.setItemText(2, _translate("Dialog", "Mittwoch"))
+        self.report_day.setItemText(3, _translate("Dialog", "Donnerstag"))
+        self.report_day.setItemText(4, _translate("Dialog", "Freitag"))

src/ui/sources/Ui_dialog_settings.ui.py

@@ -0,0 +1,8 @@
+# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\LibrarySystem\src\ui\sources\dialog_settings.ui.iRVFlN'
+#
+# Created by: PyQt6 UI code generator 6.6.1
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+

src/ui/sources/Ui_main_UserInterface.py

@@ -173,10 +173,12 @@ class Ui_MainWindow(object):
         self.actionAusleihistorie.setObjectName("actionAusleihistorie")
         self.actionBericht_erstellen = QtGui.QAction(parent=MainWindow)
         self.actionBericht_erstellen.setObjectName("actionBericht_erstellen")
+        self.actionNutzer_3 = QtGui.QAction(parent=MainWindow)
+        self.actionNutzer_3.setObjectName("actionNutzer_3")
         self.menuDatei.addAction(self.actionEinstellungen)
         self.menuDatei.addAction(self.actionBeenden)
         self.menuHotkeys.addAction(self.actionRueckgabemodus)
-        self.menuHotkeys.addAction(self.actionNutzer)
+        self.menuFenster.addAction(self.actionNutzer)
         self.menuFenster.addAction(self.actionAusleihistorie)
         self.menuFenster.addAction(self.actionBericht_erstellen)
         self.menubar.addAction(self.menuDatei.menuAction())
@@ -224,3 +226,4 @@ class Ui_MainWindow(object):
         self.actionAusleihistorie.setShortcut(_translate("MainWindow", "F8"))
         self.actionBericht_erstellen.setText(_translate("MainWindow", "Bericht erstellen"))
         self.actionBericht_erstellen.setShortcut(_translate("MainWindow", "F7"))
+        self.actionNutzer_3.setText(_translate("MainWindow", "Nutzer"))

src/ui/sources/Ui_main_userData.py

@@ -60,6 +60,9 @@ class Ui_MainWindow(object):
         self.gridLayout.addWidget(self.mail, 2, 1, 1, 1)
         self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+        self.label_5 = QtWidgets.QLabel(parent=self.centralwidget)
+        self.label_5.setObjectName("label_5")
+        self.horizontalLayout_4.addWidget(self.label_5)
         self.deleteUser = QtWidgets.QToolButton(parent=self.centralwidget)
         self.deleteUser.setMinimumSize(QtCore.QSize(30, 30))
         self.deleteUser.setText("")
@@ -171,6 +174,7 @@ class Ui_MainWindow(object):
         self.label.setText(_translate("MainWindow", "Name, Vorname"))
         self.label_3.setText(_translate("MainWindow", "Mail"))
         self.label_2.setText(_translate("MainWindow", "Matrikelnummer"))
+        self.label_5.setText(_translate("MainWindow", "Nutzer Löschen"))
         self.label_4.setText(_translate("MainWindow", "Medien"))
         self.radio_allLoanedMedia.setText(_translate("MainWindow", "Alle Ausleihen"))
         self.radio_currentlyLoaned.setText(_translate("MainWindow", "Aktuell entliehen"))

src/ui/sources/dialog_settings.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>422</width>
+    <width>492</width>
-    <height>184</height>
+    <height>306</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,18 +31,15 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="3" column="0">
-    <widget class="QLineEdit" name="default_loan_duration"/>
-   </item>
-   <item row="2" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Datenbank</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="3" column="1">
-    <layout class="QGridLayout" name="gridLayout">
+    <layout class="QGridLayout" name="databasesettings">
      <item row="1" column="1">
       <widget class="QLineEdit" name="database_name"/>
      </item>
@@ -96,7 +93,32 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="1">
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_7">
+     <property name="text">
+      <string>Inaktive Nutzer
+Löschen nach</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QSpinBox" name="default_loan_duration">
+     <property name="value">
+      <number>7</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QSpinBox" name="delete_inactive_user_duration">
+     <property name="maximum">
+      <number>9999</number>
+     </property>
+     <property name="value">
+      <number>365</number>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -106,11 +128,88 @@
      </property>
     </widget>
    </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_9">
+     <property name="text">
+      <string>Bericht</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="2" column="2">
+      <widget class="QToolButton" name="btn_select_report_path">
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_10">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QCheckBox" name="check_generate_report">
+       <property name="text">
+        <string>Bericht erstellen</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="report_path"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>Speicherpfad</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_11">
+       <property name="text">
+        <string>Tag</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="report_day">
+       <item>
+        <property name="text">
+         <string>Montag</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Dienstag</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Mittwoch</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Donnerstag</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Freitag</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>institution_name</tabstop>
-  <tabstop>default_loan_duration</tabstop>
   <tabstop>database_path</tabstop>
   <tabstop>database_name</tabstop>
   <tabstop>database_backupLocation</tabstop>

src/ui/sources/main_UserInterface.ui

@@ -308,12 +308,12 @@
      <string>Hotkeys</string>
     </property>
     <addaction name="actionRueckgabemodus"/>
-    <addaction name="actionNutzer"/>
    </widget>
    <widget class="QMenu" name="menuFenster">
     <property name="title">
      <string>Fenster</string>
     </property>
+    <addaction name="actionNutzer"/>
     <addaction name="actionAusleihistorie"/>
     <addaction name="actionBericht_erstellen"/>
    </widget>
@@ -369,6 +369,11 @@
     <string>F7</string>
    </property>
   </action>
+  <action name="actionNutzer_3">
+   <property name="text">
+    <string>Nutzer</string>
+   </property>
+  </action>
  </widget>
  <tabstops>
   <tabstop>btn_createNewUser</tabstop>

src/ui/sources/main_userData.ui

@@ -114,6 +114,13 @@
       </item>
       <item row="3" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <item>
+         <widget class="QLabel" name="label_5">
+          <property name="text">
+           <string>Nutzer Löschen</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QToolButton" name="deleteUser">
           <property name="minimumSize">