[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[2694] branches/0.9.9.0/mmex/src/mmcheckingpanel .cpp

[<vo...@us...>]

Revision: 2694
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2694&view=rev
Author:   vomikan
Date:     2012-07-05 14:13:58 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
search for amounts added

Modified Paths:
--------------
    branches/0.9.9.0/mmex/src/mmcheckingpanel.cpp

Modified: branches/0.9.9.0/mmex/src/mmcheckingpanel.cpp
===================================================================
--- branches/0.9.9.0/mmex/src/mmcheckingpanel.cpp	2012-07-05 12:31:03 UTC (rev 2693)
+++ branches/0.9.9.0/mmex/src/mmcheckingpanel.cpp	2012-07-05 14:13:58 UTC (rev 2694)
@@ -2072,16 +2072,29 @@
 
     if (searchString.IsEmpty()) return;
 
-    long max = m_listCtrlAccount->GetItemCount();
+    double amount, deposit, withdrawal;
+    bool valid_amount = mmex::formatCurrencyToDouble(searchString, amount);
+    bool withdrawal_only = false;
+    if (valid_amount && amount <0) 
+    {
+        amount = -amount;
+        withdrawal_only = true;
+    }
+
+    long last = m_listCtrlAccount->GetItemCount();
     long selectedItem = m_listCtrlAccount->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-    if (selectedItem < 0)
-        selectedItem = g_asc ? m_listCtrlAccount->GetItemCount()-1 : 0;
+    if (selectedItem < 0) //nothing selected
+        selectedItem = g_asc ? last - 1 : 0;
 
-    while (selectedItem >=0 && selectedItem <= max)
+    while (selectedItem >=0 && selectedItem <= last)
     {
         g_asc ?  selectedItem-- : selectedItem++;
         const wxString t = getItem(selectedItem, COL_NOTES);
-        if (t.Lower().Find(searchString)!=wxNOT_FOUND)
+        if (valid_amount) mmex::formatCurrencyToDouble(getItem(selectedItem, COL_DEPOSIT), deposit);
+        if (valid_amount) mmex::formatCurrencyToDouble(getItem(selectedItem, COL_WITHDRAWAL), withdrawal);
+        if (t.Lower().Find(searchString)!=wxNOT_FOUND
+            || (valid_amount && amount == deposit && !withdrawal_only)
+            || (valid_amount && amount == withdrawal))
         {
             //First of all any items should be unselected
             long cursel = m_listCtrlAccount->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.