mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
PSQL 01.11.2024
This commit is contained in:
@@ -3,75 +3,52 @@ cmake_minimum_required(VERSION 3.5)
|
||||
project(testDBpgSQL LANGUAGES CXX)
|
||||
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
set(testDBpgSQL_DEBUG TRUE)
|
||||
set(PROJECT_TYPE_DEBUG TRUE)
|
||||
endif()
|
||||
|
||||
if(testDBpgSQL_DEBUG)
|
||||
add_definitions(-DtestDBpgSQL_DEBUG)
|
||||
if(PROJECT_TYPE_DEBUG)
|
||||
add_definitions(-DPROJECT_TYPE_DEBUG)
|
||||
endif()
|
||||
|
||||
# QtCreator supports the following variables for Android, which are identical to qmake Android variables.
|
||||
# Check http://doc.qt.io/qt-5/deployment-android.html for more information.
|
||||
# They need to be set before the find_package(Qt5 ...) call.
|
||||
|
||||
#if(ANDROID)
|
||||
# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
|
||||
# if (ANDROID_ABI STREQUAL "armeabi-v7a")
|
||||
# set(ANDROID_EXTRA_LIBS
|
||||
# ${CMAKE_CURRENT_SOURCE_DIR}/path/to/libcrypto.so
|
||||
# ${CMAKE_CURRENT_SOURCE_DIR}/path/to/libssl.so)
|
||||
# endif()
|
||||
#endif()
|
||||
|
||||
find_package(Qt5 COMPONENTS Widgets REQUIRED)
|
||||
find_package(Qt5 COMPONENTS Sql REQUIRED)
|
||||
|
||||
if(ANDROID)
|
||||
add_library(testDBpgSQL SHARED
|
||||
main.cpp
|
||||
mainwindow.cpp
|
||||
mainwindow.h
|
||||
mainwindow.ui
|
||||
)
|
||||
else()
|
||||
add_executable(testDBpgSQL
|
||||
main.cpp
|
||||
mainwindow.cpp
|
||||
mainwindow.h
|
||||
mainwindow.ui
|
||||
testDBpgSQL.qrc
|
||||
)
|
||||
endif()
|
||||
add_executable(testDBpgSQL
|
||||
main.cpp
|
||||
mainwindow.cpp
|
||||
mainwindow.h
|
||||
mainwindow.ui
|
||||
testDBpgSQL.qrc
|
||||
)
|
||||
|
||||
|
||||
target_link_libraries(testDBpgSQL PRIVATE Qt5::Widgets)
|
||||
target_link_libraries(testDBpgSQL PRIVATE Qt5::Sql)
|
||||
|
||||
|
||||
target_include_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DBXML/InstructorsAndTrainees)
|
||||
target_include_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DBXML/InstructorsAndTrainees/instructors)
|
||||
target_include_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DBXML/InstructorsAndTrainees/trainees)
|
||||
target_include_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DBXML/InstructorsAndTrainees/tasks)
|
||||
if(testDBpgSQL_DEBUG)
|
||||
target_link_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DBXML/Debug64)
|
||||
target_include_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees)
|
||||
target_include_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/instructors)
|
||||
target_include_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/trainees)
|
||||
target_include_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/tasks)
|
||||
if(PROJECT_TYPE_DEBUG)
|
||||
target_link_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/Debug64)
|
||||
elseif()
|
||||
target_link_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DBXML/Release64)
|
||||
target_link_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/Release64)
|
||||
endif()
|
||||
target_link_libraries(testDBpgSQL PRIVATE libInstructorsAndTrainees.dll)
|
||||
|
||||
|
||||
target_include_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB/DataBaseLMS)
|
||||
if(testDBpgSQL_DEBUG)
|
||||
target_link_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB/Debug64)
|
||||
target_include_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/DataBaseLMS)
|
||||
if(PROJECT_TYPE_DEBUG)
|
||||
target_link_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/Debug64)
|
||||
elseif()
|
||||
target_link_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB/Release64)
|
||||
target_link_directories(testDBpgSQL PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/Release64)
|
||||
endif()
|
||||
target_link_libraries(testDBpgSQL PRIVATE libDataBaseLMS.dll)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 4.11.1, 2024-10-30T15:31:27. -->
|
||||
<!-- Written by QtCreator 4.11.1, 2024-11-01T11:44:20. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
|
||||
@@ -5,8 +5,7 @@
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QApplication a(argc, argv);
|
||||
MainWindow w;
|
||||
|
||||
MainWindow w;
|
||||
w.show();
|
||||
return a.exec();
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include <QHBoxLayout>
|
||||
#include <QMessageBox>
|
||||
|
||||
#include "mainwindow.h"
|
||||
#include "./ui_mainwindow.h"
|
||||
@@ -10,37 +11,16 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
QString appDirPath = QCoreApplication::applicationDirPath();
|
||||
//QMessageBox::information(this, tr("appFilePath"), appDirPath);
|
||||
m_instructorsAndTrainees = new InstructorsAndTrainees(appDirPath);
|
||||
m_tasksWidget = new TasksWidget(m_instructorsAndTrainees->getDataBaseTrainees());
|
||||
m_viewerTrainees = new ViewerTrainees(m_instructorsAndTrainees->getDataBaseTrainees());
|
||||
m_viewerInstructors = new ViewerInstructors(m_instructorsAndTrainees->getDataBaseInstructors());
|
||||
m_instructorsAndTraineesWidget = new InstructorsAndTraineesWidget(this);
|
||||
ui->horizontalLayout->addWidget(m_instructorsAndTraineesWidget);
|
||||
|
||||
ui->verticalLayout_2->addWidget(m_viewerTrainees);
|
||||
ui->verticalLayout_2->addWidget(m_viewerInstructors);
|
||||
ui->verticalLayout_2->addWidget(m_tasksWidget);
|
||||
|
||||
m_tasksWidget->setMaximumHeight(200);
|
||||
m_viewerInstructors->setMinimumSize(800, 300);
|
||||
m_viewerTrainees->setMinimumSize(800, 800);
|
||||
|
||||
this->showMaximized();
|
||||
this->move(0, 0);
|
||||
this->showNormal();
|
||||
//this->showMaximized();
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow()
|
||||
{
|
||||
delete m_instructorsAndTraineesWidget;
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void MainWindow::on_btnListTrainees_clicked()
|
||||
{
|
||||
m_instructorsAndTrainees->EditTrainees(this);
|
||||
m_viewerTrainees->updateTrainees();
|
||||
}
|
||||
|
||||
void MainWindow::on_btnListInstructors_clicked()
|
||||
{
|
||||
m_instructorsAndTrainees->EditInstructors(this);
|
||||
m_viewerInstructors->updateInstructors();
|
||||
}
|
||||
|
||||
@@ -2,12 +2,7 @@
|
||||
#define MAINWINDOW_H
|
||||
|
||||
#include <QMainWindow>
|
||||
|
||||
#include "instructorsAndTrainees.h"
|
||||
#include "viewertrainees.h"
|
||||
#include "viewerinstructors.h"
|
||||
#include "taskswidget.h"
|
||||
|
||||
#include "instructorsandtraineeswidget.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
namespace Ui { class MainWindow; }
|
||||
@@ -21,16 +16,9 @@ public:
|
||||
MainWindow(QWidget *parent = nullptr);
|
||||
~MainWindow();
|
||||
|
||||
private slots:
|
||||
void on_btnListTrainees_clicked();
|
||||
void on_btnListInstructors_clicked();
|
||||
|
||||
private:
|
||||
Ui::MainWindow *ui;
|
||||
|
||||
InstructorsAndTrainees* m_instructorsAndTrainees;
|
||||
ViewerTrainees* m_viewerTrainees;
|
||||
ViewerInstructors* m_viewerInstructors;
|
||||
TasksWidget* m_tasksWidget;
|
||||
InstructorsAndTraineesWidget* m_instructorsAndTraineesWidget;
|
||||
};
|
||||
#endif // MAINWINDOW_H
|
||||
|
||||
@@ -16,80 +16,7 @@
|
||||
<widget class="QWidget" name="centralwidget">
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_1">
|
||||
<item>
|
||||
<widget class="QToolButton" name="btnListTrainees">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>130</width>
|
||||
<height>58</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>List of Trainees</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="testDBpgSQL.qrc">
|
||||
<normaloff>:/resources/DB-trainees.png</normaloff>:/resources/DB-trainees.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolButtonStyle">
|
||||
<enum>Qt::ToolButtonTextUnderIcon</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="btnListInstructors">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>130</width>
|
||||
<height>58</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>List of Instructors</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="testDBpgSQL.qrc">
|
||||
<normaloff>:/resources/DB-instructors.png</normaloff>:/resources/DB-instructors.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolButtonStyle">
|
||||
<enum>Qt::ToolButtonTextUnderIcon</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2"/>
|
||||
</item>
|
||||
</layout>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
@@ -105,8 +32,6 @@
|
||||
</widget>
|
||||
<widget class="QStatusBar" name="statusbar"/>
|
||||
</widget>
|
||||
<resources>
|
||||
<include location="testDBpgSQL.qrc"/>
|
||||
</resources>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
Reference in New Issue
Block a user