Update

build/CMakeFiles/EinsatzplanQT_autogen.dir/ParseCache.txt

@@ -1,11 +1,15 @@
 # Generated by CMake. Changes will be overwritten.
-/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/main.cpp
+/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/Controller/PlanGridController/PlanGridController.cpp
-/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/Controller/EinsatzplanFrameController/EinsatzplanFrameController.hpp
+/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/EinsatzplanWindow/EinsatzplanWindow.cpp
-/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/Controller/PlanGridController/PlanGridController.hpp
+/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/EinsatzplanFrame/EinsatzplanFrame.cpp
-/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/PlanGrid/PlanGrid.hpp
+/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/Controller/EinsatzplanFrameController/EinsatzplanFrameController.cpp
+/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/PlanGrid/PlanGrid.cpp
+/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/EinsatzplanWindow/EinsatzplanWindow.hpp
  mmc:Q_OBJECT
- mdp:/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/PlanGrid/PlanGrid.hpp
+ mdp:/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/EinsatzplanWindow/EinsatzplanWindow.hpp
  mdp:/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/build/EinsatzplanQT_autogen/moc_predefs.h
+ mdp:/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/EinsatzplanFrame/EinsatzplanFrame.hpp
+ mdp:/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/PlanGrid/PlanGrid.hpp
  mdp:/usr/include/alloca.h
  mdp:/usr/include/asm-generic/errno-base.h
  mdp:/usr/include/asm-generic/errno.h
@@ -373,6 +377,7 @@
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qfont.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qfontinfo.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qfontmetrics.h
+ mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qicon.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qimage.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qkeysequence.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qpaintdevice.h
@@ -389,16 +394,25 @@
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qtguiglobal.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qtransform.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qwindowdefs.h
+ mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QFrame
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QGridLayout
+ mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QHBoxLayout
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QLabel
+ mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QMainWindow
+ mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QPushButton
+ mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QVBoxLayout
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QWidget
+ mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qabstractbutton.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qboxlayout.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qframe.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qgridlayout.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qlabel.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qlayout.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qlayoutitem.h
+ mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qmainwindow.h
+ mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qpushbutton.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qsizepolicy.h
+ mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qtabwidget.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qtwidgets-config.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qtwidgetsglobal.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qwidget.h
@@ -822,12 +836,10 @@
  mdp:/usr/include/x86_64-linux-gnu/sys/types.h
  mdp:/usr/lib/gcc/x86_64-linux-gnu/11/include/stdarg.h
  mdp:/usr/lib/gcc/x86_64-linux-gnu/11/include/stddef.h
-/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/EinsatzplanWindow/EinsatzplanWindow.hpp
+/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/PlanGrid/PlanGrid.hpp
  mmc:Q_OBJECT
- mdp:/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/EinsatzplanWindow/EinsatzplanWindow.hpp
- mdp:/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/build/EinsatzplanQT_autogen/moc_predefs.h
- mdp:/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/EinsatzplanFrame/EinsatzplanFrame.hpp
  mdp:/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/PlanGrid/PlanGrid.hpp
+ mdp:/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/build/EinsatzplanQT_autogen/moc_predefs.h
  mdp:/usr/include/alloca.h
  mdp:/usr/include/asm-generic/errno-base.h
  mdp:/usr/include/asm-generic/errno.h
@@ -1195,7 +1207,6 @@
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qfont.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qfontinfo.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qfontmetrics.h
- mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qicon.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qimage.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qkeysequence.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qpaintdevice.h
@@ -1212,25 +1223,16 @@
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qtguiglobal.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qtransform.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtGui/qwindowdefs.h
- mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QFrame
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QGridLayout
- mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QHBoxLayout
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QLabel
- mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QMainWindow
- mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QPushButton
- mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QVBoxLayout
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/QWidget
- mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qabstractbutton.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qboxlayout.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qframe.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qgridlayout.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qlabel.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qlayout.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qlayoutitem.h
- mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qmainwindow.h
- mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qpushbutton.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qsizepolicy.h
- mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qtabwidget.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qtwidgets-config.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qtwidgetsglobal.h
  mdp:/usr/include/x86_64-linux-gnu/qt6/QtWidgets/qwidget.h
@@ -1240,8 +1242,6 @@
  mdp:/usr/include/x86_64-linux-gnu/sys/types.h
  mdp:/usr/lib/gcc/x86_64-linux-gnu/11/include/stdarg.h
  mdp:/usr/lib/gcc/x86_64-linux-gnu/11/include/stddef.h
-/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/PlanGrid/PlanGrid.cpp
+/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/Controller/PlanGridController/PlanGridController.hpp
-/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/Controller/EinsatzplanFrameController/EinsatzplanFrameController.cpp
+/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/Controller/EinsatzplanFrameController/EinsatzplanFrameController.hpp
-/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/EinsatzplanFrame/EinsatzplanFrame.cpp
+/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/main.cpp
-/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/View/EinsatzplanWindow/EinsatzplanWindow.cpp
-/home/aj/Dokumente/Studium/Studium Dokumente/4. Semester/SWE/EinsatzplanQT/src/Controller/PlanGridController/PlanGridController.cpp

src/View/EinsatzplanFrame/EinsatzplanFrame.cpp

@@ -68,7 +68,7 @@ EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
     planGrid_m->show();
 
     QVBoxLayout* totalLayout = new QVBoxLayout(this);
