Merge branch 'bugfix-update-diff' into merge-test

# Conflicts:
#	ServerLMS/Systems/tools.h
#	ServerLMS/Systems/updatecontroller.h
This commit is contained in:
semenov
2025-01-20 09:31:15 +03:00
20 changed files with 247 additions and 105 deletions

View File

@@ -23,7 +23,12 @@ class ProcessingSystem : public QObject
public:
explicit ProcessingSystem(ProviderDBLMS* providerDBLMS, UpdateController* updateController, QObject *parent = nullptr);
void initialize(ServerLMSWidget *server,DataParser* dataParser,CommonClientHandler *commonClientServer,Logger *logger);
void initialize(ServerLMSWidget *server,
DataParser* dataParser,
CommonClientHandler *commonClientServer,
Logger *logger,
UpdateController *updateComtroller);
void processingClientAutorization(ClientHandler *client, ClientAutorization clientAutorization);
void processingClientDeAutorization(ClientHandler *client, ClientDeAutorization clientDeAutorization);
void processingClientQueryToDB(ClientHandler *client, ClientQueryToDB clientQueryToDB, int id = 0, void* data = nullptr);
@@ -45,7 +50,7 @@ private:
CommonClientHandler *commonClientServer;
ServerLMSWidget *server;
DataParser *dataParser;
//InstructorsAndTraineesWidget *pInstructorsAndTrainees;
UpdateController *updateController;
ProviderDBLMS* providerDBLMS;
UpdateController* updateController;
};