developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new categories for calendar with colors inside.. plus changed the working of calendar. it has now categories like all other modules

This commit is contained in:
Harry Bomrah 2013-11-04 14:44:20 +08:00
parent 8a4242aae9
commit 39fe8162b1
13 changed files with 144 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/admin/categories.js
View File

@ -12,6 +12,7 @@ $(function() {
} }
else { else {
setForm(item.data('form')); setForm(item.data('form'));
if( $( ".color-picker" ).length ) $(".color-picker").miniColors("value",item.data("form").color);
pageslide.find('form').attr('action', '/admin/module_apps/' + item.data('module') + '/categories/' + item.data('id')); pageslide.find('form').attr('action', '/admin/module_apps/' + item.data('module') + '/categories/' + item.data('id'));
pageslide.find('form').attr('method', 'put'); pageslide.find('form').attr('method', 'put');
} }

6
app/assets/stylesheets/jquery.miniColors.css
View File

@ -57,3 +57,9 @@
height: 3px; height: 3px;
background: url(miniColors/line.gif) center no-repeat; background: url(miniColors/line.gif) center no-repeat;
} }
.miniColors-trigger.btn {
background-image: none;
height: 16px;
width: 0px;
}

4
config/mongoid.yml
View File

@ -8,7 +8,7 @@ defaults: &defaults
development: development:
<<: *defaults <<: *defaults
database: test_site_new database: test_site
@ -24,4 +24,4 @@ production:
# password: <%= ENV['MONGOID_PASSWORD'] %> # password: <%= ENV['MONGOID_PASSWORD'] %>
# database: <%= ENV['MONGOID_DATABASE'] %> # database: <%= ENV['MONGOID_DATABASE'] %>
<<: *defaults <<: *defaults
database: test_site_new database: test_site

74
vendor/built_in_modules/calendar_new/app/controllers/panel/calendar_new/back_end/event_categories_controller.rb vendored
View File

@ -4,78 +4,22 @@ class Panel::CalendarNew::BackEnd::EventCategoriesController < OrbitBackendContr
# GET /events # GET /events
# GET /events.json # GET /events.json
def index def index
@event_categories = EventCategory.all @module_app_id = @module_app.id rescue nil
@categories = get_categories_for_index
@categories = @categories.page(params[:page]).per(10)
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.json { render json: @event_categories } format.json { render json: @categories }
end end
end end
# GET /events/1 def list
# GET /events/1.json @module_app_id = @module_app.id rescue nil
def show
@event_category = EventCategory.find(params[:id])
respond_to do |format| @categories = get_categories_for_index
format.html # show.html.erb @categories = @categories.page(params[:page]).per(10)
format.json { render json: @event_category } render :layout => false
end
end
# GET /events/new
# GET /events/new.json
def new
@event_category = EventCategory.new
respond_to do |format|
format.html # new.html.erb
format.json { render json: @event_category }
end
end
# GET /events/1/edit
def edit
@event_category = EventCategory.find(params[:id])
end
def create
@event_category = EventCategory.new(params[:event_category])
respond_to do |format|
if @event_category.save
format.html { redirect_to panel_calendar_new_back_end_event_categories_path, notice: 'Category was successfully created.' }
format.json { render json: @event_category, status: :created, location: @event_category }
else
format.html { render action: "new" }
format.json { render json: @event_category.errors, status: :unprocessable_entity }
end
end
end
def update
@event_category = EventCategory.find(params[:id])
respond_to do |format|
if @event_category.update_attributes(params[:event_category])
format.html { redirect_to panel_calendar_new_back_end_event_categories_path, notice: 'Category was successfully updated.' }
format.json { head :no_content }
#format.js
else
format.html { render action: "edit" }
format.json { render json: @event_category.errors, status: :unprocessable_entity }
#format.js
end
end
end
def destroy
@event_category = EventCategory.find(params[:id])
@event_category.destroy
respond_to do |format|
format.html { redirect_to panel_calendar_new_back_end_event_categories_path }
format.json { head :no_content }
end
end end
end end

13
vendor/built_in_modules/calendar_new/app/controllers/panel/calendar_new/back_end/events_controller.rb vendored
View File

