Skip to content

Commit

Permalink
fixes (#15)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gkostin1966
gkostin1966 committed Jun 10, 2019
1 parent 2c50729 commit 2f927d2
Show file tree
Hide file tree
Showing 19 changed files with 188 additions and 131 deletions.
27 changes: 10 additions & 17 deletions app/controllers/lib_ptg_folders_controller.rb
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
# frozen_string_literal: true

class LibPtgFoldersController < ApplicationController
before_action :set_lib_ptg_folder, only: [:show, :edit, :update, :destroy]
before_action :set_lib_ptg_folder, only: %i[show edit update destroy]

# GET /lib_ptg_folders
# GET /lib_ptg_folders.json
def index
@lib_ptg_folders = LibPtgFolder.all
@lib_ptg_folders = LibPtgFolder.filter(filtering_params(params)).order(name: :asc).page(params[:page])
end

# GET /lib_ptg_folders/1
# GET /lib_ptg_folders/1.json
def show
end

# GET /lib_ptg_folders/new
def new
@lib_ptg_folder = LibPtgFolder.new
end

# GET /lib_ptg_folders/1/edit
def edit
end

# POST /lib_ptg_folders
# POST /lib_ptg_folders.json
def create
@lib_ptg_folder = LibPtgFolder.new(lib_ptg_folder_params)

Expand All @@ -37,8 +31,6 @@ def create
end
end

# PATCH/PUT /lib_ptg_folders/1
# PATCH/PUT /lib_ptg_folders/1.json
def update
respond_to do |format|
if @lib_ptg_folder.update(lib_ptg_folder_params)
Expand All @@ -51,8 +43,6 @@ def update
end
end

# DELETE /lib_ptg_folders/1
# DELETE /lib_ptg_folders/1.json
def destroy
@lib_ptg_folder.destroy
respond_to do |format|
Expand All @@ -62,13 +52,16 @@ def destroy
end

private
# Use callbacks to share common setup or constraints between actions.

def set_lib_ptg_folder
@lib_ptg_folder = LibPtgFolder.find(params[:id])
end

# Never trust parameters from the scary internet, only allow the white list through.
def lib_ptg_folder_params
params.require(:lib_ptg_folder).permit(:name, :flavor, :month, :update)
params.require(:lib_ptg_folder).permit(:name, :flavor, :month, :touched)
end

def filtering_params(params)
params.slice(:name_like)
end
end
13 changes: 13 additions & 0 deletions app/models/lib_ptg_folder.rb
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,15 @@
# frozen_string_literal: true

class LibPtgFolder < ApplicationRecord
include Filterable

scope :name_like, ->(like) { where("name like ?", "%#{like}%") }

def update?
true
end

def destroy?
true
end
end
23 changes: 0 additions & 23 deletions app/views/identifiers/_form.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,11 @@

<div class="field">
<%= form.label :alias %>
<!-- <select name="post[author_id]">-->
<% aliases = @aliases.map { |identifier| [identifier.name, identifier.id] } %>
<%= form.select(:uuid, options_for_select(aliases, @alias_id), include_blank: true) %>
<!-- , selected: f.object.status-->

<!-- <select name="uuid">-->
<%#= options_from_collection_for_select(Uuid.all, :id, :unpacked) %>
<!-- </select>-->
</div>

<div class="actions">
<%= form.submit %>
</div>
<% end %>
<%#= simple_form_for(@identifier, url: identifiers_path) do |f| %>
<%#= f.error_notification %>

<!-- <div class="form-inputs">-->
<%#= f.input :name %>
<!-- </div>-->

<!-- <div class="form-inputs">-->
<%#= f.input :uuid, collection: @aliases, label_method: :name, value_method: :id, label: "Alias", selected: @alias_id, include_blank: true %>
<!-- </div>-->

<!-- <div class="form-actions">-->
<%#= f.button :submit %>
<!-- </div>-->
<%# end %>
24 changes: 14 additions & 10 deletions app/views/identifiers/edit.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
<div id="maincontent">
<h1>Editing Identifier</h1>
<div class="col-md-12">
<%= render 'form', identifier: @identifier %>
<div class="container">
<div class="row">
<h1>Editing Identifier</h1>
</div>
<div class="row"><br/></div>
<div class="row">
<%= render 'form', identifier: @identifier %>
</div>
<div class="row"><br/></div>
<div class="row">
<%= link_to 'Show', identifier_path(@identifier) %>
<span> | </span>
<%= link_to 'Back', identifiers_path %>
</div>
</div>
<div class="col-md-12"><br/></div>
<div class="col-md-12">
<%= link_to 'Show', identifier_path(@identifier) %>
<span> | </span>
<%= link_to 'Back', identifiers_path %>
</div>
<div class="col-md-12"><br/></div>
</div>
16 changes: 12 additions & 4 deletions app/views/identifiers/new.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
<div id="maincontent">
<h1>New Identifier</h1>
<div class="col-md-12">
<%= render 'form', identifier: @identifier %>
<div class="container">
<div class="row">
<h1>New Identifier</h1>
</div>
<div class="row"><br/></div>
<div class="row">
<%= render 'form', identifier: @identifier %>
</div>
<div class="row"><br/></div>
<div class="row">
<%= link_to 'Back', identifiers_path %>
</div>
</div>
<div class="col-md-12"><%= link_to 'Back', identifiers_path %></div>
</div>
4 changes: 2 additions & 2 deletions app/views/lib_ptg_folders/_form.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</div>

<div class="field">
<%= form.label :update %>
<%= form.date_select :update %>
<%= form.label :touched %>
<%= form.date_select :touched %>
</div>

<div class="actions">
Expand Down
4 changes: 3 additions & 1 deletion app/views/lib_ptg_folders/_lib_ptg_folder.json.jbuilder
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
json.extract! lib_ptg_folder, :id, :name, :flavor, :month, :update, :created_at, :updated_at
# frozen_string_literal: true

json.extract! lib_ptg_folder, :id, :name, :flavor, :month, :touched, :created_at, :updated_at
json.url lib_ptg_folder_url(lib_ptg_folder, format: :json)
23 changes: 17 additions & 6 deletions app/views/lib_ptg_folders/edit.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
<h1>Editing Lib Ptg Folder</h1>

<%= render 'form', lib_ptg_folder: @lib_ptg_folder %>
<%= link_to 'Show', @lib_ptg_folder %> |
<%= link_to 'Back', lib_ptg_folders_path %>
<div id="maincontent">
<div class="container">
<div class="row">
<h1>Editing Lib Ptg Folder</h1>
</div>
<div class="row"><br/></div>
<div class="row">
<%= render 'form', lib_ptg_folder: @lib_ptg_folder %>
</div>
<div class="row"><br/></div>
<div class="row">
<%= link_to 'Show', @lib_ptg_folder %>
<span> | </span>
<%= link_to 'Back', lib_ptg_folders_path %>
</div>
</div>
</div>
64 changes: 34 additions & 30 deletions app/views/lib_ptg_folders/index.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,37 @@
<p id="notice"><%= notice %></p>

<h1>Lib Ptg Folders</h1>

<table>
<thead>
<tr>
<th>Name</th>
<th>Flavor</th>
<th>Month</th>
<th>Update</th>
<th colspan="3"></th>
</tr>
</thead>

<tbody>
<div id="maincontent">
<div class="container">
<div class="row">
<h1>Lib Ptg Folders</h1>
</div>
<div class="row">
<div class="col-1">ID</div>
<div class="col">Name</div>
<div class="col-1">Flavor</div>
<div class="col-1">Month</div>
<div class="col-2">Touched</div>
<div class="col-3">
<%= link_to 'New Lib Ptg Folder', new_lib_ptg_folder_path %>
</div>
</div>
<% @lib_ptg_folders.each do |lib_ptg_folder| %>
<tr>
<td><%= lib_ptg_folder.name %></td>
<td><%= lib_ptg_folder.flavor %></td>
<td><%= lib_ptg_folder.month %></td>
<td><%= lib_ptg_folder.update %></td>
<td><%= link_to 'Show', lib_ptg_folder %></td>
<td><%= link_to 'Edit', edit_lib_ptg_folder_path(lib_ptg_folder) %></td>
<td><%= link_to 'Destroy', lib_ptg_folder, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<div class="row">
<div class="col-1"><%= lib_ptg_folder.id %></div>
<div class="col"><%= lib_ptg_folder.name %></div>
<div class="col-1"><%= lib_ptg_folder.flavor %></div>
<div class="col-1"><%= lib_ptg_folder.month %></div>
<div class="col-2"><%= lib_ptg_folder.touched %></div>
<div class="col-3">
<div class="row">
<div class="col"><%= link_to 'Show', lib_ptg_folder %></div>
<div class="col"><%= link_to 'Edit', edit_lib_ptg_folder_path(lib_ptg_folder) %></div>
<div class="col"><%= link_to 'Destroy', lib_ptg_folder, method: :delete, data: { confirm: 'Are you sure?' } %></div>
</div>
</div>
</div>
<% end %>
</tbody>
</table>

<br>

<%= link_to 'New Lib Ptg Folder', new_lib_ptg_folder_path %>
<div class="row">
<div class="col">&nbsp<%= paginate @lib_ptg_folders %></div>
</div>
</div>
</div>
2 changes: 2 additions & 0 deletions app/views/lib_ptg_folders/index.json.jbuilder
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# frozen_string_literal: true

json.array! @lib_ptg_folders, partial: "lib_ptg_folders/lib_ptg_folder", as: :lib_ptg_folder
20 changes: 15 additions & 5 deletions app/views/lib_ptg_folders/new.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
<h1>New Lib Ptg Folder</h1>

<%= render 'form', lib_ptg_folder: @lib_ptg_folder %>
<%= link_to 'Back', lib_ptg_folders_path %>
<div id="maincontent">
<div class="container">
<div class="row">
<h1>New Lib Ptg Folder</h1>
</div>
<div class="row"><br/></div>
<div class="row">
<%= render 'form', lib_ptg_folder: @lib_ptg_folder %>
</div>
<div class="row"><br/></div>
<div class="row">
<%= link_to 'Back', lib_ptg_folders_path %>
</div>
</div>
</div>
61 changes: 38 additions & 23 deletions app/views/lib_ptg_folders/show.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,39 @@
<p id="notice"><%= notice %></p>

<p>
<strong>Name:</strong>
<%= @lib_ptg_folder.name %>
</p>

<p>
<strong>Flavor:</strong>
<%= @lib_ptg_folder.flavor %>
</p>

<p>
<strong>Month:</strong>
<%= @lib_ptg_folder.month %>
</p>

<p>
<strong>Update:</strong>
<%= @lib_ptg_folder.update %>
</p>

<%= link_to 'Edit', edit_lib_ptg_folder_path(@lib_ptg_folder) %> |
<%= link_to 'Back', lib_ptg_folders_path %>
<div id="maincontent">
<div class="container">
<div class="row">
<h1>Lib Ptg Folder</h1>
</div>
<div class="row">
<div class="col-1"><em>ID</em></div>
<div class="col"><%= @lib_ptg_folder.id %>&nbsp;</div>
</div>
<div class="row">
<div class="col-1"><em>Name</em></div>
<div class="col"><%= @lib_ptg_folder.name %>&nbsp;</div>
</div>
<div class="row">
<div class="col-1"><em>Flavor</em></div>
<div class="col"><%= @lib_ptg_folder.flavor %>&nbsp;</div>
</div>
<div class="row">
<div class="col-1"><em>Month</em></div>
<div class="col"><%= @lib_ptg_folder.month %>&nbsp;</div>
</div>
<div class="row">
<div class="col-1"><em>Touched</em></div>
<div class="col"><%= @lib_ptg_folder.touched %>&nbsp;</div>
</div>
<div class="row">
<br/>
</div>
<div class="row">
<%= link_to_if @lib_ptg_folder.update?, 'Edit', edit_lib_ptg_folder_path(@lib_ptg_folder) %>
<span> | </span>
<%= link_to 'Back', lib_ptg_folders_path %>
</div>
<div class="row">
<br/>
</div>
</div>
</div>
2 changes: 2 additions & 0 deletions app/views/lib_ptg_folders/show.json.jbuilder
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# frozen_string_literal: true

json.partial! "lib_ptg_folders/lib_ptg_folder", lib_ptg_folder: @lib_ptg_folder
2 changes: 1 addition & 1 deletion config/routes.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
resources :identifiers
resources :uuids

root to: 'identifiers#index'
root to: 'lib_ptg_folders#index'
end
8 changes: 4 additions & 4 deletions db/migrate/20190610144221_create_lib_ptg_folders.rb
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
class CreateLibPtgFolders < ActiveRecord::Migration[5.2]
def change
create_table :lib_ptg_folders do |t|
t.string :name
t.string :flavor
t.integer :month
t.date :update
t.string :name, null: false
t.string :flavor, null: false, default: "year"
t.integer :month, null: false, default: 0
t.date :touched, null: false, default: Time.new(1970, 1, 1)

t.timestamps
end
Expand Down

0 comments on commit 2f927d2

Please sign in to comment.