Changeset 6247 for branches/WebApplication/MVC2/HLWebOKBQueryPlugin/ViewModels

Timestamp:

05/22/11 21:01:58 (13 years ago)

Author:

dhohl

Message:

#1499 The filter form does not lost any inputs after reloading the page; date filter is possible

File:

• branches/WebApplication/MVC2/HLWebOKBQueryPlugin/ViewModels/FilterModel.cs (modified) (11 diffs)

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

@@ -16 +16 @@
     public class FilterModel
     {
-        
+
 
 
@@ -61 +61 @@
         }
 
-        public static List<ComparisonItem> OrdinalComparisons 
+        public static List<ComparisonItem> OrdinalComparisons
         {
             get { return ComparisonsHelper.ordinalComparisons; }
@@ -70 +70 @@
             get { return ComparisonsHelper.stringComparisons; }
         }
-        
-
-        
+
+
+
 
         /// <summary>
@@ -192 +192 @@
                     if (dict != null)
                     {
-                      
+
                         foreach (KeyValuePair<string, string> kvp in dict)
                         {
                             if ("StringComparisonFilter".Equals(f.GetType().Name))
-                            { 
+                            {
                                 if (kvp.Key.Equals(FilterModel.ValueTextbox))
                                 {
@@ -202 +202 @@
                                 }
                                 else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
-                                {                                  
-                                    ((StringComparisonFilter)f).Comparison = ComparisonsHelper.GetStringComparisonForValue(kvp.Value);                                  
-                                } 
+                                {
+                                    ((StringComparisonFilter)f).Comparison = ComparisonsHelper.GetStringComparisonForValue(kvp.Value);
+                                }
                             }
                             else if ("NameStringComparisonFilter".Equals(f.GetType().Name))
@@ -238 +238 @@
                                     ((NameStringComparisonAvailableValuesFilter)f).Comparison = ComparisonsHelper.GetStringComparisonForValue(kvp.Value);
                                 }
-                            }  
-                             else if ("NameEqualityComparisonByteArrayFilter".Equals(f.GetType().Name))
-                            {
-                               //TODO not supported
-                            }
-                              else if ("NameEqualityComparisonBoolFilter".Equals(f.GetType().Name))
+                            }
+                            else if ("NameEqualityComparisonByteArrayFilter".Equals(f.GetType().Name))
+                            {
+                                //TODO not supported
+                            }
+                            else if ("NameEqualityComparisonBoolFilter".Equals(f.GetType().Name))
                             {
                                 if (kvp.Key.Equals(FilterModel.ValueDropDownList))
                                 {
-                                    ((NameEqualityComparisonBoolFilter)f).Value = Boolean.Parse( kvp.Value);                                  
+                                    ((NameEqualityComparisonBoolFilter)f).Value = Boolean.Parse(kvp.Value);
                                 }
                                 else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
@@ -268 +268 @@
                                 }
                                 else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
-                                {                                    
-                                    ((NameOrdinalComparisonIntFilter)f).Comparison = ComparisonsHelper.GetOrdinalComparisonForValue(kvp.Value);                                  
+                                {
+                                    ((NameOrdinalComparisonIntFilter)f).Comparison = ComparisonsHelper.GetOrdinalComparisonForValue(kvp.Value);
                                 }
                             }
@@ -286 +286 @@
                                 }
                                 else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
-                                {                                   
-                                    ((NameOrdinalComparisonLongFilter)f).Comparison = ComparisonsHelper.GetOrdinalComparisonForValue(kvp.Value);                                  
-                                }                            
-                            }
-
+                                {
+                                    ((NameOrdinalComparisonLongFilter)f).Comparison = ComparisonsHelper.GetOrdinalComparisonForValue(kvp.Value);
+                                }
+                            }
                             else if ("NameOrdinalComparisonFloatFilter".Equals(f.GetType().Name))
                             {
@@ -305 +304 @@
                                 }
                                 else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
-                                {                                   
+                                {
                                     ((NameOrdinalComparisonFloatFilter)f).Comparison = ComparisonsHelper.GetOrdinalComparisonForValue(kvp.Value);
                                 }
                             }
+                            else if ("OrdinalComparisonDateTimeFilter".Equals(f.GetType().Name))
+                            {
+                                if (kvp.Key.Equals(FilterModel.ValueTextbox))
+                                {
+                                    try
+                                    {
+                                        ((OrdinalComparisonDateTimeFilter)f).Value = DateTime.Parse(kvp.Value);
+                                    }
+                                    catch (Exception)
+                                    {
+                                        //TOOD Fehler ausgeben
+                                    }
+                                }
+                                else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
+                                {
+                                    ((OrdinalComparisonDateTimeFilter)f).Comparison = ComparisonsHelper.GetOrdinalComparisonForValue(kvp.Value);
+                                }
+                            }
                             else if ("NameOrdinalComparisonDoubleFilter".Equals(f.GetType().Name))
                             {
@@ -323 +340 @@
                                 }
                                 else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
-                                {                                    
+                                {
                                     ((NameOrdinalComparisonDoubleFilter)f).Comparison = ComparisonsHelper.GetOrdinalComparisonForValue(kvp.Value);
                                 }
                             }
-                                
+
 
                             else
@@ -334 +351 @@
                             }
 
-                            
+
                         }
-                       
-                        
+
+
                     }
                 }