mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-27 19:45:43 +03:00
Прокинул общее кол-во AMM и FIM
This commit is contained in:
@@ -194,6 +194,22 @@ QList<TaskAmmFim> ConnectorToServer::getListTasksFIMforTrainee(int trainee_id)
|
|||||||
return QList<TaskAmmFim>();
|
return QList<TaskAmmFim>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int ConnectorToServer::getCountTasksAMMforTrainee(int trainee_id)
|
||||||
|
{
|
||||||
|
if(mapTasksAMM.contains(trainee_id))
|
||||||
|
return mapTasksAMM.value(trainee_id).count();
|
||||||
|
else
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int ConnectorToServer::getCountTasksFIMforTrainee(int trainee_id)
|
||||||
|
{
|
||||||
|
if(mapTasksFIM.contains(trainee_id))
|
||||||
|
return mapTasksFIM.value(trainee_id).count();
|
||||||
|
else
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
bool ConnectorToServer::isArchivedInstructor(int id)
|
bool ConnectorToServer::isArchivedInstructor(int id)
|
||||||
{
|
{
|
||||||
for(Instructor instructor : listInstructors)
|
for(Instructor instructor : listInstructors)
|
||||||
|
|||||||
@@ -47,6 +47,8 @@ public:
|
|||||||
QList<Classroom> getListClassrooms();
|
QList<Classroom> getListClassrooms();
|
||||||
QList<TaskAmmFim> getListTasksAMMforTrainee(int trainee_id);
|
QList<TaskAmmFim> getListTasksAMMforTrainee(int trainee_id);
|
||||||
QList<TaskAmmFim> getListTasksFIMforTrainee(int trainee_id);
|
QList<TaskAmmFim> getListTasksFIMforTrainee(int trainee_id);
|
||||||
|
int getCountTasksAMMforTrainee(int trainee_id);
|
||||||
|
int getCountTasksFIMforTrainee(int trainee_id);
|
||||||
|
|
||||||
bool isArchivedInstructor(int id);
|
bool isArchivedInstructor(int id);
|
||||||
bool isAdminInstructor(int id);
|
bool isAdminInstructor(int id);
|
||||||
|
|||||||
@@ -199,6 +199,8 @@ void AMMtasksWidget::slot_UpdateTasksAMMforTrainee(int trainee_id)
|
|||||||
{
|
{
|
||||||
QList<TaskAmmFim> listTask = connectorToServer->getListTasksAMMforTrainee(trainee_id);
|
QList<TaskAmmFim> listTask = connectorToServer->getListTasksAMMforTrainee(trainee_id);
|
||||||
signal_prepareAMMListItemsForTrainee(listTask);
|
signal_prepareAMMListItemsForTrainee(listTask);
|
||||||
|
|
||||||
|
emit signal_countTasksAMMforTraineeChanged(trainee_id, listTask.count());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,6 +59,8 @@ Q_SIGNALS:
|
|||||||
|
|
||||||
void signal_stopParserPreparation();
|
void signal_stopParserPreparation();
|
||||||
|
|
||||||
|
void signal_countTasksAMMforTraineeChanged(int trainee_id, int count);
|
||||||
|
|
||||||
public Q_SLOTS:
|
public Q_SLOTS:
|
||||||
void slot_AMMlistItemsReady(QList<QTreeWidgetItem*> listItems);
|
void slot_AMMlistItemsReady(QList<QTreeWidgetItem*> listItems);
|
||||||
|
|
||||||
|
|||||||
@@ -226,6 +226,8 @@ void FIMtasksWidget::slot_UpdateTasksFIMforTrainee(int trainee_id)
|
|||||||
{
|
{
|
||||||
QList<TaskAmmFim> listTask = connectorToServer->getListTasksFIMforTrainee(trainee_id);
|
QList<TaskAmmFim> listTask = connectorToServer->getListTasksFIMforTrainee(trainee_id);
|
||||||
emit signal_prepareFIMListItemsForTrainee(listTask);
|
emit signal_prepareFIMListItemsForTrainee(listTask);
|
||||||
|
|
||||||
|
emit signal_countTasksFIMforTraineeChanged(trainee_id, listTask.count());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,8 @@ Q_SIGNALS:
|
|||||||
|
|
||||||
void signal_stopParserPreparation();
|
void signal_stopParserPreparation();
|
||||||
|
|
||||||
|
void signal_countTasksFIMforTraineeChanged(int trainee_id, int count);
|
||||||
|
|
||||||
public Q_SLOTS:
|
public Q_SLOTS:
|
||||||
void slot_FIMlistItemsReady(QList<QTreeWidgetItem*> listItems);
|
void slot_FIMlistItemsReady(QList<QTreeWidgetItem*> listItems);
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,10 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, M
|
|||||||
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMMforTrainee, ammTasksWidget_personal, &AMMtasksWidget::slot_UpdateTasksAMMforTrainee);
|
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMMforTrainee, ammTasksWidget_personal, &AMMtasksWidget::slot_UpdateTasksAMMforTrainee);
|
||||||
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIMforTrainee, fimTasksWidget_personal, &FIMtasksWidget::slot_UpdateTasksFIMforTrainee);
|
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIMforTrainee, fimTasksWidget_personal, &FIMtasksWidget::slot_UpdateTasksFIMforTrainee);
|
||||||
|
|
||||||
|
connect(ammTasksWidget_personal, &AMMtasksWidget::signal_countTasksAMMforTraineeChanged, this, &PersonalCardTrainee::slot_countTasksAMMforTraineeChanged);
|
||||||
|
connect(fimTasksWidget_personal, &FIMtasksWidget::signal_countTasksFIMforTraineeChanged, this, &PersonalCardTrainee::slot_countTasksFIMforTraineeChanged);
|
||||||
|
|
||||||
|
|
||||||
fimTasksWidget_personal->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
|
fimTasksWidget_personal->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
|
||||||
ammTasksWidget_personal->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
|
ammTasksWidget_personal->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
|
||||||
|
|
||||||
@@ -78,3 +82,19 @@ void PersonalCardTrainee::loadInfo()
|
|||||||
ui->lblLoginTime->setText(timing.getEntryTimeS());
|
ui->lblLoginTime->setText(timing.getEntryTimeS());
|
||||||
ui->lblTimeExit->setText(timing.getExitTimeS());
|
ui->lblTimeExit->setText(timing.getExitTimeS());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PersonalCardTrainee::slot_countTasksAMMforTraineeChanged(int trainee_id, int count)
|
||||||
|
{
|
||||||
|
if(id_trainee == trainee_id)
|
||||||
|
{
|
||||||
|
ui->lblCntAMM->setText(QString::number(count));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void PersonalCardTrainee::slot_countTasksFIMforTraineeChanged(int trainee_id, int count)
|
||||||
|
{
|
||||||
|
if(id_trainee == trainee_id)
|
||||||
|
{
|
||||||
|
ui->lblCntFIM->setText(QString::number(count));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -24,6 +24,10 @@ public:
|
|||||||
private:
|
private:
|
||||||
void loadInfo();
|
void loadInfo();
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void slot_countTasksAMMforTraineeChanged(int trainee_id, int count);
|
||||||
|
void slot_countTasksFIMforTraineeChanged(int trainee_id, int count);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ConnectorToServer* connectorToServer;
|
ConnectorToServer* connectorToServer;
|
||||||
MessangerController* messangerController;
|
MessangerController* messangerController;
|
||||||
|
|||||||
Reference in New Issue
Block a user