ui updates, add table to elsa for statistics

2024-05-24 16:27:52 +02:00
parent 356f6852a4
commit 8ec9521f49
2 changed files with 103 additions and 23 deletions
--- a/src/ui/Ui_semesterapparat_ui.py
+++ b/src/ui/Ui_semesterapparat_ui.py
@@ -879,6 +879,9 @@ class Ui_MainWindow(object):
        self.statistics_table.setSizePolicy(sizePolicy)
        self.statistics_table.setMaximumSize(QtCore.QSize(16777215, 16777215))
        self.statistics_table.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
+        self.statistics_table.setHorizontalScrollBarPolicy(
+            QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff
+        )
        self.statistics_table.setEditTriggers(
            QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers
        )
@@ -894,9 +897,10 @@ class Ui_MainWindow(object):
        self.statistics_table.setHorizontalHeaderItem(2, item)
        self.statistics_table.horizontalHeader().setCascadingSectionResizes(True)
        self.statistics_table.horizontalHeader().setDefaultSectionSize(59)
-        self.statistics_table.horizontalHeader().setMinimumSectionSize(24)
+        self.statistics_table.horizontalHeader().setMinimumSectionSize(40)
        self.statistics_table.horizontalHeader().setSortIndicatorShown(True)
        self.statistics_table.horizontalHeader().setStretchLastSection(True)
+        self.statistics_table.verticalHeader().setStretchLastSection(True)
        self.gridLayout_4.addWidget(self.statistics_table, 0, 0, 1, 1)
        self.tabWidget_3.addTab(self.tab_6, "")
        self.tab_7 = QtWidgets.QWidget()
@@ -1042,7 +1046,7 @@ class Ui_MainWindow(object):
        self.dokument_list_elsa.horizontalHeader().setMinimumSectionSize(41)
        self.dokument_list_elsa.verticalHeader().setDefaultSectionSize(30)
        self.check_file_elsa = QtWidgets.QPushButton(parent=self.create_frame_elsa)
-        self.check_file_elsa.setGeometry(QtCore.QRect(1080, 100, 131, 51))
+        self.check_file_elsa.setGeometry(QtCore.QRect(1060, 120, 131, 51))
        font = QtGui.QFont()
        font.setPointSize(9)
        font.setBold(False)
@@ -1051,7 +1055,7 @@ class Ui_MainWindow(object):
        self.btn_open_document_elsa = QtWidgets.QPushButton(
            parent=self.create_frame_elsa
        )
-        self.btn_open_document_elsa.setGeometry(QtCore.QRect(1080, 60, 131, 25))
+        self.btn_open_document_elsa.setGeometry(QtCore.QRect(1060, 80, 131, 25))
        font = QtGui.QFont()
        font.setPointSize(9)
        font.setBold(False)
@@ -1060,7 +1064,7 @@ class Ui_MainWindow(object):
        self.btn_add_document_elsa = QtWidgets.QPushButton(
            parent=self.create_frame_elsa
        )
-        self.btn_add_document_elsa.setGeometry(QtCore.QRect(1080, 20, 131, 25))
+        self.btn_add_document_elsa.setGeometry(QtCore.QRect(1060, 40, 131, 25))
        font = QtGui.QFont()
        font.setPointSize(9)
        font.setBold(False)
@@ -1141,11 +1145,32 @@ class Ui_MainWindow(object):
        item = QtWidgets.QTableWidgetItem()
        self.table_elsa_list.setHorizontalHeaderItem(3, item)
        self.table_elsa_list.horizontalHeader().setStretchLastSection(True)
