[flatpaks/flatpak-runtime] f45: Include Fedora Flatpak status in applications report

[flatpaks/flatpak-runtime] f45: Include Fedora Flatpak status in applications report

[Owen W. Taylor]

A new commit has been pushed.

Repo   : flatpaks/flatpak-runtime
Branch : f45
Commit : 47df85ae5c08e072258cabb85be344ffcea97e35
Author : Owen W. Taylor <otaylor@fishsoup.net>
Date   : 2020-03-20T21:51:58+01:00
Stats  : +51/-26 in 3 file(s)
URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/47df85ae5c08e072258cabb85be344ffcea97e35?branch=f45

Log:
Include Fedora Flatpak status in applications report

---
diff --git a/reports/applications.html b/reports/applications.html
index a6dcaf0..cc52365 100644
--- a/reports/applications.html
+++ b/reports/applications.html
@@ -20,12 +20,13 @@
     </ul>
     <table id="appTable">
       <thead>
-	<th>Name</th>
-	<th>Package</th>
-	<th>Flathub?</th>
-	<th title="Number of reviews in ODRS"># Reviews</th>
-	<th title="Average number of stars in ODRS">Review Avg</th>
-	<th title="Number of packages that need to be bundled"># Extra</th>
+	<th><br>Name</th>
+	<th><br>Fedora Package</th>
+	<th><br>Flathub</th>
+	<th>Fedora<br>Flatpak</th>
+	<th title="Number of reviews in ODRS"><br># Reviews</th>
+	<th title="Average number of stars in ODRS"><br>Review Avg</th>
+	<th title="Number of packages that need to be bundled"><br># Extra</th>
       </thead>
       <tbody>
       </tbody>
@@ -33,9 +34,10 @@
     <div class="summary">
       <div id="summaryClose" onclick="closeSummary()">X</div>
       <table>
-	<tr><td class="sample no-flathub"></td><td> - In Fedora, not in Flathub</td></tr>
-	<tr><td class="sample no-fedora"></td><td> - In Flathub, not in Fedora</td></tr>
-	<tr><td class="sample no-flathub-fedora"></td><td> - Not in Flathub or Fedora</td></tr>
+	<tr><td class="sample fedora-package no-flathub"></td><td> - In Fedora, not in Flathub</td></tr>
+	<tr><td class="sample fedora-package flathub"></td><td> - In Fedora and Flathub</td></tr>
+	<tr><td class="sample no-fedora-package flathub"></td><td> - In Flathub, not in Fedora</td></tr>
+	<tr><td class="sample no-fedora-package no-flathub"></td><td> - Not in Flathub or Fedora</td></tr>
       </table>
       <div class="note">Click on rows for details. Click on headers to sort.</div>
     </div>

diff --git a/reports/report.css b/reports/report.css
index 03000a8..cc6c8a0 100644
--- a/reports/report.css
+++ b/reports/report.css
@@ -166,16 +166,34 @@ tr.extra {
 
 /* Application Report */
 
-table.dataTable tbody tr.no-fedora, .summary td.no-fedora {
-    background: #ffeedd;
+.summary td.sample {
+    background: white;
+    border: 1px solid black;
+    width: 20px;
 }
 
-table.dataTable tbody tr.no-flathub, .summary td.no-flathub  {
+table.dataTable#appTable thead th {
+    padding: 10px;
+}
+
+table.dataTable tbody tr.fedora-package.flathub, .summary td.sample.fedora-package.flathub {
+    background: white;
+}
+
+table.dataTable tbody tr.fedora-package.no-flathub, .summary td.fedora-package.no-flathub  {
     background: #ddeeff;
 }
 
-table.dataTable tbody tr.no-flathub-fedora, .summary td.no-flathub-fedora  {
-    background: #e0e0e0;
+table.dataTable tbody tr.fedora-package.no-fedora-flatpak td.fedora-flatpak-column {
+    font-weight: bold;
+}
+
+table.dataTable tbody tr.no-fedora-package.flathub, .summary td.no-fedora-package.flathub {
+    background: #fff8d8;
+}
+
+table.dataTable tbody tr.no-fedora-package.no-flathub, .summary td.no-fedora-package.no-flathub  {
+    background: #e8e8e8;
 }
 
 table.dataTable tbody tr.shown {
@@ -210,11 +228,6 @@ table.packageTable tbody td, table.packageTable thead th {
     padding: 4px 4px;
 }
 
-.summary td.sample {
-    border: 1px solid black;
-    width: 20px;
-}
-
 /* Application Packages Report */
 
 #appPackagesReport .header {

diff --git a/reports/report.js b/reports/report.js
index b24c701..ca24837 100644
--- a/reports/report.js
+++ b/reports/report.js
@@ -22,21 +22,31 @@ function startAppReport() {
 	    dataSrc: 'applications',
 	},
 	createdRow: function(row, data) {
-            if (data.package == null && data.flathub != null)
-		$(row).addClass('no-fedora')
-            if (data.package != null && data.flathub == null)
+            if (data.flathub != null)
+		$(row).addClass('flathub')
+            else
 		$(row).addClass('no-flathub')
-            if (data.flathub == null && data.package == null)
-		$(row).addClass('no-flathub-fedora')
+            if (data.package)
+		$(row).addClass('fedora-package')
+            else
+		$(row).addClass('no-fedora-package')
+            if (data.fedora_flatpak)
+		$(row).addClass('fedora-flatpak')
+            else
+		$(row).addClass('no-fedora-flatpak')
 	},
 	columns: [
 	    { data: 'name', className: 'text-left' },
 	    { data: 'package', defaultContent: '', className: 'text-left' },
 	    { data: 'flathub', defaultContent: '', render: {
-		display: function(data) { return data != null ? 'true' : '' },
+		display: function(data) { return data != null ? '\u2714' : '' },
 		sort: function(data) { return data != null ? 0 : 1 },
        	    },
 	      className: 'text-center' },
+            { data: 'fedora_flatpak', defaultContent: '', render: {
+                display: function(data, type, row, meta) { return data ? '\u2714' : row.package ? 'Todo' : '' },
+                sort: function(data) { return data ? 0 : 1 },
+            }, className: 'text-center fedora-flatpak-column' },
 	    { data: 'star_total', defaultContent: '', className: 'text-center' },
 	    { data: 'star_avg', defaultContent: '', render: {
 		display: function(data, type, row, meta) { return data ? data.toFixed(1) : '' }
@@ -46,7 +56,7 @@ function startAppReport() {
 		sort: function(data, type, row, meta) { return data ? data.length : 0 },
 	    }, className: 'text-center' },
 	],
-	order: [[3, 'desc']],
+	order: [[4, 'desc']],
 	pageLength: 100,
 	lengthMenu: [[25,100,250,-1],['25', '100', '250', 'All']],
     })