hackathon_manager 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99f475dde632563cf2d5c4adf80ad8b500b80a088dfcaa843386dae839fb23ae
-  data.tar.gz: 4d28ed86f0e80eaccb6c08d66446f2bc37676d20522da0299b41c950edcd4d07
+  metadata.gz: de045d24ad6751129f094dc294549b9eb0931d8619d3873142f862ba286ba0c8
+  data.tar.gz: 43adf2336dce9187e1a430f99b6ae87cc82f827b06dbffdaa83cb974c69c1d92
 SHA512:
-  metadata.gz: 9775467de28e6342a843871c6cd9c673d0f746d654a2144d2774ed0681cbecc5d7979d142dd99097817bf5b89bed366146c44814de601ffdcb4da091b7b07866
-  data.tar.gz: c65519396f46cc143b198c41f45d8dead6ebe8fa9f0b6c26933282d5ad1d190c03b295ecdc38a8af0b6c4412201a47fcbff5ff7d4c5e414c83aae018459e6d15
+  metadata.gz: d29229b913d9af245341d9826308a6fcf53bd5c1c4bff7aacf2aad0e50f0a5351de3766b4571ebc3bd63867fd6f89d60cb6850179a912544dc8f5a1e4974491b
+  data.tar.gz: 1c33c481248ac95f4ae82ee9ab150e42aa812a6529c5a010a9886478495d1ae77ee1f428de676869e36a8fb01f6467445fdffe86968e754e6a681d4b412cbf57

data/app/controllers/manage/application_controller.rb

@@ -1,6 +1,7 @@
 class Manage::ApplicationController < ApplicationController
   before_action :logged_in
   before_action :limit_admin_access, only: ["edit", "update", "new", "create", "destroy", "convert_to_admin", "deliver", "merge", "perform_merge", "toggle_bus_captain", "duplicate", "update_acc_status", "send_update_email", "live_preview"]
+  skip_before_action :verify_authenticity_token, if: :json_request?
 
   def logged_in
     authenticate_user!
@@ -10,4 +11,8 @@ class Manage::ApplicationController < ApplicationController
   def limit_admin_access
     redirect_to url_for(controller: controller_name, action: :index) if current_user.admin_limited_access
   end
+
+  def json_request?
+    request.format.json?
+  end
 end

data/app/controllers/manage/trackable_events_controller.rb

@@ -0,0 +1,85 @@
+class Manage::TrackableEventsController < Manage::ApplicationController
+  before_action :set_trackable_event, only: [:show, :edit, :update, :destroy]
+  before_action :scope_limited_admin_access, only: [:edit, :update, :destroy]
+
+  respond_to :html, :json
+
+  # GET /manage/trackable_events
+  def index
+    @trackable_events = TrackableEvent.all
+    respond_with(:manage, @trackable_events)
+  end
+
+  # GET /manage/trackable_events/1
+  def show
+    respond_with(:manage, @trackable_event)
+  end
+
+  # GET /manage/trackable_events/new
+  def new
+    trackable_tag_id = params[:trackable_tag_id]
+    @trackable_event = TrackableEvent.new(trackable_tag_id: trackable_tag_id)
+    respond_with(:manage, @trackable_event)
+  end
+
+  # GET /manage/trackable_events/1/edit
+  def edit
+  end
+
+  # POST /manage/trackable_events
+  def create
+    @trackable_event = TrackableEvent.new(trackable_event_params.merge(user_id: current_user.id))
+
+    if @trackable_event.save
+      respond_to do |format|
+        format.html { redirect_to manage_trackable_tag_path(@trackable_event.trackable_tag), notice: 'Trackable event was successfully created.' }
+        format.json { render json: @trackable_event }
+      end
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /manage/trackable_events/1
+  def update
+    if @trackable_event.update(trackable_event_params)
+      respond_to do |format|
+        format.html { redirect_to manage_trackable_tag_path(@trackable_event.trackable_tag), notice: 'Trackable event was successfully updated.' }
+        format.json { render json: @trackable_event }
+      end
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /manage/trackable_events/1
+  def destroy
+    @trackable_event.destroy
+    respond_to do |format|
+      format.html { redirect_to manage_trackable_tag_url(@trackable_event.trackable_tag), notice: 'Trackable event was successfully destroyed.' }
+      format.json { render json: @trackable_event }
+    end
+  end
+
+  private
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_trackable_event
+    @trackable_event = TrackableEvent.find(params[:id])
+  end
+
+  # Only allow a trusted parameter "white list" through.
+  def trackable_event_params
+    params.require(:trackable_event).permit(:band_id, :trackable_tag_id)
+  end
+
+  # Permit limited-access admins (overrides Manage::ApplicationController#limit_admin_access)
+  def limit_admin_access
+  end
+
+  # If the admin is limited, scope changes only to those they created
+  def scope_limited_admin_access
+    return if !current_user.admin_limited_access || @trackable_event.blank? || @trackable_event.user.blank?
+    redirect_to manage_trackable_events_path, notice: 'You may not view events you did not create.' if @trackable_event.user != current_user
+  end
+end

