https://github.com/StephaneCouturier/Katalog/issues/340

StephaneCouturier · Dec 2, 2024 · bdf13ad · bdf13ad
1 parent 07b2c5f
commit bdf13ad
Show file tree

Hide file tree

Showing 10 changed files with 487 additions and 469 deletions.
diff --git a/src/devicemappingview.cpp b/src/devicemappingview.cpp
@@ -136,8 +136,8 @@ QVariant DeviceMappingView::data(const QModelIndex &index, int role) const
                 return QIcon(QIcon::fromTheme("media-optical"));
         }
         //Icon for target catalog
-        if( index.column()==10 ){
-            QModelIndex idx = index.sibling(index.row(), 11);
+        if( index.column()==11 ){
+            QModelIndex idx = index.sibling(index.row(), 12);
             if( QSortFilterProxyModel::data(idx, Qt::DisplayRole).toBool()==true ){
                 return QIcon(QIcon::fromTheme("media-optical-blu-ray"));
             }

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
@@ -7328,12 +7328,12 @@ background: url(:/images/link-h.png) repeat-x center;</string>
              <widget class="QPushButton" name="BackUp_pushButton_DeleteSelectedMapping">
               <property name="maximumSize">
                <size>
-                <width>250</width>
+                <width>200</width>
                 <height>16777215</height>
                </size>
               </property>
               <property name="text">
-               <string>Delete selected mapping</string>
+               <string>Delete selected</string>
               </property>
               <property name="icon">
                <iconset theme="QIcon::ThemeIcon::EditDelete"/>
@@ -7357,6 +7357,9 @@ background: url(:/images/link-h.png) repeat-x center;</string>
                 <property name="text">
                  <string>Create mapping</string>
                 </property>
+                <property name="icon">
+                 <iconset theme="QIcon::ThemeIcon::DocumentSave"/>
+                </property>
                </widget>
               </item>
               <item>
@@ -7440,6 +7443,13 @@ background: url(:/images/link-h.png) repeat-x center;</string>
             </item>
             <item row="1" column="0">
              <layout class="QHBoxLayout" name="horizontalLayout">
+              <item>
+               <widget class="QLabel" name="BackUp_label_CurrentMappings">
+                <property name="text">
+                 <string>Device mappings</string>
+                </property>
+               </widget>
+              </item>
               <item>
                <widget class="QPushButton" name="BackUp_pushButton_ReloadDeviceMappings">
                 <property name="maximumSize">
@@ -7449,7 +7459,7 @@ background: url(:/images/link-h.png) repeat-x center;</string>
                  </size>
                 </property>
                 <property name="text">
-                 <string>Reload device mappings</string>
+                 <string>Reload</string>
                 </property>
                 <property name="icon">
                  <iconset theme="view-refresh"/>
@@ -7478,13 +7488,6 @@ background: url(:/images/link-h.png) repeat-x center;</string>
               </item>
              </layout>
             </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="BackUp_label_CurrentMappings">
-              <property name="text">
-               <string>Device mappings</string>
-              </property>
-             </widget>
-            </item>
             <item row="3" column="0">
              <widget class="QTableView" name="BackUp_tableView_CurrentMappings">
               <property name="lineWidth">

diff --git a/src/mainwindow_tab_backup.cpp b/src/mainwindow_tab_backup.cpp
@@ -96,8 +96,8 @@ void MainWindow::loadBackUpMapping()
 {
     //Load data from table device_mapping
     QSqlQuery query(QSqlDatabase::database("defaultConnection"));
-
-    QString querySQL = QLatin1String(R"(
+    QString querySQL;
+    querySQL = QLatin1String(R"(
                             SELECT
                                 dm.mapping_id,
                                 dm.mapping_name,
@@ -149,11 +149,34 @@ void MainWindow::loadBackUpMapping()
                             AND   dm.mapping_device_target_id = d2.device_id
                         )");
 
-    querySQL += QLatin1String(R"(
-                            ORDER BY dm.mapping_name
-                        )");
+    if (      selectedDevice->type == "Storage" ){
+        querySQL += " AND d1.device_parent_id =:device_parent_id ";
+    }
+    else if ( selectedDevice->type == "Catalog" ){
+        querySQL += " AND d1.device_id =:device_id ";
+    }
+    else if ( selectedDevice->type == "Virtual" ){
+        QString prepareSQL = QLatin1String(R"(
+                                        AND d1.device_id IN (
+                                        WITH RECURSIVE hierarchy AS (
+                                             SELECT device_id, device_parent_id, device_name
+                                             FROM device
+                                             WHERE device_id = :device_id
+                                             UNION ALL
+                                             SELECT t.device_id, t.device_parent_id, t.device_name
+                                             FROM device t
+                                             JOIN hierarchy h ON t.device_parent_id = h.device_id
+                                        )
+                                        SELECT device_id
+                                        FROM hierarchy)
+                                    )");
+        querySQL += prepareSQL;
+    }
 
+    querySQL +=" ORDER BY d1.device_type DESC, d1.device_parent_id ASC, dm.mapping_name ASC ";
     query.prepare(querySQL);
+    query.bindValue(":device_id",        selectedDevice->ID);
+    query.bindValue(":device_parent_id", selectedDevice->ID);
 
     if (!query.exec())
     {

diff --git a/src/translations/Katalog_cz_CZ.qm b/src/translations/Katalog_cz_CZ.qm