ish_manager 0.1.8.129 → 0.1.8.131

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48484effb5c6e5cd1be8569e9b255377e193dddb
-  data.tar.gz: 902776746aa1a7a601a300ef02e5acaf1671a397
+  metadata.gz: 9e0f77b4d33f6b41b6cd113c06e81a2c20ee0e19
+  data.tar.gz: 90eac77d3aa8e353070ab5ccd07412284244aa1e
 SHA512:
-  metadata.gz: 970c4bc9018082fa383dfad29ba676ecfa9e4c3ba7ca54ba5f90bd1a305734663f7a8c62eb118696701a925c58f8a07a54044f7b3cf451d8bb012d8a689a0ec5
-  data.tar.gz: e5e9a54aa0a9e53a612b20c05cf2ffafcfd7b58ab4462f243c475c1160770a1d57855b14fdb692674902d6e017a9afbffc82c44d03b626a6f15b9bedcef4391f
+  metadata.gz: 0d67d716aa2fef436a46ac2d5e398eb45fe842148c0ed7977c808d27feb8d8be57c89ce97fa5ad60b32d36ed3e647a6e4598a16e4896f0a0cd4a1c91289bd174
+  data.tar.gz: d860f763f68b41e230d7902e0e1ed4822ae9f2ebfe673fff2cebce3fbdc9d3f1f9de95c1a70607a34c498382ecf40ac30e222b3a996562d6999a527a9d183ff1

data/app/assets/stylesheets/ish_manager/application.css

@@ -125,7 +125,7 @@ nav.pagination
 .description {
   border: 1px solid red;
   padding: 1em;
-  font-size: 2em;
+  font-size: 1.6em;
 }
 
 /**

data/app/controllers/ish_manager/events_controller.rb

@@ -0,0 +1,54 @@
+
+class IshManager::EventsController < IshManager::ApplicationController
+
+  before_action :set_lists
+
+  def index
+    authorize! :index, ::Event
+    @events = Event.all
+  end
+
+  def new
+    @event = Event.new
+    authorize! :new, @event
+  end
+
+  def create
+    @event = Event.new params[:event].permit!
+    authorize! :create, @event
+    if @event.save
+      redirect_to :action => :index
+    else
+      flash[:alert] = @event.errors.messages
+      render :action => :new
+    end
+  end
+
+  def edit
+    @event = Event.find params[:id]
+    authorize! :edit, @event
+  end
+
+  def update
+    @event = Event.find params[:id]
+    authorize! :update, @event
+
+    flag = @event.update_attributes params[:event].permit!
+    if flag
+      flash[:notice] = 'updated event'
+      redirect_to :action => :index
+    else
+      flash[:alert] = "No luck: #{@event.errors.messages}"
+      render :action => :edit
+    end
+  end
+
+  def show
+    @event = Event.find params[:id]
+    authorize! :show, @event
+    redirect_to :action => :edit, :id => @event.id
+  end
+
+end
+
+

data/app/controllers/ish_manager/stock_options_controller.rb

@@ -15,8 +15,6 @@ class IshManager::StockOptionsController < IshManager::ApplicationController
     authorize! :create, @stock_option
     flag = @stock_option.save
 
-    byebug
-
     if flag
       flash[:notice] = 'Created stock option.'
     else

data/app/helpers/ish_manager/images_helper.rb

@@ -224,7 +224,10 @@ module IshManager::ImagesHelper
   end
 
   def new_image_tag
-    image_tag 'icons/20x20/new.png'
+    raw('<i class="fa fa-plus-square"></i>')
+  end
+  def new_img
+    raw('<i class="fa fa-plus-square"></i>')
   end
 
   def is_public_image_tag resource

data/app/views/ish_manager/events/_form.haml

@@ -0,0 +1,24 @@
+
+= form_for event do |f|
+  .a
+    = f.label :name
+    = f.text_field :name
+
+  .a
+    = f.label :eventname
+    = f.text_field :eventname
+
+  .a
+    = f.label :city
+    = f.select :city, options_for_select( @cities_list, :selected => event.city_id )
+
+  .a
+    = f.label :date
+    = f.text_field :date
+
+  .a
+    = f.text_area :description, :class => [ :tinymce ] 
+    
+  .a
+    = f.submit
+    

data/app/views/ish_manager/events/_index.haml

@@ -1,6 +1,15 @@
+
 .manager-events--index
-  %h2 Events (#{@city.events.length})
-  %ul
-    - @city.events.each do |event|
-      %li= event.name
-  %hr
+  %h5 Events (#{events.length}) #{link_to new_img, new_event_path}
+  %table
+    %tr
+      %th actions
+      %th date
+      %th city
+      %th name
+    - events.each do |event|
+      %tr
+        %td= link_to edit_img, edit_event_path( event )
+        %td= event.date.to_s[0, 10]
+        %td= link_to event.city.name, city_path( event.city )
+        %td= event.name

data/app/views/ish_manager/events/edit.haml

@@ -0,0 +1,2 @@
+
+= render 'form', :event => @event

data/app/views/ish_manager/events/index.haml

@@ -0,0 +1,2 @@
+
+= render 'index', :events => @events

data/app/views/ish_manager/events/new.haml

@@ -0,0 +1,2 @@
+
+= render 'form', :event => @event

data/app/views/ish_manager/user_profiles/index.haml

@@ -15,6 +15,7 @@
             %li <b>Name:</b> #{profile.name}
             %li <b>Role:</b> #{profile.role_name}
             %li <b>User.email:</b> #{profile.user ? profile.user.email : nil}
+            %li <b>City:</b> #{profile.current_city ? profile.current_city.name : nil}
             %li <b>About:</b> #{profile.about}
         .col-sm-8
           Shared galleries:<br />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.129
+  version: 0.1.8.131
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2017-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,6 +155,7 @@ files:
 - app/controllers/ish_manager/ally_controller.rb
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/cities_controller.rb
+- app/controllers/ish_manager/events_controller.rb
 - app/controllers/ish_manager/features_controller.rb
 - app/controllers/ish_manager/friends_controller.rb
 - app/controllers/ish_manager/galleries_controller.rb
@@ -206,8 +207,12 @@ files:
 - app/views/ish_manager/cities/new_feature.haml
 - app/views/ish_manager/cities/new_newsitem.haml
 - app/views/ish_manager/cities/show.haml
+- app/views/ish_manager/events/_form.haml
 - app/views/ish_manager/events/_index.haml
 - app/views/ish_manager/events/_index.haml~
+- app/views/ish_manager/events/edit.haml
+- app/views/ish_manager/events/index.haml
+- app/views/ish_manager/events/new.haml
 - app/views/ish_manager/features/_form.haml
 - app/views/ish_manager/features/_index.haml
 - app/views/ish_manager/features/_index.haml~