data/app/controllers/manage/trackable_tags_controller.rb

@@ -0,0 +1,67 @@
+class Manage::TrackableTagsController < Manage::ApplicationController
+  before_action :set_trackable_tag, only: [:show, :edit, :update, :destroy]
+
+  respond_to :html, :json
+
+  # GET /manage/trackable_tags
+  def index
+    @trackable_tags = TrackableTag.all
+    respond_with(:manage, @trackable_tags)
+  end
+
+  # GET /manage/trackable_tags/1
+  def show
+    respond_with(:manage, @trackable_tag)
+  end
+
+  # GET /manage/trackable_tags/new
+  def new
+    @trackable_tag = TrackableTag.new
+    respond_with(:manage, @questionnaire)
+  end
+
+  # GET /manage/trackable_tags/1/edit
+  def edit
+  end
+
+  # POST /manage/trackable_tags
+  def create
+    @trackable_tag = TrackableTag.new(trackable_tag_params)
+
+    if @trackable_tag.save
+      flash[:notice] = 'Trackable tag was successfully created.'
+      respond_with(:manage, @trackable_tag)
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /manage/trackable_tags/1
+  def update
+    if @trackable_tag.update(trackable_tag_params)
+      flash[:notice] = 'Trackable tag was successfully updated.'
+      respond_with(:manage, @trackable_tag)
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /manage/trackable_tags/1
+  def destroy
+    @trackable_tag.destroy
+    flash[:notice] = 'Trackable tag was successfully destroyed.'
+    respond_with(:manage, @trackable_tag)
+  end
+
+  private
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_trackable_tag
+    @trackable_tag = TrackableTag.find(params[:id])
+  end
+
+  # Only allow a trusted parameter "white list" through.
+  def trackable_tag_params
+    params.require(:trackable_tag).permit(:name)
+  end
+end

data/app/models/trackable_event.rb

@@ -0,0 +1,8 @@
+class TrackableEvent < ApplicationRecord
+  validates_presence_of :band_id, :trackable_tag, :user
+
+  strip_attributes
+
+  belongs_to :trackable_tag
+  belongs_to :user
+end

data/app/models/trackable_tag.rb

@@ -0,0 +1,10 @@
+class TrackableTag < ApplicationRecord
+  validates_presence_of :name
+  validates_uniqueness_of :name
+  strip_attributes
+  has_many :trackable_events
+
+  def sorted_events
+    trackable_events.order(created_at: :desc)
+  end
+end

data/app/views/layouts/manage/application.html.haml

@@ -55,6 +55,10 @@
                 = active_link_to manage_stats_path, class: "nav-link" do
                   .fa.fa-table.fa-fw.icon-space-r-half
                   Stats
+              %li.nav-item
+                = active_link_to manage_trackable_tags_path, class: "nav-link" do
+                  .fa.fa-tag.fa-fw.icon-space-r-half
+                  Trackable Tags
             - unless current_user.admin_limited_access?
               %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted
                 %span Advanced

data/app/views/manage/trackable_events/_form.html.haml

