Changeset 6191

Timestamp:

05/14/11 09:29:18 (14 years ago)

Author:

mjesner

Message:

#1499 wrong index in ComparisonsHelper; selectedValue in ComboBox

Location:

branches/WebApplication/MVC2/HLWebOKBQueryPlugin

Files:

• ViewModels/ComparisonsHelper.cs (modified) (2 diffs)
• ViewModels/FilterModel.cs (modified) (2 diffs)
• Views/Filter/Filters.ascx (modified) (2 diffs)

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/ViewModels/ComparisonsHelper.cs

@@ -32 +32 @@
         public static List<ComparisonItem> stringComparisons = new List<ComparisonItem>() {
            new ComparisonItem((int)OKBQueryService.StringComparison.Equal, STRING_COMPARISONS_EQUAL),
-           new ComparisonItem((int)OKBQueryService.StringComparison.NotLike, STRING_COMPARISONS_NOT_EQUAL),
+           new ComparisonItem((int)OKBQueryService.StringComparison.NotEqual, STRING_COMPARISONS_NOT_EQUAL),
            new ComparisonItem((int)OKBQueryService.StringComparison.Contains, STRING_COMPARISONS_CONTAINS),
            new ComparisonItem((int)OKBQueryService.StringComparison.NotContains, STRING_COMPARISONS_NOT_CONTAINS),
@@ -38 +38 @@
            new ComparisonItem((int)OKBQueryService.StringComparison.NotLike, STRING_COMPARISONS_NOT_LIKE)
          };
+
+
+        public static String GetValueForStringComparision(OKBQueryService.StringComparison comparisionValue)
+        {
+            switch (comparisionValue)
+            {
+                case OKBQueryService.StringComparison.Equal:
+                    return STRING_COMPARISONS_EQUAL;
+                case OKBQueryService.StringComparison.Contains:
+                    return STRING_COMPARISONS_CONTAINS;
+                case OKBQueryService.StringComparison.Like:
+                    return STRING_COMPARISONS_LIKE;
+                case OKBQueryService.StringComparison.NotContains:
+                    return STRING_COMPARISONS_NOT_CONTAINS;
+                case OKBQueryService.StringComparison.NotEqual:
+                    return STRING_COMPARISONS_NOT_EQUAL;
+                case OKBQueryService.StringComparison.NotLike:
+                    return STRING_COMPARISONS_NOT_LIKE;
+                default:
+                    return STRING_COMPARISONS_EQUAL; //TODO 
+            }
+        }
+
 
 

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/ViewModels/FilterModel.cs

@@ -201 +201 @@
                     if (dict != null)
                     {
+                      
                         foreach (KeyValuePair<string, string> kvp in dict)
                         {
                             if ("StringComparisonFilter".Equals(f.GetType().Name))
                             {
+
+                                ((StringComparisonFilter)f).Value = kvp.Value;
+
                                 if (kvp.Key.Equals(FilterModel.ValueTextbox))
                                 {
-                                    ((StringComparisonFilter)f).Value = kvp.Value + "111";
+                                    ((StringComparisonFilter)f).Value = kvp.Value; // +"111";
+
+                                    //((StringComparisonFilter)f).Value = ((StringComparisonFilter)f).Value;
+                                  //  ((StringComparisonFilter)f).Comparison = ((StringComparisonFilter)f).Comparison;
+
+
                                 }
                                 else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
                                 {
-                                    ((StringComparisonFilter)f).Value = ((StringComparisonFilter)f).Value + "222";
+                                  //  ((StringComparisonFilter)f).Value = ((StringComparisonFilter)f).Value;
                                     ((StringComparisonFilter)f).Comparison = ComparisonsHelper.GetStringComparisonForValue(kvp.Value);
+                                  
                                 }
                                 // To this for alle keys
@@ -221 +231 @@
                                 // To this for all filters
                             }
+
+                            
                         }
+                        StringComparisonFilter scf = (StringComparisonFilter)f;
+                        //throw new Exception("Huhu ich bin doof");
+                        
                     }
                 }

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

@@ -2 +2 @@
 <%@ Import Namespace="HLWebOKBQueryPlugin.Models" %>
 <%@ Import Namespace="HLWebOKBQueryPlugin.OKBQueryService" %>
+<%@ Import Namespace="HLWebOKBQueryPlugin.ViewModels" %>
+
 <!-- Put all into a form that calls the "AddFilter" Action-->
 <div><table>
@@ -40 +42 @@
     <% StringComparisonFilter filter = ((StringComparisonFilter)f); %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons,"Value","Text", filter.Comparison))%>   
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text",(int)filter.Comparison))%>   
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, (filter.Value))%>
     <% }