@ -40,6 +40,7 @@ class Panel::CalendarNew::BackEnd::EventsController < OrbitBackendController
# GET /events/new.json # GET /events/new.json
def new def new
@event = Event.new @event = Event.new
@categories = get_categories_for_index
@end_d_t = "" @end_d_t = ""
@start_d_t = "" @start_d_t = ""
@all_day = false; @all_day = false;
@ -61,15 +62,13 @@ class Panel::CalendarNew::BackEnd::EventsController < OrbitBackendController
@start_d_t = params[:startDate] @start_d_t = params[:startDate]
end end
render :layout => false render :layout => false
#respond_to do |format|
# format.html # new.html.erb
# format.json { render json: @event }
#end
end end
# GET /events/1/edit # GET /events/1/edit
def edit def edit
@event = Event.find(params[:id]) @event = Event.find(params[:id])
@categories = get_categories_for_index
@end_d_t = @event.end.strftime("%Y/%m/%d %H:%M").to_s @end_d_t = @event.end.strftime("%Y/%m/%d %H:%M").to_s
@start_d_t = @event.start.strftime("%Y/%m/%d %H:%M").to_s @start_d_t = @event.start.strftime("%Y/%m/%d %H:%M").to_s
@all_day = @event.all_day @all_day = @event.all_day
@ -80,12 +79,8 @@ class Panel::CalendarNew::BackEnd::EventsController < OrbitBackendController
# POST /events # POST /events
# POST /events.json # POST /events.json
def create def create
@event = Event.new(params[:event]) @event = Event.new(params[:event])
# if params[:event][:period] == "Does not repeat"
#else
# @event_recurring = EventRecurring.new(params[:event])
#end
if @event.present? && @event.save if @event.present? && @event.save
render json: @event.to_json render json: @event.to_json
else else

17
vendor/built_in_modules/calendar_new/app/models/event.rb vendored
View File