@@ -0,0 +1,14 @@
+.form-container
+  = bs_horizontal_simple_form_for @trackable_event, url: url_for(action: @trackable_event.new_record? ? "create" : "update", controller: "trackable_events"), html: { "data-validate" => "form" } do |f|
+    = f.error_notification
+
+    .form-inputs
+      = f.input :band_id
+      = f.input :trackable_tag_id, collection: TrackableTag.all, required: true
+      %p
+        User:
+        = current_user.email
+        (current user, this can't be changed)
+
+    .form-actions
+      = f.button :submit, class: 'btn-primary'

data/app/views/manage/trackable_events/edit.html.haml

@@ -0,0 +1,11 @@
+= render "layouts/manage/page_title", title: "Edit Trackable Event", subtitle: @trackable_event.id
+
+= render 'form'
+
+%br
+
+= link_to 'Show', manage_trackable_event_path(@trackable_event)
+\|
+= link_to 'Back', manage_trackable_events_path
+\|
+= link_to 'Destroy', manage_trackable_event_path(@trackable_event), method: :delete, data: { confirm: 'Are you sure?' }

data/app/views/manage/trackable_events/index.html.haml

@@ -0,0 +1,29 @@
+= render "layouts/manage/page_title", title: "Trackable Events"
+
+%table.table.table-striped
+  %thead
+    %tr
+      %th Band
+      %th Trackable tag
+      %th User
+      %th
+      %th
+      %th
+
+  %tbody
+    - @trackable_events.each do |trackable_event|
+      %tr
+        %td= trackable_event.band_id
+        %td= trackable_event.trackable_tag.name
+        %td= trackable_event.user.email
+        %td= link_to 'Show', manage_trackable_event_path(trackable_event)
+        - unless current_user.admin_limited_access && current_user != trackable_event.user
+          %td= link_to 'Edit', edit_manage_trackable_event_path(trackable_event)
+          %td= link_to 'Destroy', manage_trackable_event_path(trackable_event), method: :delete, data: { confirm: 'Are you sure?' }
+        - else
+          %td
+          %td
+
+%br
+
+= link_to 'New Trackable event', new_manage_trackable_event_path

data/app/views/manage/trackable_events/new.html.haml

@@ -0,0 +1,3 @@
+= render "layouts/manage/page_title", title: "New Trackable Event"
+
+= render 'form'

data/app/views/manage/trackable_events/show.html.haml

@@ -0,0 +1,18 @@
+= render "layouts/manage/page_title", title: "Trackable Event", subtitle: @trackable_event.id
+
+%p
+  %b Band:
+  = @trackable_event.band_id
+%p
+  %b Created:
+  = display_datetime(@trackable_event.created_at)
+%p
+  %b Trackable tag:
+  = link_to @trackable_event.trackable_tag.name, manage_trackable_tag_path(@trackable_event.trackable_tag)
+%p
+  %b User:
+  = link_to @trackable_event.user.email, manage_admin_path(@trackable_event.user)
+
+= link_to 'Edit', edit_manage_trackable_event_path(@trackable_event)
+\|
+= link_to 'Back', manage_trackable_events_path

data/app/views/manage/trackable_tags/_form.html.haml

@@ -0,0 +1,9 @@
+.form-container
+  = bs_horizontal_simple_form_for @trackable_tag, url: url_for(action: @trackable_tag.new_record? ? "create" : "update", controller: "trackable_tags"), html: { "data-validate" => "form" } do |f|
+    = f.error_notification
+
+    .form-inputs
+      = f.input :name
+
+    .form-actions
+      = f.button :submit, class: 'btn-primary'

data/app/views/manage/trackable_tags/edit.html.haml

@@ -0,0 +1,4 @@
+= render "layouts/manage/page_title", title: "Edit Trackable Tag", subtitle: @trackable_tag.name do
+  = link_to 'Cancel', manage_trackable_tag_path(@trackable_tag), class: 'btn btn-sm btn-outline-secondary'
+
+= render 'form'

data/app/views/manage/trackable_tags/index.html.haml

@@ -0,0 +1,20 @@
+= render "layouts/manage/page_title", title: "Trackable Tags" do
+  = link_to "New Tag", new_manage_trackable_tag_path, class: "btn btn-sm btn-outline-secondary"
+
+%table.table.table-striped
+  %thead
+    %tr
+      %th Name
+      %th Events
+      %th Last event
+      %th Add event
+
+  %tbody
+    - @trackable_tags.each do |trackable_tag|
+      %tr
+        %td= link_to trackable_tag.name, manage_trackable_tag_path(trackable_tag)
+        %td= pluralize(trackable_tag.trackable_events.count, "event")
+        %td= trackable_tag.trackable_events.any? ? display_datetime(trackable_tag.sorted_events.first.created_at) : ''
+        %td= link_to 'Add event', new_manage_trackable_event_path(trackable_tag_id: trackable_tag.id)
+
+%br

data/app/views/manage/trackable_tags/new.html.haml

@@ -0,0 +1,4 @@
+= render "layouts/manage/page_title", title: "New Trackable Tag"  do
+  = link_to 'Cancel', manage_trackable_tags_path, class: 'btn btn-sm btn-outline-secondary'
+
+= render 'form'

data/app/views/manage/trackable_tags/show.html.haml

@@ -0,0 +1,31 @@
+= render "layouts/manage/page_title", title: @trackable_tag.name, subtitle: "Trackable Tag" do
+  .btn-group
+    = link_to 'Edit', edit_manage_trackable_tag_path(@trackable_tag), class: 'btn btn-sm btn-outline-secondary'
+    = link_to 'Delete', manage_trackable_tag_path(@trackable_tag), method: :delete, data: { confirm: "Are you sure? The trackable tag \"#{@trackable_tag.name}\" will be permanently erased. This action is irreversible." }, class: 'btn btn-sm btn-outline-secondary'
+
+%p
+  %b Name:
+  = @trackable_tag.name
+
+%p
+  %b= link_to 'Add event', new_manage_trackable_event_path(trackable_tag_id: @trackable_tag.id)
+
+= area_chart @trackable_tag.trackable_events.group_by_minute(:created_at).count
+
+%table.table.table-striped
+  %thead
+    %tr
+      %th Date
+      %th Band
+      %th Entered by
+      %th
+
+  %tbody
+    - @trackable_tag.sorted_events.each do |trackable_event|
+      %tr
+        %td= display_datetime(trackable_event.created_at)
+        %td= trackable_event.band_id
+        %td= trackable_event.user.email
+        %td
+          - unless current_user.admin_limited_access && current_user != trackable_event.user
+            = link_to 'Edit', edit_manage_trackable_event_path(trackable_event)

data/config/routes.rb

@@ -77,5 +77,7 @@ Rails.application.routes.draw do
     end
     resource :config do
     end
+    resources :trackable_events
+    resources :trackable_tags
   end
 end

data/db/migrate/20190107232955_create_trackable_tags.rb

@@ -0,0 +1,10 @@
+class CreateTrackableTags < ActiveRecord::Migration[5.2]
+  def change
+    create_table :trackable_tags do |t|
+      t.string :name
+
+      t.timestamps
+    end
+    add_index :trackable_tags, :name, unique: true
+  end
+end

data/db/migrate/20190107233210_create_trackable_events.rb

@@ -0,0 +1,11 @@
+class CreateTrackableEvents < ActiveRecord::Migration[5.2]
+  def change
+    create_table :trackable_events do |t|
+      t.string :band_id
+      t.references :trackable_tag, foreign_key: true
+      t.references :user, type: :integer, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.10.3'.freeze
+  VERSION = '0.11.0'.freeze
 end

data/test/factories/trackable_event.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :trackable_event do
+    band_id { "foo" }
+    association :user
+    association :trackable_tag
+  end
+end

data/test/factories/trackable_tag.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :trackable_tag do
+    sequence :name do |n|
+      "Tag #{n}"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-06 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -531,6 +531,8 @@ files:
 - app/controllers/manage/questionnaires_controller.rb
 - app/controllers/manage/schools_controller.rb
 - app/controllers/manage/stats_controller.rb
+- app/controllers/manage/trackable_events_controller.rb
+- app/controllers/manage/trackable_tags_controller.rb
 - app/controllers/questionnaires_controller.rb
 - app/controllers/rsvps_controller.rb
 - app/controllers/users/omniauth_callbacks_controller.rb
@@ -557,6 +559,8 @@ files:
 - app/models/questionnaire.rb
 - app/models/school.rb
 - app/models/school_name_duplicate.rb
+- app/models/trackable_event.rb
+- app/models/trackable_tag.rb
 - app/models/user.rb
 - app/views/application/_bus_list_info.html.haml
 - app/views/application/_bus_list_stats.html.haml
@@ -622,6 +626,16 @@ files:
 - app/views/manage/schools/new.html.haml
 - app/views/manage/schools/show.html.haml
 - app/views/manage/stats/index.html.haml
+- app/views/manage/trackable_events/_form.html.haml
+- app/views/manage/trackable_events/edit.html.haml
+- app/views/manage/trackable_events/index.html.haml
+- app/views/manage/trackable_events/new.html.haml
+- app/views/manage/trackable_events/show.html.haml
+- app/views/manage/trackable_tags/_form.html.haml
+- app/views/manage/trackable_tags/edit.html.haml
+- app/views/manage/trackable_tags/index.html.haml
+- app/views/manage/trackable_tags/new.html.haml
+- app/views/manage/trackable_tags/show.html.haml
 - app/views/questionnaires/_form.html.haml
 - app/views/questionnaires/edit.html.haml
 - app/views/questionnaires/new.html.haml
@@ -692,6 +706,8 @@ files:
 - db/migrate/20181125213158_add_grad_year_and_race_ethnicity_to_questionnaires.rb
 - db/migrate/20181221194407_create_doorkeeper_tables.rb
 - db/migrate/20181221195241_enable_pkce.rb
+- db/migrate/20190107232955_create_trackable_tags.rb
+- db/migrate/20190107233210_create_trackable_events.rb
 - db/schools.csv
 - db/seed_messages/questionnaire--accepted.md
 - db/seed_messages/questionnaire--denied.md
@@ -711,6 +727,8 @@ files:
 - test/factories/school.rb
 - test/factories/school_name_duplicate.rb
 - test/factories/temp_doorkeeper.rb
+- test/factories/trackable_event.rb
+- test/factories/trackable_tag.rb
 - test/factories/users.rb
 homepage: https://github.com/sman591/hackathon_manager
 licenses: