This is an automated email from the git hooks/post-receive script.
bex pushed a change to branch master in repository fedora-budget.
from f8b1d10 Adding Translation Sprint T-shirts new 3056592 Adding reporting for Council and Other Expenses
The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
Summary of changes: FY18/{overall.adoc => council.adoc} | 7 +++---- FY18/gen_reports | 6 ++++++ _builder/budget2tsv | 2 +- _topic_map.yml | 2 ++ 4 files changed, 12 insertions(+), 5 deletions(-) copy FY18/{overall.adoc => council.adoc} (69%)
This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master in repository fedora-budget.
commit 305659236b4a65ddfb2edab776904fa6bcc0d44b Author: Brian (bex) Exelbierd bex@pobox.com Date: Tue Jul 4 14:26:49 2017 +0200
Adding reporting for Council and Other Expenses --- FY18/council.adoc | 12 ++++++++++++ FY18/gen_reports | 6 ++++++ _builder/budget2tsv | 2 +- _topic_map.yml | 2 ++ 4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/FY18/council.adoc b/FY18/council.adoc new file mode 100644 index 0000000..3a2d8d4 --- /dev/null +++ b/FY18/council.adoc @@ -0,0 +1,12 @@ +Fedora Council and Other Expenses +================================= + +Budget Report +------------- + +[caption="", format="csv", separator=" ", cols="4*>,1", options="header, footer"] +.All amounts are in US Dollars +|=== +Budget Spent So Far Remaining Budget Percent Spent Budget Category +include::FY18/council.csv[] +|=== diff --git a/FY18/gen_reports b/FY18/gen_reports index f52d1ad..b10be11 100755 --- a/FY18/gen_reports +++ b/FY18/gen_reports @@ -24,6 +24,12 @@ ledger -f ledger/fedora.ledger budget '^D&I' --flat | tail -n +2 | ../_builder/b # Mindshare - doesn't do second levels so we need to just do the first level list and cut the first line ledger -f ledger/fedora.ledger budget '^Mindshare' --flat | tail -n +2 | ../_builder/budget2tsv > mindshare.csv
+# Council and Other Expenses +ledger -f ledger/fedora.ledger budget '^Council' and not '^Council$' --flat | ../_builder/budget2tsv > council.csv +if [ ! -s council.csv ]; then + ledger -f ledger/fedora.ledger budget '^Council' --flat | ../_builder/budget2tsv > council.csv +fi + # APAC ledger -f ledger/fedora.ledger budget '^APAC' and not '^APAC$' --flat --depth 2 | ../_builder/budget2tsv > apac.csv if [ ! -s apac.csv ]; then diff --git a/_builder/budget2tsv b/_builder/budget2tsv index ae96601..25d9346 100755 --- a/_builder/budget2tsv +++ b/_builder/budget2tsv @@ -12,4 +12,4 @@ # Set up any remaining negative values to be -$ not $- # Remove any Account Nesting present by removing all values before the last : # Swap the first and second columns to get to the goal order -grep -v '^----' | sed 's/^ +//' | sed 's/ + /\t/g' | sed 's/ $/\t$/g' | sed 's/^$-/$/' | sed 's/%$/%\tTotal/' | sed 's/^([$]*[0-9.,]+\t)$-/\1$/' | sed 's/$-/-$/g' | sed 's/\t[^\t]+:([^:]+)$/\t\1/' | awk 'BEGIN{ FS="\t" } {print $2 "\t" $1 "\t" $3 "\t" $4 "\t" $5}' +grep -v '^----' | sed 's/^ +//' | sed 's/ + /\t/g' | sed 's/ $/\t$/g' | sed 's/^$([0-9])/-$\1/g' | sed 's/^$-/$/' | sed 's/%$/%\tTotal/' | sed 's/^([$]*[0-9.,]+\t)$-/\1$/' | sed 's/$-/-$/g' | sed 's/\t[^\t]+:([^:]+)$/\t\1/' | awk 'BEGIN{ FS="\t" } {print $2 "\t" $1 "\t" $3 "\t" $4 "\t" $5}' diff --git a/_topic_map.yml b/_topic_map.yml index 158af4c..c79ac00 100644 --- a/_topic_map.yml +++ b/_topic_map.yml @@ -60,6 +60,8 @@ Topics: File: events.adoc - Name: FADs Budget File: fads.adoc + - Name: Council and Other Expenses + File: council.adoc --- Name: FY 17 Budget Reports Dir: FY17
budget-devel@lists.fedoraproject.org