@ -4,6 +4,7 @@ require 'date'
class Event class Event
include Mongoid::Document include Mongoid::Document
include Mongoid::Timestamps include Mongoid::Timestamps
include OrbitCategory::Categorizable
include Mongoid::MultiParameterAttributes include Mongoid::MultiParameterAttributes
field :title field :title
@ -12,13 +13,11 @@ class Event
field :end, type: DateTime field :end, type: DateTime
field :all_day, type: Boolean field :all_day, type: Boolean
field :recurring, type: Boolean field :recurring, type: Boolean
field :event_category_id
field :frequency field :frequency
field :period field :period
attr_accessor :agenda_start, :agenda_end, :get_agenda_events attr_accessor :agenda_start, :agenda_end, :get_agenda_events
belongs_to :event_category
validates_presence_of :title, :message => "Please fill the title of the Event" validates_presence_of :title, :message => "Please fill the title of the Event"
@ -42,8 +41,8 @@ class Event
:end => self.end.rfc822, :end => self.end.rfc822,
:allDay => self.all_day, :allDay => self.all_day,
:recurring => self.recurring, :recurring => self.recurring,
:calendar => self.event_category_id, :calendar => self.category_id,
:color => EventCategory.find(self.event_category_id).color, :color => Category.find(self.category_id).custom_value,
:edit_url => Rails.application.routes.url_helpers.edit_panel_calendar_new_back_end_event_path(self.id), :edit_url => Rails.application.routes.url_helpers.edit_panel_calendar_new_back_end_event_path(self.id),
:delete_url => Rails.application.routes.url_helpers.panel_calendar_new_back_end_event_path(self.id) :delete_url => Rails.application.routes.url_helpers.panel_calendar_new_back_end_event_path(self.id)
} }
@ -64,13 +63,13 @@ class Event
@i = TimeDifference.between(re.start,end_date).in_days.to_i @i = TimeDifference.between(re.start,end_date).in_days.to_i
(1..@i).each do |i| (1..@i).each do |i|
@start_date = re.start + i @start_date = re.start + i
@recurring << {:id => re.id, :title=>re.title, :note=>re.note, :start=>@start_date, :end => @start_date, :allDay => re.all_day, :recurring => re.recurring, :calendar => re.event_category_id.to_s, :color => EventCategory.find(re.event_category_id).color, :edit_url => Rails.application.routes.url_helpers.edit_panel_calendar_new_back_end_event_path(re.id), :delete_url => Rails.application.routes.url_helpers.panel_calendar_new_back_end_event_path(re.id)} @recurring << {:id => re.id, :title=>re.title, :note=>re.note, :start=>@start_date, :end => @start_date, :allDay => re.all_day, :recurring => re.recurring, :calendar => re.category_id.to_s, :color => Category.find(re.category_id).custom_value, :edit_url => Rails.application.routes.url_helpers.edit_panel_calendar_new_back_end_event_path(re.id), :delete_url => Rails.application.routes.url_helpers.panel_calendar_new_back_end_event_path(re.id)}
end end
elsif re.start < start_date elsif re.start < start_date
@i = TimeDifference.between(start_date,end_date).in_days.to_i @i = TimeDifference.between(start_date,end_date).in_days.to_i
(0..@i-1).each do |i| (0..@i-1).each do |i|
@start_date = start_date.to_date + i @start_date = start_date.to_date + i
@recurring << {:id => re.id, :title=>re.title, :note=>re.note, :start=>@start_date, :end => @start_date, :allDay => re.all_day, :recurring => re.recurring, :calendar => re.event_category_id.to_s, :color => EventCategory.find(re.event_category_id).color, :edit_url => Rails.application.routes.url_helpers.edit_panel_calendar_new_back_end_event_path(re.id), :delete_url => Rails.application.routes.url_helpers.panel_calendar_new_back_end_event_path(re.id)} @recurring << {:id => re.id, :title=>re.title, :note=>re.note, :start=>@start_date, :end => @start_date, :allDay => re.all_day, :recurring => re.recurring, :calendar => re.category_id.to_s, :color => Category.find(re.category_id).custom_value, :edit_url => Rails.application.routes.url_helpers.edit_panel_calendar_new_back_end_event_path(re.id), :delete_url => Rails.application.routes.url_helpers.panel_calendar_new_back_end_event_path(re.id)}
end end
end end
when "Weekly" when "Weekly"
@ -81,7 +80,7 @@ class Event
@start_date += (7*re.frequency.to_i) @start_date += (7*re.frequency.to_i)
@end_date += (7*re.frequency.to_i) @end_date += (7*re.frequency.to_i)
@recurring << {:id => re.id, :title=>re.title, :note=>re.note, :start=>@start_date, :end => @end_date, :allDay => re.all_day, :recurring => re.recurring, :calendar => re.event_category_id.to_s, :color => EventCategory.find(re.event_category_id).color, :edit_url => Rails.application.routes.url_helpers.edit_panel_calendar_new_back_end_event_path(re.id), :delete_url => Rails.application.routes.url_helpers.panel_calendar_new_back_end_event_path(re.id)} @recurring << {:id => re.id, :title=>re.title, :note=>re.note, :start=>@start_date, :end => @end_date, :allDay => re.all_day, :recurring => re.recurring, :calendar => re.category_id.to_s, :color => Category.find(re.category_id).custom_value, :edit_url => Rails.application.routes.url_helpers.edit_panel_calendar_new_back_end_event_path(re.id), :delete_url => Rails.application.routes.url_helpers.panel_calendar_new_back_end_event_path(re.id)}
end end
when "Monthly" when "Monthly"
if !(start_date..end_date).cover?(re.start) if !(start_date..end_date).cover?(re.start)
@ -91,7 +90,7 @@ class Event
@start_date = sd @start_date = sd
sd = sd >> @i*re.frequency.to_i sd = sd >> @i*re.frequency.to_i
ed = ed >> @i*re.frequency.to_i ed = ed >> @i*re.frequency.to_i
@recurring << {:id => re.id, :title=>re.title, :note=>re.note, :start=>sd, :end => ed, :allDay => re.all_day, :recurring => re.recurring, :calendar => re.event_category_id.to_s, :color => EventCategory.find(re.event_category_id).color, :edit_url => Rails.application.routes.url_helpers.edit_panel_calendar_new_back_end_event_path(re.id), :delete_url => Rails.application.routes.url_helpers.panel_calendar_new_back_end_event_path(re.id)} @recurring << {:id => re.id, :title=>re.title, :note=>re.note, :start=>sd, :end => ed, :allDay => re.all_day, :recurring => re.recurring, :calendar => re.category_id.to_s, :color => Category.find(re.category_id).custom_value, :edit_url => Rails.application.routes.url_helpers.edit_panel_calendar_new_back_end_event_path(re.id), :delete_url => Rails.application.routes.url_helpers.panel_calendar_new_back_end_event_path(re.id)}
end end
when "Yearly" when "Yearly"
if !(start_date..end_date).cover?(re.start) if !(start_date..end_date).cover?(re.start)
@ -101,7 +100,7 @@ class Event
@start_date = sd @start_date = sd
sd = sd >> 12 * @i*re.frequency.to_i sd = sd >> 12 * @i*re.frequency.to_i
ed = ed >> 12 * @i*re.frequency.to_i ed = ed >> 12 * @i*re.frequency.to_i
@recurring << {:id => re.id, :title=>re.title, :note=>re.note, :start=>sd, :end => ed, :allDay => re.all_day, :recurring => re.recurring, :calendar => re.event_category_id.to_s, :color => EventCategory.find(re.event_category_id).color, :edit_url => Rails.application.routes.url_helpers.edit_panel_calendar_new_back_end_event_path(re.id), :delete_url => Rails.application.routes.url_helpers.panel_calendar_new_back_end_event_path(re.id)} @recurring << {:id => re.id, :title=>re.title, :note=>re.note, :start=>sd, :end => ed, :allDay => re.all_day, :recurring => re.recurring, :calendar => re.category_id.to_s, :color => Category.find(re.category_id).custom_value, :edit_url => Rails.application.routes.url_helpers.edit_panel_calendar_new_back_end_event_path(re.id), :delete_url => Rails.application.routes.url_helpers.panel_calendar_new_back_end_event_path(re.id)}
end end
end end
end end

