Crylia/EinsatzplanQT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix styling, refactor some variables, simplified some code

Browse Source
This commit is contained in:
Crylia
2024-07-06 19:57:11 +02:00
parent 5310e0bcb3
commit 674b88bf42
32 changed files with 1292 additions and 1355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/Controller/EinsatzplanFrameController/EinsatzplanFrameController.cpp
View File

@@ -1,51 +1,36 @@
# include "EinsatzplanFrameController.hpp"
# include "../../Core/DBHandler/DBPlan.hpp"
EinsatzplanFrameController::EinsatzplanFrameController(QString id, bool admin)
:id_m(id),admin_m(admin)
{
:m_id(id),
m_admin(admin) {
const std::map<std::string, std::string> config = load_config("../config.cfg");
m_connectionString = fmt::format(
"host={} port={} dbname={} user={} password={}",
config.at("DB_HOST"),
config.at("DB_PORT"),
config.at("DB_NAME"),
config.at("DB_USER"),
config.at("DB_PASSWORD")
);
}
void EinsatzplanFrameController::deleteMember(QString id){
DBPlan* db = new DBPlan();
db->deleteVeranstalter(id.toStdString());
/*
DatabaseHandler db = new DatabaseHandler();
db.executeQuery("DELETE FROM ...")
*/
void EinsatzplanFrameController::deleteMember(QString id) {
DBPlan* db = new DBPlan(m_connectionString);
db->deleteVeranstalter(id.toStdString( ));
}
void EinsatzplanFrameController::deleteVeranstaltung(QString veranstaltungsname){
DBPlan* db = new DBPlan();
db->deleteVeranstaltung(veranstaltungsname.toStdString());
/*
DatabaseHandler db = new DatabaseHandler();
db.executeQuery()
*/
void EinsatzplanFrameController::deleteVeranstaltung(QString veranstaltungsname) {
DBPlan* db = new DBPlan(m_connectionString);
db->deleteVeranstaltung(veranstaltungsname.toStdString( ));
}
void EinsatzplanFrameController::createMember(QString name, QString email, QString passwort, bool admin){
DBPlan* db = new DBPlan();
std::string temp;
if (admin)
temp = "TRUE";
else
temp = "FALSE";
db->hinzufuegenVeranstalter(email.toStdString(),name.toStdString(),passwort.toStdString(),temp);
/*
DatabaseHandler db = new DatabaseHandler();
db.executeQuery()
*/
void EinsatzplanFrameController::createMember(QString name, QString email, QString passwort, bool admin) {
DBPlan* db = new DBPlan(m_connectionString);
db->hinzufuegenVeranstalter(email.toStdString( ), name.toStdString( ), passwort.toStdString( ), admin ? "TRUE" : "FALSE");
}
void EinsatzplanFrameController::createVeranstaltung(QString name, QString raum, QString campus, QString time){
DBPlan* db = new DBPlan();
db->hinzufuegenVeranstaltung(name.toStdString(),time.toStdString(),campus.toStdString(),raum.toStdString());
/*
DatabaseHandler db = new DatabaseHandler();
db.executeQuery()
*/
}
void EinsatzplanFrameController::createVeranstaltung(QString name, QString raum, QString campus, QString time) {
DBPlan* db = new DBPlan(m_connectionString);
db->hinzufuegenVeranstaltung(name.toStdString( ), time.toStdString( ), campus.toStdString( ), raum.toStdString( ));
}

31
src/Controller/EinsatzplanFrameController/EinsatzplanFrameController.hpp
View File

@@ -1,14 +1,23 @@
# pragma once
# include <QString>
#pragma once
#include <QString>
#include <fmt/format.h>
#include "../../Core/DBHandler/DBPlan/DBPlan.hpp"
#include "../../Core/config/config.hpp"
class EinsatzplanFrameController {
private:
std::string m_connectionString;
class EinsatzplanFrameController{
protected:
QString id_m;
bool admin_m;
QString m_id;
bool m_admin;
public:
EinsatzplanFrameController(QString id = "0000000", bool admin = true);
void deleteMember(QString id);
void deleteVeranstaltung(QString veranstaltungsname);
void createMember(QString name, QString email, QString passwort, bool admin);
void createVeranstaltung(QString name, QString raum, QString campus, QString time);
};
EinsatzplanFrameController(QString id = "0000000", bool admin = true);
void deleteMember(QString id);
void deleteVeranstaltung(QString veranstaltungsname);
void createMember(QString name, QString email, QString passwort, bool admin);
void createVeranstaltung(QString name, QString raum, QString campus, QString time);
};

52
src/Controller/PlanGridController/PlanGridController.cpp
View File

@@ -1,7 +1,7 @@
# include "PlanGridController.hpp"
#include "PlanGridController.hpp"
PlanGridController::PlanGridController(){
weekdays[0] = "Montag";
PlanGridController::PlanGridController( ) {
weekdays[0] = "Montag";
weekdays[1] = "Dienstag";
weekdays[2] = "Mittwoch";
weekdays[3] = "Donnerstag";
@@ -13,14 +13,25 @@ PlanGridController::PlanGridController(){
times[3] = "14:00 - 16:00";
times[4] = "16:00 - 18:00";
planMap = new QMap<QPair<QString, QString>, QLabel*>();
planMap = new QMap<QPair<QString, QString>, QLabel*>( );
const std::map<std::string, std::string> config = load_config("../config.cfg");
m_connectionString = fmt::format(
"host={} port={} dbname={} user={} password={}",
config.at("DB_HOST"),
config.at("DB_PORT"),
config.at("DB_NAME"),
config.at("DB_USER"),
config.at("DB_PASSWORD")
);
}
QMap<QPair<QString, QString>, QLabel*>* PlanGridController::getVeranstaltungen(){
DBPlan* db = new DBPlan();
QMap<QPair<QString, QString>, QLabel*>* PlanGridController::getVeranstaltungen( ) {
DBPlan* db = new DBPlan(m_connectionString);
// stringFormat = tag , anfangszeit , Ort , Veranstaltung , Mitarbeiter , mitarbeiterID
std::vector<std::string> planData = db->getPlan();
std::vector<std::string> planData = db->getPlan( );
QString tag;
QString anfang;
@@ -29,34 +40,31 @@ QMap<QPair<QString, QString>, QLabel*>* PlanGridController::getVeranstaltungen()
QString mitarbeiter;
QString mitarbeiterId;
std::string temp;
for (const auto& veranstaltung:planData){
for (const auto& veranstaltung : planData) {
std::istringstream f(veranstaltung);
std::getline(f,temp,',');
std::getline(f, temp, ',');
tag.fromStdString(temp);
std::getline(f,temp,',');
std::getline(f, temp, ',');
anfang.fromStdString(temp);
std::getline(f,temp,',');
std::getline(f, temp, ',');
ort.fromStdString(temp);
std::getline(f,temp,',');
std::getline(f, temp, ',');
name.fromStdString(temp);
std::getline(f,temp,',');
std::getline(f, temp, ',');
mitarbeiter.fromStdString(temp);
std::getline(f,temp,',');
std::getline(f, temp, ',');
mitarbeiterId.fromStdString(temp);
QLabel* temp = new QLabel(name + "\n" + mitarbeiter + "\n" + ort);
temp->setObjectName("temp");
temp->setStyleSheet(R"(
temp->setObjectName("temp");
temp->setStyleSheet(R"(
#temp{
}
)");
temp->setFixedSize(240, 100);
planMap->insert(qMakePair(tag, anfang), temp);
temp->setFixedSize(240, 100);
planMap->insert(qMakePair(tag, anfang), temp);
}
return planMap;
//DatabaseHandler db = new DatabaseHandler();
//db.ex
return planMap;
}

33
src/Controller/PlanGridController/PlanGridController.hpp
View File

@@ -1,16 +1,23 @@
# pragma once
# include <QLabel>
# include <iostream>
# include <sstream>
# include "../../Core/DBHandler/DBPlan.hpp"
#pragma once
#include <QLabel>
#include <sstream>
#include <fmt/format.h>
#include "../../Core/config/config.hpp"
#include "../../Core/DBHandler/DBPlan/DBPlan.hpp"
class PlanGridController {
private:
std::string m_connectionString;
class PlanGridController{
protected:
QString weekdays[5];
QString times[5];
QMap<QPair<QString, QString>, QLabel*>* planMap;
public:
PlanGridController();
QString weekdays[5];
QString times[5];
QMap<QPair<QString, QString>, QLabel*>* planMap;
QMap<QPair<QString, QString>, QLabel*>* getVeranstaltungen();
};
public:
PlanGridController( );
QMap<QPair<QString, QString>, QLabel*>* getVeranstaltungen( );
};