From 3adbef8c08b8996d405b99f12a4fcc1fa47327eb Mon Sep 17 00:00:00 2001
From: Andrew nuark G <mrcluster@ya.ru>
Date: Tue, 22 Dec 2020 23:05:38 +0700
Subject: [PATCH] Redone Admin panel UI

---
 sea_transport/adminpanel.cpp |  21 +--
 sea_transport/adminpanel.h   |   7 +-
 sea_transport/adminpanel.ui  | 338 +++++++++++++++++++----------------
 3 files changed, 190 insertions(+), 176 deletions(-)

diff --git a/sea_transport/adminpanel.cpp b/sea_transport/adminpanel.cpp
index 868ed4e..2418e16 100644
--- a/sea_transport/adminpanel.cpp
+++ b/sea_transport/adminpanel.cpp
@@ -14,24 +14,23 @@ AdminPanel::AdminPanel(QWidget *parent) : QMainWindow(parent), ui(new Ui::AdminP
 //    connect(ui->pb_users_add, &QPushButton::clicked, this, &AdminPanel::on_user_add);
 //    connect(ui->pb_users_remove, &QPushButton::clicked, this, &AdminPanel::on_user_remove);
 
-//    connect(ui->pb_users_add, &QPushButton::clicked, this, &AdminPanel::on_storage_add);
-//    connect(ui->pb_users_remove, &QPushButton::clicked, this, &AdminPanel::on_storage_remove);
-
 //    connect(ui->pb_dp_add, &QPushButton::clicked, this, &AdminPanel::on_delivery_point_add);
 //    connect(ui->pb_dp_remove, &QPushButton::clicked, this, &AdminPanel::on_delivery_point_remove);
 
 
-//    ui->tv_vessels->setModel();
-
     uvm = new UsersViewModel(this);
     ui->tv_users->setModel(this->uvm);
 
-//    ui->tv_dp->setModel();
+    vvm = new VesselsViewModel(this);
+    ui->tv_vessels->setModel(vvm);
 
-//    ui->tv_storages->setModel();
+    dpvm = new DeliveryPointsViewModel(this);
+    ui->tv_dp->setModel(dpvm);
 
 
     uvm->update();
+    vvm->update();
+    dpvm->update();
 }
 
 AdminPanel::~AdminPanel() {
@@ -66,14 +65,6 @@ void AdminPanel::on_user_remove() {
 
 }
 
-void AdminPanel::on_storage_add() {
-
-}
-
-void AdminPanel::on_storage_remove() {
-
-}
-
 void AdminPanel::on_delivery_point_add() {
 
 }
diff --git a/sea_transport/adminpanel.h b/sea_transport/adminpanel.h
index a65ce20..8152158 100644
--- a/sea_transport/adminpanel.h
+++ b/sea_transport/adminpanel.h
@@ -4,6 +4,8 @@
 #include <QMainWindow>
 
 #include "viewmodels/usersviewmodel.h"
+#include "viewmodels/vesselsviewmodel.h"
+#include "viewmodels/deliverypointsviewmodel.h"
 
 #include "entities/user_entity.h"
 
@@ -18,6 +20,8 @@ class AdminPanel : public QMainWindow
     user_entity user;
 
     UsersViewModel *uvm;
+    VesselsViewModel *vvm;
+    DeliveryPointsViewModel *dpvm;
 
 public:
     explicit AdminPanel(QWidget *parent = nullptr);
@@ -38,9 +42,6 @@ private:
     void on_user_add();
     void on_user_remove();
 
-    void on_storage_add();
-    void on_storage_remove();
-
     void on_delivery_point_add();
     void on_delivery_point_remove();
 };