21
vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/back_end/event_categories/_category.html.erb vendored Normal file
View File

@ -0,0 +1,21 @@
<tr class="<%= 'disable' if category.disable %>">
<% @site_valid_locales.each_with_index do |locale, i| %>
<td>
<%= category.title_translations[locale] %>
<% if i == 0 %>
<div class="quick-edit">
<ul class="nav nav-pills">
<% if is_admin?%>
<li><%= link_to t(:edit), '#', class: "open-slide", data: {title: t(:edit_category), id: category.id.to_s, module: @module_app_id.to_s, form: category.title_translations.merge(color: category.custom_value)} %></li>
<li><%= link_to show_toggle_archive_btn(category), toggle_admin_module_app_category_path(@module_app_id, category), method: :post, remote: true, class: "archive_toggle" %></li>
<% end %>
<% if is_manager? || is_admin? %>
<li><%= link_to t(:category_auth), admin_authorizations_path(@module_app.key, 'category_authorization', category.id) %></li>
<% end %>
</ul>
</div>
<% end %>
</td>
<% end %>
<td><span class="badge" style="background-color: <%= category.custom_value %>;"><%= category.custom_value %></span></td>
</tr>

12
vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/back_end/event_categories/_form.html.erb vendored Normal file
View File

@ -0,0 +1,12 @@
<%= flash_messages %>
<%= f.error_messages %>
<%= label_tag("color", t("calendar.color")) %>
<div class="input-append">
<%= f.text_field :custom_value, id: "color", :class => "color-picker miniColors input-small", :size => "7", :maxlength => "7", :autocomplete=>"off",:value=>"9100FF" %>
</div>
<%= f.fields_for :title_translations do |f| %>
<% @site_valid_locales.each do |locale| %>
<%= label_tag "name-#{locale}", "#{t(:name)} (#{I18nVariable.from_locale(locale)})" %>
<%= f.text_field locale, :class => 'input-large', :value => (@category.title_translations[locale] rescue ''), placeholder: t(:name), id: locale %>
<% end %>
<% end %>

79
vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/back_end/event_categories/index.html.erb vendored
View File

@ -1,28 +1,65 @@
<table class="table main-list"> <%= stylesheet_link_tag "jquery.miniColors" %>
<%= javascript_include_tag "jquery.miniColors.min" %>
<%= javascript_include_tag "admin/categories" %>
<div id="categories_index">
<table class="table main-list">
<thead> <thead>
<tr> <tr class="sort-header">
<th class="span1"><%= t('event_category.name') %></th> <% @site_valid_locales.each_with_index do |locale, i| %>
<th class="span1"><%= t('event_category.color') %></th> <th class="<%= 'span5' if i <= 1 %>"><a href="#"><%= t(:_locale, :locale => locale) %></a></th>
<%if is_manager? %>
<th class="span1"><%= t('event_category.edit') %></th>
<th class="span1"><%= t('event_category.delete') %></th>
<% end %> <% end %>
<th class="span2"><a href="#"><%= t('event_category.color') %></a></th>
</tr> </tr>
</thead> </thead>
<tbody id="tbody_locations" class="sort-holder"> <tbody>
<% @event_categories.each do |event_category| %> <%= render partial: 'category', collection: @categories %>
<tr class="with_action">
<td><%= event_category.name %></td>
<td><%= event_category.color%></td>
<%if is_manager? %>
<td><%= link_to 'Edit', edit_panel_calendar_new_back_end_event_category_path(event_category) %></td>
<td><%= link_to 'Destroy', panel_calendar_new_back_end_event_category_path(event_category), method: :delete , :confirm => t(:sure?) %></td>
<%end%>
</tr>
<% end %>
</tbody> </tbody>
</table> </table>
<%= link_to "Add", new_panel_calendar_new_back_end_event_category_path, :class => "btn btn-primary pull-right", :id=>"create_event_btn", :ref=>"add-btn" %> <div class="bottomnav clearfix">
</p> <div class="action pull-right">
<%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), '#', class: "btn btn-primary open-slide", data: {title: t(:add_category), id: 'new', module: @module_app_id.to_s } %>
</div>
<div class="pagination pagination-centered">
<%= paginate @categories unless @categories.blank? %>
</div>
</div>
</div>
<div id="pageslide">
<div class="page-title clearfix">
<a class="pull-right" href="javascript:$.pageslide.close()">
<i class="icons-arrow-left-2"></i>
</a>
<span></span>
</div>
<div class="view-page">
<div class="nano">
<div class="content">
<%= form_for :category, url: nil, html:{:id=>"color"}, remote: true do |f| %>
<fieldset>
<%= render :partial => "form", :locals => { :f => f } %>
<div class="form-actions">
<a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
<%= f.submit t(:submit), class: 'btn btn-primary btn-small' %>
</div>
</fieldset>
<% end %>
</div>
</div>
</div>
</div>
<script type="text/javascript">
if($('.color-picker').length > 0){
$('.color-picker').miniColors(); // just in category view
$('.miniColors-trigger').addClass('btn');
}
$("form#color").bind("ajax:complete",function(){
$.get("<%= panel_calendar_new_back_end_event_categories_list_path %>",function(data){
$("#categories_index").html(data);
openSlide();
})
})
</script>

