- Enter your budget requests & contributions. You can return to edit your entries at any time.
+ Enter your budget requests & contributions. After entering your items will then be able to view the budget as a whole, as it takes shape. You can return to edit your entries at any time.
budget name:
@@ -299,6 +299,8 @@ sub prepare_budget {
$record2->{firstname} $record2->{lastname}
+
Financial budget elements
;
+
request money
your monetary requests from the f20 budget (all sums in €)
@@ -355,7 +357,7 @@ END
print(qq(
\n));
print(qq(
));
- print(qq(
input money
your monetary contribution to the budget (direct payments for materials/services, donations to f20, as a sum total)
));
+ print(qq(
&/or input money
your monetary contribution to the budget (direct payments for materials/services, donations to f20, as a sum total)
things you commit to doing, non-remunerated. (check the box if this labour has already been deployed)
));
@@ -807,9 +810,11 @@ sub compile_budget {
$sthr->execute;
my $sqlef = qq(
- SELECT budget_id, item, cost, currency, type
+# SELECT budget_id, item, cost, currency, type
+ SELECT *
FROM expenditure
LEFT JOIN budgets on expenditure.budget_id=budgets.id
+ LEFT JOIN agents on expenditure.agent_id=agents.id
WHERE expenditure.budget_id = '$budget_id'
AND type='fee'
ORDER BY expenditure.item);
@@ -817,8 +822,11 @@ sub compile_budget {
$sthef->execute;
my $sqlem = qq(
- SELECT budget_id, item, cost, currency, type FROM expenditure
+# SELECT budget_id, item, cost, currency, type FROM expenditure
+ SELECT *
+ FROM expenditure
LEFT JOIN budgets on expenditure.budget_id=budgets.id
+ LEFT JOIN agents on expenditure.agent_id=agents.id
WHERE expenditure.budget_id = '$budget_id'
AND type='materials'
ORDER BY expenditure.item);
@@ -826,8 +834,11 @@ sub compile_budget {
$sthem->execute;
my $sqlex = qq(
- SELECT budget_id, item, cost, currency, type FROM expenditure
+# SELECT budget_id, item, cost, currency, type FROM expenditure
+ SELECT *
+ FROM expenditure
LEFT JOIN budgets on expenditure.budget_id=budgets.id
+ LEFT JOIN agents on expenditure.agent_id=agents.id
WHERE expenditure.budget_id = '$budget_id'
AND type='misc'
ORDER BY expenditure.item);
@@ -857,7 +868,7 @@ END
if ($agent_id ne "") {
while (my $recordfc = $sthfc->fetchrow_hashref) {
print <[$recordfc->{count}]. This multi-player budget will remain open for editing until $recordb->{end_date}. Monetary items will be kept anonymous (although identifable to the budget r/administrators). Labour & resources will be tagged with the name of the contributor.
+Contributing agents [$recordfc->{count}]. This multi-player budget will remain open for editing until $recordb->{end_date}.
END
}
}
@@ -918,6 +929,8 @@ END
my $cost = $recordef->{cost};
$display_cost = sprintf "%.2f",$cost;
$display_cost =~ s/(\d)(?=(\d{3})+(\D|$))/$1\,/g; ## add commma
+ $initials = get_initials($recordef);
+
print <
$recordef->{item}
@@ -925,6 +938,7 @@ END
END
}
+
print_subtitle("Resources / remunerated");
while (my $recordem = $sthem->fetchrow_hashref) {
@@ -984,7 +998,7 @@ END
print_title("NONFINANCIAL");
- print_subtitle("Human and nonhuman budget contributions: / labour and resources, deployed &/or offfered, latent, awaiting activation");
+ print_subtitle("Human and nonhuman budget contributions: / labour and resources, deployed &/or offered, latent, awaiting activation");
print_subtitle("Labour / deployed");
@@ -992,7 +1006,7 @@ END
while (my $record = $sthdl->fetchrow_hashref) {
$record->{item} =~ s/^([a-z])/\U$1/; ## capitalise first letter
$initials = get_initials($record);
- print_item("$record->{item} [$initials]");
+ print_item_nf("$record->{item} [$initials]");
}
print_subtitle("Resources / deployed");
@@ -1001,7 +1015,7 @@ END
while (my $record = $sthdr->fetchrow_hashref) {
$record->{item} =~ s/^([a-z])/\U$1/; ## capitalise first letter
$initials = get_initials($record);
- print_item("$record->{item} [$initials]");
+ print_item_nf("$record->{item} [$initials]");
}
print_subtitle("Labour / offered");
@@ -1010,7 +1024,7 @@ END
while (my $record = $sthol->fetchrow_hashref) {
$record->{item} =~ s/^([a-z])/\U$1/; ## capitalise first letter
$initials = get_initials($record);
- print_item("$record->{item} [$initials]");
+ print_item_nf("$record->{item} [$initials]");
}
print_subtitle("Resources / offered");
@@ -1019,7 +1033,7 @@ END
while (my $record = $sthor->fetchrow_hashref) {
$record->{item} =~ s/^([a-z])/\U$1/; ## capitalise first letter
$initials = get_initials($record);
- print_item("$record->{item} [$initials]");
+ print_item_nf("$record->{item} [$initials]");
}
$dbh->disconnect;
@@ -1977,7 +1991,7 @@ sub print_subtotal {
END
}
-## print standard budget item with a description and optional amount
+## print financial budget item with a description and optional amount
sub print_item {
my $string = shift;
@@ -1991,6 +2005,17 @@ sub print_item {
END
}
+## print nonfinancial budget item with a description only
+
+sub print_item_nf {
+ my $string = shift;
+ print <
+