Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
with
168 additions
and 192 deletions.
- +5 −6 app/views/expenses/edit.html.erb
- +19 −30 app/views/incomes/_form.html.erb
- +4 −5 app/views/incomes/edit.html.erb
- +0 −2 app/views/incomes/new.html.erb
- +41 −46 app/views/layouts/application.html.erb
- +23 −24 app/views/mybudgets/_expenses.html.erb
- +21 −23 app/views/mybudgets/_form.html.erb
- +21 −24 app/views/mybudgets/_incomes.html.erb
- +18 −19 app/views/mybudgets/index.html.erb
- +16 −13 app/views/mybudgets/show.html.erb
| @@ -1,8 +1,7 @@ | ||
| <div class="row"> | ||
| <div class="col-md-8"> | ||
| <%= render 'expenses/new_expenses_form' %> | ||
|
|
||
| </div> | ||
| <div class="col-md-4"> | ||
| </div> | ||
| <div class="col-md-8"> | ||
| <%= render 'expenses/new_expenses_form' %> | ||
| </div> | ||
| <div class="col-md-4"> | ||
| </div> | ||
| </div> |
| @@ -1,36 +1,25 @@ | ||
| <div class="bordered-form"> | ||
| <%= form_for [@mybudget, @income] do |f| %> | ||
| <%= form_for [@mybudget, @income] do |f| %> | ||
|
|
||
| <table> | ||
| <tr> | ||
| <table> | ||
| <tr> | ||
| <td class="field-name"> | ||
| <%= f.label :income %><br> | ||
| </td> | ||
| <td class="field"> | ||
| <%= f.text_field :income %> | ||
| </td> | ||
| </tr> | ||
|
|
||
| <tr> | ||
| <td class="field-name"> | ||
| <%= f.label :amount %><br> | ||
| </td> | ||
| <td class="field"> | ||
| <%= f.number_field :amount %> | ||
| </td> | ||
| </tr> | ||
|
|
||
| <tr> | ||
| <td class="field-name" id="total-field-name"> | ||
| <%= f.label :total_income %><br></td> | ||
| <td class="total-output"><%= @income.total_income%></td> | ||
| </tr> | ||
|
|
||
| </table> | ||
|
|
||
| <%= f.label :income %><br> | ||
| </td> | ||
| <td class="field"><%= f.text_field :income %></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="field-name"> <%= f.label :amount %><br></td> | ||
| <td class="field"><%= f.number_field :amount %></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="field-name" id="total-field-name"> | ||
| <%= f.label :total_income %><br></td> | ||
| <td class="total-output"><%= @income.total_income%></td> | ||
| </tr> | ||
| </table> | ||
| <div class="actions"> | ||
| <%= f.submit %> | ||
| <%= f.submit %> | ||
| </div> | ||
|
|
||
| <% end %> | ||
| <% end %> | ||
| </div> |
| @@ -1,7 +1,6 @@ | ||
| <div class="row"> | ||
| <div class="col-md-8"> | ||
| <%= render 'incomes/new_incomes_form' %> | ||
| </div> | ||
| <div class="col-md-4"> | ||
| </div> | ||
| <div class="col-md-8"> | ||
| <%= render 'incomes/new_incomes_form' %> | ||
| <div class="col-md-4"> | ||
| </div> | ||
| </div> |
| @@ -1,3 +1 @@ | ||
| NEW | ||
|
|
||
| <%= render 'form' %> |
| @@ -1,53 +1,48 @@ | ||
| <div class="application"> | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>MyBudget</title> | ||
| <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> | ||
| <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> | ||
| <%= csrf_meta_tags %> | ||
| </head> | ||
| <body> | ||
|
|
||
| <nav class="navbar navbar-default"> | ||
| <div class="container-fluid"> | ||
| <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>MyBudget</title> | ||
| <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> | ||
| <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> | ||
| <%= csrf_meta_tags %> | ||
| </head> | ||
| <body> | ||
|
|
||
| <nav class="navbar navbar-default"> | ||
| <div class="container-fluid"> | ||
| <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> | ||
| <ul class="nav navbar-nav navbar-right"> | ||
| <li class="dropdown"> | ||
| <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">LOGIN/OUT <span class="caret"></span></a> | ||
| <ul class="dropdown-menu"> | ||
| <li><a href="#">List </a></li> | ||
| <li><a href="#">of </a></li> | ||
| <li><a href="#">Users</a></li> | ||
| <li role="separator" class="divider"></li> | ||
| <li><a href="#">Create New User</a></li> | ||
| </ul> | ||
| <li class="dropdown"> | ||
| <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">LOGIN/OUT <span class="caret"></span></a> | ||
| <ul class="dropdown-menu"> | ||
| <li><a href="#">List </a></li> | ||
| <li><a href="#">of </a></li> | ||
| <li><a href="#">Users</a></li> | ||
| <li role="separator" class="divider"></li> | ||
| <li><a href="#">Create New User</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> | ||
| <ul class="nav navbar-nav navbar-right"> | ||
| <li class="dropdown"> | ||
| <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">MENU <span class="caret"></span></a> | ||
| <ul class="dropdown-menu"> | ||
| <li role="separator" class="divider"></li> | ||
| </ul> | ||
| </li> | ||
| <li class="dropdown"> | ||
| <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">MENU <span class="caret"></span></a> | ||
| <ul class="dropdown-menu"> | ||
| <li role="separator" class="divider"></li> | ||
| </ul> | ||
| </li> | ||
| </ul> | ||
|
|
||
| </div><!-- /.navbar-collapse --> | ||
| </div><!-- /.container-fluid --> | ||
| </nav> | ||
| <div class="row"> | ||
| <div class="col-md-12"> | ||
| <h1><center><%= @mybudget.name %></center></h1> | ||
|
|
||
| <body><center> | ||
| <p>This is an app designed to assist individuals in projecting their own budgets, savings and expenses from week to week. It will be built with Ruby on Rails, customized boostrap and postgreSQL assisted by tutorials demonstyrating an understanding of development processes</p> | ||
| </center><body> | ||
|
|
||
| </div> | ||
| </div> | ||
| <%= yield %> | ||
|
|
||
| </body> | ||
| </html> | ||
| </div><!-- /.navbar-collapse --> | ||
| </div><!-- /.container-fluid --> | ||
| </nav> | ||
| <div class="row"> | ||
| <div class="col-md-12"> | ||
| <h1><center><%= @mybudget.name %></center></h1> | ||
| <center> | ||
| <p>This is an app designed to assist individuals in projecting their own budgets, savings and expenses from week to week. It will be built with Ruby on Rails, customized boostrap and postgreSQL assisted by tutorials demonstyrating an understanding of development processes</p> | ||
| </center> | ||
| </div> | ||
| <%= yield %> | ||
| </body> | ||
| </html> | ||
| </div> |
| @@ -1,31 +1,30 @@ | ||
| <div class="bordered-form" > | ||
|
|
||
| <h2>Expenses</h2> | ||
| <h2>Expenses</h2> | ||
| <div> - this will do the same as above. There will be links for each allowing for the calculation of new expenses added on the spot.</div> | ||
| <%= link_to 'Add Expense', new_mybudget_expense_path(@mybudget, @expense) %> | ||
|
|
||
| <div> - this will do the same as above. There will be links for each allowing for the calculation of new expenses added on the spot.</div> | ||
|
|
||
| <%= link_to 'Add Expense', new_mybudget_expense_path(@mybudget, @expense) %> | ||
|
|
||
| <table class="table" > | ||
| <table class="table" > | ||
| <thead> | ||
| <tr> | ||
| <th>Expense Type</th> | ||
| <th>Amount</th> | ||
| </tr> | ||
| <tr> | ||
| <th>Expense Type</th> | ||
| <th>Amount</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <% @mybudget.expenses.each do |expense| %> | ||
| <tr> | ||
| <div id="expenses"></div> | ||
| <td><%= expense.expense %></td> | ||
| <td><%= expense.amount %></td> | ||
| <td></td> | ||
| <% end %> | ||
| <tbody> | ||
| <% @mybudget.expenses.each do |expense| %> | ||
| <tr> | ||
| <div id="expenses"></div> | ||
| <td><%= expense.expense %></td> | ||
| <td><%= expense.amount %></td> | ||
| <td></td> | ||
| </tr> | ||
| <% end %> | ||
| </tbody> | ||
| </table> | ||
| <br> | ||
| <div>TOTAL EXPENSES</div> | ||
| <div class="total-output"><%= Expense.sum(:amount) %> | ||
|
|
||
| </div> | ||
| </table> | ||
| <br> | ||
| <div>TOTAL EXPENSES</div> | ||
| <div class="total-output"><%= Expense.sum(:amount) %> | ||
| </div> | ||
| </div> |
| @@ -1,29 +1,27 @@ | ||
| <div class="bordered-form"> | ||
| <%= form_for [@mybudget] do |f| %> | ||
|
|
||
| <h1>New Budget</h1> | ||
| <table> | ||
| <tr> | ||
| <%= form_for [@mybudget] do |f| %> | ||
| <h1>New Budget</h1> | ||
| <table> | ||
| <tr> | ||
| <td class="field-name"> | ||
| <%= f.label :name %><br> | ||
| </td> | ||
| <td class="field"> | ||
| <%= f.text_field :name %> | ||
| </td> | ||
| </tr> | ||
|
|
||
| <tr> | ||
| <td class="field-name"> | ||
| <%= f.label :open_bal %><br> | ||
| </td> | ||
| <td class="field"> | ||
| <%= f.number_field :open_bal, :step => 0.01 %> | ||
| </td> | ||
| </tr> | ||
| <%= f.label :name %><br> | ||
| </td> | ||
| <td class="field"> | ||
| <%= f.text_field :name %> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td class="field-name"> | ||
| <%= f.label :open_bal %><br> | ||
| </td> | ||
| <td class="field"> | ||
| <%= f.number_field :open_bal, :step => 0.01 %> | ||
| </td> | ||
| </tr> | ||
| </table> | ||
|
|
||
| <div class="actions"> | ||
| <%= f.submit %> | ||
| <%= f.submit %> | ||
| </div> | ||
|
|
||
| <% end %> | ||
| <% end %> | ||
| </div> |
| @@ -1,30 +1,27 @@ | ||
| <div class="bordered-form" > | ||
| <h2>Incomes</h2> | ||
| <div> - this is going to be an incomes show page which will list all of the incomes and allow the user to add new income values as the week goes. In the long run this will help keep track of projections.</div> | ||
| <%= link_to 'Add Income', new_mybudget_income_path(@mybudget, @income) %> | ||
|
|
||
| <h2>Incomes</h2> | ||
|
|
||
| <div> - this is going to be an incomes show page which will list all of the incomes and allow the user to add new income values as the week goes. In the long run this will help keep track of projections.</div> | ||
|
|
||
| <%= link_to 'Add Income', new_mybudget_income_path(@mybudget, @income) %> | ||
|
|
||
| <table class="table" > | ||
| <table class="table" > | ||
| <thead> | ||
| <tr> | ||
| <th>Incomes</th> | ||
| </tr> | ||
| <tr> | ||
| <th>Incomes</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <% @mybudget.incomes.each do |income| %> | ||
| <tr> | ||
| <div id="incomes"></div> | ||
| <td class="table-items"><%= income.income %></td> | ||
| <td class="amount">$<%= income.amount %></td> | ||
| <td></td> | ||
| <% end %> | ||
| <tbody> | ||
| <% @mybudget.incomes.each do |income| %> | ||
| <tr> | ||
| <div id="incomes"></div> | ||
| <td class="table-items"><%= income.income %></td> | ||
| <td class="amount">$<%= income.amount %></td> | ||
| <td></td> | ||
| </tr> | ||
| <% end %> | ||
| </tbody> | ||
| </table> | ||
| <br> | ||
| <div>TOTAL INCOME</div> | ||
| <div class="total-output"><%= Income.sum(:amount) %> | ||
|
|
||
| </div> | ||
| </table> | ||
| <br> | ||
| <div>TOTAL INCOME</div> | ||
| <div class="total-output"><%= Income.sum(:amount) %> | ||
| </div> | ||
| </div> |
| @@ -1,27 +1,26 @@ | ||
| <div class="row"> | ||
| <div class="col-md-8"> | ||
| <%= link_to 'first budget', new_mybudget_path %> | ||
| <div class="col-md-8"> | ||
| <%= link_to 'first budget', new_mybudget_path %> | ||
|
|
||
| <table class="table"> | ||
| <thead> | ||
| <table class="table"> | ||
| <thead> | ||
| <tr> | ||
| <th>Name</th> | ||
| <th>Opening Balance</th> | ||
| <th colspan="3"></th> | ||
| <th>Name</th> | ||
| <th>Opening Balance</th> | ||
| <th colspan="3"></th> | ||
| </tr> | ||
| </thead> | ||
|
|
||
| <tbody> | ||
| </thead> | ||
| <tbody> | ||
| <% @mybudget.each do |mybudget| %> | ||
| <tr> | ||
| <td><%= mybudget.name %></td> | ||
| <td><%= mybudget.open_bal %></td> > | ||
| </tr> | ||
| <tr> | ||
| <td><%= mybudget.name %></td> | ||
| <td><%= mybudget.open_bal %></td> > | ||
| </tr> | ||
| <% end %> | ||
| </tbody> | ||
| </table> | ||
| </tbody> | ||
| </table> | ||
|
|
||
| </div> | ||
| <div class="col-md-4"> | ||
| </div> | ||
| </div> | ||
| <div class="col-md-4"> | ||
| </div> | ||
| </div> |
Oops, something went wrong.