From d9fb538407c54af661df38e92534429fc29e6f6a Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Wed, 14 Dec 2016 23:29:23 +0300
Subject: [PATCH] =?UTF-8?q?WebInterface:=20=D0=B1=D0=BE=D0=BB=D0=B5=D0=B5?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=D1=80=D0=BE=D0=B1=D0=BD=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=BE=20=D0=B1=D0=B0=D0=BD=D0=B4=D0=BB=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

id, name, symname, state, version, last modified
---
 webinterface/pom.xml                          |  2 +-
 .../java/asys/webinterface/AjaxHandler.java   | 29 ++++++++++-------
 .../resources/static/bundle-list.component.js | 31 +++++++++++++++----
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/webinterface/pom.xml b/webinterface/pom.xml
index b7e6ddd..df755ce 100644
--- a/webinterface/pom.xml
+++ b/webinterface/pom.xml
@@ -19,7 +19,7 @@
 
     <groupId>asys</groupId>
     <artifactId>webinterface</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
diff --git a/webinterface/src/main/java/asys/webinterface/AjaxHandler.java b/webinterface/src/main/java/asys/webinterface/AjaxHandler.java
index f6342e0..d711c7f 100644
--- a/webinterface/src/main/java/asys/webinterface/AjaxHandler.java
+++ b/webinterface/src/main/java/asys/webinterface/AjaxHandler.java
@@ -4,7 +4,6 @@
  */
 package asys.webinterface;
 
-import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.sun.net.httpserver.HttpExchange;
@@ -30,16 +29,7 @@ public class AjaxHandler implements HttpHandler {
 
         String jsonPath = httpExchange.getRequestURI().getPath();
         if (jsonPath.equals("/ajax/bundles.json")) {
-            JsonArray jsonArray = new JsonArray();
-
-            for (Bundle bundle : context.getBundle(0).getBundleContext().getBundles()) {
-                JsonObject jsonObject = new JsonObject();
-                jsonObject.addProperty("name", bundle.getHeaders().get("Bundle-Name"));
-                jsonObject.addProperty("symname", bundle.getSymbolicName());
-                jsonArray.add(jsonObject);
-            }
-
-            outJson = jsonArray.toString();
+            outJson = bundleList().toString();
         }
 
         httpExchange.getResponseHeaders().add("Context-Type", "application/json;charset=utf-8");
@@ -48,4 +38,21 @@ public class AjaxHandler implements HttpHandler {
         responseBody.write(outJson.getBytes(defaultCharset));
         responseBody.close();
     }
+
+    private JsonArray bundleList() {
+        JsonArray jsonArray = new JsonArray();
+
+        for (Bundle bundle : context.getBundle(0).getBundleContext().getBundles()) {
+            JsonObject jsonObject = new JsonObject();
+            jsonObject.addProperty("id", bundle.getBundleId());
+            jsonObject.addProperty("state", bundle.getState());
+            jsonObject.addProperty("name", bundle.getHeaders().get("Bundle-Name"));
+            jsonObject.addProperty("symname", bundle.getSymbolicName());
+            jsonObject.addProperty("lastModified", bundle.getHeaders().get("Bnd-LastModified"));
+            jsonObject.addProperty("version", bundle.getVersion().toString());
+            jsonArray.add(jsonObject);
+        }
+
+        return jsonArray;
+    }
 }
diff --git a/webinterface/src/main/resources/static/bundle-list.component.js b/webinterface/src/main/resources/static/bundle-list.component.js
index 1cb6487..b9ace6d 100644
--- a/webinterface/src/main/resources/static/bundle-list.component.js
+++ b/webinterface/src/main/resources/static/bundle-list.component.js
@@ -4,16 +4,35 @@ angular.
   module('asysApp').
   component('bundleList', {
     template:
-        '<ul>' +
-          '<li ng-repeat="bundle in $ctrl.bundles">' +
-            '<b>{{bundle.name}}</b>' +
-            '<p>{{bundle.symname}}</p>' +
-          '</li>' +
-        '</ul>',
+        '<table width="100%">' +
+          '<thead><tr>' +
+            '<th>ID</th><th>Name</th><th>State</th><th>Version</th><th>Last modified</th>' +
+          '</tr></thead>' +
+          '<tbody>' +
+            '<tr ng-repeat="bundle in $ctrl.bundles">' +
+              '<td>{{bundle.id}}</td>' +
+              '<td>{{bundle.name}}</td>' +
+              '<td>{{bundle.state | stateFormat}}</td>' +
+              '<td>{{bundle.version}}</td>' +
+              '<td>{{bundle.lastModified | date:"dd/MM/yyyy HH:mm"}}</td>' +
+            '</tr>' +
+          '</tbody>' +
+        '</table>',
     controller: function PhoneListController($http) {
       var self = this;
       $http.get('/ajax/bundles.json').then(function(response) {
         self.bundles = response.data;
       });
     }
+  }).
+  filter('stateFormat', function() {
+    return function(state) {
+      if      (state == 1)  {return 'UNINSTALLED';}
+      else if (state == 2)  {return 'INSTALLED';}
+      else if (state == 4)  {return 'RESOLVED';}
+      else if (state == 8)  {return 'STARTING';}
+      else if (state == 16) {return 'STOPPING';}
+      else if (state == 32) {return 'ACTIVE';}
+      else                  {return 'UNKNOW('+state+')'}
+    }
   });
\ No newline at end of file