Added support for 'accounts' columns in reports.

diff --git a/docs/en/ChangeLog.xml b/docs/en/ChangeLog.xml
index 0c45458..571f612 100644 (file)
--- a/docs/en/ChangeLog.xml
+++ b/docs/en/ChangeLog.xml
@@ -1301,4 +1301,13 @@ characters are used.</para></listitem>
 </itemizedlist></para>
 
 </sect2>
+<sect2 id="Changelog_2_4_2"><title>Version 2.4.2 (Some day)</title>
+<para>
+<itemizedlist mark='opencircle'>
+
+<listitem><para>Added 'accounts' column to reports.</para></listitem>
+
+</itemizedlist></para>
+
+</sect2>
 </sect1>

diff --git a/docs/en/PropertyReference.xml b/docs/en/PropertyReference.xml
index f0034be..8778f15 100644 (file)
--- a/docs/en/PropertyReference.xml
+++ b/docs/en/PropertyReference.xml
@@ -394,6 +394,11 @@ file processing, the report macros must be prefixed with an additional
   <freestyle>
    <para><simplelist type="horiz" columns="2">
    
+   <member><varname>accounts</varname></member>
+   <member>This columns lists the account that is assigned to the
+          respective task. It is called 'accounts' because later
+          versions will have support for multiple accounts.</member>
+   
    <member><varname>chart</varname></member>
    <member>Use this column to get Gantt and resource charts. It's only
    supported by the interactive reports in the GUI.</member>

diff --git a/taskjuggler/CSVReportElement.cpp b/taskjuggler/CSVReportElement.cpp
index d7d6157..b680c57 100644 (file)
--- a/taskjuggler/CSVReportElement.cpp
+++ b/taskjuggler/CSVReportElement.cpp
@@ -440,6 +440,14 @@ CSVReportElement::genCellEmpty(TableCellInfo* tci)
 }
 
 void
+CSVReportElement::genCellAccounts(TableCellInfo* tci)
+{
+    genCell(QString().sprintf("%s", tci->tli->task->getAccount() ?
+                              tci->tli->task->getAccount()->getId().latin1() :
+                              ""), tci, true);
+}
+
+void
 CSVReportElement::genCellSequenceNo(TableCellInfo* tci)
 {
     genCell(tci->tli->ca2 == 0 ?

diff --git a/taskjuggler/CSVReportElement.h b/taskjuggler/CSVReportElement.h
index a93cc28..e124e6f 100644 (file)
--- a/taskjuggler/CSVReportElement.h
+++ b/taskjuggler/CSVReportElement.h
@@ -53,6 +53,7 @@ public:
     virtual void genHeadYear(TableCellInfo* tcf);
 
     virtual void genCellEmpty(TableCellInfo*);
+    virtual void genCellAccounts(TableCellInfo* tli);
     virtual void genCellSequenceNo(TableCellInfo* tli);
     virtual void genCellNo(TableCellInfo* tli);
     virtual void genCellHierarchNo(TableCellInfo* tli);

diff --git a/taskjuggler/HTMLReportElement.cpp b/taskjuggler/HTMLReportElement.cpp
index 7d3a527..e55baaa 100644 (file)
--- a/taskjuggler/HTMLReportElement.cpp
+++ b/taskjuggler/HTMLReportElement.cpp
@@ -895,6 +895,14 @@ HTMLReportElement::genCellEmpty(TableCellInfo* tci)
 }
 
 void
+HTMLReportElement::genCellAccounts(TableCellInfo* tci)
+{
+    genCell(QString().sprintf("%s", tci->tli->task->getAccount() ?
+                              tci->tli->task->getAccount()->getId().latin1() :
+                              ""), tci, true);
+}
+
+void
 HTMLReportElement::genCellSequenceNo(TableCellInfo* tci)
 {
     genCell(tci->tli->ca2 == 0 ?

diff --git a/taskjuggler/HTMLReportElement.h b/taskjuggler/HTMLReportElement.h
index 98e7602..65d2959 100644 (file)
--- a/taskjuggler/HTMLReportElement.h
+++ b/taskjuggler/HTMLReportElement.h
@@ -49,6 +49,7 @@ public:
     virtual void genHeadYear(TableCellInfo* tcf);
 
     virtual void genCellEmpty(TableCellInfo*);
+    virtual void genCellAccounts(TableCellInfo* tli);
     virtual void genCellSequenceNo(TableCellInfo* tli);
     virtual void genCellNo(TableCellInfo* tli);
     virtual void genCellHierarchNo(TableCellInfo* tli);

diff --git a/taskjuggler/QtReportElement.h b/taskjuggler/QtReportElement.h
index 8bb0875..b614fa1 100644 (file)
--- a/taskjuggler/QtReportElement.h
+++ b/taskjuggler/QtReportElement.h
@@ -50,6 +50,7 @@ public:
     virtual void genHeadYear(TableCellInfo*) { }
 
     virtual void genCellEmpty(TableCellInfo*) { }
+    virtual void genCellAccounts(TableCellInfo*) { }
     virtual void genCellSequenceNo(TableCellInfo*) { }
     virtual void genCellNo(TableCellInfo*) { }
     virtual void genCellHierarchNo(TableCellInfo*) { }

diff --git a/taskjuggler/ReportElement.cpp b/taskjuggler/ReportElement.cpp
index 149cbed..86660b0 100644 (file)
--- a/taskjuggler/ReportElement.cpp
+++ b/taskjuggler/ReportElement.cpp
@@ -70,7 +70,12 @@ ReportElement::ReportElement(Report* r, const QString& df, int dl) :
     currencyFormat = r->getCurrencyFormat();
 
     TableColumnFormat* tcf =
-        new TableColumnFormat(KW("seqno"), this, i18n("Seq. No."));
+        new TableColumnFormat(KW("accounts"), this, i18n("Accounts"));
+    tcf->genTaskLine1 = &ReportElement::genCellAccounts;
+    tcf->genTaskLine2 = &ReportElement::genCellAccounts;
+    tcf->hAlign = TableColumnFormat::left;
+
+    tcf = new TableColumnFormat(KW("seqno"), this, i18n("Seq. No."));
     tcf->genTaskLine1 = &ReportElement::genCellSequenceNo;
     tcf->genResourceLine1 = &ReportElement::genCellSequenceNo;
     tcf->genAccountLine1 = &ReportElement::genCellSequenceNo;

diff --git a/taskjuggler/ReportElement.h b/taskjuggler/ReportElement.h
index 1f0a0d0..31745e0 100644 (file)
--- a/taskjuggler/ReportElement.h
+++ b/taskjuggler/ReportElement.h
@@ -188,6 +188,7 @@ public:
     virtual void genHeadYear(TableCellInfo*) = 0;
 
     virtual void genCellEmpty(TableCellInfo*) = 0;
+    virtual void genCellAccounts(TableCellInfo*) = 0;
     virtual void genCellSequenceNo(TableCellInfo*) = 0;
     virtual void genCellNo(TableCellInfo*) = 0;
     virtual void genCellHierarchNo(TableCellInfo*) = 0;