-        self.elsa_statistic = QtWidgets.QFrame(parent=self.tab_8)
-        self.elsa_statistic.setGeometry(QtCore.QRect(810, 410, 431, 271))
-        self.elsa_statistic.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
-        self.elsa_statistic.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
-        self.elsa_statistic.setObjectName("elsa_statistic")
+        self.elsa_statistic_frame = QtWidgets.QFrame(parent=self.tab_8)
+        self.elsa_statistic_frame.setGeometry(QtCore.QRect(810, 410, 431, 271))
+        self.elsa_statistic_frame.setObjectName("elsa_statistic_frame")
+        self.elsa_statistics = QtWidgets.QTabWidget(parent=self.elsa_statistic_frame)
+        self.elsa_statistics.setGeometry(QtCore.QRect(0, 0, 431, 271))
+        self.elsa_statistics.setObjectName("elsa_statistics")
+        self.tab_9 = QtWidgets.QWidget()
+        self.tab_9.setObjectName("tab_9")
+        self.tableWidget_2 = QtWidgets.QTableWidget(parent=self.tab_9)
+        self.tableWidget_2.setGeometry(QtCore.QRect(0, 0, 421, 231))
+        self.tableWidget_2.setHorizontalScrollBarPolicy(
+            QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff
+        )
+        self.tableWidget_2.setEditTriggers(
+            QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers
+        )
+        self.tableWidget_2.setObjectName("tableWidget_2")
+        self.tableWidget_2.setColumnCount(2)
+        self.tableWidget_2.setRowCount(0)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(0, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(1, item)
+        self.tableWidget_2.horizontalHeader().setDefaultSectionSize(210)
+        self.tableWidget_2.horizontalHeader().setSortIndicatorShown(True)
+        self.elsa_statistics.addTab(self.tab_9, "")
        self.elsa_cancel_create = QtWidgets.QPushButton(parent=self.tab_8)
        self.elsa_cancel_create.setEnabled(False)
        self.elsa_cancel_create.setGeometry(QtCore.QRect(30, 90, 91, 24))
@@ -1990,6 +2015,14 @@ class Ui_MainWindow(object):
        item.setText(_translate("MainWindow", "Signatur"))
        item = self.table_elsa_list.horizontalHeaderItem(3)
        item.setText(_translate("MainWindow", "Seite"))
+        item = self.tableWidget_2.horizontalHeaderItem(0)
+        item.setText(_translate("MainWindow", "Semester"))
+        item = self.tableWidget_2.horizontalHeaderItem(1)
+        item.setText(_translate("MainWindow", "Zugang"))
+        self.elsa_statistics.setTabText(
+            self.elsa_statistics.indexOf(self.tab_9),
+            _translate("MainWindow", "Tabelle"),
+        )
        self.elsa_cancel_create.setText(_translate("MainWindow", "Abbrechen"))
        self.elsa_add_new.setText(_translate("MainWindow", "Neuer Auftrag"))
        item = self.elsa_table.horizontalHeaderItem(0)
--- a/src/ui/semesterapparat_ui.ui
+++ b/src/ui/semesterapparat_ui.ui
@@ -1711,6 +1711,9 @@
                       <property name="focusPolicy">
                        <enum>Qt::NoFocus</enum>
                       </property>
+                       <property name="horizontalScrollBarPolicy">
+                        <enum>Qt::ScrollBarAlwaysOff</enum>
+                       </property>
                       <property name="editTriggers">
                        <set>QAbstractItemView::NoEditTriggers</set>
                       </property>
@@ -1721,7 +1724,7 @@
                        <bool>true</bool>
                       </attribute>
                       <attribute name="horizontalHeaderMinimumSectionSize">
-                        <number>24</number>
+                        <number>40</number>
                       </attribute>
                       <attribute name="horizontalHeaderDefaultSectionSize">
                        <number>59</number>
@@ -1732,6 +1735,9 @@
                       <attribute name="horizontalHeaderStretchLastSection">
                        <bool>true</bool>
                       </attribute>
+                       <attribute name="verticalHeaderStretchLastSection">
+                        <bool>true</bool>
+                       </attribute>
                       <column>
                        <property name="text">
                         <string>Semester</string>
@@ -2044,8 +2050,8 @@
             <widget class="QPushButton" name="check_file_elsa">
              <property name="geometry">
               <rect>
-                <x>1080</x>
-                <y>100</y>
+                <x>1060</x>
+                <y>120</y>
                <width>131</width>
                <height>51</height>
               </rect>
@@ -2067,8 +2073,8 @@
             <widget class="QPushButton" name="btn_open_document_elsa">
              <property name="geometry">
               <rect>
-                <x>1080</x>
-                <y>60</y>
+                <x>1060</x>
+                <y>80</y>
                <width>131</width>
                <height>25</height>
               </rect>
@@ -2086,8 +2092,8 @@
             <widget class="QPushButton" name="btn_add_document_elsa">
              <property name="geometry">
               <rect>
-                <x>1080</x>
-                <y>20</y>
+                <x>1060</x>
+                <y>40</y>
                <width>131</width>
                <height>25</height>
               </rect>
@@ -2248,7 +2254,7 @@
              </property>
             </column>
            </widget>
-            <widget class="QFrame" name="elsa_statistic">
+            <widget class="QFrame" name="elsa_statistic_frame">
             <property name="geometry">
              <rect>
               <x>810</x>
@@ -2257,12 +2263,53 @@
               <height>271</height>
              </rect>
             </property>
-             <property name="frameShape">
-              <enum>QFrame::StyledPanel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
+             <widget class="QTabWidget" name="elsa_statistics">
+              <property name="geometry">
+               <rect>
+                <x>0</x>
+                <y>0</y>
+                <width>431</width>
+                <height>271</height>
+               </rect>
+              </property>
+              <widget class="QWidget" name="tab_9">
+               <attribute name="title">
+                <string>Tabelle</string>
+               </attribute>
+               <widget class="QTableWidget" name="tableWidget_2">
+                <property name="geometry">
+                 <rect>
+                  <x>0</x>
+                  <y>0</y>
+                  <width>421</width>
+                  <height>231</height>
+                 </rect>
+                </property>
+                <property name="horizontalScrollBarPolicy">
+                 <enum>Qt::ScrollBarAlwaysOff</enum>
+                </property>
+                <property name="editTriggers">
+                 <set>QAbstractItemView::NoEditTriggers</set>
+                </property>
+                <attribute name="horizontalHeaderDefaultSectionSize">
+                 <number>210</number>
+                </attribute>
+                <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
+                 <bool>true</bool>
+                </attribute>
+                <column>
+                 <property name="text">
+                  <string>Semester</string>
+                 </property>
+                </column>
+                <column>
+                 <property name="text">
+                  <string>Zugang</string>
+                 </property>
+                </column>
+               </widget>
+              </widget>
+             </widget>
            </widget>
            <widget class="QPushButton" name="elsa_cancel_create">
             <property name="enabled">