From 0dde7142194dbc8c10a990da4e4a2cbc0d6507ff Mon Sep 17 00:00:00 2001
From: Fei Long Wang <flwang@catalyst.net.nz>
Date: Thu, 23 Feb 2017 16:16:17 +1300
Subject: [PATCH] Support subscriptoin age and confirmed

Implement blueprint: subscription-confirmation

Change-Id: I48074a6a582758de273e681931c90d51a19fc5f7
---
 zaqar_ui/api/zaqar.py                                         | 4 ++++
 .../static/dashboard/project/queues/table/subscription.html   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/zaqar_ui/api/zaqar.py b/zaqar_ui/api/zaqar.py
index ce843c3..1bf7db5 100644
--- a/zaqar_ui/api/zaqar.py
+++ b/zaqar_ui/api/zaqar.py
@@ -93,6 +93,8 @@ def subscription_list(request, queue_name):
     return [{'subscriber': s.subscriber,
              'id': s.id,
              'ttl': s.ttl,
+             'age': s.age,
+             'confirmed': s.confirmed,
              'options': s.options}
             for s in zaqarclient(request).subscriptions(queue_name)]
 
@@ -102,6 +104,8 @@ def subscription_create(request, queue_name, sub_data):
     return {'subscriber': subscription.subscriber,
             'id': subscription.id,
             'ttl': subscription.ttl,
+            'age': subscription.age,
+            'confirmed': subscription.confirmed,
             'options': subscription.options}
 
 
diff --git a/zaqar_ui/static/dashboard/project/queues/table/subscription.html b/zaqar_ui/static/dashboard/project/queues/table/subscription.html
index 66a2b7f..441de99 100644
--- a/zaqar_ui/static/dashboard/project/queues/table/subscription.html
+++ b/zaqar_ui/static/dashboard/project/queues/table/subscription.html
@@ -5,6 +5,8 @@
     <tr>
       <th translate>Subscriber</th>
       <th translate>Time to Live</th>
+      <th translate>Age</th>
+      <th translate>Confirmed</th>
       <th translate>Options</th>
       <th translate>Actions</th>
     </tr>
@@ -16,6 +18,8 @@
     <tr ng-repeat="sub in subCtrl.queuesMap[q.name].subscriptions">
       <td>{$ sub.subscriber $}</td>
       <td>{$ sub.ttl $}</td>
+      <td>{$ sub.age $}</td>
+      <td>{$ sub.confirmed $}</td>
       <td>{$ sub.options $}</td>
       <td>
         <button class="btn btn-xs btn-danger"