13
vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/back_end/event_categories/list.html.erb vendored Normal file
View File

@ -0,0 +1,13 @@
<table class="table main-list">
<thead>
<tr class="sort-header">
<% @site_valid_locales.each_with_index do |locale, i| %>
<th class="<%= 'span5' if i <= 1 %>"><a href="#"><%= t(:_locale, :locale => locale) %></a></th>
<% end %>
<th class="span2"><a href="#"><%= t('event_category.color') %></a></th>
</tr>
</thead>
<tbody>
<%= render partial: 'category', collection: @categories %>
</tbody>
</table>

2
vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/back_end/events/_form.html.erb vendored
View File

@ -52,7 +52,7 @@
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<%= f.label "Calendar", :class=>"control-label span3" %> <%= f.label "Calendar", :class=>"control-label span3" %>
<%= f.collection_select :event_category_id, EventCategory.all, :id, :name%> <%= f.select :category_id, @categories.collect{|t| [ t.title, t.id ]} %>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<label class="checkbox inline"><%= f.check_box :recurring,:id=>"recurring_checkbox", :checked => @recurring %> Recurring</label> <label class="checkbox inline"><%= f.check_box :recurring,:id=>"recurring_checkbox", :checked => @recurring %> Recurring</label>

2
vendor/built_in_modules/calendar_new/config/routes.rb vendored
View File

@ -2,8 +2,10 @@ Rails.application.routes.draw do
namespace :panel do namespace :panel do
namespace :calendar_new do namespace :calendar_new do
namespace :back_end do namespace :back_end do
match 'event_categories/list' => "event_categories#list"
resources :event_categories resources :event_categories
match 'events/agenda' => 'events#agenda', :as => :agenda match 'events/agenda' => 'events#agenda', :as => :agenda
resources :events resources :events
end end
namespace :front_end do namespace :front_end do

12
vendor/built_in_modules/calendar_new/init.rb vendored
View File

@ -28,18 +28,18 @@ module CalendarNew
head_link_path "panel_calendar_new_back_end_events_path" head_link_path "panel_calendar_new_back_end_events_path"
context_link 'calendar.categories', # context_link 'calendar.categories',
:link_path=>"admin_module_app_categories_path(get_module_app)" , # :link_path=>"admin_module_app_categories_path(get_module_app)" ,
:priority=>2, # :priority=>2,
:active_for_category => 'CalendarNew', # :active_for_category => 'CalendarNew',
:available_for => [:manager] # :available_for => [:manager]
context_link 'tags', context_link 'tags',
:link_path=>"admin_module_tags_path(module_app_id: get_module_app)" , :link_path=>"admin_module_tags_path(module_app_id: get_module_app)" ,
:priority=>4, :priority=>4,
:active_for_tag => 'CalendarNew', :active_for_tag => 'CalendarNew',
:available_for => [:manager] :available_for => [:manager]
context_link 'calendar.color', context_link 'calendar.categories',
:link_path=>"panel_calendar_new_back_end_event_categories_path" , :link_path=>"panel_calendar_new_back_end_event_categories_path" ,
:priority=>3, :priority=>3,
:active_for_tag => 'CalendarNew', :active_for_tag => 'CalendarNew',