Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'work38' into DEV

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-12-16 12:07:05 +03:00
parent 8a00f2e6bf 4db649b478
commit 317e576300
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LibDataBaseInterface/databaselms.h
View File

@@ -11,7 +11,7 @@
#include "tasksAmmFim.h" #include "tasksAmmFim.h"
#include "timingoftrainee.h" #include "timingoftrainee.h"
static const QString backupEmptyName = ".\\restoreDB\\DBLMS_EMPTY.backup"; static const QString backupEmptyName = ".\\DBLMS_EMPTY.backup";
static const QString restoreDBscriptName = ".\\restoreDB\\restoreDBscript.bat"; static const QString restoreDBscriptName = ".\\restoreDB\\restoreDBscript.bat";
class DATABASELMS_EXPORT DataBaseSettings class DATABASELMS_EXPORT DataBaseSettings

8
LibServer/Systems/logger.cpp
View File

@@ -70,10 +70,10 @@ void Logger::handleLog(QString msg, LogLevel logLevel)
QString level; QString level;
QString colorLevel = "pink"; QString colorLevel = "pink";
#ifndef PROJECT_TYPE_DEBUG //#ifndef PROJECT_TYPE_DEBUG
if(logLevel == DEBUG) // if(logLevel == DEBUG)
return; // return;
#endif //#endif
switch (logLevel) switch (logLevel)
{ {