almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-06 05:01:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Wording : use 'expenses' rather than 'expenditures'

Browse source
This commit is contained in:
Alexis Métaireau 2021-04-12 21:32:44 +02:00
parent a2c3364266
commit fda210e519
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ihatemoney/models.py
View file

@ -144,7 +144,7 @@ class Project(db.Model):
] ]
), ),
"balance": self.balance[member.id], "balance": self.balance[member.id],
"monthly_exp": self.get_monthly_expenditure(member.id), "monthly_exp": self.get_monthly_expenses(member.id),
} }
for member in self.active_members for member in self.active_members
] ]
@ -165,11 +165,11 @@ class Project(db.Model):
def uses_weights(self): def uses_weights(self):
return len([i for i in self.members if i.weight != 1]) > 0 return len([i for i in self.members if i.weight != 1]) > 0
def get_monthly_expenditure(self, member_id): def get_monthly_expenses(self, member_id):
""" """
Computes monthly expenses for member_id Computes monthly expenses for member_id
:return: a list of tuples of the form (date, expenditure) :return: a list of tuples of the form (date, expenses)
""" """
query_result = {} query_result = {}
member_monthly = defaultdict(lambda: defaultdict(float)) member_monthly = defaultdict(lambda: defaultdict(float))

30
ihatemoney/static/js/charts.js
View file

@ -12,7 +12,7 @@ function populateCharts(member_stats, months_in, monthly_stats) {
}); });
//Start of chart for total expenditure per month //Start of chart for total expenses per month
var month_to_int = { var month_to_int = {
"Jan": 1, "Jan": 1,
"Feb": 2, "Feb": 2,
@ -43,12 +43,12 @@ function populateCharts(member_stats, months_in, monthly_stats) {
months.reverse(); months.reverse();
exp_per_month.reverse() exp_per_month.reverse()
exp_per_month.splice(0,0,"Combined Monthly Expenditure"); exp_per_month.splice(0,0,"Combined Monthly Expenses");
var exp_per_month_chart = bb.generate({ var exp_per_month_chart = bb.generate({
title: { title: {
text: "Combined Monthly Expenditure" text: "Combined Monthly Expenses"
}, },
data: { data: {
columns: [ columns: [
@ -62,15 +62,15 @@ function populateCharts(member_stats, months_in, monthly_stats) {
categories: months categories: months
}, },
y: { y: {
label: "Expenditure" label: "Amount"
} }
}, },
bindto: "#combinedPerMonth" bindto: "#combinedPerMonth"
}); });
// End of total expenditure per month chart // End of total expenses per month chart
// Start of expenditure per member per month chart // Start of expenses per member per month chart
var members_exp_by_month = []; var members_exp_by_month = [];
member_stats.forEach(function(stat) { member_stats.forEach(function(stat) {
var month_dict = []; var month_dict = [];
@ -105,7 +105,7 @@ function populateCharts(member_stats, months_in, monthly_stats) {
var chart_columns = []; var chart_columns = [];
months.forEach(function(month) { months.forEach(function(month) {
members_exp_by_month.forEach(function(member) { members_exp_by_month.forEach(function(member) {
// If current member had expenditure on current month // If current member had expenses on current month
if (month in member.member_months) { if (month in member.member_months) {
member_exp_dict[member.name].push(member.member_months[month]); member_exp_dict[member.name].push(member.member_months[month]);
} else { } else {
@ -113,14 +113,14 @@ function populateCharts(member_stats, months_in, monthly_stats) {
} }
}); });
}); });
// Pushing each individual member's expenditure per month array into the chart array // Pushing each individual member's expenses per month array into the chart array
// chart array is what is given to bb.generate // chart array is what is given to bb.generate
members_exp_by_month.forEach(function(member) { members_exp_by_month.forEach(function(member) {
chart_columns.push(member_exp_dict[member.name]); chart_columns.push(member_exp_dict[member.name]);
}); });
var members_exp_month_chart = bb.generate({ var members_exp_month_chart = bb.generate({
title: { title: {
text: "Monthly Expenditure Per Member" text: "Monthly Expenses Per Member"
}, },
data: { data: {
columns: chart_columns, columns: chart_columns,
@ -132,20 +132,20 @@ function populateCharts(member_stats, months_in, monthly_stats) {
categories: months, categories: months,
}, },
y: { y: {
label: "Expenditure" label: "Amounts"
} }
}, },
bindto: "#memberPerMonth" bindto: "#memberPerMonth"
}); });
//end of expenditure per month per member //end of expenses per month per member
// Start of Expenditure Pie Chart // Start of Expenses Pie Chart
pie_cols = []; pie_cols = [];
members_exp_by_month.forEach(function(member) { members_exp_by_month.forEach(function(member) {
var particpant = member.name; var participant = member.name;
var spent = total_exp_per_member[member.name]; var spent = total_exp_per_member[member.name];
var exp_arr = [particpant, spent]; var exp_arr = [participant, spent];
pie_cols.push(exp_arr); pie_cols.push(exp_arr);
}); });
@ -157,7 +157,7 @@ function populateCharts(member_stats, months_in, monthly_stats) {
bindto: "#expPie" bindto: "#expPie"
}); });
// End of Expenditure Pie Chart // End of Expenses Pie Chart
} }