From 137c89bc9a870c4018f4c000494c89af9ceea67a Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 9 Jan 2013 23:34:39 +1300
Subject: Finished archive panel

---
 src/org/traccar/web/client/view/ArchiveView.ui.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/org/traccar/web/client/view/ArchiveView.ui.xml')

diff --git a/src/org/traccar/web/client/view/ArchiveView.ui.xml b/src/org/traccar/web/client/view/ArchiveView.ui.xml
index 370eb02..f27d38f 100644
--- a/src/org/traccar/web/client/view/ArchiveView.ui.xml
+++ b/src/org/traccar/web/client/view/ArchiveView.ui.xml
@@ -16,7 +16,7 @@
     <ui:attributes width="1" height="1" />
   </ui:with>
 
-  <ui:with type="com.sencha.gxt.data.shared.ListStore" field="store" />
+  <ui:with type="com.sencha.gxt.data.shared.ListStore" field="positionStore" />
   <ui:with type="com.sencha.gxt.widget.core.client.grid.ColumnModel" field="columnModel" />
 
   <ui:with type="com.sencha.gxt.widget.core.client.grid.GridView" field="view">
@@ -30,28 +30,30 @@
         <toolbar:ToolBar>
 
           <toolbar:LabelToolItem label="Device:" />
-          <form:TimeField /> <!-- put combobox here -->
+          <form:ComboBox ui:field="deviceCombo" editable="false" triggerAction="ALL" />
           <toolbar:SeparatorToolItem />
 
           <toolbar:LabelToolItem label="From:" />
-          <form:DateField width="125" />
+          <form:DateField width="125" ui:field="fromDate" />
           <toolbar:LabelToolItem width="5" />
-          <form:TimeField width="75" />
+          <form:TimeField width="75" ui:field="fromTime" triggerAction="ALL" />
           <toolbar:SeparatorToolItem />
 
           <toolbar:LabelToolItem label="To:" />
-          <form:DateField width="125" />
+          <form:DateField width="125" ui:field="toDate" />
           <toolbar:LabelToolItem width="5" />
-          <form:TimeField width="75" />
+          <form:TimeField width="75" ui:field="toTime" triggerAction="ALL" />
           <toolbar:SeparatorToolItem />
-          
+
           <button:TextButton ui:field="loadButton" text="Load" />
-        
+          <toolbar:FillToolItem />
+          <button:TextButton ui:field="clearButton" text="Clear" />
+
         </toolbar:ToolBar>
       </container:child>
       
       <container:child layoutData="{layoutData}">
-        <grid:Grid ui:field="grid" store="{store}" cm="{columnModel}" view="{view}" />
+        <grid:Grid ui:field="grid" store="{positionStore}" cm="{columnModel}" view="{view}" />
       </container:child>
 
     </container:VerticalLayoutContainer>
-- 
cgit v1.2.3