Refs #2, display site and project dashboards

introlab · Mar 15, 2024 · 612fc6d · 612fc6d
1 parent a698662
commit 612fc6d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 8 deletions.
diff --git a/Frontend/DashboardsViewer/content/screens/DashboardSelector.qml b/Frontend/DashboardsViewer/content/screens/DashboardSelector.qml
@@ -50,7 +50,7 @@ DashboardSelectorForm {
         }
     }
 
-    projectGridView.delegate.onItemClicked: function(id, definition){
+    onItemClicked: function(id, definition){
         stackview.push("Dashboard.qml")
 
         // get current pushed element
@@ -131,9 +131,23 @@ DashboardSelectorForm {
 
         model.onCountChanged: function() {
 
+            selectorForm.siteGridView.model.clear();
             for (var i = 0; i < model.count; ++i) {
                 var dashboard = model.get(i);
                 console.log(dashboard);
+
+                var description = dashboard.dashboard_description;
+                var enabled = dashboard.dashboard_enabled;
+                var name = dashboard.dashboard_name;
+                var definition = dashboard.versions.dashboard_definition;
+
+                console.log(description, enabled, name, definition);
+
+
+                selectorForm.siteGridView.model.append({"id": dashboard.id_dashboard,
+                                                          "name": name,
+                                                          "definition": definition,
+                                                          "color": "Blue"})
             }
         }
     } // projectsDashboardDataSource
@@ -154,7 +168,7 @@ DashboardSelectorForm {
 
         model.onCountChanged: function() {
 
-            selectorForm.projetGridView.model.clear();
+            selectorForm.projectGridView.model.clear();
 
 
             for (var i = 0; i < model.count; ++i) {
@@ -166,10 +180,7 @@ DashboardSelectorForm {
                 var name = dashboard.dashboard_name;
                 var definition = dashboard.versions.dashboard_definition;
 
-                console.log(description, enabled, name, definition);
-
-
-                selectorForm.projetGridView.model.append({"id": dashboard.id_dashboard,
+                selectorForm.projectGridView.model.append({"id": dashboard.id_dashboard,
                                                           "name": name,
                                                           "definition": definition,
                                                           "color": "Blue"})

diff --git a/Frontend/DashboardsViewer/content/screens/DashboardSelectorForm.ui.qml b/Frontend/DashboardsViewer/content/screens/DashboardSelectorForm.ui.qml
@@ -8,13 +8,17 @@ import "../delegates"
 import DashboardsViewer 1.0
 
 Item {
+    id: rootItem
     //property alias btnOK: btnStart
     //property alias fileName: inputJSON.text
     property alias cmbSites: cmbSites
     property alias cmbProjects: cmbProjects
     property alias siteGridView: siteGridView
     property alias projectGridView: projectGridView
 
+    signal itemClicked(var id, var definition)
+
+
     Item {
         anchors.centerIn: parent
         width: 0.8 * parent.width
@@ -115,7 +119,15 @@ Item {
                             clip: true
                             ScrollBar.vertical: FlickableScrollBar {}
                             model: ListModel {}
-                            delegate: SiteProjectDelegate {}
+                            delegate: SiteProjectDelegate {
+                                id: siteProjectDelegateSite
+
+                                Connections {
+                                    target: siteProjectDelegateSite
+                                    onItemClicked: rootItem.itemClicked
+                                }
+
+                            }
                         } // GridView 1
 
                         GridView {
@@ -128,7 +140,15 @@ Item {
                             clip: true
 
                             ScrollBar.vertical: FlickableScrollBar {}
-                            delegate: SiteProjectDelegate {}
+                            delegate: SiteProjectDelegate {
+                                id: siteProjectdelegateProject
+
+                                Connections {
+                                    target: siteProjectdelegateProject
+                                    onItemClicked: rootItem.itemClicked
+                                }
+
+                            }
                         } // GridView 2
                     } //RowLayout (2)
                 } // Rectangle 2