DialogEditTrainee (adminMode)

InstructorsAndTrainees/trainees/dialogedittrainee.cpp

@@ -4,11 +4,12 @@
 #include <QPushButton>
 #include <QRegExpValidator>
 
-DialogEditTrainee::DialogEditTrainee(QWidget *parent) :
+DialogEditTrainee::DialogEditTrainee(bool adminMode, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::DialogEditTrainee),
     traineeInput(),
-    flNeedHashPassword(false)
+    flNeedHashPassword(false),
+    adminMode(adminMode)
 {
     ui->setupUi(this);
     verify();
@@ -23,9 +24,9 @@ DialogEditTrainee::DialogEditTrainee(QWidget *parent) :
     ui->editLogin->setValidator(new QRegExpValidator(QRegExp("[A-Za-z\\d]+"), this));
 
     ui->editPassword->setEnabled(false);
-#ifndef PROJECT_TYPE_DEBUG
+//#ifndef PROJECT_TYPE_DEBUG
     ui->editPassword->setEchoMode(QLineEdit::EchoMode::Password);
-#endif
+//#endif
 
     ui->btnViewPassword->setEnabled(false);
     ui->btnChangePassword->setEnabled(false);
@@ -55,7 +56,10 @@ void DialogEditTrainee::setTrainee(Trainee trainee)
         ui->btnViewPassword->setEnabled(true);
     }
     else
-        ui->btnChangePassword->setEnabled(true);
+    {
+        //if(adminMode)
+            ui->btnChangePassword->setEnabled(true);
+    }
 
     ui->btnOK->setEnabled(false);
 }
@@ -129,4 +133,6 @@ void DialogEditTrainee::on_btnChangePassword_clicked()
 
     ui->editPassword->setText("");
     flNeedHashPassword = true;
+
+    ui->editPassword->setFocus();
 }

InstructorsAndTrainees/trainees/dialogedittrainee.h

@@ -13,7 +13,7 @@ class DialogEditTrainee : public QDialog
     Q_OBJECT
 
 public:
-    explicit DialogEditTrainee(QWidget *parent = nullptr);
+    explicit DialogEditTrainee(bool adminMode, QWidget *parent = nullptr);
     ~DialogEditTrainee();
 
     void setTrainee(Trainee trainee);
@@ -43,6 +43,8 @@ private:
     Trainee traineeInput;
 
     bool flNeedHashPassword;
+
+    bool adminMode;
 };
 
 #endif // DIALOGEDITTRAINEE_H

InstructorsAndTrainees/trainees/editortrainees.cpp

@@ -514,7 +514,7 @@ bool EditorTrainees::editGroup(Group group, Group *group_edit)
 
 bool EditorTrainees::editTrainee(Trainee trainee, Trainee *trainee_edit)
 {
-    DialogEditTrainee dlg(this);
+    DialogEditTrainee dlg(adminMode, this);
     dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
     dlg.setTrainee(trainee);