oonyeje/Pearlception_Website_RoR
1
0
Fork 0
mirror of https://github.com/oonyeje/Pearlception_Website_RoR.git synced 2025-12-25 11:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

New grade form added

Browse Source
This commit is contained in:
bmv root 2017-05-04 12:56:41 -04:00
parent e75d593efb
commit 4fe4916ed3
3 changed files with 130 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Pearlception/app/controllers/grades_controller.rb
View File

@ -1,6 +1,10 @@
class GradesController < ApplicationController class GradesController < ApplicationController
before_filter :deny_to_visitors before_filter :deny_to_visitors
def new
end
def index def index
@grades = Grade.all @grades = Grade.all
end end

8
Pearlception/app/controllers/registrations_controller.rb
View File

@ -25,16 +25,16 @@ class RegistrationsController < Devise::RegistrationsController
end end
else else
flash[:alert] = "The serial key provided was invalid." flash[:alert] = "The serial key provided was invalid."
redirect_to '/' redirect_to '/signin'
end end
else else
flash[:alert] = "A company serial key must be provided to register." flash[:alert] = "A company serial key must be provided to register."
redirect_to '/' redirect_to '/signin'
end end
if @user == "" if @user == ""
flash[:alert] = "Please provide a password to register with." flash[:alert] = "Please provide a password to register with."
redirect_to '/' redirect_to '/signin'
else else
@user.save @user.save
begin begin
@ -46,7 +46,7 @@ class RegistrationsController < Devise::RegistrationsController
if !@user.admin if !@user.admin
Apartment::Tenant.switch(Company.find(@user.company_id).company_name.gsub(/'/,'').gsub(/\s/,'')) Apartment::Tenant.switch(Company.find(@user.company_id).company_name.gsub(/'/,'').gsub(/\s/,''))
end end
redirect_to "/" and return redirect_to "/pearlception" and return
end end
end end

122
Pearlception/app/views/grades/new.html.erb Normal file
View File

@ -0,0 +1,122 @@
<%= stylesheet_link_tag "dashboard" %>_
</head>
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/pearlception">Pearlception</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<!-- <li><a href="#">Dashboard</a></li> -->
<!-- <li><a href="#">Settings</a></li>
<li><a href="#">Profile</a></li>
<li><a href="#">Help</a></li> -->
<li>
<%= link_to(destroy_user_session_path, class: 'logout-link', :method => :delete) do %>
<i class="fa fa-external-link"></i> Logout
<% end %>
</li>
</ul>
<!-- <form class="navbar-form navbar-right">
<input type="text" class="form-control" placeholder="Search...">
</form> -->
</div>
</div>
</nav>
<div class="container-fluid">
<div class="row">
<div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar">
<li><a href="/pearlception">Overview</a></li>
<!-- This will be removed and placed with correct logic in corresponding controller -->
<% if current_user.admin? %>
<li><a href="companies#index">Companies</a></li>
<% else %>
<li><a href="statistics#index">Statistics</a></li>
<li class="active"><a href="grades#index">Grades <span class="sr-only">(current)</span></a></li>
<% end %>
</ul>
<!-- <ul class="nav nav-sidebar">
<li><a href="">Nav item</a></li>
<li><a href="">Nav item again</a></li>
<li><a href="">One more nav</a></li>
<li><a href="">Another nav item</a></li>
<li><a href="">More navigation</a></li>
</ul>
<ul class="nav nav-sidebar">
<li><a href="">Nav item again</a></li>
<li><a href="">One more nav</a></li>
<li><a href="">Another nav item</a></li>
</ul> -->
</div>
</div>
</div>
<!--Form for new grade here-->
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
<form method="POST">
<%=csrf_meta_tag%>
<div class="form-group">
<label>Full Name</label>
<input type="text" class="form-control" placeholder="Full name of grade">
</div>
<div class="form-group">
<label>Short Name(10 characters max)</label>
<input type="text" class="form-control" placeholder="Short name of grade">
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label>Max Width</label>
<input type="text" class="form-control" placeholder="Maximum width for oysters in this grade.">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label>Minimum Width</label>
<input type="text" class="form-control" placeholder="Minimum width for oysters in this grade">
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label>Max Length</label>
<input type="text" class="form-control" placeholder="Maximum length for oysters in this grade.">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label>Minimum Length</label>
<input type="text" class="form-control" placeholder="Minimum length for oysters in this grade">
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label>Max Height</label>
<input type="text" class="form-control" placeholder="Maximum height for oysters in this grade.">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label>Minimum Height</label>
<input type="text" class="form-control" placeholder="Minimum height for oysters in this grade">
</div>
</div>
</div>
<button type="submit" class="btn btn-primary">Submit</button>
</form>
</div>
<!--End of new grade form-->
<%= javascript_include_tag "bootstrap.min" %>_
</body>