diff --git a/sea_transport/adminpanel.ui b/sea_transport/adminpanel.ui
index 3eaa710..98e15da 100644
--- a/sea_transport/adminpanel.ui
+++ b/sea_transport/adminpanel.ui
@@ -6,169 +6,21 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1200</width>
-    <height>600</height>
+    <width>1162</width>
+    <height>567</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="2" column="0">
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Vessels</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QTableView" name="tv_vessels">
-        <attribute name="horizontalHeaderStretchLastSection">
-         <bool>true</bool>
-        </attribute>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
-        <item>
-         <widget class="QPushButton" name="pb_vessels_add">
-          <property name="text">
-           <string>Add</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pb_vessels_remove">
-          <property name="text">
-           <string>Remove</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </item>
-    <item row="2" column="1">
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <item>
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Users</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QTableView" name="tv_users">
-        <attribute name="horizontalHeaderStretchLastSection">
-         <bool>true</bool>
-        </attribute>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
-         <widget class="QPushButton" name="pb_users_add">
-          <property name="text">
-           <string>Add</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pb_users_remove">
-          <property name="text">
-           <string>Remove</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </item>
-    <item row="1" column="1">
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <item>
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Delivery points</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QTableView" name="tv_dp">
-        <attribute name="horizontalHeaderStretchLastSection">
-         <bool>true</bool>
-        </attribute>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QPushButton" name="pb_dp_add">
-          <property name="text">
-           <string>Add</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pb_dp_remove">
-          <property name="text">
-           <string>Remove</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </item>
-    <item row="1" column="0">
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Storages</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QTableView" name="tv_storages">
-        <attribute name="horizontalHeaderStretchLastSection">
-         <bool>true</bool>
-        </attribute>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QPushButton" name="pb_storage_add">
-          <property name="text">
-           <string>Add</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pb_storage_remove">
-          <property name="text">
-           <string>Remove</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </item>
-    <item row="0" column="1">
-     <widget class="QLabel" name="lab_user">
-      <property name="text">
-       <string>Hello, user %1</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
-     </widget>
-    </item>
+   <layout class="QGridLayout" name="gridLayout_4">
     <item row="0" column="0">
      <widget class="QPushButton" name="pb_logout">
       <property name="sizePolicy">
@@ -182,6 +34,176 @@
       </property>
      </widget>
     </item>
+    <item row="0" column="1">
+     <widget class="QLabel" name="lab_user">
+      <property name="text">
+       <string>Hello, user %1</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0" colspan="2">
+     <widget class="QTabWidget" name="tw_tabs">
+      <property name="tabShape">
+       <enum>QTabWidget::Rounded</enum>
+      </property>
+      <property name="currentIndex">
+       <number>2</number>
+      </property>
+      <property name="documentMode">
+       <bool>false</bool>
+      </property>
+      <property name="tabBarAutoHide">
+       <bool>false</bool>
+      </property>
+      <widget class="QWidget" name="tab_users">
+       <attribute name="title">
+        <string>Users</string>
+       </attribute>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0" colspan="2">
+         <widget class="QTableView" name="tv_users">
+          <attribute name="horizontalHeaderStretchLastSection">
+           <bool>true</bool>
+          </attribute>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>953</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="1">
+         <layout class="QHBoxLayout" name="horizontalLayout_3">
+          <item>
+           <widget class="QPushButton" name="pb_users_add">
+            <property name="text">
+             <string>Add</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pb_users_remove">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Remove</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="tab_vessels">
+       <attribute name="title">
+        <string>Vessels</string>
+       </attribute>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="1" column="2">
+         <layout class="QHBoxLayout" name="horizontalLayout_4">
+          <item>
+           <widget class="QPushButton" name="pb_vessels_add">
+            <property name="text">
+             <string>Add</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pb_vessels_remove">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Remove</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item row="1" column="1">
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>953</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="0" column="1" colspan="2">
+         <widget class="QTableView" name="tv_vessels">
+          <attribute name="horizontalHeaderStretchLastSection">
+           <bool>true</bool>
+          </attribute>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="tab">
+       <attribute name="title">
+        <string>Delivery points</string>
+       </attribute>
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="1" column="1">
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>953</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="2">
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QPushButton" name="pb_dp_add">
+            <property name="text">
+             <string>Add</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pb_dp_remove">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Remove</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item row="0" column="1" colspan="2">
+         <widget class="QTableView" name="tv_dp">
+          <attribute name="horizontalHeaderStretchLastSection">
+           <bool>true</bool>
+          </attribute>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menubar">
@@ -189,7 +211,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1200</width>
+     <width>1162</width>
      <height>21</height>
     </rect>
    </property>