event tables

1 files changed, 9 insertions, 9 deletions

diff --git a/views/village.twig b/views/village.twig
index b843ef4..d2b8a4e 100644
--- a/views/village.twig
+++ b/views/village.twig
@@ -86,12 +86,12 @@
         <tbody>
         {% for event in events['UpgradeBuilding'] %}
         <tr>
-          <td>{{ event.data.type }}</td>
+          <td>{{ event.type }}</td>
           <td class="timer">
           {% include 'components/timer.twig' with { 'time': event.event.time|date('c') } %}
           </td>
           <td>
-            <a class="btn" href="/village/{{ village.x }}/{{ village.y }}/building/{{ event.data.type }}/build/cancel">
+            <a class="btn" href="/village/{{ village.x }}/{{ village.y }}/building/UpgradeBuilding/build/cancel">
               Cancel
             </a>
           </td>
@@ -114,7 +114,7 @@
         <tbody>
         {% for event in events['TrainUnits'] %}
         <tr>
-          <td>{{ event.data.type }}</td>
+          <td>{{ event.type }}</td>
           <td class="timer">
           {% include 'components/timer.twig' with { 'time': event.event.time|date('c') } %}
           </td>
@@ -146,16 +146,16 @@
         <tbody>
         {% for event in events['SendUnits'] %}
         <tr>
-          <td>{{ event.data.type }}</td>
-          <td>{{ event.data.unit }}</td>
-          <td>{{ event.data.amount }}</td>
-          <td>{{ village.get(event.data.source).name }}</td>
-          <td>{{ village.get(event.data.destination).name }}</td>
+          <td>{{ event.type }}</td>
+          <td>{{ event.unit }}</td>
+          <td>{{ event.amount }}</td>
+          <td>{{ village.get(event.source).name }}</td>
+          <td>{{ village.get(event.destination).name }}</td>
           <td class="timer">
           {% include 'components/timer.twig' with { 'time': event.event.time|date('c') } %}
           </td>
           <td>
-            {% if event.data.cancel %}
+            {% if event.isCanceled %}
               Canceled
             {% else %}
               {% if event.event.villageId == village.id %}