Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/27/11 19:15:16 (14 years ago)
Author:
cfleisch
Message:

#1499 styling filter and bubblechart, filter bugfixes

Location:
branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Chart/BubbleChart.ascx

    r6171 r6318  
    33<%@ Register assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" namespace="System.Web.UI.DataVisualization.Charting" tagprefix="asp" %>
    44
    5 
     5<div style="background-color: #eeeeee;border-style:solid;border-color:#aaa;border-width:1px;padding:10px;list-style-type:none;">
    66<% using (Html.BeginForm("UpdateBubbleChart","Chart")) %>
    77<% { %>
    88
    9 <%: Html.Label("x axis")%>
     9<%: Html.Label("X-Axis")%>
    1010<%: Html.DropDownList("valuesAxisXCombobox", new SelectList(((ChartModel)Model).valuesAxisX))%>
    11 
    12 <%: Html.Label("y axis")%>
     11<br />
     12<%: Html.Label("Y-Axis")%>
    1313<%: Html.DropDownList("valuesAxisYCombobox", new SelectList(((ChartModel)Model).valuesAxisY))%>
    14 
    15 <%: Html.Label("bubble size")%>
     14<br />
     15<%: Html.Label("Bubble Size")%>
    1616<%: Html.DropDownList("bubbleSizeCombobox", new SelectList(((ChartModel)Model).bubbleSize))%>
    1717
    18 <input type="submit" value="update chart" />
     18<input type="submit" class="hl-icon-refresh" value="update chart" />
     19</div>
     20
     21
    1922
    2023<% } %>

  • branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Chart/Index.aspx

    r6118 r6318  
    11<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
     2
     3<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
     4   <% Html.RenderAction("Menu","Query"); %>
     5</asp:Content>
    26
    37<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
    … …  
    711<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
    812
    9     <h2>Index (Chart)</h2>
     13    <h2>Bubble Chart</h2>
    1014
    1115

  • branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Filters.ascx

    r6308 r6318  
    33<%@ Import Namespace="HLWebOKBQueryPlugin.OKBQueryService" %>
    44<%@ Import Namespace="HLWebOKBQueryPlugin.ViewModels" %>
    5 
    6 
    75<script src="/Scripts/MicrosoftAjax.js" type="text/javascript"></script>
    86<script src="/Scripts/MicrosoftMvcValidation.js" type="text/javascript"></script>
    9 
    107<script type="text/javascript">
    118    function setAction(action, id) {
    … …  
    1613</script>
    1714
     15<% using (Html.BeginForm("AddFilter", "Filter", FormMethod.Post, new { Name = "filterForm" })) %>
     16<% {  %>
     17<!-- Put all into a form that calls the "AddFilter" Action-->
     18<%
     19    CombinedFilter topFilter = ((FilterModel)Model).Content;
     20%>
     21<%: Html.Hidden("selectedFilter",null, new { Id = "selectedFilter" })%>
     22<%: Html.Hidden("action", null, new { Id = "action" })%>
     23<div>
     24    <%
     25        foreach (Filter fNode in topFilter.Filters) {
    1826
    19 <% Html.EnableClientValidation(); %>
    20  <% using (Html.BeginForm("AddFilter", "Filter", FormMethod.Post, new { Name = "filterForm" })) %>
    21     <% {  %> 
    22 <!-- Put all into a form that calls the "AddFilter" Action-->
    23 
    24     <%
    25      CombinedFilter topFilter = ((FilterModel)Model).Content;
     27            CombinedFilter currentFilter = (CombinedFilter)fNode;
     28            string comboboxName = FilterModel.ComboboxName + "." + currentFilter.Id;
     29            string hiddenName = FilterModel.ParentIdName + "." + currentFilter.Id;
    2630    %>
    27     <div><table>
    28 <tr><td>A<br />N<br />D</td><td>
    29 
    30   <%: Html.Hidden("selectedFilter",null, new { Id = "selectedFilter" })%>
    31        <%: Html.Hidden("action", null, new { Id = "action" })%>
    32    
    33            <%
    34      foreach (Filter fNode in topFilter.Filters)
    35      {
    36 
    37          CombinedFilter currentFilter = (CombinedFilter)fNode;
    38          string comboboxName = FilterModel.ComboboxName + "." + currentFilter.Id;
    39          string hiddenName = FilterModel.ParentIdName + "." + currentFilter.Id;
    40     %>
    41     <table border="0"><tr><td>
    42     <%: Html.Hidden(hiddenName, currentFilter.Id.ToString())%>
    43    
    44     <%: Html.DropDownList(comboboxName, new SelectList(((FilterModel)Model).AvailableFilterForCombobox, "FilterTypeName", "Label"))%>
    45    
    46    
    47     <input type="button" name="submitButton" value="+" class="hl-button-text-plus"   onClick="setAction('add','<%: currentFilter.Id%>');" />
    48    <!-- <input type="submit" name="submitButton" value="+.<%:currentFilter.Id%>"  />-->
    49 </td></tr><tr><td>
    50 <!-- Build the selected filters. The filtesr will be stored in the session and the
     31    <ul style="background-color: #eeeeee;border-style:solid;border-color:#aaa;border-width:1px;padding:10px;list-style-type:none;">
     32        <li>
     33            <%: Html.Hidden(hiddenName, currentFilter.Id.ToString())%>
     34            <%: Html.DropDownList(comboboxName, new SelectList(((FilterModel)Model).AvailableFilterForCombobox, "FilterTypeName", "Label"))%>
     35            <input type="button" name="submitButton" value="+" class="hl-button-text-plus" onclick="setAction('add','<%: currentFilter.Id%>');" />
     36            <!-- <input type="submit" name="submitButton" value="+.<%:currentFilter.Id%>"  />-->
     37        </li>
     38        <!-- Build the selected filters. The filtesr will be stored in the session and the
    5139Controller puts the current filters from the session into the model. Selected Filters
    5240will be iterated. -->
    53 <% if (currentFilter.Filters != null)
    54    {
     41        <% if (currentFilter.Filters != null) {
    5542
    56        foreach (Filter f in currentFilter.Filters)
    57        {
    58            if (f != null)
    59            {  %>
    60 
    61            <tr><td>
    62     <%
     43               foreach (Filter f in currentFilter.Filters) {
     44                   if (f != null) {  %>
     45        <li style="background-color:#FFF380;padding:5px;margin:5px;">
     46            <%
    6347           
    6448
    65      if ("StringComparisonFilter".Equals(f.GetType().Name))
    66      {  %>
    67     <% StringComparisonFilter filter = ((StringComparisonFilter)f); %>
    68     <%: Html.Label(filter.Label)%>
    69     <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>   
    70     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, (filter.Value))%>
    71     <%: Html.TextBoxFor(model => ((FilterModel)Model).IntValue, (filter.Value))%>
    72     <%: Html.ValidationMessageFor(model => ((FilterModel)Model).IntValue)%>
    73     <% }
    74      else if ("NameStringComparisonFilter".Equals(f.GetType().Name))
    75      { %>
    76     <% NameStringComparisonFilter filter = ((NameStringComparisonFilter)f); %>
    77     <%: Html.Label(filter.Label)%>
    78     <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>   
    79     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
    80     <% }
    81      else if ("StringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
    82      { %>
    83     <% StringComparisonAvailableValuesFilter filter = ((StringComparisonAvailableValuesFilter)f); %>
    84     <%: Html.Label(filter.Label)%>
    85     <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>   
    86     <%: Html.DropDownList(f.Id + "." + FilterModel.ValueTextbox, new SelectList(filter.AvailableValues, filter.Value))%>
    87     <% }
    88      else if ("NameEqualityComparisonByteArrayFilter".Equals(f.GetType().Name))
    89      { %>
    90     <% NameEqualityComparisonByteArrayFilter filter = ((NameEqualityComparisonByteArrayFilter)f); %>
    91     <%: Html.Label(filter.Label)%>
    92     <%: Html.Label("not supported")%>
    93     <% }
    94      else if ("NameEqualityComparisonBoolFilter".Equals(f.GetType().Name))
    95      { %>
    96     <% NameEqualityComparisonBoolFilter filter = ((NameEqualityComparisonBoolFilter)f);   %>
    97     <%: Html.Label(filter.Label)%>
    98     <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.BoolComparisons, "Value", "Text", (int)filter.Comparison))%>     
    99     <%: Html.DropDownList(f.Id + "." + FilterModel.ValueDropDownList, new SelectList(((FilterModel)Model).BoolStates, filter.Value))%>
    100     <% }
    101      else if ("NameOrdinalComparisonIntFilter".Equals(f.GetType().Name))
    102      { %>
    103     <% NameOrdinalComparisonIntFilter filter = ((NameOrdinalComparisonIntFilter)f);   %>
    104     <%: Html.Label(filter.Label)%>
    105     <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.OrdinalComparisons, "Value", "Text", (int)filter.Comparison))%>
    106     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
    107     <% }
    108      else if ("NameStringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
    109      { %>
    110     <% NameStringComparisonAvailableValuesFilter filter = ((NameStringComparisonAvailableValuesFilter)f);   %>
    111     <%: Html.Label(filter.Label)%>
    112     <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>   
    113     <%: Html.DropDownList(f.Id + "." + FilterModel.ValueDropDownList, new SelectList(filter.AvailableValues, filter.Value))%>
    114     <% }
    115      else if ("NameOrdinalComparisonDoubleFilter".Equals(f.GetType().Name))
    116      { %>
    117     <% NameOrdinalComparisonDoubleFilter filter = ((NameOrdinalComparisonDoubleFilter)f);   %>
    118     <%: Html.Label(filter.Label)%>
    119     <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.OrdinalComparisons, "Value", "Text", (int)filter.Comparison))%>
    120     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
    121     <% }
    122      else if ("NameOrdinalComparisonFloatFilter".Equals(f.GetType().Name))
    123      { %>
    124     <% NameOrdinalComparisonFloatFilter filter = ((NameOrdinalComparisonFloatFilter)f);   %>
    125     <%: Html.Label(filter.Label)%>
    126     <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.OrdinalComparisons, "Value", "Text", (int)filter.Comparison))%>
    127     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
    128     <% }
    129      else if ("NameOrdinalComparisonLongFilter".Equals(f.GetType().Name))
    130      { %>
    131     <% NameOrdinalComparisonLongFilter filter = ((NameOrdinalComparisonLongFilter)f);   %>
    132     <%: Html.Label(filter.Label)%>
    133     <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.OrdinalComparisons, "Value", "Text", (int)filter.Comparison))%>
    134     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
    135     <% }
    136      else if ("OrdinalComparisonDateTimeFilter".Equals(f.GetType().Name))
    137      { %>
    138     <% OrdinalComparisonDateTimeFilter filter = ((OrdinalComparisonDateTimeFilter)f);   %>
    139     <%: Html.Label(filter.Label)%>
    140     <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.OrdinalComparisons, "Value", "Text", (int)filter.Comparison))%>
    141     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
    142     <% }                 
     49                if ("StringComparisonFilter".Equals(f.GetType().Name)) {
     50            %>
     51            <% StringComparisonFilter filter = ((StringComparisonFilter)f); %>
     52            <%: Html.Label(filter.Label)%>
     53            <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>
     54            <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, (filter.Value))%>
     55            <% }
     56                                else if ("NameStringComparisonFilter".Equals(f.GetType().Name)) { %>
     57            <% NameStringComparisonFilter filter = ((NameStringComparisonFilter)f); %>
     58            <%: Html.Label(filter.Label)%>
     59            <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>
     60            <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     61            <% }
     62                                else if ("StringComparisonAvailableValuesFilter".Equals(f.GetType().Name)) { %>
     63            <% StringComparisonAvailableValuesFilter filter = ((StringComparisonAvailableValuesFilter)f); %>
     64            <%: Html.Label(filter.Label)%>
     65            <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>
     66            <%: Html.DropDownList(f.Id + "." + FilterModel.ValueTextbox, new SelectList(filter.AvailableValues, filter.Value))%>
     67            <% }
     68                                else if ("NameEqualityComparisonByteArrayFilter".Equals(f.GetType().Name)) { %>
     69            <% NameEqualityComparisonByteArrayFilter filter = ((NameEqualityComparisonByteArrayFilter)f); %>
     70            <%: Html.Label(filter.Label)%>
     71            <%: Html.Label("not supported")%>
     72            <% }
     73                                else if ("NameEqualityComparisonBoolFilter".Equals(f.GetType().Name)) { %>
     74            <% NameEqualityComparisonBoolFilter filter = ((NameEqualityComparisonBoolFilter)f);   %>
     75            <%: Html.Label(filter.Label)%>
     76            <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.BoolComparisons, "Value", "Text", (int)filter.Comparison))%>
     77            <%: Html.DropDownList(f.Id + "." + FilterModel.ValueDropDownList, new SelectList(((FilterModel)Model).BoolStates, filter.Value))%>
     78            <% }
     79                                else if ("NameOrdinalComparisonIntFilter".Equals(f.GetType().Name)) { %>
     80            <% NameOrdinalComparisonIntFilter filter = ((NameOrdinalComparisonIntFilter)f);   %>
     81            <%: Html.Label(filter.Label)%>
     82            <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.OrdinalComparisons, "Value", "Text", (int)filter.Comparison))%>
     83            <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     84            <% }
     85                                else if ("NameStringComparisonAvailableValuesFilter".Equals(f.GetType().Name)) { %>
     86            <% NameStringComparisonAvailableValuesFilter filter = ((NameStringComparisonAvailableValuesFilter)f);   %>
     87            <%: Html.Label(filter.Label)%>
     88            <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>
     89            <%: Html.DropDownList(f.Id + "." + FilterModel.ValueDropDownList, new SelectList(filter.AvailableValues, filter.Value))%>
     90            <% }
     91                                else if ("NameOrdinalComparisonDoubleFilter".Equals(f.GetType().Name)) { %>
     92            <% NameOrdinalComparisonDoubleFilter filter = ((NameOrdinalComparisonDoubleFilter)f);   %>
     93            <%: Html.Label(filter.Label)%>
     94            <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.OrdinalComparisons, "Value", "Text", (int)filter.Comparison))%>
     95            <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     96            <% }
     97                                else if ("NameOrdinalComparisonFloatFilter".Equals(f.GetType().Name)) { %>
     98            <% NameOrdinalComparisonFloatFilter filter = ((NameOrdinalComparisonFloatFilter)f);   %>
     99            <%: Html.Label(filter.Label)%>
     100            <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.OrdinalComparisons, "Value", "Text", (int)filter.Comparison))%>
     101            <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     102            <% }
     103                                else if ("NameOrdinalComparisonLongFilter".Equals(f.GetType().Name)) { %>
     104            <% NameOrdinalComparisonLongFilter filter = ((NameOrdinalComparisonLongFilter)f);   %>
     105            <%: Html.Label(filter.Label)%>
     106            <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.OrdinalComparisons, "Value", "Text", (int)filter.Comparison))%>
     107            <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     108            <% }
     109                                else if ("OrdinalComparisonDateTimeFilter".Equals(f.GetType().Name)) { %>
     110            <% OrdinalComparisonDateTimeFilter filter = ((OrdinalComparisonDateTimeFilter)f);   %>
     111            <%: Html.Label(filter.Label)%>
     112            <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.OrdinalComparisons, "Value", "Text", (int)filter.Comparison))%>
     113            <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     114            <% }                 
    143115                 
     116            %>
     117            <!-- <input type="submit" name="submitButton" value="-.<%:f.Id%>"  class="hl-icon-delete"  style="text-indent:-999em;"  />
     118       -->
     119            <input type="button" name="submitButton" value="-" class="hl-icon-delete" onclick="setAction('delete','<%: f.Id%>');" />
     120            <% } // if%>
     121        </li>
     122        <% } // inner foreach %>
     123    </ul>
     124     <% } // if%>
     125    <%
     126           }// foreach
    144127    %>
    145        <!-- <input type="submit" name="submitButton" value="-.<%:f.Id%>"  class="hl-icon-delete"  style="text-indent:-999em;"  />
    146        -->
    147     <input type="button" name="submitButton" value="-"  class="hl-icon-delete"  onClick="setAction('delete','<%: f.Id%>');" />
    148    
    149 <% }%>
    150     </td></tr>
    151     <% } %>
    152      </table></td></tr>
    153  <%  }%>
    154    <% }%>
    155 
    156 
    157 
    158  
    159   </table> <input type="button" name="submitButton"  value="or"  onClick="setAction('or','');"  />
    160  </br>
    161  <input type="button" name="submitButton" value="runs"  onClick="setAction('runs','');" />
    162  
    163  
    164 <% }   
    165 %>
    166  </div>
     128    <a    class="hl-button-text-plus" onclick="setAction('or','');" >OR Filter</a>
     129    <a   class="hl-icon-refresh"  onclick="setAction('runs','');" >Refresh</a>
     130    <%
     131        }   // form
     132    %>
     133</div>

  • branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Results.aspx

    r6303 r6318  
    44<%@ Import Namespace="HLWebOKBQueryPlugin.OKBQueryService" %>
    55<%@ Import Namespace="HLWebOKBQueryPlugin.Helpers" %>
     6
     7<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
     8   <% Html.RenderAction("Menu","Query"); %>
     9</asp:Content>
    610
    711<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">

  • branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/Menu.ascx

    r6253 r6318  
    66</li>
    77<li <% if(Session["SelectedSubMenu"] == "Results") {%> class="selected" <%}%>>
    8     <%: Html.ActionLink("Results", "Results", "Query") %>
     8    <%: Html.ActionLink("Tabular View", "Results", "Query") %>
    99</li>
    1010<% if (Session["QueryRunDetailId"] != null) { %>
Note: See TracChangeset for help on using the changeset viewer.