diff --git a/iFacility/administrationpanel.ui b/iFacility/administrationpanel.ui
index 27e1bca..54acd8c 100644
--- a/iFacility/administrationpanel.ui
+++ b/iFacility/administrationpanel.ui
@@ -19,7 +19,7 @@
808
- 503
+ 679
diff --git a/iFacility/registrationdialog.cpp b/iFacility/registrationdialog.cpp
index e98cdff..4c35885 100644
--- a/iFacility/registrationdialog.cpp
+++ b/iFacility/registrationdialog.cpp
@@ -7,6 +7,7 @@ RegistrationDialog::RegistrationDialog(QWidget *parent) :
upvm = new UserProfessionViewModel(this);
ui->userProfessions->setModel(upvm);
+ ui->userProfessions->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
connect(ui->userProfessions->selectionModel(),
&QItemSelectionModel::selectionChanged,
diff --git a/iFacility/viewmodels/professionsviewmodel.cpp b/iFacility/viewmodels/professionsviewmodel.cpp
index cb5960c..1015e32 100644
--- a/iFacility/viewmodels/professionsviewmodel.cpp
+++ b/iFacility/viewmodels/professionsviewmodel.cpp
@@ -8,7 +8,6 @@ void ProfessionsViewModel::invalidateData() {
beginResetModel();
clear();
- QStandardItemModel::setHeaderData(0, Qt::Orientation::Horizontal, "Professions");
QStandardItem *rootNode = invisibleRootItem();
foreach (auto prof, Database::instance()->professions()) {
QStandardItem *profNode = new QStandardItem("Profession: " + prof.title());
@@ -23,9 +22,11 @@ void ProfessionsViewModel::invalidateData() {
up = uProf;
}
}
- QStandardItem *workerRank = new QStandardItem(tr("%1 rank").arg(up.getRank()));
- QStandardItem *acqDateNode = new QStandardItem(
+ QStandardItem *workerUID = new QStandardItem("UID: " + worker->uID().toString());
+ QStandardItem *workerRank = new QStandardItem(tr("Rank: %1").arg(up.getRank()));
+ QStandardItem *acqDateNode = new QStandardItem("Acquisition date: " +
up.getAcquiredDate().toString(Qt::DateFormat::SystemLocaleShortDate));
+ workerNode->appendRow(workerUID);
workerNode->appendRow(workerRank);
workerNode->appendRow(acqDateNode);
if (worker->getCurrentProfession() == prof.pID()) {
diff --git a/iFacility/viewmodels/userprofessionviewmodel.cpp b/iFacility/viewmodels/userprofessionviewmodel.cpp
index 8134856..108f30c 100644
--- a/iFacility/viewmodels/userprofessionviewmodel.cpp
+++ b/iFacility/viewmodels/userprofessionviewmodel.cpp
@@ -19,7 +19,7 @@ QVariant UserProfessionViewModel::headerData(int section,
case 0:
return QString("Profession");
case 1:
- return QString("Date of acquirement");
+ return QString("Acquisition date");
case 2:
return QString("Rank");
}