svn commit: r330645 - in /struts/sandbox/trunk/overdrive: Nexus/Web/GridControl.ascx.cs PhoneBook/Web/Forms/Directory2.aspx.cs PhoneBook/Web/Resources/AppBase.xml PhoneBook/Web/Resources/Queries.xml

[husted]

Author: husted
Date: Thu Nov  3 13:43:08 2005
New Revision: 330645

URL: http://svn.apache.org/viewcvs?rev=330645&view=rev
Log:
OVR-24
* Correct letter filter event handler so that pages scroll correctly.

Modified:
    struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs
    struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs
    struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/AppBase.xml
    struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Queries.xml

Modified: struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs
URL: 
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs?rev=330645&r1=330644&r2=330645&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs Thu Nov  3 
13:43:08 2005
@@ -583,8 +583,7 @@
 
                public virtual void Reset()
                {
-                       list_ResetIndex();
-                       list_Refresh();
+                       Reset(list_Criteria);
                }
 
                protected virtual void list_Item(string commandName, int index)
@@ -801,7 +800,7 @@
                        {
                                int from = (page * size) + 1;
                                int thru = (page * size) + size;
-                               if (thru>count) thru = count;                   
        
+                               // if (thru>count) thru = count;                
                
                                ListPageIndexChangedArgs a = new 
ListPageIndexChangedArgs();
                                a.ItemFrom = from;
                                a.ItemThru = thru;

Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs
URL: 
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs?rev=330645&r1=330644&r2=330645&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs 
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs Thu 
Nov  3 13:43:08 2005
@@ -179,7 +179,6 @@
                        FindArgs a = e as FindArgs;
                        lister.Read(a.Criteria);
                        lister.Reset();
-                       lister.Open();
                }
 
                /// <summary>

Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/AppBase.xml
URL: 
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/AppBase.xml?rev=330645&r1=330644&r2=330645&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/AppBase.xml 
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/AppBase.xml Thu Nov  
3 13:43:08 2005
@@ -31,4 +31,6 @@
 
        <object id="BaseSave" type="PhoneBook.Core.Commands.BaseSave, 
PhoneBook.Core" parent="BaseMapper"/>
 
+    <object id="EntryInitial" type="PhoneBook.Core.Commands.EntryInitial, 
PhoneBook.Core" parent="BaseMapper"/>
+
 </objects>

Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Queries.xml
URL: 
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Queries.xml?rev=330645&r1=330644&r2=330645&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Queries.xml 
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Queries.xml Thu Nov  
3 13:43:08 2005
@@ -76,6 +76,9 @@
                                pk_entry AS entry_key                           
                        FROM entry
                        <dynamic prepend="WHERE">                       
+                               <isNotNull property="initial" prepend="AND">
+                                       last_name LIKE #initial#
+                               </isNotNull>
                                <isNotNull property="last_name" prepend="AND">
                                        last_name=#last_name#
                                </isNotNull>
@@ -111,6 +114,9 @@
                <select id="entry_count" paramClass="Hashtable" 
resultClass="string">
                        SELECT COUNT(*) FROM entry
                        <dynamic prepend="WHERE">                       
+                               <isNotNull property="initial" prepend="AND">
+                                       last_name LIKE #initial#
+                               </isNotNull>
                                <isNotNull property="last_name" prepend="AND">
                                        last_name=#last_name#
                                </isNotNull>
@@ -137,6 +143,12 @@
                                </isNotNull>
                        </dynamic>                      
                </select>
+               
+               <select id="entry_initial" paramClass="string" 
resultClass="string">            
+                       SELECT COUNT(*) 
+                       FROM entry
+                       WHERE last_name LIKE #value#
+               </select>                                                       
                
                
                <insert id="entry_insert" parameterMap="entry_save_param">
              INSERT INTO entry (                           



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]