Update and connect to drone (#1)
All checks were successful
continuous-integration/drone/push Build is passing

Reviewed-on: #1
This commit is contained in:
Andrew Tomaka 2023-03-08 19:25:24 -05:00
parent 0887a5f6b9
commit fd75a7c6ff
17 changed files with 215 additions and 170 deletions

View file

@ -1,5 +1,5 @@
class CreditCardBillsController < ApplicationController
before_action :set_credit_card_bill, only: %i[ show edit update destroy ]
before_action :set_credit_card_bill, only: %i[show edit update destroy]
# GET /credit_card_bills or /credit_card_bills.json
def index
@ -58,13 +58,14 @@ class CreditCardBillsController < ApplicationController
end
private
# Use callbacks to share common setup or constraints between actions.
def set_credit_card_bill
@credit_card_bill = CreditCardBill.find(params[:id])
end
# Only allow a list of trusted parameters through.
def credit_card_bill_params
params.require(:credit_card_bill).permit(:description, :amount)
end
# Use callbacks to share common setup or constraints between actions.
def set_credit_card_bill
@credit_card_bill = CreditCardBill.find(params[:id])
end
# Only allow a list of trusted parameters through.
def credit_card_bill_params
params.require(:credit_card_bill).permit(:description, :amount)
end
end

View file

@ -1,5 +1,5 @@
class ExpensesController < ApplicationController
before_action :set_expense, only: %i[ show edit update destroy ]
before_action :set_expense, only: %i[show edit update destroy]
# GET /expenses or /expenses.json
def index
@ -58,13 +58,14 @@ class ExpensesController < ApplicationController
end
private
# Use callbacks to share common setup or constraints between actions.
def set_expense
@expense = Expense.find(params[:id])
end
# Only allow a list of trusted parameters through.
def expense_params
params.require(:expense).permit(:description, :payment, :period, :credit_card, :estimated)
end
# Use callbacks to share common setup or constraints between actions.
def set_expense
@expense = Expense.find(params[:id])
end
# Only allow a list of trusted parameters through.
def expense_params
params.require(:expense).permit(:description, :payment, :period, :credit_card, :estimated)
end
end

View file

@ -1,5 +1,5 @@
class IncomesController < ApplicationController
before_action :set_income, only: %i[ show edit update destroy ]
before_action :set_income, only: %i[show edit update destroy]
# GET /incomes or /incomes.json
def index
@ -58,13 +58,14 @@ class IncomesController < ApplicationController
end
private
# Use callbacks to share common setup or constraints between actions.
def set_income
@income = Income.find(params[:id])
end
# Only allow a list of trusted parameters through.
def income_params
params.require(:income).permit(:description, :included, :amount, :member_id)
end
# Use callbacks to share common setup or constraints between actions.
def set_income
@income = Income.find(params[:id])
end
# Only allow a list of trusted parameters through.
def income_params
params.require(:income).permit(:description, :included, :amount, :member_id)
end
end

View file

@ -1,5 +1,5 @@
class MembersController < ApplicationController
before_action :set_member, only: %i[ show edit update destroy ]
before_action :set_member, only: %i[show edit update destroy]
# GET /members or /members.json
def index
@ -58,13 +58,14 @@ class MembersController < ApplicationController
end
private
# Use callbacks to share common setup or constraints between actions.
def set_member
@member = Member.find(params[:id])
end
# Only allow a list of trusted parameters through.
def member_params
params.require(:member).permit(:name, :pays)
end
# Use callbacks to share common setup or constraints between actions.
def set_member
@member = Member.find(params[:id])
end
# Only allow a list of trusted parameters through.
def member_params
params.require(:member).permit(:name, :pays)
end
end

View file

@ -3,7 +3,7 @@ class Expense < ApplicationRecord
monthly: 12,
annually: 1,
weekly: 52,
quarterly: 4,
quarterly: 4
}.freeze
enum :period, PERIOD_OCCURENCES.keys

View file

@ -1,5 +1,5 @@
class Member < ApplicationRecord
has_many :incomes
has_many :incomes, dependent: :destroy
def income
incomes.sum(&:amount)
@ -15,6 +15,8 @@ class Member < ApplicationRecord
def burden_percent
((Income.total - others_included_income) / Income.total).round(2)
rescue
0
end
def burden_amount(total_amount: Expense.monthly_total)