-    totalLayout->setContentsMargins(50,20,50,20);
+    totalLayout->setContentsMargins(30,20,30,20);
 
     QHBoxLayout* topLayout = new QHBoxLayout(this);
     topLayout->addWidget(profileImg_m, 1, Qt::AlignLeft);
@@ -83,7 +83,7 @@ EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
     
 
     totalLayout->addLayout(topLayout);
-    totalLayout->addLayout(bottomLayout);
+    totalLayout->addLayout(bottomLayout,2);
 
 
 
@@ -116,6 +116,9 @@ EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
             background-color: #DCFF78;
             border-radius: 10px;
         }
+        #deleteMember:pressed{
+            background-color: #CCEF68;
+        }
         )");
         deleteMemberButton_m->show();
 
@@ -130,6 +133,9 @@ EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
             background-color: #DCFF78;
             border-radius: 10px;
         }
+        #createVeranstaltung:pressed{
+            background-color: #CCEF68;
+        }
         )");
         createVeranstaltungButton_m->show();
 
@@ -144,14 +150,18 @@ EinsatzplanFrame::EinsatzplanFrame(QWidget* parent, QString id, bool admin)
             background-color: #DCFF78;
             border-radius: 10px;
         }
+        #deleteVeranstaltung:pressed{
+            background-color: #CCEF68;
+        }
         )");
         deleteVeranstaltungButton_m->show();
 
         QHBoxLayout* adminLayout = new QHBoxLayout(this);
-        adminLayout->addWidget(createMemberButton_m, 1, Qt::AlignCenter);
+        adminLayout->addWidget(createMemberButton_m, 1, Qt::AlignLeft);
-        adminLayout->addWidget(deleteMemberButton_m,1 , Qt::AlignCenter);
+        adminLayout->addWidget(deleteMemberButton_m,1 , Qt::AlignLeft);
-        adminLayout->addWidget(createVeranstaltungButton_m,1 , Qt::AlignCenter);
+        adminLayout->addStretch(1);
-        adminLayout->addWidget(deleteVeranstaltungButton_m,1 , Qt::AlignCenter);
+        adminLayout->addWidget(createVeranstaltungButton_m,1 , Qt::AlignRight);
+        adminLayout->addWidget(deleteVeranstaltungButton_m,1 , Qt::AlignRight);
         
         totalLayout->addLayout(adminLayout);
 

src/View/PlanGrid/PlanGrid.cpp

@@ -29,18 +29,36 @@ PlanGrid::PlanGrid(QWidget* parent)
 	times[9] = "17:00 - 18:00";
 
 
+
 	planMap = new QMap<QPair<QString, QString>, QLabel*>( );
 
 	gridLayout = new QGridLayout(this);
 
 	for (int i = 0; i < 5; ++i) {
 		for (int j = 0; j < 10; ++j) {
-			planMap->insert(qMakePair(weekdays[i], times[j]), nullptr);
+			QLabel* temp = new QLabel();
+			temp->setObjectName("temp");
+			temp->setStyleSheet(R"(
+			#temp{
+				
+			}
+			)");
+			temp->setFixedSize(250,40);
+			planMap->insert(qMakePair(weekdays[i], times[j]), temp);
 		}
 	}
 
+	populateGrid();
+
+
 	QLabel* temp = new QLabel();
-	temp->setFixedSize(124,100);
+	temp->setObjectName("temp");
+	temp->setStyleSheet(R"(
+	#temp{
+		border-top-left-radius: 10px;
+	}
+	)");
+	temp->setFixedSize(140,80);
 	gridLayout->addWidget(temp, 0, 0);
 
 	for (int i = 0; i < 5; i++) {
@@ -51,24 +69,34 @@ PlanGrid::PlanGrid(QWidget* parent)
 		#temp{
 			font-size: 24px;
 			font-weight: bold;
-			color: #d8d8d8
+			color: #d8d8d8;
 		}
 		)");
 		gridLayout->addWidget(temp, 0, i+1,Qt::AlignCenter);
 	}
+
 	for (int i = 0; i < 10; i++) {
 		QLabel* temp = new QLabel(times[i]);
-		temp->setFixedSize(124,50);
+		temp->setFixedSize(140,40);
 		temp->setObjectName("temp");
 		temp->setStyleSheet(R"(
 		#temp{
 			font-size: 16px;
 			font-weight: bold;
-			color: #d8d8d8
+			color: #d8d8d8;
 		}
 		)");
 		gridLayout->addWidget(temp, i+1, 0, Qt::AlignCenter);
 	}
 
+	gridLayout->setSpacing(0);
 	setLayout(gridLayout);
 }
+
+void PlanGrid::populateGrid(){
+	for (int i = 0; i<5; i++){
+		for (int j = 0; j < 10; ++j){
+			gridLayout->addWidget(planMap->value(qMakePair(weekdays[i],times[j])),j+1,i+1);
+		}
+	} 
+}

src/View/PlanGrid/PlanGrid.hpp

@@ -9,6 +9,8 @@ class PlanGrid : public QWidget {
 private:
     QString weekdays[5];
     QString times[10];
+    
+    void populateGrid();
 protected:
     QGridLayout* gridLayout;
     QMap<QPair<QString, QString>, QLabel*>* planMap;