Dish show page match features #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

larryt1026 wants to merge 34 commits into firstdraft-projects:master from week4jessieliu:dish_show_page_match_features

app/controllers/cuisines_controller.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ class CuisinesController < ApplicationController @@
       def index
         @q = Cuisine.ransack(params[:q])
         @cuisines = @q.result(:distinct => true).includes(:dishes).page(params[:page]).per(10)
+        @bookmark = Bookmark.new
         render("cuisines/index.html.erb")
       end
@@ Expand Down @@

app/controllers/dishes_controller.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,8 @@ class DishesController < ApplicationController @@
       def index
         @q = Dish.ransack(params[:q])
         @dishes = @q.result(:distinct => true).includes(:cuisine, :bookmarks, :fans, :specialists).page(params[:page]).per(10)
+        @bookmark = Bookmark.new
+        @cuisines = Cuisine.all
         render("dishes/index.html.erb")
       end
@@ Expand Down @@

app/views/dishes/index.html.erb

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,112 +1,104 @@
  
    <div class="page-header">

      <h1>

        Dishes

        <a href="/dishes/new" class="btn btn-lg btn-success">New Dish</a>

        <a href="/venues/new" class="btn btn-lg btn-success">Add a new venue</a>

      </h1>

    </div><div class="row mb-1">

      <div class="col-md-12">

    </div>

    <div class="row mb-1">

      <div class="col-md-3">

        <%= search_form_for @q, :class => "collapse", :id => "dishes_filters" do |f| %>

          <p class="lead">Narrow results:</p>

            <div class="form-group">

        <%= f.label :name_cont, "Name contains" %>

        <%= f.text_field :name_cont, :class => "form-control", :placeholder => "Name contains" %>

      </div>

    <div class="form-group">

              <%= f.label :created_at, "Created at" %>

              <div class="row">

                <div class='col-md-6 mb-1'>

                  <div class='input-group date' id='created_atgteqPicker'>

                      <%= f.text_field :created_at_gteq, :class => "form-control", :placeholder => "Created at greater than or equal to" %>

                      <span class="input-group-addon">

                          <span class="glyphicon glyphicon-calendar"></span>

                      </span>

                  </div>

                </div>

                <div class='col-md-6'>

                  <div class='input-group date' id='created_atlteqPicker'>

                      <%= f.text_field :created_at_lteq, :class => "form-control", :placeholder => "Created at less than or equal to" %>

                      <span class="input-group-addon">

                          <span class="glyphicon glyphicon-calendar"></span>

                      </span>

                  </div>

                </div>

              </div>

          </div>

          <script type="text/javascript">

              $(function () {

                  $('#created_atgteqPicker').datetimepicker({

                      format: 'YYYY-MM-DD hh:mm:SS'

                  });

                  $('#created_atlteqPicker').datetimepicker({

                      useCurrent: false,

                      format: 'YYYY-MM-DD hh:mm:SS'

                  });

                  $('#created_atgteqPicker').on("dp.change", function (e) {

                      $('#created_atlteqPicker').data("DateTimePicker").minDate(e.date);

                  });

                  $('#created_atlteqPicker').on("dp.change", function (e) {

                      $('#created_atgteqPicker').data("DateTimePicker").maxDate(e.date);

                  });

              });

          </script>

            <div class="form-group">

          <%= f.label :cuisine_name_cont, "Cuisine name contains" %>

          <%= f.text_field :cuisine_name_cont, :class => "form-control", :placeholder => "Cuisine name contains" %>

        </div>

    <div class="form-group">

          <%= f.label :bookmarks_notes_cont, "Bookmark notes contains" %>

          <%= f.text_field :bookmarks_notes_cont, :class => "form-control", :placeholder => "Bookmark notes contains" %>

        </div>

    <div class="form-group">

          <%= f.label :fans_username_cont, "User username contains" %>

          <%= f.text_field :fans_username_cont, :class => "form-control", :placeholder => "User username contains" %>

        <div class="form-group">

          <%= f.label :name_cont, "Name contains" %>

          <%= f.text_field :name_cont, :class => "form-control", :placeholder => "Name contains" %>

        </div>

         <div class="form-group">

    <div class="form-group">

          <%= f.label :specialists_name_cont, "Venue name contains" %>

          <%= f.text_field :specialists_name_cont, :class => "form-control", :placeholder => "Venue name contains" %>

          <%= f.label :cuisine_id_eq_any, "Cuisine" %>

              <% @cuisines.each do |cuisine| %>

              <div class="checkbox">

                <label>

                  <%= f.check_box :cuisine_id_eq_any, {multiple: true}, cuisine.id, nil %>

                  <%= cuisine.name %>

                </label>

              </div>

        <% end %>

        </div>

          <%= f.submit :class => "btn btn-primary btn-block mb-1" %>

        <%= f.submit :class => "btn btn-primary btn-block mb-1" %>

          <a href="/dishes" class="btn btn-default btn-block mb-1">Clear filters</a>

        <% end %>

        <a class="btn btn-default btn-block mb-1" data-toggle="collapse" href="#dishes_filters">

          Show Filters

        </a>

      </div>

    </div>

    <div class="row">

      <div class="col-md-12">

        <table class="table table-striped table-hover">

          <tr>

            <th>Name</th>

            <th>Cuisine</th>

            <th>Actions</th>

            <th>The very best...</th>

            <th>is at...</th>

            <th></th>

          </tr>

          <% @dishes.each do |dish| %>

          <tr>

            <td><%= dish.name %></td>

            <td>

              <% if dish.cuisine.present? %>

                <a href="/cuisines/<%= dish.cuisine.id %>">

                  <%= dish.cuisine.name %>

              <a href="/dishes/<%= dish.id %>"><%= dish.name %></a>

            </td>

            <td>

              <% if dish.bookmarks.find_by(:user_id => current_user.id).present? %>

                <a href="/venues/<%= dish.bookmarks.find_by(:user_id => current_user.id).venue.id %>">

                  <%= dish.bookmarks.find_by(:user_id => current_user.id).venue.name %>

                </a>

              <% else %>

                <form action="/create_bookmark" method="post">

                  <!-- Hidden input for authenticity token to protect from forgery -->

                  <input name="authenticity_token" type="hidden" value="<%= form_authenticity_token %>">

                  <!-- Label and input for dish_id -->

                  <input type="hidden" name="dish_id" value="<%= dish.id %>">

                  <!-- Label and input for user_id -->

                  <input type="hidden" name="user_id" value="<%= current_user.id %>">

                  <!-- Label and input for venue_id -->

                  <div class = "form-group">

                    <label for="venue_id" class="control-label sr-only">

                        Venue

                    </label>

                    <%= select_tag(:venue_id, options_from_collection_for_select(Venue.all, :id, :name, @bookmark.venue_id), prompt:"Choose a venue...", :class => "form-control input-sm") %>

                  </div>

                  <button class="btn btn-primary btn-sm">

                    <i class="fa fa-heart"></i>

                  </button>

                </form>

              <% end %>

            </td>

            <td>

              <a href="/dishes/<%= dish.id %>" class="btn btn-primary">Show</a>

              <a href="/dishes/<%= dish.id %>/edit" class="btn btn-warning">Edit</a>

              <a href="/delete_dish/<%= dish.id %>" class="btn btn-danger" rel="nofollow">Delete</a>

            <td class="text-right">

              <span class="label">

                <% if dish.cuisine.present? %>

                  <a href="/cuisines/<%= dish.cuisine.id %>">

                    <%= dish.cuisine.name %>

                  </a>

                <% end %>

              </span>

            </td>

          </tr>

          <% end %>

        </table>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dish show page match features #2

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Dish show page match features #2

Are you sure you want to change the base?

Uh oh!

Dish show page match features #2

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!