[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[1237] trunk/mmex/src

[<ste...@us...>]

Revision: 1237
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1237&view=rev
Author:   stef145g
Date:     2011-04-18 00:23:25 +0000 (Mon, 18 Apr 2011)

Log Message:
-----------
Custom Reports: Allow heading Identifiers

Modified Paths:
--------------
    trunk/mmex/src/customreportindex.cpp
    trunk/mmex/src/mmex.cpp

Modified: trunk/mmex/src/customreportindex.cpp
===================================================================
--- trunk/mmex/src/customreportindex.cpp	2011-04-17 08:21:10 UTC (rev 1236)
+++ trunk/mmex/src/customreportindex.cpp	2011-04-18 00:23:25 UTC (rev 1237)
@@ -99,7 +99,10 @@
 
 wxString customSQLReportIndex::currentReportFileName()
 {
-    return wxString() << mmex::getPathUser(mmex::DIRECTORY) << currentReportFileName_;
+    wxString returnStr;
+    if (currentReportFileName_ != wxT(""))
+        returnStr = wxString() << mmex::getPathUser(mmex::DIRECTORY) << currentReportFileName_;
+    return returnStr;
 }
 
 wxString customSQLReportIndex::reportFileName(int index)
@@ -125,9 +128,11 @@
         {
             indexFile_->AddLine(_("Custom SQL Reports"));
             indexFile_->AddLine(wxT(""));
-            indexFile_->AddLine(_("Report Name:Report Filename.sql[:SUB]"));
+            indexFile_->AddLine(_("Report Name[:Report Filename.sql[:SUB]]"));
             indexFile_->AddLine(wxT("========================================"));
             indexFile_->AddLine(wxT("My First Report:My First Report.sql"));
+            indexFile_->AddLine(wxT("My Report Heading"));
+            indexFile_->AddLine(wxT("My Second Report:My Second Report.sql:SUB"));
             indexFile_->Write();
             resetReportsIndex();
             setSQLReportsActive();

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-04-17 08:21:10 UTC (rev 1236)
+++ trunk/mmex/src/mmex.cpp	2011-04-18 00:23:25 UTC (rev 1237)
@@ -1398,30 +1398,33 @@
 void mmGUIFrame::createCustomReport(int index)
 {
     wxString rfn = custRepIndex_->reportFileName(index);
-    wxTextFile sqlFile(rfn);  
-    if ( sqlFile.Exists() )
+    if (rfn != wxT(""))
     {
-        wxString sqlStr;
-        sqlFile.Open();
-        sqlStr << sqlFile.GetFirstLine() << wxT("\n"); 
-        while (! sqlFile.Eof())
+        wxTextFile sqlFile(rfn);  
+        if ( sqlFile.Exists() )
         {
-            wxString nextLine = sqlFile.GetNextLine();
-            wxString line = nextLine;
-            line.Trim(false);
-            if (line.Mid(1,2) != wxT("--"))
-                sqlStr << nextLine << wxT("\n");
+            wxString sqlStr;
+            sqlFile.Open();
+            sqlStr << sqlFile.GetFirstLine() << wxT("\n"); 
+            while (! sqlFile.Eof())
+            {
+                wxString nextLine = sqlFile.GetNextLine();
+                wxString line = nextLine;
+                line.Trim(false);
+                if (line.Mid(1,2) != wxT("--"))
+                    sqlStr << nextLine << wxT("\n");
+            }
+
+            mmCustomSQLReport* csr = new mmCustomSQLReport(m_core.get(), custRepIndex_->currentReportTitle(), sqlStr);
+            menuPrintingEnable(true);
+            createReportsPage(csr);
         }
-
-        mmCustomSQLReport* csr = new mmCustomSQLReport(m_core.get(), custRepIndex_->currentReportTitle(), sqlStr);
-        menuPrintingEnable(true);
-        createReportsPage(csr);
+        else
+        {
+            wxString msg = wxString() << _("Cannot locate file: ") << rfn << wxT("\n\n");
+            wxMessageBox(msg,_("Custom SQL Reports"),wxOK|wxICON_ERROR);
+        }
     }
-    else
-    {
-        wxString msg = wxString() << _("Cannot locate file: ") << rfn << wxT("\n\n");
-        wxMessageBox(msg,_("Custom SQL Reports"),wxOK|wxICON_ERROR);
-    }
 }
 
 bool mmGUIFrame::CustomSQLReportSelected( int& customSqlReportID, mmTreeItemData* iData )


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